From 8ad83a5f9fba16a4f0dee8e92db073ee8da6d777 Mon Sep 17 00:00:00 2001 From: Nabeel Shahzad Date: Tue, 27 Mar 2018 14:46:32 -0500 Subject: [PATCH] asset cleanup --- .../Installer/Resources/views/app.blade.php | 4 +- public/assets/admin/js/vendor.js | 394 ++++-- .../frontend => assets/frontend/js}/app.js | 0 .../frontend/js}/manifest.js | 0 .../admin => assets/frontend/js}/vendor.js | 66 +- public/assets/installer/js/app.js | 238 ++++ .../js/vendor.js} | 0 public/assets/system/js/vendor.js | 317 +++-- public/js/admin/app.js | 1168 ----------------- public/js/admin/manifest.js | 101 -- public/js/frontend/vendor.js | 230 ---- public/mix-manifest.json | 12 +- resources/js/admin/app.js | 8 + resources/js/installer/app.js | 5 + resources/views/layouts/default/app.blade.php | 6 +- webpack.mix.js | 11 +- 16 files changed, 778 insertions(+), 1782 deletions(-) rename public/{js/frontend => assets/frontend/js}/app.js (100%) rename public/{js/frontend => assets/frontend/js}/manifest.js (100%) rename public/{js/admin => assets/frontend/js}/vendor.js (99%) create mode 100644 public/assets/installer/js/app.js rename public/assets/{system/js/installer-vendor.js => installer/js/vendor.js} (100%) delete mode 100644 public/js/admin/app.js delete mode 100644 public/js/admin/manifest.js delete mode 100644 public/js/frontend/vendor.js create mode 100644 resources/js/admin/app.js create mode 100644 resources/js/installer/app.js diff --git a/modules/Installer/Resources/views/app.blade.php b/modules/Installer/Resources/views/app.blade.php index cfc3573d..2e268886 100644 --- a/modules/Installer/Resources/views/app.blade.php +++ b/modules/Installer/Resources/views/app.blade.php @@ -72,9 +72,7 @@ {{----}} - -{{----}} -{{----}} + {{-- Start of the required tags block. Don't remove these or things will break!! --}} - - - + + + @yield('scripts') {{-- End the required tags block --}} diff --git a/webpack.mix.js b/webpack.mix.js index 7749e4da..3fcbdf73 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -118,7 +118,7 @@ mix.scripts([ 'node_modules/jquery/dist/jquery.js', 'node_modules/pjax/pjax.js', 'node_modules/select2/dist/js/select2.js', -], 'public/assets/system/js/installer-vendor.js') +], 'public/assets/installer/js/vendor.js'); /** * DEFAULT SKIN FRONTEND FILES @@ -142,9 +142,10 @@ const extract = [ 'leaflet', 'Leaflet.Geodesic', 'leaflet-rotatedmarker' -] +]; -mix.js('resources/js/frontend/app.js', 'public/js/frontend') - .extract(extract) +mix.js('resources/js/frontend/app.js', 'public/assets/frontend/js') + .extract(extract); -//mix.js('resources/js/admin/app.js', 'public/js/admin') +/*mix.js('resources/js/admin/app.js', 'public/assets/admin/js') + .extract(extract);*/