fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix

This commit is contained in:
Wächtler, Yannick 2022-01-09 17:35:28 +01:00
parent c3ab4c7512
commit b77e7f88d4
11 changed files with 24675 additions and 20139 deletions

44471
package-lock.json generated

File diff suppressed because it is too large Load diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
public/js/dist/all.js vendored

Binary file not shown.

Binary file not shown.

View file

@ -1,5 +1,5 @@
{ {
"/js/build/app.js": "/js/build/app.js?id=c015308b9685c9375c71", "/js/build/app.js": "/js/build/app.js?id=53b8d5c2b746ea8777a7",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=83e39e254b7f9035eddc", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=83e39e254b7f9035eddc",
"/css/build/overrides.css": "/css/build/overrides.css?id=4fc3a0e0a16964643e70", "/css/build/overrides.css": "/css/build/overrides.css?id=4fc3a0e0a16964643e70",
"/css/build/app.css": "/css/build/app.css?id=a7cd7ad6e0e053ccf443", "/css/build/app.css": "/css/build/app.css?id=a7cd7ad6e0e053ccf443",
@ -18,15 +18,15 @@
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=efda2335fa5243175850", "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=efda2335fa5243175850",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c24716a423d375902723", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c24716a423d375902723",
"/css/dist/all.css": "/css/dist/all.css?id=2ee76a9bb4100b60febc", "/css/dist/all.css": "/css/dist/all.css?id=97ea7f220e05bd2c1d46",
"/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
"/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6e35c74c14f89f55df49",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6e35c74c14f89f55df49",
"/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=810d7e520c3057ee500e", "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=810d7e520c3057ee500e",
"/js/build/vendor.js": "/js/build/vendor.js?id=651427cc4b45d8e68d0c", "/js/build/vendor.js": "/js/build/vendor.js?id=b717ba4eb48e4ce62615",
"/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=7058545374c5c6a6a881", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=d6794066f6af00743d5f",
"/js/dist/all.js": "/js/dist/all.js?id=b12eaebad0af2541f40b", "/js/dist/all.js": "/js/dist/all.js?id=e3ee59aad9b5feb67315",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=efda2335fa5243175850", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=efda2335fa5243175850",
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6e35fb4cb2f1063b3047", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6e35fb4cb2f1063b3047",
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=ec96c42439cdeb022133", "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=ec96c42439cdeb022133",

View file

@ -6,7 +6,6 @@
@push('js') @push('js')
<script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script> <script src="{{ url(mix('js/dist/bootstrap-table.js')) }}"></script>
<script src="{{ url('js/bootstrap-table-locale-all.js') }}"></script>
<script nonce="{{ csrf_token() }}"> <script nonce="{{ csrf_token() }}">
$(function () { $(function () {

View file

@ -1,170 +1,232 @@
const mix = require('laravel-mix'); 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 mix
.options({ .options({
processCssUrls: false, processCssUrls: false,
processFontUrls: true, processFontUrls: true,
clearConsole: false clearConsole: false,
}) })
.less('./node_modules/admin-lte/build/less/AdminLTE.less', 'css/build') .less("./node_modules/admin-lte/build/less/AdminLTE.less", "css/build")
.less('./resources/assets/less/app.less', 'css/build') .less("./resources/assets/less/app.less", "css/build")
.less('./resources/assets/less/overrides.less', 'css/build') .less("./resources/assets/less/overrides.less", "css/build")
.styles( .styles(
[ [
'./resources/assets/css/font-awesome/all.css', "./resources/assets/css/font-awesome/all.css",
'./node_modules/bootstrap/dist/css/bootstrap.css', "./node_modules/bootstrap/dist/css/bootstrap.css",
'./public/css/build/AdminLTE.css', "./public/css/build/AdminLTE.css",
'./node_modules/jquery-ui-bundle/jquery-ui.css', "./node_modules/jquery-ui-bundle/jquery-ui.css",
'./node_modules/admin-lte/plugins/iCheck/minimal/blue.css', "./node_modules/admin-lte/plugins/iCheck/minimal/blue.css",
'./node_modules/icheck/skins/minimal/minimal.css', "./node_modules/icheck/skins/minimal/minimal.css",
'./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css', "./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css",
'./node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css', "./node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css",
'./node_modules/blueimp-file-upload/css/jquery.fileupload.css', "./node_modules/blueimp-file-upload/css/jquery.fileupload.css",
'./node_modules/blueimp-file-upload/css/jquery.fileupload-ui.css', "./node_modules/blueimp-file-upload/css/jquery.fileupload-ui.css",
'./node_modules/ekko-lightbox/dist/ekko-lightbox.css', "./node_modules/ekko-lightbox/dist/ekko-lightbox.css",
'./node_modules/bootstrap-table/dist/bootstrap-table.css', "./node_modules/bootstrap-table/dist/bootstrap-table.css",
'./public/css/build/app.css', "./public/css/build/app.css",
'./node_modules/select2/dist/css/select2.css', "./node_modules/select2/dist/css/select2.css",
'./public/css/build/overrides.css' "./public/css/build/overrides.css",
], ],
'./public/css/dist/all.css' "./public/css/dist/all.css"
).version(); )
.version();
mix.copy(
mix.copy(['./node_modules/icheck/skins/minimal/blue.png', [
'./node_modules/icheck/skins/minimal/blue@2x.png'], './public/css'); "./node_modules/icheck/skins/minimal/blue.png",
"./node_modules/icheck/skins/minimal/blue@2x.png",
],
"./public/css"
);
/** /**
* Copy, minify and version signature-pad.css * Copy, minify and version signature-pad.css
*/ */
mix mix
.copy('./resources/assets/css/signature-pad.css', './public/css/dist') .copy("./resources/assets/css/signature-pad.css", "./public/css/dist")
.minify('./public/css/dist/signature-pad.css'); .minify("./public/css/dist/signature-pad.css");
// Combine main SnipeIT JS files // Combine main SnipeIT JS files
mix.js( mix
.js(
[ [
'./resources/assets/js/vue.js', // require()s vue, and require()s bootstrap.js "./resources/assets/js/vue.js", // require()s vue, and require()s bootstrap.js
'./resources/assets/js/snipeit.js', //this is the actual Snipe-IT JS "./resources/assets/js/snipeit.js", //this is the actual Snipe-IT JS
'./resources/assets/js/snipeit_modals.js' "./resources/assets/js/snipeit_modals.js",
], ],
'./public/js/build/app.js' //because of compiling - this does not work very well :( "./public/js/build/app.js" //because of compiling - this does not work very well :(
).vue(); )
.vue();
// Convert the skins to CSS // 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(
mix.less('./resources/assets/less/skins/skin-red.less', 'css/dist/skins', './public/css/dist/skins/skin-red.css'); "./resources/assets/less/skins/skin-blue.less",
mix.less('./resources/assets/less/skins/skin-contrast.less', 'css/dist/skins', './public/css/dist/skins/skin-contrast.css'); "css/dist/skins",
mix.less('./resources/assets/less/skins/skin-green.less', 'css/dist/skins', './public/css/dist/skins/skin-green.css'); "./public/css/dist/skins/skin-blue.css"
mix.less('./resources/assets/less/skins/skin-green-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-green-light.css'); );
mix.less('./resources/assets/less/skins/skin-black.less', 'css/dist/skins', './public/css/dist/skins/skin-black.css'); mix.less(
mix.less('./resources/assets/less/skins/skin-black-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-black-light.css'); "./resources/assets/less/skins/skin-red.less",
mix.less('./resources/assets/less/skins/skin-red-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-red-light.css'); "css/dist/skins",
mix.less('./resources/assets/less/skins/skin-purple.less', 'css/dist/skins', './public/css/dist/skins/skin-purple.css'); "./public/css/dist/skins/skin-red.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/dist/skins/skin-yellow.css'); mix.less(
mix.less('./resources/assets/less/skins/skin-yellow-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-yellow-light.css'); "./resources/assets/less/skins/skin-contrast.less",
mix.less('./resources/assets/less/skins/skin-blue-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-blue-light.css'); "css/dist/skins",
mix.less('./resources/assets/less/skins/skin-orange-dark.less', 'css/dist/skins', './public/css/dist/skins/skin-orange-light.css'); "./public/css/dist/skins/skin-contrast.css"
mix.less('./resources/assets/less/skins/skin-orange.less', 'css/dist/skins', './public/css/dist/skins/skin-orange.css'); );
mix.less(
"./resources/assets/less/skins/skin-green.less",
"css/dist/skins",
"./public/css/dist/skins/skin-green.css"
);
mix.less(
"./resources/assets/less/skins/skin-green-dark.less",
"css/dist/skins",
"./public/css/dist/skins/skin-green-light.css"
);
mix.less(
"./resources/assets/less/skins/skin-black.less",
"css/dist/skins",
"./public/css/dist/skins/skin-black.css"
);
mix.less(
"./resources/assets/less/skins/skin-black-dark.less",
"css/dist/skins",
"./public/css/dist/skins/skin-black-light.css"
);
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/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/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 * Combine bootstrap table css
*/ */
mix.combine( mix
.combine(
[ [
'./node_modules/bootstrap-table/dist/bootstrap-table.css', "./node_modules/bootstrap-table/dist/bootstrap-table.css",
'./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css' "./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.css",
], ],
'public/css/dist/bootstrap-table.css' "public/css/dist/bootstrap-table.css"
).version(); )
.version();
/** /**
* Combine JS * Combine JS
*/ */
mix mix.combine(
.combine( [
[ // lots of node_modules here - should this be subsumed by require()? // lots of node_modules here - should this be subsumed by require()?
'./node_modules/jquery/dist/jquery.js', "./node_modules/jquery/dist/jquery.js",
'./node_modules/select2/dist/js/select2.full.min.js', "./node_modules/select2/dist/js/select2.full.min.js",
'./node_modules/admin-lte/dist/js/adminlte.min.js', "./node_modules/admin-lte/dist/js/adminlte.min.js",
'./node_modules/tether/dist/js/tether.js', "./node_modules/tether/dist/js/tether.js",
'./node_modules/jquery-ui-bundle/jquery-ui.js', "./node_modules/jquery-ui-bundle/jquery-ui.js",
'./node_modules/jquery-slimscroll/jquery.slimscroll.js', "./node_modules/jquery-slimscroll/jquery.slimscroll.js",
'./node_modules/jquery.iframe-transport/jquery.iframe-transport.js', "./node_modules/jquery.iframe-transport/jquery.iframe-transport.js",
'./node_modules/blueimp-file-upload/js/jquery.fileupload.js', "./node_modules/blueimp-file-upload/js/jquery.fileupload.js",
'./node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js', "./node_modules/bootstrap-colorpicker/dist/js/bootstrap-colorpicker.js",
'./node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js', "./node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js",
'./node_modules/ekko-lightbox/dist/ekko-lightbox.js', "./node_modules/ekko-lightbox/dist/ekko-lightbox.js",
'./node_modules/icheck/icheck.js', //definite problem here :( "./node_modules/icheck/icheck.js", //definite problem here :(
'./resources/assets/js/extensions/pGenerator.jquery.js', "./resources/assets/js/extensions/pGenerator.jquery.js",
'./node_modules/chart.js/dist/Chart.js', "./node_modules/chart.js/dist/Chart.js",
'./resources/assets/js/signature_pad.js', "./resources/assets/js/signature_pad.js",
'./node_modules/jquery-form-validator/form-validator/jquery.form-validator.js', //problem? "./node_modules/jquery-form-validator/form-validator/jquery.form-validator.js", //problem?
'./node_modules/list.js/dist/list.js' "./node_modules/list.js/dist/list.js",
], ],
'public/js/build/vendor.js' // this file seems OK! "public/js/build/vendor.js" // this file seems OK!
); );
/** /**
* Combine bootstrap table js * Combine bootstrap table js
*/ */
mix mix
.combine( .combine(
[ [
'./node_modules/bootstrap-table/dist/bootstrap-table.js', "./node_modules/bootstrap-table/dist/bootstrap-table.js",
'./node_modules/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js', "./node_modules/bootstrap-table/dist/bootstrap-table-locale-all.js",
'./node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js', "./node_modules/bootstrap-table/dist/extensions/mobile/bootstrap-table-mobile.js",
'./node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js', "./node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js",
'./resources/assets/js/extensions/jquery.base64.js', "./node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js",
'./node_modules/tableexport.jquery.plugin/tableExport.min.js', "./resources/assets/js/extensions/jquery.base64.js",
'./node_modules/tableexport.jquery.plugin/libs/jsPDF/polyfills.umd.min.js', "./node_modules/tableexport.jquery.plugin/tableExport.min.js",
'./node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.umd.min.js', "./node_modules/tableexport.jquery.plugin/libs/jsPDF/polyfills.umd.min.js",
'./resources/assets/js/FileSaver.min.js', "./node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.umd.min.js",
'./node_modules/xlsx/dist/xlsx.core.min.js', "./resources/assets/js/FileSaver.min.js",
'./node_modules/bootstrap-table/dist/extensions/sticky-header/bootstrap-table-sticky-header.js', "./node_modules/xlsx/dist/xlsx.core.min.js",
'./node_modules/bootstrap-table/dist/extensions/toolbar/bootstrap-table-toolbar.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(); "public/js/dist/bootstrap-table.js"
)
.version();
mix.combine(
[
'./public/js/build/vendor.js',
'./public/js/build/app.js'
],
'./public/js/dist/all.js'
).version();
mix
.combine(
["./public/js/build/vendor.js", "./public/js/build/app.js"],
"./public/js/dist/all.js"
)
.version();
/** /**
* Copy, minify and version skins * Copy, minify and version skins
*/ */
mix mix
.minify([ .minify([
'./public/css/dist/skins/skin-green.css', "./public/css/dist/skins/skin-green.css",
'./public/css/dist/skins/skin-green-dark.css', "./public/css/dist/skins/skin-green-dark.css",
'./public/css/dist/skins/skin-black.css', "./public/css/dist/skins/skin-black.css",
'./public/css/dist/skins/skin-black-dark.css', "./public/css/dist/skins/skin-black-dark.css",
'./public/css/dist/skins/skin-blue.css', "./public/css/dist/skins/skin-blue.css",
'./public/css/dist/skins/skin-blue-dark.css', "./public/css/dist/skins/skin-blue-dark.css",
'./public/css/dist/skins/skin-yellow.css', "./public/css/dist/skins/skin-yellow.css",
'./public/css/dist/skins/skin-yellow-dark.css', "./public/css/dist/skins/skin-yellow-dark.css",
'./public/css/dist/skins/skin-red.css', "./public/css/dist/skins/skin-red.css",
'./public/css/dist/skins/skin-red-dark.css', "./public/css/dist/skins/skin-red-dark.css",
'./public/css/dist/skins/skin-purple.css', "./public/css/dist/skins/skin-purple.css",
'./public/css/dist/skins/skin-purple-dark.css', "./public/css/dist/skins/skin-purple-dark.css",
'./public/css/dist/skins/skin-orange.css', "./public/css/dist/skins/skin-orange.css",
'./public/css/dist/skins/skin-orange-dark.css', "./public/css/dist/skins/skin-orange-dark.css",
'./public/css/dist/skins/skin-contrast.css' "./public/css/dist/skins/skin-contrast.css",
]) ])
.version(); .version();