More npm/css/js updates

package.json

@@ -16,10 +16,16 @@
     "jquery": "^3.1.1",
     "laravel-mix": "0.12.1",
     "lodash": "^4.17.4",
-    "vue": "2.1.6"
+    "vue": "2.3.3",
+    "vue-template-compiler": "2.3.3"
   },
   "dependencies": {
     "blueimp-file-upload": "^9.18.0",
+    "bootstrap-colorpicker": "^2.5.1",
+    "bootstrap-less": "^3.3.8",
+    "ekko-lightbox": "^5.1.1",
+    "fastclick": "^1.0.6",
+    "font-awesome": "^4.7.0",
     "jquery-ui": "^1.12.1",
     "select2": "^4.0.3",
     "vue-resource": "^1.3.3",

public/mix-manifest.json

@@ -1,12 +1,15 @@
 {
   "/build/vue.js": "/build/vue.js",
   "/mix.js": "/mix.js",
-  "/build/app.css": "/build/app.css",
+  "/build/app.css": "/build/app.535d8af1016a2377e449920c617f0197.css",
-  "/build/AdminLTE.css": "/build/AdminLTE.css",
+  "/build/AdminLTE.css": "/build/AdminLTE.3d8a2b2e33baa060b1b324363ad5e1c2.css",
-  "/build/overrides.css": "/build/overrides.css",
+  "/build/overrides.css": "/build/overrides.617623c6a96be3e0cbd11c5d4039ec10.css",
   "/css/all.css": "/css/all.css",
   "/js/all.js": "/js/all.js",
-  "/css/app.css": "/css/app.47a3626f2a026645fe48f025aacc900f.css",
+  "/css/app.css": "/css/app.css",
   "/css/dist/all.css": "/css/dist/all.css",
-  "/js/dist/all.js": "/js/dist/all.js"
+  "/js/dist/all.js": "/js/dist/all.js",
+  "/css/AdminLTE.css": "/css/AdminLTE.css",
+  "/css/overrides.css": "/css/overrides.css",
+  "/css/skin-blue.css": "/css/skin-blue.css"
 }

resources/assets/less/AdminLTE.less

@@ -37,14 +37,11 @@
 @import "navs.less";
 @import "table.less";
 @import "labels.less";
-@import "direct-chat.less";
-@import "users-list.less";
 @import "modal.less";
 
 //PAGES
 //------
 @import "login_and_register.less";
-@import "404_500_errors.less";
 
 //Plugins
 //--------
@@ -56,3 +53,5 @@
 //-------------
 @import "miscellaneous.less";
 @import "print.less";
+
+@import "skins/skin-blue.less";

resources/assets/less/app.less

@@ -1,11 +1,8 @@
-@icon-font-path: '../../../bower_components/bootstrap-less/fonts';
+@icon-font-path: '../public/fonts';
-@fa-font-path:   '../../../bower_components/font-awesome/fonts/';
+@fa-font-path: "../public/fonts";
-@import '../../../bower_components/bootstrap-less/less/bootstrap';
+@import '../../../node_modules/font-awesome/less/font-awesome';
-@import '../../../bower_components/font-awesome/less/font-awesome';
+@import '../../../node_modules/bootstrap/less/bootstrap';
-@import '../../../bower_components/ekko-lightbox/ekko-lightbox';
+@import '../../../node_modules/ekko-lightbox/ekko-lightbox';
-@import '../../../bower_components/bootstrap-colorpicker/src/less/colorpicker';
+@import '../../../node_modules/bootstrap-colorpicker/src/less/colorpicker';
-
-
-
 
 

resources/views/dashboard.blade.php

@@ -10,7 +10,6 @@
 {{-- Page content --}}
 @section('content')
 
-<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/morris.css') }}">
 <div class="row">
   <!-- panel -->
   <div class="col-lg-3 col-xs-6">

resources/views/hardware/import.blade.php

@@ -1,5 +1,5 @@
 @extends('layouts/default')
-<link rel="stylesheet" type="text/css" href="{{ asset('assets/css/lib/jquery.fileupload.css') }}">
+<link rel="stylesheet" type="text/css" href="{{ asset('css/lib/jquery.fileupload.css') }}">
 {{-- Page title --}}
 @section('title')
 {{ trans('general.import') }}
@@ -19,4 +19,4 @@
         el: '#app'
     });
 </script>
-@endsection
+@endsection

resources/views/layouts/default.blade.php

@@ -13,15 +13,15 @@
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
 
     <!-- Select2 -->
-    <link rel="stylesheet" href="{{ asset('assets/js/plugins/select2/select2.min.css') }}">
+    <link rel="stylesheet" href="{{ asset('js/plugins/select2/select2.min.css') }}">
 
     <!-- iCheck for checkboxes and radio inputs -->
-    <link rel="stylesheet" href="{{ asset('assets/js/plugins/iCheck/all.css') }}">
+    <link rel="stylesheet" href="{{ asset('js/plugins/iCheck/all.css') }}">
 
     <!-- bootstrap tables CSS -->
