CSS Libraries and style updates (#388)
* Update now-ui frontend lib to latest instead of the beta * Update to bootstrap 4 lib * Fix flights and profile pages
This commit is contained in:
Nabeel S
217
webpack.mix.js
217
webpack.mix.js
@@ -4,37 +4,45 @@ const mix = require('laravel-mix');
|
||||
|
||||
mix.disableNotifications();
|
||||
|
||||
/**
|
||||
* COPY ASSETS
|
||||
* Copy required assets
|
||||
*/
|
||||
function copyAssets()
|
||||
{
|
||||
// Copy bootstrap 4 (for frontend)
|
||||
// mix.copy('node_modules/bootstrap/dist/css/bootstrap.min.css', 'public/assets/vendor/bootstrap/4.3/css');
|
||||
// mix.copy('node_modules/bootstrap/dist/css/bootstrap.min.css.map', 'public/assets/vendor/bootstrap/4.3/css');
|
||||
// mix.copy('node_modules/bootstrap/dist/js/bootstrap.js', 'public/assets/vendor/bootstrap/4.3/js');
|
||||
|
||||
mix.copy('node_modules/bootstrap/fonts/*.woff2', 'public/assets/fonts/');
|
||||
mix.copy('node_modules/bootstrap/fonts/*.woff2', 'public/assets/admin/fonts/');
|
||||
mix.copy('node_modules/x-editable/dist/bootstrap3-editable/img/*', 'public/assets/admin/img/');
|
||||
mix.copy('node_modules/jquery/dist/jquery.js', 'public/assets/global/js/');
|
||||
mix.copy('node_modules/flag-icon-css/flags/', 'public/assets/global/flags/');
|
||||
mix.copy('node_modules/leaflet/dist/images/', 'public/assets/global/css/images/');
|
||||
// copy bootstrap3 (for admin)
|
||||
// mix.copy('node_modules/bootstrap3/dist/css/bootstrap.css', 'public/assets/vendor/bootstrap/3.4/css');
|
||||
// mix.copy('node_modules/bootstrap3/dist/css/bootstrap.min.css', 'public/assets/vendor/bootstrap/3.4/css');
|
||||
|
||||
/**
|
||||
* DEFAULT SKIN FRONTEND FILES
|
||||
*/
|
||||
mix.copy('node_modules/bootstrap3/dist/fonts/*.woff2', 'public/assets/fonts/');
|
||||
mix.copy('node_modules/bootstrap3/dist/fonts/*.woff2', 'public/assets/admin/fonts/');
|
||||
mix.copy('node_modules/x-editable/dist/bootstrap3-editable/img/*', 'public/assets/admin/img/');
|
||||
|
||||
mix.sass('resources/sass/now-ui/now-ui-kit.scss',
|
||||
'public/assets/frontend/css/now-ui-kit.css')
|
||||
.options({
|
||||
processCssUrls: false,
|
||||
compressed: true
|
||||
}).sourceMaps();
|
||||
mix.copy('node_modules/jquery/dist/jquery.js', 'public/assets/global/js/');
|
||||
mix.copy('node_modules/flag-icon-css/flags/', 'public/assets/global/flags/');
|
||||
mix.copy('node_modules/leaflet/dist/images/', 'public/assets/global/css/images/');
|
||||
mix.copy('node_modules/icheck/skins/square/blue*.png', 'public/assets/admin/css');
|
||||
}
|
||||
|
||||
/**
|
||||
* ADMIN REQUIRED FILES
|
||||
*/
|
||||
function buildFrontendAssets()
|
||||
{
|
||||
mix.sass('resources/sass/now-ui/now-ui-kit.scss', 'public/assets/frontend/css/now-ui-kit.css');
|
||||
|
||||
mix.sass('resources/sass/admin/paper-dashboard.scss',
|
||||
'public/assets/admin/css/vendor.min.css')
|
||||
mix.scripts([
|
||||
'node_modules/moment/moment.js',
|
||||
'node_modules/popper.js/dist/umd/popper.js',
|
||||
'node_modules/popper.js/dist/umd/popper-utils.js',
|
||||
'node_modules/bootstrap/dist/js/bootstrap.js',
|
||||
], 'public/assets/frontend/js/vendor.js');
|
||||
}
|
||||
|
||||
function buildAdminAssets()
|
||||
{
|
||||
mix.sass('resources/sass/admin/paper-dashboard.scss',
|
||||
'public/assets/admin/css/vendor.min.css')
|
||||
.styles([
|
||||
'node_modules/bootstrap/dist/css/bootstrap.css',
|
||||
'node_modules/bootstrap3/dist/css/bootstrap.css',
|
||||
'node_modules/animate.css/animate.css',
|
||||
'node_modules/icheck/skins/square/blue.css',
|
||||
'node_modules/select2/dist/css/select2.css',
|
||||
@@ -44,95 +52,96 @@ mix.sass('resources/sass/admin/paper-dashboard.scss',
|
||||
'public/assets/admin/css/vendor.min.css',
|
||||
], 'public/assets/admin/css/vendor.css').version()
|
||||
.options({
|
||||
compressed: true
|
||||
processCssUrls: false,
|
||||
compressed: true
|
||||
})
|
||||
.sourceMaps();
|
||||
|
||||
mix.scripts([
|
||||
'node_modules/lodash/lodash.js',
|
||||
'node_modules/jquery/dist/jquery.js',
|
||||
'node_modules/moment/moment.js',
|
||||
//'node_modules/axios/dist/axios.js',
|
||||
'node_modules/bootstrap/dist/js/bootstrap.js',
|
||||
'node_modules/bootstrap/js/collapse.js',
|
||||
'node_modules/bootstrap/js/transition.js',
|
||||
'node_modules/popper.js/dist/umd/popper.js',
|
||||
'node_modules/popper.js/dist/umd/popper-utils.js',
|
||||
'node_modules/select2/dist/js/select2.js',
|
||||
//'node_modules/leaflet/dist/leaflet.js',
|
||||
'node_modules/icheck/icheck.js',
|
||||
'node_modules/pikaday/pikaday.js',
|
||||
'node_modules/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.js',
|
||||
'node_modules/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
|
||||
'node_modules/jquery-pjax/jquery.pjax.js',
|
||||
'node_modues/paper-dashboard/assets/js/paper-dashboard.js',
|
||||
], 'public/assets/admin/js/vendor.js');
|
||||
mix.scripts([
|
||||
'node_modules/lodash/lodash.js',
|
||||
'node_modules/jquery/dist/jquery.js',
|
||||
'node_modules/moment/moment.js',
|
||||
'node_modules/bootstrap3/dist/js/bootstrap.js',
|
||||
'node_modules/bootstrap3/js/collapse.js',
|
||||
'node_modules/bootstrap3/js/transition.js',
|
||||
'node_modules/popper.js/dist/umd/popper.js',
|
||||
'node_modules/popper.js/dist/umd/popper-utils.js',
|
||||
'node_modules/select2/dist/js/select2.js',
|
||||
'node_modules/icheck/icheck.js',
|
||||
'node_modules/pikaday/pikaday.js',
|
||||
'node_modules/x-editable/dist/bootstrap3-editable/js/bootstrap-editable.js',
|
||||
'node_modules/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js',
|
||||
'node_modules/jquery-pjax/jquery.pjax.js',
|
||||
'node_modues/paper-dashboard/assets/js/paper-dashboard.js',
|
||||
], 'public/assets/admin/js/vendor.js');
|
||||
}
|
||||
|
||||
mix.copy('node_modules/icheck/skins/square/blue*.png', 'public/assets/admin/css');
|
||||
function buildGlobalAssets()
|
||||
{
|
||||
mix.scripts([
|
||||
'node_modules/lodash/lodash.js',
|
||||
'node_modules/jquery/dist/jquery.js',
|
||||
'node_modules/select2/dist/js/select2.js',
|
||||
'node_modules/cookieconsent/build/cookieconsent.min.js',
|
||||
], 'public/assets/global/js/vendor.js');
|
||||
|
||||
/**
|
||||
* SYSTEM REQUIRED AND GLOBAL VENDOR FILES
|
||||
*/
|
||||
mix.styles([
|
||||
'node_modules/select2/dist/css/select2.css',
|
||||
'node_modules/leaflet/dist/leaflet.css',
|
||||
'node_modules/flag-icon-css/css/flag-icon.css',
|
||||
'node_modules/cookieconsent/build/cookieconsent.min.css',
|
||||
], 'public/assets/global/css/vendor.css')
|
||||
.options({
|
||||
//processCssUrls: true,
|
||||
compressed: true
|
||||
})
|
||||
.sourceMaps();
|
||||
}
|
||||
|
||||
mix.scripts([
|
||||
'node_modules/lodash/lodash.js',
|
||||
'node_modules/jquery/dist/jquery.js',
|
||||
'node_modules/select2/dist/js/select2.js',
|
||||
'node_modules/cookieconsent/build/cookieconsent.min.js',
|
||||
], 'public/assets/global/js/vendor.js');
|
||||
function buildInstallerAssets()
|
||||
{
|
||||
mix.styles([
|
||||
'node_modules/bootstrap/dist/css/bootstrap.css',
|
||||
'public/assets/frontend/css/now-ui-kit.css',
|
||||
'node_modules/select2/dist/css/select2.css',
|
||||
'node_modules/flag-icon-css/css/flag-icon.css',
|
||||
], 'public/assets/installer/css/vendor.css')
|
||||
.options({
|
||||
//processCssUrls: false,
|
||||
compressed: true
|
||||
})
|
||||
.sourceMaps();
|
||||
|
||||
mix.styles([
|
||||
'node_modules/select2/dist/css/select2.css',
|
||||
'node_modules/leaflet/dist/leaflet.css',
|
||||
'node_modules/flag-icon-css/css/flag-icon.css',
|
||||
'node_modules/cookieconsent/build/cookieconsent.min.css',
|
||||
], 'public/assets/global/css/vendor.css')
|
||||
.options({
|
||||
//processCssUrls: true,
|
||||
compressed: true
|
||||
})
|
||||
.sourceMaps();
|
||||
mix.scripts([
|
||||
'node_modules/jquery/dist/jquery.js',
|
||||
'node_modules/select2/dist/js/select2.js',
|
||||
], 'public/assets/installer/js/vendor.js');
|
||||
}
|
||||
|
||||
/**
|
||||
* INSTALLER VENDOR FILES
|
||||
*/
|
||||
function buildApp()
|
||||
{
|
||||
const extract = [
|
||||
'lodash',
|
||||
'popper.js',
|
||||
'jquery',
|
||||
'select2',
|
||||
'pjax',
|
||||
'leaflet',
|
||||
'Leaflet.Geodesic',
|
||||
'leaflet-rotatedmarker'
|
||||
];
|
||||
|
||||
mix.styles([
|
||||
'node_modules/bootstrap/dist/css/bootstrap.css',
|
||||
'public/assets/frontend/css/now-ui-kit.css',
|
||||
'node_modules/select2/dist/css/select2.css',
|
||||
'node_modules/flag-icon-css/css/flag-icon.css',
|
||||
], 'public/assets/installer/css/vendor.css')
|
||||
.options({
|
||||
//processCssUrls: false,
|
||||
compressed: true
|
||||
})
|
||||
.sourceMaps();
|
||||
mix.js('resources/js/frontend/app.js', 'public/assets/frontend/js/app.js');
|
||||
mix.js('resources/js/installer/app.js', 'public/assets/installer/js/app.js');
|
||||
mix.js('resources/js/admin/app.js', 'public/assets/admin/js/app.js');
|
||||
}
|
||||
|
||||
mix.scripts([
|
||||
'node_modules/jquery/dist/jquery.js',
|
||||
'node_modules/select2/dist/js/select2.js',
|
||||
], 'public/assets/installer/js/vendor.js');
|
||||
|
||||
/**
|
||||
* COMMON JS STUFF
|
||||
*/
|
||||
|
||||
// These should go into the separate vendor.js file
|
||||
const extract = [
|
||||
'lodash',
|
||||
'popper.js',
|
||||
'jquery',
|
||||
'select2',
|
||||
'pjax',
|
||||
'leaflet',
|
||||
'Leaflet.Geodesic',
|
||||
'leaflet-rotatedmarker'
|
||||
];
|
||||
|
||||
mix.js('resources/js/frontend/app.js', 'public/assets/frontend/js/app.js');
|
||||
mix.js('resources/js/installer/app.js', 'public/assets/installer/js/app.js');
|
||||
mix.js('resources/js/admin/app.js', 'public/assets/admin/js/app.js');
|
||||
copyAssets();
|
||||
buildFrontendAssets();
|
||||
buildAdminAssets();
|
||||
buildInstallerAssets();
|
||||
buildGlobalAssets();
|
||||
buildApp();
|
||||
|
||||
mix.webpackConfig({
|
||||
/*entry: {
|
||||
|
||||
Reference in New Issue
Block a user