Ficing webpack, CSS and JS (*whew* that sucked)

Signed-off-by: snipe <snipe@snipe.net>

public/mix-manifest.json

@@ -1,42 +1,38 @@
 {
-    "/js/build/vue.js": "/js/build/vue.js",
+    "/js/build/app.js": "/js/build/app.js?id=a7bc4e83c6d3ae912094",
-    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css",
+    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341",
-    "/css/build/app.css": "/css/build/app.css",
+    "/css/build/app.css": "/css/build/app.css?id=180fafe3f6a28ed15dd7",
-    "/css/build/overrides.css": "/css/build/overrides.css",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=d4fe2beb579ecbeb4ee2",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=9fa704134cfacfacab93",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css",
+    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=747948e5f269f64047f7",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css",
+    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=d7996d850e8bcdc4e167",
-    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css",
+    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=eb25d2ec49f730d09431",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=0cfa39cacd9c83b4f53b",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css",
+    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=35602987835e5d50d162",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=6bd9c2420a41eaf96f0b",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=60de5bc2660c35544c4d",
-    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css",
+    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=b6dcb6d5c666fc5c8cc0",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=9dd1dc817a71431e5904",
-    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css",
+    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=cb85a4e40e784319e878",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=4a19f5ae861f98f40bab",
-    "/css/skins/dist/skin-blue-dark.css": "/css/skins/dist/skin-blue-dark.css",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=2f665cf40d7348b3f94c",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=71c178700d68294e3413",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css",
+    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b4fc4a74e1f6367dc3e2",
-    "/js/build/vue.js.map": "/js/build/vue.js.map",
+    "/css/dist/all.css": "/css/dist/all.css?id=eb45baac804f83ec6cf1",
-    "/css/build/AdminLTE.css.map": "/css/build/AdminLTE.css.map",
+    "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
-    "/css/build/app.css.map": "/css/build/app.css.map",
+    "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
-    "/css/build/overrides.css.map": "/css/build/overrides.css.map",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=0cfa39cacd9c83b4f53b",
-    "/css/dist/skins/skin-blue.css.map": "/css/dist/skins/skin-blue.css.map",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=6bd9c2420a41eaf96f0b",
-    "/css/dist/skins/skin-red.css.map": "/css/dist/skins/skin-red.css.map",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=2f665cf40d7348b3f94c",
-    "/css/dist/skins/skin-contrast.css.map": "/css/dist/skins/skin-contrast.css.map",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=4a19f5ae861f98f40bab",
-    "/css/dist/skins/skin-green.css.map": "/css/dist/skins/skin-green.css.map",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=60de5bc2660c35544c4d",
-    "/css/dist/skins/skin-green-dark.css.map": "/css/dist/skins/skin-green-dark.css.map",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=9dd1dc817a71431e5904",
-    "/css/dist/skins/skin-black.css.map": "/css/dist/skins/skin-black.css.map",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=71c178700d68294e3413",
-    "/css/dist/skins/skin-black-dark.css.map": "/css/dist/skins/skin-black-dark.css.map",
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=d7996d850e8bcdc4e167",
-    "/css/dist/skins/skin-red-dark.css.map": "/css/dist/skins/skin-red-dark.css.map",
+    "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
-    "/css/dist/skins/skin-purple.css.map": "/css/dist/skins/skin-purple.css.map",
+    "/css/build/signature-pad.min.css": "/css/build/signature-pad.min.css?id=d41d8cd98f00b204e980",
-    "/css/dist/skins/skin-purple-dark.css.map": "/css/dist/skins/skin-purple-dark.css.map",
+    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=a534edb9f7179f6dcf62",
-    "/css/dist/skins/skin-yellow.css.map": "/css/dist/skins/skin-yellow.css.map",
+    "/js/build/vendor.js": "/js/build/vendor.js?id=ac70ab5fd89efc2aa7d0",
-    "/css/dist/skins/skin-yellow-dark.css.map": "/css/dist/skins/skin-yellow-dark.css.map",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=9407782198cbc29f23d1",
-    "/css/skins/dist/skin-blue-dark.css.map": "/css/skins/dist/skin-blue-dark.css.map",
+    "/js/dist/all.js": "/js/dist/all.js?id=f930032e5ca0a4bb587a"
-    "/css/dist/skins/skin-orange-dark.css.map": "/css/dist/skins/skin-orange-dark.css.map",
-    "/css/dist/skins/skin-orange.css.map": "/css/dist/skins/skin-orange.css.map",
-    "/css/dist/all.css": "/css/dist/all.css",
-    "/js/dist/all.js": "/js/dist/all.js"
 }

