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);*/