Use combined css and js files

Changelog

@@ -1,4 +1,5 @@
 2018-11-08 DariusIII
+	* Chg: Use combined css and js files
 	* Chg: Remove fxp/composer-asset
 	* Chg: Remove last of bower assets and add them to npm and laravel-mix asset management
 	* Chg: First batch of changes to use npm and laravel-mix for asset management

public/assets/css/custom.css

@@ -6299,4 +6299,4 @@ ul.notifications {
 
 .copyright-info {
     padding: 8px 0;
-}
+}

public/assets/js/custom.js

@@ -1,321 +1,229 @@
-/*
+/**
  * To change this license header, choose License Headers in Project Properties.
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
 
-/** ******  left menu  *********************** **/
-$(function () {
-    $('#sidebar-menu li ul').slideUp();
-    $('#sidebar-menu li').removeClass('active');
+var CURRENT_URL = window.location.href.split('#')[0].split('?')[0],
+    $BODY = $('body'),
+    $MENU_TOGGLE = $('#menu_toggle'),
+    $SIDEBAR_MENU = $('#sidebar-menu'),
+    $SIDEBAR_FOOTER = $('.sidebar-footer'),
+    $LEFT_COL = $('.left_col'),
+    $RIGHT_COL = $('.right_col'),
+    $NAV_MENU = $('.nav_menu'),
+    $FOOTER = $('footer');
 
-    $('#sidebar-menu li').on('click touchstart', function() {
-        var link = $('a', this).attr('href');
+// Sidebar
+$(document).ready(function() {
+    // TODO: This is some kind of easy fix, maybe we can improve this
+    var setContentHeight = function () {
+        // reset height
+        $RIGHT_COL.css('min-height', $(window).height());
 
-        if(link) {
-            window.location.href = link;
+        var bodyHeight = $BODY.outerHeight(),
+            footerHeight = $BODY.hasClass('footer_fixed') ? -10 : $FOOTER.height(),
+            leftColHeight = $LEFT_COL.eq(1).height() + $SIDEBAR_FOOTER.height(),
+            contentHeight = bodyHeight < leftColHeight ? leftColHeight : bodyHeight;
+
+        // normalize content
+        contentHeight -= $NAV_MENU.height() + footerHeight;
+
+        $RIGHT_COL.css('min-height', contentHeight);
+    };
+
+    $SIDEBAR_MENU.find('a').on('click', function(ev) {
+        var $li = $(this).parent();
+
+        if ($li.is('.active')) {
+            $li.removeClass('active active-sm');
+            $('ul:first', $li).slideUp(function() {
+                setContentHeight();
+            });
         } else {
-            if ($(this).is('.active')) {
-                $(this).removeClass('active');
-                $('ul', this).slideUp();
-            } else {
-                $('#sidebar-menu li').removeClass('active');
-                $('#sidebar-menu li ul').slideUp();
-
-                $(this).addClass('active');
-                $('ul', this).slideDown();
+            // prevent closing menu if we are on child menu
+            if (!$li.parent().is('.child_menu')) {
+                $SIDEBAR_MENU.find('li').removeClass('active active-sm');
+                $SIDEBAR_MENU.find('li ul').slideUp();
             }
+
+            $li.addClass('active');
+
+            $('ul:first', $li).slideDown(function() {
+                setContentHeight();
+            });
         }
     });
 
-    $('#menu_toggle').click(function () {
-        if ($('body').hasClass('nav-md')) {
-            $('body').removeClass('nav-md').addClass('nav-sm');
-            $('.left_col').removeClass('scroll-view').removeAttr('style');
-            $('.sidebar-footer').hide();
-
-            if ($('#sidebar-menu li').hasClass('active')) {
-                $('#sidebar-menu li.active').addClass('active-sm').removeClass('active');
-            }
+    // toggle small or large menu
+    $MENU_TOGGLE.on('click', function() {
+        if ($BODY.hasClass('nav-md')) {
+            $SIDEBAR_MENU.find('li.active ul').hide();
+            $SIDEBAR_MENU.find('li.active').addClass('active-sm').removeClass('active');
         } else {
-            $('body').removeClass('nav-sm').addClass('nav-md');
-            $('.sidebar-footer').show();
-
-            if ($('#sidebar-menu li').hasClass('active-sm')) {
-                $('#sidebar-menu li.active-sm').addClass('active').removeClass('active-sm');
-            }
+            $SIDEBAR_MENU.find('li.active-sm ul').show();
+            $SIDEBAR_MENU.find('li.active-sm').addClass('active').removeClass('active-sm');
         }
+
+        $BODY.toggleClass('nav-md nav-sm');
+
+        setContentHeight();
+
+        $('.dataTable').each ( function () { $(this).dataTable().fnDraw(); });
     });
-});
 
-/* Sidebar Menu active class */
-$(function () {
-    var url = window.location;
-    $('#sidebar-menu a[href="' + url + '"]').parent('li').addClass('current-page');
-    $('#sidebar-menu a').filter(function () {
-        return this.href == url;
-    }).parent('li').addClass('current-page').parent('ul').slideDown().parent().addClass('active');
-});
+    // check active menu
+    $SIDEBAR_MENU.find('a[href="' + CURRENT_URL + '"]').parent('li').addClass('current-page');
 
-/** ******  /left menu  *********************** **/
-/** ******  right_col height flexible  *********************** **/
-$(".right_col").css("min-height", $(window).height());
-$(window).resize(function () {
-    $(".right_col").css("min-height", $(window).height());
-});
-/** ******  /right_col height flexible  *********************** **/
+    $SIDEBAR_MENU.find('a').filter(function () {
+        return this.href == CURRENT_URL;
+    }).parent('li').addClass('current-page').parents('ul').slideDown(function() {
+        setContentHeight();
+    }).parent().addClass('active');
 
+    // recompute content when resizing
+    $(window).smartresize(function(){
+        setContentHeight();
+    });
 
+    setContentHeight();
 
-/** ******  tooltip  *********************** **/
-$(function () {
-    $('[data-toggle="tooltip"]').tooltip()
-})
-/** ******  /tooltip  *********************** **/
-/** ******  progressbar  *********************** **/
-if ($(".progress .progress-bar")[0]) {
-    $('.progress .progress-bar').progressbar(); // bootstrap 3
-}
-/** ******  /progressbar  *********************** **/
-/** ******  switchery  *********************** **/
-if ($(".js-switch")[0]) {
-    var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
-    elems.forEach(function (html) {
-        var switchery = new Switchery(html, {
-            color: '#26B99A'
+    // fixed sidebar
+    if ($.fn.mCustomScrollbar) {
+        $('.menu_fixed').mCustomScrollbar({
+            autoHideScrollbar: true,
+            theme: 'minimal',
+            mouseWheel:{ preventDefault: true }
         });
-    });
-}
-/** ******  /switcher  *********************** **/
-/** ******  collapse panel  *********************** **/
-// Close ibox function
-$('.close-link').click(function () {
-    var content = $(this).closest('div.x_panel');
-    content.remove();
+    }
 });
+// /Sidebar
 
-// Collapse ibox function
-$('.collapse-link').click(function () {
-    var x_panel = $(this).closest('div.x_panel');
-    var button = $(this).find('i');
-    var content = x_panel.find('div.x_content');
-    content.slideToggle(200);
-    (x_panel.hasClass('fixed_height_390') ? x_panel.toggleClass('').toggleClass('fixed_height_390') : '');
-    (x_panel.hasClass('fixed_height_320') ? x_panel.toggleClass('').toggleClass('fixed_height_320') : '');
-    button.toggleClass('fa-chevron-up').toggleClass('fa-chevron-down');
-    setTimeout(function () {
-        x_panel.resize();
-    }, 50);
-});
-/** ******  /collapse panel  *********************** **/
-/** ******  iswitch  *********************** **/
+// Panel toolbox
+$(document).ready(function() {
+    $('.collapse-link').on('click', function() {
+        var $BOX_PANEL = $(this).closest('.x_panel'),
+            $ICON = $(this).find('i'),
+            $BOX_CONTENT = $BOX_PANEL.find('.x_content');
 
-$(function () {
-    var checkAll = $('input.flat-all');
-    var checkboxes = $('input.flat');
-
-    $('input').iCheck({
-        checkboxClass: 'icheckbox_flat-green',
-        radioClass: 'iradio_flat-green'
-    });
-
-    checkAll.on('ifChecked ifUnchecked', function(event) {
-        if (event.type == 'ifChecked') {
-            checkboxes.iCheck('check');
+        // fix for some div with hardcoded fix class
+        if ($BOX_PANEL.attr('style')) {
+            $BOX_CONTENT.slideToggle(200, function(){
+                $BOX_PANEL.removeAttr('style');
+            });
         } else {
-            checkboxes.iCheck('uncheck');
+            $BOX_CONTENT.slideToggle(200);
+            $BOX_PANEL.css('height', 'auto');
         }
+
+        $ICON.toggleClass('fa-chevron-up fa-chevron-down');
     });
 
-    checkboxes.on('ifChanged', function(event){
-        if(checkboxes.filter(':checked').length == checkboxes.length) {
-            checkAll.prop('checked', 'checked');
-        } else {
-            checkAll.prop('checked', false);
-        }
-        checkAll.iCheck('update');
+    $('.close-link').click(function () {
+        var $BOX_PANEL = $(this).closest('.x_panel');
+
+        $BOX_PANEL.remove();
     });
 });
-/** ******  /iswitch  *********************** **/
-/** ******  star rating  *********************** **/
-// Starrr plugin (https://github.com/dobtco/starrr)
-var __slice = [].slice;
+// /Panel toolbox
 
-(function ($, window) {
-    var Starrr;
-
-    Starrr = (function () {
-        Starrr.prototype.defaults = {
-            rating: void 0,
-            numStars: 5,
-            change: function (e, value) {
-            }
-        };
-
-        function Starrr($el, options) {
-            var i, _, _ref,
-                    _this = this;
-
-            this.options = $.extend({}, this.defaults, options);
-            this.$el = $el;
-            _ref = this.defaults;
-            for (i in _ref) {
-                _ = _ref[i];
-                if (this.$el.data(i) != null) {
-                    this.options[i] = this.$el.data(i);
-                }
-            }
-            this.createStars();
-            this.syncRating();
-            this.$el.on('mouseover.starrr', 'span', function (e) {
-                return _this.syncRating(_this.$el.find('span').index(e.currentTarget) + 1);
-            });
-            this.$el.on('mouseout.starrr', function () {
-                return _this.syncRating();
-            });
-            this.$el.on('click.starrr', 'span', function (e) {
-                return _this.setRating(_this.$el.find('span').index(e.currentTarget) + 1);
-            });
-            this.$el.on('starrr:change', this.options.change);
-        }
-
-        Starrr.prototype.createStars = function () {
-            var _i, _ref, _results;
-
-            _results = [];
-            for (_i = 1, _ref = this.options.numStars; 1 <= _ref ? _i <= _ref : _i >= _ref; 1 <= _ref ? _i++ : _i--) {
-                _results.push(this.$el.append("<span class='glyphicon .glyphicon-star-empty'></span>"));
-            }
-            return _results;
-        };
-
-        Starrr.prototype.setRating = function (rating) {
-            if (this.options.rating === rating) {
-                rating = void 0;
-            }
-            this.options.rating = rating;
-            this.syncRating();
-            return this.$el.trigger('starrr:change', rating);
-        };
-
-        Starrr.prototype.syncRating = function (rating) {
-            var i, _i, _j, _ref;
-
-            rating || (rating = this.options.rating);
-            if (rating) {
-                for (i = _i = 0, _ref = rating - 1; 0 <= _ref ? _i <= _ref : _i >= _ref; i = 0 <= _ref ? ++_i : --_i) {
-                    this.$el.find('span').eq(i).removeClass('glyphicon-star-empty').addClass('glyphicon-star');
-                }
-            }
-            if (rating && rating < 5) {
-                for (i = _j = rating; rating <= 4 ? _j <= 4 : _j >= 4; i = rating <= 4 ? ++_j : --_j) {
-                    this.$el.find('span').eq(i).removeClass('glyphicon-star').addClass('glyphicon-star-empty');
-                }
-            }
-            if (!rating) {
-                return this.$el.find('span').removeClass('glyphicon-star').addClass('glyphicon-star-empty');
-            }
-        };
-
-        return Starrr;
-
-    })();
-    return $.fn.extend({
-        starrr: function () {
-            var args, option;
-
-            option = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
-            return this.each(function () {
-                var data;
-
-                data = $(this).data('star-rating');
-                if (!data) {
-                    $(this).data('star-rating', (data = new Starrr($(this), option)));
-                }
-                if (typeof option === 'string') {
-                    return data[option].apply(data, args);
-                }
-            });
-        }
+// Tooltip
+$(document).ready(function() {
+    $('[data-toggle="tooltip"]').tooltip({
+        container: 'body'
     });
-})(window.jQuery, window);
-
-$(function () {
-    return $(".starrr").starrr();
 });
+// /Tooltip
 
-$(document).ready(function () {
-
-    $('#stars').on('starrr:change', function (e, value) {
-        $('#count').html(value);
-    });
-
-
-    $('#stars-existing').on('starrr:change', function (e, value) {
-        $('#count-existing').html(value);
-    });
-
+// Progressbar
+$(document).ready(function() {
+    if ($(".progress .progress-bar")[0]) {
+        $('.progress .progress-bar').progressbar();
+    }
 });
-/** ******  /star rating  *********************** **/
-/** ******  table  *********************** **/
+// /Progressbar
+
+// Switchery
+$(document).ready(function() {
+    if ($(".js-switch")[0]) {
+        var elems = Array.prototype.slice.call(document.querySelectorAll('.js-switch'));
+        elems.forEach(function (html) {
+            var switchery = new Switchery(html, {
+                color: '#26B99A'
+            });
+        });
+    }
+});
+// /Switchery
+
+// iCheck
+$(document).ready(function() {
+    if ($("input.flat")[0]) {
+        $(document).ready(function () {
+            $('input.flat').iCheck({
+                checkboxClass: 'icheckbox_flat-green',
+                radioClass: 'iradio_flat-green'
+            });
+        });
+    }
+});
+// /iCheck
+
+// Table
 $('table input').on('ifChecked', function () {
-    check_state = '';
+    checkState = '';
     $(this).parent().parent().parent().addClass('selected');
     countChecked();
 });
 $('table input').on('ifUnchecked', function () {
-    check_state = '';
+    checkState = '';
     $(this).parent().parent().parent().removeClass('selected');
     countChecked();
 });
 
-var check_state = '';
+var checkState = '';
+
 $('.bulk_action input').on('ifChecked', function () {
-    check_state = '';
+    checkState = '';
     $(this).parent().parent().parent().addClass('selected');
     countChecked();
 });
 $('.bulk_action input').on('ifUnchecked', function () {
-    check_state = '';
+    checkState = '';
     $(this).parent().parent().parent().removeClass('selected');
     countChecked();
 });
 $('.bulk_action input#check-all').on('ifChecked', function () {
-    check_state = 'check_all';
+    checkState = 'all';
     countChecked();
 });
 $('.bulk_action input#check-all').on('ifUnchecked', function () {
-    check_state = 'uncheck_all';
+    checkState = 'none';
     countChecked();
 });
 
 function countChecked() {
-    if (check_state == 'check_all') {
+    if (checkState === 'all') {
         $(".bulk_action input[name='table_records']").iCheck('check');
     }
-    if (check_state == 'uncheck_all') {
+    if (checkState === 'none') {
         $(".bulk_action input[name='table_records']").iCheck('uncheck');
     }
-    var n = $(".bulk_action input[name='table_records']:checked").length;
-    if (n > 0) {
+
+    var checkCount = $(".bulk_action input[name='table_records']:checked").length;
+
+    if (checkCount) {
         $('.column-title').hide();
         $('.bulk-actions').show();
-        $('.action-cnt').html(n + ' Records Selected');
+        $('.action-cnt').html(checkCount + ' Records Selected');
     } else {
         $('.column-title').show();
         $('.bulk-actions').hide();
     }
 }
-/** ******  /table  *********************** **/
-/** ******    *********************** **/
-/** ******    *********************** **/
-/** ******    *********************** **/
-/** ******    *********************** **/
-/** ******    *********************** **/
-/** ******    *********************** **/
-/** ******  Accordion  *********************** **/
 
-$(function () {
+// Accordion
+$(document).ready(function() {
     $(".expand").on("click", function () {
         $(this).next().slideToggle(200);
         $expand = $(this).find(">:first-child");
@@ -328,27 +236,13 @@ $(function () {
     });
 });
 
-/** ******  Accordion  *********************** **/
-
-/** ******  scrollview  *********************** **/
-$(document).ready(function () {
-
-    $(".scroll-view").niceScroll({
-        touchbehavior: true,
-        cursorcolor: "rgba(42, 63, 84, 0.35)"
-    });
-
-});
-/** ******  /scrollview  *********************** **/
-
-/** ******  NProgress  *********************** **/
+// NProgress
 if (typeof NProgress != 'undefined') {
     $(document).ready(function () {
         NProgress.start();
     });
 
-    $(window).load(function () {
+    $(window).on('load', function() {
         NProgress.done();
     });
-}
-/** ******  NProgress  *********************** **/
+}

resources/views/themes/Gentele/basepage.tpl

@@ -21,20 +21,7 @@
 
 	<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
 	<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
-	<!-- Bootstrap core CSS -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/bootstrap.min.css")}}
-	<!-- flexboxgrid -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/flexboxgrid.min.css")}}
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/svg-with-js.min.css")}}
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/pnotify.css")}}
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/animate.min.css")}}
-	<!-- Normalize.css -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/normalize.css")}}
-	<!-- Custom styling plus plugins -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/custom.css")}}
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/green.css")}}
-	<!-- fancybox css -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/jquery.fancybox.min.css")}}
+	{{Html::style("{$smarty.const.WWW_ASSETS}/css/all-css.css")}}
 
 </head>
 <body class="nav-md">
@@ -192,44 +179,7 @@
 
 </div>
 <!-- jQuery 3.3.0 -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/jquery/jquery.min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/bootstrap.min.js")}}
-<!-- bootstrap progress js -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/bootstrap-progressbar.min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/bootstrap-hover-dropdown.min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery.nicescroll.min.js")}}
-<!-- icheck -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/icheck.min.js")}}
-<!-- tinymce editor -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/tinymce.min.js")}}
-<!-- jQuery migrate script -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery-migrate.min.js")}}
-<!-- newznab default scripts, needed for stuff to work -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery.colorbox-min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/autosize.min.js")}}
-<!-- Custom functions -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/functions.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/custom.js")}}
-
-<!-- PNotify -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/pnotify.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/pnotify.animate.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/pnotify.desktop.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/pnotify.callbacks.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/pnotify.buttons.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/pnotify.confirm.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/pnotify.nonblock.js")}}
-
-<!-- pace -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/pace.min.js")}}
-<!-- scrollup -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery.goup.min.js")}}
-
-<!-- fancybox js -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery.fancybox.min.js")}}
-<!--font-awesome-->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/v4-shims.min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/all.min.js")}}
+{{Html::script("{$smarty.const.WWW_ASSETS}/js/all-js.js")}}
 
 
 <script>

resources/views/themes/admin/baseadminpage.tpl

@@ -20,22 +20,8 @@
 
 	<title>{$meta_title}{if $meta_title != "" && $site->metatitle != ""} - {/if}{$site->metatitle}</title>
 
-	<!-- Bootstrap core CSS -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/bootstrap.min.css")}}
-	<!-- flexboxgrid -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/flexboxgrid.min.css")}}
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/svg-with-js.css")}}
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/pnotify.css")}}
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/animate.min.css")}}
-	<!-- Normalize.css -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/normalize.css")}}
-	<!-- Custom styling plus plugins -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/custom.css")}}
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/green.css")}}
-	<!-- fancybox css -->
-	{{Html::style("{$smarty.const.WWW_ASSETS}/css/jquery.fancybox.min.css")}}
-    <!--multiselect css-->
-    {{Html::style("{$smarty.const.WWW_ASSETS}/css/multi-select.css")}}
+
+	{{Html::style("{$smarty.const.WWW_ASSETS}/css/all-css.css")}}
 
 </head>
 <body class="nav-md">
@@ -93,36 +79,8 @@
 	</div>
 
 </div>
-<!-- jQuery 3.2.0 -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/jquery/jquery.min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/bootstrap.min.js")}}
-<!-- bootstrap progress js -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/bootstrap-progressbar.min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/bootstrap-hover-dropdown.min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery.nicescroll.min.js")}}
-<!-- icheck -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/icheck.min.js")}}
-<!-- tinymce editor -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/tinymce.min.js")}}
-<!-- jQuery migrate script -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery-migrate.min.js")}}
-<!-- newznab default scripts, needed for stuff to work -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery.colorbox-min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/autosize.min.js")}}
-<!-- Custom functions -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/functions.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/custom.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/utils-admin.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery.multi-select.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery.MultiFile.min.js")}}
-<!-- pace -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/pace.min.js")}}
-<!-- fancybox js -->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/jquery.fancybox.min.js")}}
-<!--font-awesome-->
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/v4-shims.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/all.min.js")}}
-{{Html::script("{$smarty.const.WWW_ASSETS}/js/bootstrap-datepicker.min.js")}}
+
+{{Html::script("{$smarty.const.WWW_ASSETS}/js/all-js.js")}}
 
 </body>
 

webpack.mix.js

@@ -11,7 +11,8 @@ const mix = require('laravel-mix');
  |
  */
 
-mix.copy('node_modules/bootstrap/dist/css/bootstrap.min.css', 'public/assets/css/bootstrap.min.css')
+mix
+    .copy('node_modules/bootstrap/dist/css/bootstrap.min.css', 'public/assets/css/bootstrap.min.css')
     .copy('node_modules/bootstrap/dist/css/bootstrap.min.css.map', 'public/assets/css/bootstrap.min.css.map')
     .copy('node_modules/bootstrap/dist/js/bootstrap.min.js', 'public/assets/js/bootstrap.min.js')
     .copy('node_modules/datatables/media/css/jquery.dataTables.min.css', 'public/assets/css/jquery.dataTables.min.css')
@@ -56,5 +57,55 @@ mix.copy('node_modules/bootstrap/dist/css/bootstrap.min.css', 'public/assets/css
     .copy('node_modules/multiselect/css/multi-select.css', 'public/assets/css/multi-select.css')
     .copy('node_modules/multiselect/js/jquery.multi-select.js', 'public/assets/js/jquery.multi-select.js')
     .copy('node_modules/pace-js/pace.min.js', 'public/assets/js/pace.min.js')
-    .copy('node_modules/jquery-slimscroll/jquery.slimscroll.min.js', 'public/assets/js/jquery.slimscroll.min.js');
+    .copy('node_modules/jquery-slimscroll/jquery.slimscroll.min.js', 'public/assets/js/jquery.slimscroll.min.js')
+    .styles(
+        [
+            'public/assets/css/bootstrap.min.css',
+            'public/assets/css/jquery.dataTables.min.css',
+            'public/assets/css/animate.min.css',
+            'public/assets/css/bootstrap-datepicker.standalone.min.css',
+            'public/assets/css/bootstrap-progressbar-3.3.4.min.css',
+            'public/assets/css/svg-with-js.min.css',
+            'public/assets/css/jquery.fancybox.min.css',
+            'public/assets/css/green.css',
+            'public/assets/css/pnotify.css',
+            'public/assets/css/flexboxgrid2.min.css',
+            'public/assets/css/multi-select.css',
+            'public/assets/css/normalize.css',
+            'public/assets/css/custom.css'
+    ], 'public/assets/css/all-css.css')
+    .scripts(
+        [
+            'public/assets/jquery/jquery.min.js',
+            'public/assets/js/bootstrap.min.js',
+            'public/assets/js/jquery-migrate.min.js',
+            'public/assets/js/all.min.js',
+            'public/assets/js/v4-shims.min.js',
+            'public/assets/js/jquery.dataTables.min.js',
+            'public/assets/js/bootstrap-datepicker.min.js',
+            'public/assets/js/autosize.min.js',
+            'public/assets/js/bootstrap-hover-dropdown.min.js',
+            'public/assets/js/bootstrap-progressbar.min.js',
+            'public/assets/js/jquery.nicescroll.min.js',
+            'public/assets/js/pnotify.js',
+            'public/assets/js/pnotify.animate.js',
+            'public/assets/js/pnotify.buttons.js',
+            'public/assets/js/pnotify.callbacks.js',
+            'public/assets/js/pnotify.confirm.js',
+            'public/assets/js/pnotify.desktop.js',
+            'public/assets/js/pnotify.nonblock.js',
+            'public/assets/js/tinymce.min.js',
+            'public/assets/js/icheck.min.js',
+            'public/assets/js/jquery.colorbox-min.js',
+            'public/assets/js/jquery.MultiFile.min.js',
+            'public/assets/js/jquery.multi-select.js',
+            'public/assets/js/pace.min.js',
+            'public/assets/js/jquery.slimscroll.min.js',
+            'public/assets/js/jquery.goup.min.js',
+            'public/assets/js/utils-admin.js',
+            'public/assets/js/custom.js',
+            'public/assets/js/functions.js'
+        ]
+    , 'public/assets/js/all-js.js')
+    .sourceMaps();