resources/assets/less/AdminLTE.less

@@ -59,3 +59,4 @@
 @import "print.less";
 
 
+

resources/assets/less/app.less

@@ -1,7 +1,453 @@
 
-@icon-font-path: '../fonts';
+body {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
+  "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+  sans-serif;
+  font-size: 13px;
+}
+// Moved from default.blade.php
+@media (max-width: 400px) {
+  .navbar-left {
+    margin: 2px;
+  }
 
-@import '../../../node_modules/bootstrap-less/bootstrap/bootstrap';
+  .nav::after {
-@import '../../../node_modules/ekko-lightbox/ekko-lightbox';
+    clear: none;
-@import '../../../node_modules/bootstrap-colorpicker/src/less/colorpicker';
+  }
+}
 
+.skin-blue .main-header .logo {
+  background-color: inherit !important;
+}
+.main-header .logo {
+  width: 100% !important;
+  white-space: nowrap;
+  text-align: left;
+  display: block;
+  clear: both;
+  //text-overflow: hidden;
+}
+
+.huge {
+  font-size: 40px;
+}
+
+.btn-file {
+  position: relative;
+  overflow: hidden;
+}
+
+.dropdown-menu > li > a {
+  color: #354044;
+}
+
+#sort tr.cansort {
+  border-radius: 2px;
+  padding: 10px;
+  background: #f4f4f4;
+  margin-bottom: 3px;
+  border-left: 2px solid #e6e7e8;
+  color: #444;
+  cursor: move;
+}
+
+.user-image-inline {
+  float: left;
+  width: 25px;
+  height: 25px;
+  border-radius: 50%;
+  margin-right: 10px;
+}
+
+.input-group .input-group-addon {
+  background-color: #f4f4f4;
+}
+
+a.accordion-header {
+  color: #333;
+}
+
+.dynamic-form-row {
+  padding: 10px;
+  margin: 20px;
+}
+
+.handle {
+  padding-left: 10px;
+}
+
+.btn-file input[type="file"] {
+  position: absolute;
+  top: 0;
+  right: 0;
+  min-width: 100%;
+  min-height: 100%;
+  font-size: 100px;
+  text-align: right;
+  filter: alpha(opacity=0);
+  opacity: 0;
+  outline: none;
+  background: white;
+  cursor: inherit;
+  display: block;
+}
+
+.main-footer {
+  font-size: 13px;
+}
+
+.main-header {
+  max-height: 150px;
+}
+
+.navbar-nav > .user-menu > .dropdown-menu {
+  width: inherit;
+}
+
+.main-header .logo {
+  padding: 0px 5px 0px 15px;
+}
+
+.sidebar-toggle {
+  margin-left: -48px;
+  z-index: 100;
+  background-color: inherit;
+}
+
+.sidebar-toggle-mobile {
+  z-index: 100;
+  width: 50px;
+  padding-top: 10px;
+}
+
+// .skin-blue .main-header .navbar .dropdown-menu li a {
+//   //color: inherit;
+// }
+
+.main-header .sidebar-toggle:before {
+  content: "\f0c9";
+}
+
+.direct-chat-contacts {
+  padding: 10px;
+  height: 150px;
+}
+
+.select2-container {
+  width: 100%;
+}
+.error input {
+  color: #dd4b39;
+  border: 2px solid #dd4b39 !important;
+}
+
+.error label,
+.alert-msg {
+  color: #dd4b39;
+  display: block;
+}
+
+.input-group[class*="col-"] {
+  padding-right: 15px;
+  padding-left: 15px;
+}
+.control-label.multiline {
+  padding-top: 10px;
+}
+
+.btn-outline {
+  color: inherit;
+  background-color: transparent;
+  transition: all 0.5s;
+}
+
+.btn-primary.btn-outline {
+  color: #428bca;
+}
+
+.btn-success.btn-outline {
+  color: #5cb85c;
+}
+
+.btn-info.btn-outline {
+  color: #5bc0de;
+}
+
+.btn-warning.btn-outline {
+  color: #f0ad4e;
+}
+
+.btn-danger.btn-outline {
+  color: #d9534f;
+}
+
+.btn-primary.btn-outline:hover,
+.btn-success.btn-outline:hover,
+.btn-info.btn-outline:hover,
+.btn-warning.btn-outline:hover,
+.btn-danger.btn-outline:hover {
+  color: #fff;
+}
+
+.slideout-menu {
+  position: fixed;
+  top: 0;
+  right: -250px;
+  width: 250px;
+  height: 100%;
+  background: #333;
+  z-index: 100;
+  margin-top: 100px;
+  color: white;
+  padding: 10px;
+}
+
+.slideout-menu h3 {
+  position: relative;
+  padding: 5px 5px;
+  color: #fff;
+  font-size: 1.2em;
+  font-weight: 400;
+  border-bottom: 4px solid #222;
+}
+
+.slideout-menu .slideout-menu-toggle {
+  position: absolute;
+  top: 12px;
+  right: 10px;
+  display: inline-block;
+  padding: 6px 9px 5px;
+  font-family: Arial, sans-serif;
+  font-weight: bold;
+  line-height: 1;
+  background: #222;
+  color: #999;
+  text-decoration: none;
+  vertical-align: top;
+}
+
+.slideout-menu .slideout-menu-toggle:hover {
+  color: #fff;
+}
+
+.slideout-menu ul {
+  list-style: none;
+  font-weight: 300;
+  border-top: 1px solid #151515;
+  border-bottom: 1px solid #454545;
+}
+
+.slideout-menu ul li {
+  border-top: 1px solid #454545;
+  border-bottom: 1px solid #151515;
+}
+
+.slideout-menu ul li a {
+  position: relative;
+  display: block;
+  padding: 10px;
+  color: #999;
+  text-decoration: none;
+}
+
+.slideout-menu ul li a:hover {
+  background: #000;
+  color: #fff;
+}
+
+.slideout-menu ul li a i {
+  position: absolute;
+  top: 15px;
+  right: 10px;
+  opacity: 0.5;
+}
+
+.btn-box-tool-lg {
+  font-size: 16px;
+  color: orange;
+}
+
+/*Form Wizard*/
+.bs-wizard {
+  margin-top: 20px;
+  border-bottom: solid 1px #e0e0e0;
+  padding: 0 0 10px 0;
+}
+.bs-wizard > .bs-wizard-step {
+  padding: 0;
+  position: relative;
+}
+
+//    .bs-wizard > .bs-wizard-step + .bs-wizard-step {}
+
+.bs-wizard > .bs-wizard-step .bs-wizard-stepnum {
+  color: #595959;
+  font-size: 16px;
+  margin-bottom: 5px;
+}
+
+.bs-wizard > .bs-wizard-step .bs-wizard-info {
+  color: #999;
+  font-size: 14px;
+}
+
+.bs-wizard > .bs-wizard-step > .bs-wizard-dot {
+  position: absolute;
+  width: 30px;
+  height: 30px;
+  display: block;
+  background: #fbe8aa;
+  top: 45px;
+  left: 50%;
+  margin-top: -15px;
+  margin-left: -15px;
+  border-radius: 50%;
+}
+
+.bs-wizard > .bs-wizard-step > .bs-wizard-dot:after {
+  content: " ";
+  width: 14px;
+  height: 14px;
+  background: #fbbd19;
+  border-radius: 50px;
+  position: absolute;
+  top: 8px;
+  left: 8px;
+}
+
+.bs-wizard > .bs-wizard-step > .progress {
+  position: relative;
+  border-radius: 0px;
+  height: 8px;
+  box-shadow: none;
+  margin: 20px 0;
+}
+
+.bs-wizard > .bs-wizard-step > .progress > .progress-bar {
+  width: 0px;
+  box-shadow: none;
+  background: #fbe8aa;
+}
+
+.bs-wizard > .bs-wizard-step.complete > .progress > .progress-bar {
+  width: 100%;
+}
+
+.bs-wizard > .bs-wizard-step.active > .progress > .progress-bar {
+  width: 50%;
+}
+
+.bs-wizard > .bs-wizard-step:first-child.active > .progress > .progress-bar {
+  width: 0%;
+}
+
+.bs-wizard > .bs-wizard-step:last-child.active > .progress > .progress-bar {
+  width: 100%;
+}
+
+.bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot {
+  background-color: #f5f5f5;
+}
+
+.bs-wizard > .bs-wizard-step.disabled > .bs-wizard-dot:after {
+  opacity: 0;
+}
+
+.bs-wizard > .bs-wizard-step:first-child > .progress {
+  left: 50%;
+  width: 50%;
+}
+
+.bs-wizard > .bs-wizard-step:last-child > .progress {
+  width: 50%;
+}
+
+.bs-wizard > .bs-wizard-step.disabled a.bs-wizard-dot {
+  pointer-events: none;
+}
+/*END Form Wizard*/
+
+.left-navblock {
+  display: inline-block;
+  // float: left;
+  text-align: left;
+  color: white;
+  padding: 0px;
+  /* adjust based on your layout */
+}
+
+.skin-blue .main-header .navbar .dropdown-menu li a {
+  color: #333;
+}
+
+a.logo.no-hover a:hover {
+  background-color: transparent;
+}
+
+.required {
+  border-right: 6px solid orange;
+}
+
+.sidebar-menu {
+  font-size: 14px;
+  white-space: normal;
+}
+
+@media print {
+  a[href]:after {
+    content: none;
+  }
+
+  .tab-content > .tab-pane {
+    display: block !important;
+    opacity: 1 !important;
+    visibility: visible !important;
+  }
+}
+
+img.navbar-brand-img,
+.navbar-brand > img {
+  float: left;
+  padding: 5px 5px 5px 0;
+  max-height: 50px;
+}
+
+.input-daterange {
+  border-radius: 0px;
+}
+
+.btn.bg-maroon,
+.btn.bg-purple {
+  min-width: 90px;
+}
+
+[hidden] {
+  display: none !important;
+}
+
+#toolbar {
+  margin-top: 10px;
+}
+
+#uploadPreview {
+  border-color: grey;
+  border-width: 1px;
+  border-style: solid;
+}
+
+.icon-med {
+  font-size: 20px;
+  color: #889195;
+}
+
+#login-logo {
+  padding-top: 20px;
+  padding-bottom: 10px;
+  max-width: 200px;
+}
+
+.left-navblock {
+  max-width: 500px;
+}
+
+@import "overrides.less";