-    <link rel="stylesheet" href="{{ asset('assets/css/bootstrap-table.css') }}">
+    <link rel="stylesheet" href="{{ asset('css/bootstrap-table.css') }}">
 
-    <link rel="stylesheet" href="{{ mix('assets/css/app.css') }}">
+    <link rel="stylesheet" href="{{ mix('css/dist/all.css') }}">
 
     <link rel="shortcut icon" type="image/ico" href="{{ asset('favicon.ico') }}">
 
@@ -88,8 +88,8 @@
             <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
 
        @else
-            <script src="{{ asset('assets/js/html5shiv.js') }}"></script>
+            <script src="{{ asset('js/html5shiv.js') }}"></script>
-            <script src="{{ asset('assets/js/respond.js') }}"></script>
+            <script src="{{ asset('js/respond.js') }}"></script>
        @endif
        <![endif]-->
   </head>
@@ -671,7 +671,7 @@
 
 
 
-    <script src="{{ mix('js/all.js') }}"></script>
+    <script src="{{ mix('js/dist/all.js') }}"></script>
 
     @section('moar_scripts')
     @show

resources/views/partials/bootstrap-table.blade.php

@@ -1,16 +1,16 @@
 {{-- This Will load our default bootstrap-table settings on any table with a class of "snipe-table" and export it to the passed 'exportFile' name --}}
-<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
+<script src="{{ asset('js/bootstrap-table.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
+<script src="{{ asset('js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
 
 @if (!isset($simple_view))
-<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js?v=1') }}"></script>
+<script src="{{ asset('js/extensions/export/bootstrap-table-export.js?v=1') }}"></script>
-<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js?v=1') }}"></script>
+<script src="{{ asset('js/extensions/cookie/bootstrap-table-cookie.js?v=1') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
+<script src="{{ asset('js/extensions/export/tableExport.js') }}"></script>
-<script src="{{ asset('assets/js/FileSaver.min.js') }}"></script>
+<script src="{{ asset('js/FileSaver.min.js') }}"></script>
-<script src="{{ asset('assets/js/jspdf.min.js') }}"></script>
+<script src="{{ asset('js/jspdf.min.js') }}"></script>
-<script src="{{ asset('assets/js/jspdf.plugin.autotable.js') }}"></script>
+<script src="{{ asset('js/jspdf.plugin.autotable.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
+<script src="{{ asset('js/extensions/export/jquery.base64.js') }}"></script>
-<script src="{{ asset('assets/js/extensions/toolbar/bootstrap-table-toolbar.js') }}"></script>
+<script src="{{ asset('js/extensions/toolbar/bootstrap-table-toolbar.js') }}"></script>
 @endif
 
 <script>

webpack.mix.js

@@ -0,0 +1,64 @@
+
+const { mix } = require('laravel-mix');
+
+mix.setPublicPath('build');
+
+mix
+    .less('resources/assets/less/AdminLTE.less', 'public/css')
+    .less('resources/assets/less/app.less', 'public/css')
+    .less('resources/assets/less/overrides.less', 'public/css')
+    .copy('./node_modules/bootstrap/fonts/*', 'public/fonts')
+    .copy('./node_modules/font-awesome/fonts/*', 'public/fonts')
+    .options(
+        {
+        processCssUrls: false,
+        processFontUrls: false,
+            uglify: {
+                compress: false,
+            }
+
+    })
+
+
+.styles([
+    'public/css/app.css',
+    'public/css/AdminLTE.css',
+    './bower_components/iCheck/skins/minimal/minimal.css',
+    'public/css/overrides.css',
+
+], 'public/css/dist/all.css')
+
+//mix.version('public/css/all.css', 'public/css');
+
+
+.js(
+    // jQuery is loaded from vue.js webpack process
+    './resources/assets/js/vue.js', //this is Snipe-IT's initializer for Vue.js
+    'public/build'
+)
+
+.scripts([
+    'public/build/vue.js', //this is the modularized nifty Vue.js thing we just built, above!
+    './bower_components/tether/dist/js/tether.min.js',
+    './bower_components/jquery-ui/jquery-ui.js',
+    './bower_components/jquery-slimscroll/jquery.slimscroll.js',
+    './bower_components/jquery.iframe-transport/jquery.iframe-transport.js',
+    './bower_components/blueimp-file-upload/js/jquery.fileupload.js',
+    './node_modules/fastclick/lib/fastclick.js',
+    './node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js',
+    './bower_components/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
+    './bower_components/iCheck/icheck.js',
+    './bower_components/select2/dist/js/select2.full.js',
+    './node_modules/ekko-lightbox/dist/ekko-lightbox.js',
+    './resources/assets/js/app.js', //this is part of AdminLTE
+    './resources/assets/js/snipeit.js', //this is the actual Snipe-IT JS
+
+
+
+],'public/js/dist/all.js');
+
+//if (mix.config.inProduction) {
+//    mix.version();
+//}
+
+