DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #15170 from uberbrady/simplify_css_skin_building

Browse source 
Dynamically iterate through the skin listing to build skins
This commit is contained in:
snipe 2024-07-26 15:14:24 +01:00 committed by GitHub
parent e4a82edd3f daf5a80081
commit 614d05acb5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

111
webpack.mix.js
View file

@ -1,4 +1,5 @@
const mix = require("laravel-mix"); const mix = require("laravel-mix");
const fs = require("node:fs");
// 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
@ -68,67 +69,30 @@ mix
"./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 :(
) )
var skins = fs.readdirSync("resources/assets/less/skins");
// Convert the skins to CSS // Convert the skins to CSS
mix.less( for (var i in skins) {
"./resources/assets/less/skins/skin-blue.less", mix.less(
"css/dist/skins", "resources/assets/less/skins/" + skins[i],
); "css/dist/skins"
mix.less( )
"./resources/assets/less/skins/skin-red.less", }
"css/dist/skins",
); var css_skins = fs.readdirSync("public/css/dist/skins");
mix.less( for (var i in css_skins) {
"./resources/assets/less/skins/skin-contrast.less", if (css_skins[i].endsWith(".min.css")) {
"css/dist/skins", //don't minify already minified skinns
); continue;
mix.less( }
"./resources/assets/less/skins/skin-green.less", if (css_skins[i].endsWith(".css")) {
"css/dist/skins", // only minify files ending with '.css'
); mix.minify("public/css/dist/skins/" + css_skins[i]).version();
mix.less( }
"./resources/assets/less/skins/skin-green-dark.less", //TODO - if we only ever use the minified versions, this could be simplified down to one line (above)
"css/dist/skins", // but it stays like this so we have the minified and non-minified versions of the skins
); // right now the code seems to use the un-minified skins
mix.less( }
"./resources/assets/less/skins/skin-black.less",
"css/dist/skins",
);
mix.less(
"./resources/assets/less/skins/skin-black-dark.less",
"css/dist/skins",
);
mix.less(
"./resources/assets/less/skins/skin-red-dark.less",
"css/dist/skins",
);
mix.less(
"./resources/assets/less/skins/skin-purple.less",
"css/dist/skins",
);
mix.less(
"./resources/assets/less/skins/skin-purple-dark.less",
"css/dist/skins",
);
mix.less(
"./resources/assets/less/skins/skin-yellow.less",
"css/dist/skins",
);
mix.less(
"./resources/assets/less/skins/skin-yellow-dark.less",
"css/dist/skins",
);
mix.less(
"./resources/assets/less/skins/skin-blue-dark.less",
"css/dist/skins",
);
mix.less(
"./resources/assets/less/skins/skin-orange-dark.less",
"css/dist/skins",
);
mix.less(
"./resources/assets/less/skins/skin-orange.less",
"css/dist/skins",
);
/** /**
* Combine bootstrap table css * Combine bootstrap table css
@ -163,7 +127,7 @@ mix.combine(
"./node_modules/ekko-lightbox/dist/ekko-lightbox.js", "./node_modules/ekko-lightbox/dist/ekko-lightbox.js",
"./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", //dupe?
"./node_modules/jquery-validation/dist/jquery.validate.js", "./node_modules/jquery-validation/dist/jquery.validate.js",
"./node_modules/list.js/dist/list.js", "./node_modules/list.js/dist/list.js",
"./node_modules/clipboard/dist/clipboard.js", "./node_modules/clipboard/dist/clipboard.js",
@ -200,27 +164,4 @@ mix
["./public/js/build/vendor.js", "./public/js/build/app.js"], ["./public/js/build/vendor.js", "./public/js/build/app.js"],
"./public/js/dist/all.js" "./public/js/dist/all.js"
) )
.version(); .version();
/**
* Copy, minify and version skins
*/
mix
.minify([
"./public/css/dist/skins/skin-green.css",
"./public/css/dist/skins/skin-green-dark.css",
"./public/css/dist/skins/skin-black.css",
"./public/css/dist/skins/skin-black-dark.css",
"./public/css/dist/skins/skin-blue.css",
"./public/css/dist/skins/skin-blue-dark.css",
"./public/css/dist/skins/skin-yellow.css",
"./public/css/dist/skins/skin-yellow-dark.css",
"./public/css/dist/skins/skin-red.css",
"./public/css/dist/skins/skin-red-dark.css",
"./public/css/dist/skins/skin-purple.css",
"./public/css/dist/skins/skin-purple-dark.css",
"./public/css/dist/skins/skin-orange.css",
"./public/css/dist/skins/skin-orange-dark.css",
"./public/css/dist/skins/skin-contrast.css",
])
.version();