resources/assets/less/overrides.less

@@ -466,7 +466,19 @@ h4 {
   display: table-cell;
 }
 
-.btn-link {
+.small-box {
-  color: @dark-gray;
+  padding-left: 10px;
-  text-decoration: underline;
+  padding-right: 10px;
+  color: #fff;
+}
+
+.small-box > a:link, .small-box > a:visited, .small-box > a:hover {
+  color: #fff;
+}
+
+.select2-container--default .select2-selection--single, .select2-selection .select2-selection--single {
+  border: 1px solid #d2d6de;
+  border-radius: 0;
+  padding: 6px 12px;
+  height: 34px;
 }

resources/assets/less/skins/_all-skins.less

@@ -1,14 +1,17 @@
 //All skins in one file
-@import "skin-blue.less";
-@import "skin-blue-light.less";
 @import "skin-black.less";
-@import "skin-black-light.less";
+@import "skin-black-dark.less";
-@import "skin-green.less";
+@import "skin-blue.less";
-@import "skin-green-light.less";
+@import "skin-blue-dark.less";
-@import "skin-red.less";
-@import "skin-red-light.less";
-@import "skin-yellow.less";
-@import "skin-yellow-light.less";
-@import "skin-purple.less";
-@import "skin-purple-light.less";
 @import "skin-contrast.less";
+@import "skin-green.less";
+@import "skin-green-dark.less";
+@import "skin-orange-dark.less";
+@import "skin-purple.less";
+@import "skin-purple-dark.less";
+@import "skin-red.less";
+@import "skin-red-dark.less";
+@import "skin-orange.less";
+@import "skin-yellow.less";
+@import "skin-yellow-dark.less";
+

resources/views/layouts/default.blade.php

@@ -29,8 +29,9 @@
 
     {{-- stylesheets --}}
 
-    <link rel="stylesheet" href="{{ url('css/dist/all.css') }}">
+    <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
-    <link rel="stylesheet" href="{{ url('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css') }}">
+    <link rel="stylesheet" href="{{ url(mix('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css')) }}">
+
 
 
       {{-- page level css --}}
@@ -70,6 +71,7 @@
           </style>
       @endif
 
+
     <script nonce="{{ csrf_token() }}">
           window.snipeit = {
               settings: {
@@ -836,7 +838,7 @@
     </div>
 
     {{-- Javascript files --}}
-    <script src="{{ url('js/dist/all.js') }}" nonce="{{ csrf_token() }}"></script>
+    <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
     {{-- Page level javascript --}}
     @stack('js')
 

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

@@ -1,14 +1,9 @@
 @push('css')
-<link rel="stylesheet" href="{{ url('css/dist/bootstrap-table.css') }}">
+<link rel="stylesheet" href="{{ url(mix('css/dist/bootstrap-table.css')) }}">
 @endpush
 
 @push('js')
-<script src="{{ url('js/dist/bootstrap-table.js') }}"></script>
+<script src="{{ asset(mix('js/dist/bootstrap-table.js')) }}"></script>
-
-@if (!isset($simple_view))
-<script src="{{ url('js/dist/bootstrap-table-simple-view.js') }}"></script>
-@endif
-
 <script nonce="{{ csrf_token() }}">
 
     $(function () {

webpack.mix.js

@@ -1,12 +1,10 @@
 
 const { mix } = require('laravel-mix');
 
-
+// This generates a file called app.css, which we use
-// // This generates a file called app.css, which we use
+// later on to build all.css
-// // later on to build all.css
 mix
-    .options(
+    .options({
-        {
         processCssUrls: false,
         processFontUrls: true,
         clearConsole: false
@@ -14,61 +12,66 @@ mix
     .less('./node_modules/admin-lte/build/less/AdminLTE.less', 'css/build')
     .less('./resources/assets/less/app.less', 'css/build')
     .less('./resources/assets/less/overrides.less', 'css/build')
-    .styles([
+    .styles(
-            './resources/assets/css/font-awesome/font-awesome.min.css',
+        [
             './node_modules/bootstrap/dist/css/bootstrap.css',
+            './node_modules/font-awesome/css/font-awesome.css',
             './public/css/build/AdminLTE.css',
-            './resources/assets/css/app.css',
+            './node_modules/jquery-ui-dist/jquery-ui.css',
-            './node_modules/select2/dist/css/select2.css',
+            './node_modules/admin-lte/plugins/iCheck/minimal/blue.css',
-            './node_modules/select2/dist/css/select2.css',
+            './node_modules/icheck/skins/minimal/minimal.css',
             './node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css',
-            './resources/assets/css/bootstrap-tables-sticky-header.css',
+            './node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css',
-            //'./node_modules/jquery-ui-bundle/jquery-ui.css',
+            './node_modules/blueimp-file-upload/css/jquery.fileupload.css',
-            './resources/assets/css/signature-pad.css',
+            './node_modules/blueimp-file-upload/css/jquery.fileupload-ui.css',
-            './node_modules/icheck/skins/minimal/_all.css',
+            './node_modules/ekko-lightbox/dist/ekko-lightbox.css',
+            './node_modules/bootstrap-table/dist/bootstrap-table.css',
+            './public/css/build/app.css',
+            //'./resources/assets/css/lib/select2.css',
+            './node_modules/select2/dist/css/select2.css',
             './public/css/build/overrides.css'
         ],
-        './public/css/dist/all.css')
+        './public/css/dist/all.css'
+    ).version();
 
-    // jQuery is loaded from vue.js webpack process
-    // This compiles the vue.js file in the build directory
-    // for later concatenation in the scripts() section below.
-    .js(
-        './resources/assets/js/vue.js', // Snipe-IT's initializer for Vue.js
-        './public/js/build'
-    ).sourceMaps()
-    .scripts([
-            './public/js/build/vue.js', //this is the modularized nifty Vue.js thing we just built, above!
-            //'./node_modules/jquery/dist/jquery.js',
-            //'./node_modules/jquery-ui-bundle/jquery-ui.js',
-            //'./node_modules/bootstrap/dist/js/bootstrap.js',
-            './resources/assets/js/app.js', //this is part of AdminLTE
 
-            './node_modules/tether/dist/js/tether.min.js',
-            './node_modules/jquery-slimscroll/jquery.slimscroll.js',
-            './node_modules/jquery.iframe-transport/jquery.iframe-transport.js',
-            './node_modules/blueimp-file-upload/js/jquery.fileupload.js',
-            './node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js',
-            './node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
-            './node_modules/icheck/icheck.js',
-            './node_modules/select2/dist/js/select2.js',
-            './node_modules/jquery-form-validator/form-validator/jquery.form-validator.js',
-            './node_modules/list.js/dist/list.js',
-            './node_modules/ekko-lightbox/dist/ekko-lightbox.js',
 
+mix.copy(['./node_modules/icheck/skins/minimal/blue.png',
+    './node_modules/icheck/skins/minimal/blue@2x.png'], './public/css');
+
+/**
+ * Copy, minify and version skins
+ */
+mix
+    .minify([
+        './public/css/dist/skins/skin-green-dark.css',
+        './public/css/dist/skins/skin-black-dark.css',
+        './public/css/dist/skins/skin-blue-dark.css',
+        './public/css/dist/skins/skin-yellow-dark.css',
+        './public/css/dist/skins/skin-red-dark.css',
+        './public/css/dist/skins/skin-purple-dark.css',
+        './public/css/dist/skins/skin-orange-dark.css',
+        './public/css/dist/skins/skin-contrast.css'
+    ])
+    .version();
+/**
+ * Copy, minify and version signature-pad.css
+ */
+mix
+    .copy('./resources/assets/css/signature-pad.css', './public/css/dist')
+    .minify('./public/css/build/signature-pad.css');
+
+// Combine main SnipeIT JS files
+mix.js(
+    [
+        './resources/assets/js/vue.js',
         './resources/assets/js/snipeit.js', //this is the actual Snipe-IT JS
         './resources/assets/js/snipeit_modals.js'
     ],
-        './public/js/dist/all.js');
+    './public/js/build/app.js'
-
+);
-// Syntax: mix.copy(from, to);
-// mix.copy('./public/css/build/app.css', './public/css/dist/all.css')
-//     .copy('./public/js/build/app.js', './public/js/dist/all.js')
-     mix.copy('./node_modules/font-awesome/fonts', './public/css/fonts')
-        .copy('./node_modules/icheck/skins/minimal', './public/css/dist');
-
-//mix.version();
 
+// Convert the skins to CSS
 mix.less('./resources/assets/less/skins/skin-blue.less', 'css/dist/skins', './public/css/dist/skins/skin-blue.css');
 mix.less('./resources/assets/less/skins/skin-red.less', 'css/dist/skins', './public/css/dist/skins/skin-red.css');
 mix.less('./resources/assets/less/skins/skin-contrast.less', 'css/dist/skins', './public/css/dist/skins/skin-contrast.css');
@@ -79,10 +82,86 @@ mix.less('./resources/assets/less/skins/skin-black-dark.less', 'css/dist/skins',
 mix.less('./resources/assets/less/skins/skin-red-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-red-light.css');
 mix.less('./resources/assets/less/skins/skin-purple.less', 'css/dist/skins', './public/css/dist/skins/skin-purple.css');
 mix.less('./resources/assets/less/skins/skin-purple-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-purple-light.css');
-mix.less('./resources/assets/less/skins/skin-yellow.less', 'css/dist/skins', './public/css/skins/dist/skin-yellow.css');
+mix.less('./resources/assets/less/skins/skin-yellow.less', 'css/dist/skins', './public/css/dist/skins/skin-yellow.css');
 mix.less('./resources/assets/less/skins/skin-yellow-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-yellow-light.css');
-mix.less('./resources/assets/less/skins/skin-blue-dark.less', 'css/skins/dist', './public/css/dist/skins/skin-blue-light.css');
+mix.less('./resources/assets/less/skins/skin-blue-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-blue-light.css');
 mix.less('./resources/assets/less/skins/skin-orange-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-orange-light.css');
 mix.less('./resources/assets/less/skins/skin-orange.less', 'css/dist/skins', './public/css/dist/skins/skin-orange.css');
 
 
+/**
+ * Combine bootstrap table css
+ */
+mix.combine(
+    [
+        './node_modules/bootstrap-table/dist/bootstrap-table.css',
+        './node_modules/bootstrap-table/dist/extentions/mobile/bootstrap-table-mobile.css',
+        './node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.css',
+        './node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css'
+    ],
+    'public/css/dist/bootstrap-table.css'
+).version();
+
+
+
+/**
+ * Combine JS
+ */
+mix
+    .combine(
+        [
+            './node_modules/admin-lte/dist/js/adminlte.min.js',
+            './node_modules/tether/dist/js/tether.js',
+            './node_modules/jquery-slimscroll/jquery.slimscroll.js',
+            './node_modules/jquery.iframe-transport/jquery.iframe-transport.js',
+            './node_modules/blueimp-file-upload/js/jquery.fileupload.js',
+            './node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js',
+            './node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js',
+            './node_modules/ekko-lightbox/dist/ekko-lightbox.js',
+            './node_modules/icheck/icheck.js',
+            './resources/assets/js/extensions/pGenerator.jquery.js',
+            './node_modules/chart.js/dist/Chart.js',
+            './resources/assets/js/signature_pad.js',
+            './node_modules/jquery-form-validator/form-validator/jquery.form-validator.js',
+            './node_modules/list.js/dist/list.js'
+        ],
+        'public/js/build/vendor.js'
+    );
+
+
+
+/**
+ * Combine bootstrap table js
+ */
+mix
+    .combine(
+        [
+            './node_modules/bootstrap-table/dist/bootstrap-table.js',
+            './node_modules/bootstrap-table/dist/extentions/mobile/bootstrap-table-mobile.js',
+            './node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js',
+            './node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js',
+            './resources/assets/js/extensions/jquery.base64.js',
+            './node_modules/tableexport.jquery.plugin/tableExport.js',
+            './node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.min.js',
+            './resources/js/FileSaver.min.js',
+            './resources/js/xlsx.core.min.js',
+            './node_modules/tableexport.jquery.plugin/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js',
+            './node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js',
+            './node_modules/bootstrap-table/dist/extensions/toolbar/bootstrap-table-toolbar.js'
+        ],
+        'public/js/dist/bootstrap-table.js'
+ ).version();
+
+
+mix.combine(
+        [
+            './public/js/build/app.js',
+            './public/js/build/vendor.js'
+
+        ],
+        './public/js/dist/all.js'
+    ).version();
+
+
+
+