From e820d4bc4d476d9ae6150cabe8b384279fd365a6 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 4 Dec 2019 17:03:16 -0800 Subject: [PATCH] Moved js/css/less out of resources/assets Per https://laravel.com/docs/5.7/upgrade --- resources/{assets => }/css/signature-pad.css | 0 .../css/skins/skin-green-dark.css | 0 .../css/skins/skin-orange-dark.css | 0 .../{assets => }/css/skins/skin-red-dark.css | 0 resources/{assets => }/js/bootstrap.js | 0 .../{assets => }/js/components/alert.vue | 0 .../asset-models/fieldset-default-values.vue | 0 .../components/importer/importer-errors.vue | 0 .../js/components/importer/importer-file.vue | 0 .../js/components/importer/importer.vue | 0 .../components/passport/AuthorizedClients.vue | 0 .../js/components/passport/Clients.vue | 0 .../passport/PersonalAccessTokens.vue | 0 .../{assets => }/js/components/select2.vue | 0 .../js/extensions/jquery.base64.js | 0 .../js/extensions/pGenerator.jquery.js | 0 resources/{assets => }/js/signature_pad.js | 0 resources/{assets => }/js/snipeit.js | 0 resources/{assets => }/js/snipeit_modals.js | 0 resources/{assets => }/js/vue.js | 0 resources/{assets => }/less/AdminLTE.less | 0 resources/{assets => }/less/app.less | 0 resources/{assets => }/less/spacing.less | 0 webpack.mix.js | 20 +++++++++---------- 24 files changed, 10 insertions(+), 10 deletions(-) rename resources/{assets => }/css/signature-pad.css (100%) rename resources/{assets => }/css/skins/skin-green-dark.css (100%) rename resources/{assets => }/css/skins/skin-orange-dark.css (100%) rename resources/{assets => }/css/skins/skin-red-dark.css (100%) rename resources/{assets => }/js/bootstrap.js (100%) rename resources/{assets => }/js/components/alert.vue (100%) rename resources/{assets => }/js/components/forms/asset-models/fieldset-default-values.vue (100%) rename resources/{assets => }/js/components/importer/importer-errors.vue (100%) rename resources/{assets => }/js/components/importer/importer-file.vue (100%) rename resources/{assets => }/js/components/importer/importer.vue (100%) rename resources/{assets => }/js/components/passport/AuthorizedClients.vue (100%) rename resources/{assets => }/js/components/passport/Clients.vue (100%) rename resources/{assets => }/js/components/passport/PersonalAccessTokens.vue (100%) rename resources/{assets => }/js/components/select2.vue (100%) rename resources/{assets => }/js/extensions/jquery.base64.js (100%) rename resources/{assets => }/js/extensions/pGenerator.jquery.js (100%) rename resources/{assets => }/js/signature_pad.js (100%) rename resources/{assets => }/js/snipeit.js (100%) rename resources/{assets => }/js/snipeit_modals.js (100%) rename resources/{assets => }/js/vue.js (100%) rename resources/{assets => }/less/AdminLTE.less (100%) rename resources/{assets => }/less/app.less (100%) rename resources/{assets => }/less/spacing.less (100%) diff --git a/resources/assets/css/signature-pad.css b/resources/css/signature-pad.css similarity index 100% rename from resources/assets/css/signature-pad.css rename to resources/css/signature-pad.css diff --git a/resources/assets/css/skins/skin-green-dark.css b/resources/css/skins/skin-green-dark.css similarity index 100% rename from resources/assets/css/skins/skin-green-dark.css rename to resources/css/skins/skin-green-dark.css diff --git a/resources/assets/css/skins/skin-orange-dark.css b/resources/css/skins/skin-orange-dark.css similarity index 100% rename from resources/assets/css/skins/skin-orange-dark.css rename to resources/css/skins/skin-orange-dark.css diff --git a/resources/assets/css/skins/skin-red-dark.css b/resources/css/skins/skin-red-dark.css similarity index 100% rename from resources/assets/css/skins/skin-red-dark.css rename to resources/css/skins/skin-red-dark.css diff --git a/resources/assets/js/bootstrap.js b/resources/js/bootstrap.js similarity index 100% rename from resources/assets/js/bootstrap.js rename to resources/js/bootstrap.js diff --git a/resources/assets/js/components/alert.vue b/resources/js/components/alert.vue similarity index 100% rename from resources/assets/js/components/alert.vue rename to resources/js/components/alert.vue diff --git a/resources/assets/js/components/forms/asset-models/fieldset-default-values.vue b/resources/js/components/forms/asset-models/fieldset-default-values.vue similarity index 100% rename from resources/assets/js/components/forms/asset-models/fieldset-default-values.vue rename to resources/js/components/forms/asset-models/fieldset-default-values.vue diff --git a/resources/assets/js/components/importer/importer-errors.vue b/resources/js/components/importer/importer-errors.vue similarity index 100% rename from resources/assets/js/components/importer/importer-errors.vue rename to resources/js/components/importer/importer-errors.vue diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/js/components/importer/importer-file.vue similarity index 100% rename from resources/assets/js/components/importer/importer-file.vue rename to resources/js/components/importer/importer-file.vue diff --git a/resources/assets/js/components/importer/importer.vue b/resources/js/components/importer/importer.vue similarity index 100% rename from resources/assets/js/components/importer/importer.vue rename to resources/js/components/importer/importer.vue diff --git a/resources/assets/js/components/passport/AuthorizedClients.vue b/resources/js/components/passport/AuthorizedClients.vue similarity index 100% rename from resources/assets/js/components/passport/AuthorizedClients.vue rename to resources/js/components/passport/AuthorizedClients.vue diff --git a/resources/assets/js/components/passport/Clients.vue b/resources/js/components/passport/Clients.vue similarity index 100% rename from resources/assets/js/components/passport/Clients.vue rename to resources/js/components/passport/Clients.vue diff --git a/resources/assets/js/components/passport/PersonalAccessTokens.vue b/resources/js/components/passport/PersonalAccessTokens.vue similarity index 100% rename from resources/assets/js/components/passport/PersonalAccessTokens.vue rename to resources/js/components/passport/PersonalAccessTokens.vue diff --git a/resources/assets/js/components/select2.vue b/resources/js/components/select2.vue similarity index 100% rename from resources/assets/js/components/select2.vue rename to resources/js/components/select2.vue diff --git a/resources/assets/js/extensions/jquery.base64.js b/resources/js/extensions/jquery.base64.js similarity index 100% rename from resources/assets/js/extensions/jquery.base64.js rename to resources/js/extensions/jquery.base64.js diff --git a/resources/assets/js/extensions/pGenerator.jquery.js b/resources/js/extensions/pGenerator.jquery.js similarity index 100% rename from resources/assets/js/extensions/pGenerator.jquery.js rename to resources/js/extensions/pGenerator.jquery.js diff --git a/resources/assets/js/signature_pad.js b/resources/js/signature_pad.js similarity index 100% rename from resources/assets/js/signature_pad.js rename to resources/js/signature_pad.js diff --git a/resources/assets/js/snipeit.js b/resources/js/snipeit.js similarity index 100% rename from resources/assets/js/snipeit.js rename to resources/js/snipeit.js diff --git a/resources/assets/js/snipeit_modals.js b/resources/js/snipeit_modals.js similarity index 100% rename from resources/assets/js/snipeit_modals.js rename to resources/js/snipeit_modals.js diff --git a/resources/assets/js/vue.js b/resources/js/vue.js similarity index 100% rename from resources/assets/js/vue.js rename to resources/js/vue.js diff --git a/resources/assets/less/AdminLTE.less b/resources/less/AdminLTE.less similarity index 100% rename from resources/assets/less/AdminLTE.less rename to resources/less/AdminLTE.less diff --git a/resources/assets/less/app.less b/resources/less/app.less similarity index 100% rename from resources/assets/less/app.less rename to resources/less/app.less diff --git a/resources/assets/less/spacing.less b/resources/less/spacing.less similarity index 100% rename from resources/assets/less/spacing.less rename to resources/less/spacing.less diff --git a/webpack.mix.js b/webpack.mix.js index 6d7d0aad2b..ff3b66ddca 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -8,8 +8,8 @@ mix processFontUrls: true, clearConsole: false }) - .less("./resources/assets/less/AdminLTE.less", "css/build") - .less("./resources/assets/less/app.less", "css/build") + .less("./resources/less/AdminLTE.less", "css/build") + .less("./resources/less/app.less", "css/build") .styles( [ "./node_modules/bootstrap/dist/css/bootstrap.css", @@ -35,7 +35,7 @@ mix.copy(["./node_modules/icheck/skins/minimal/blue.png", /** * Copy, minify and version skins */ -mix.copyDirectory("./resources/assets/css/skins", "./public/css/skins"); +mix.copyDirectory("./resources/css/skins", "./public/css/skins"); mix .minify([ "./public/css/skins/skin-green-dark.css", @@ -47,16 +47,16 @@ mix * Copy, minify and version signature-pad.css */ mix - .copy("./resources/assets/css/signature-pad.css", "./public/css") + .copy("./resources/css/signature-pad.css", "./public/css") .minify("./public/css/signature-pad.css") .version(); // Combine main SnipeIT JS files mix.js( [ - "./resources/assets/js/vue.js", - "./resources/assets/js/snipeit.js", //this is the actual Snipe-IT JS - "./resources/assets/js/snipeit_modals.js" + "./resources/js/vue.js", + "./resources/js/snipeit.js", //this is the actual Snipe-IT JS + "./resources/js/snipeit_modals.js" ], "./public/js/app.js" ); @@ -76,9 +76,9 @@ mix "./node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.js", "./node_modules/ekko-lightbox/dist/ekko-lightbox.js", "./node_modules/icheck/icheck.js", - "./resources/assets/js/extensions/pGenerator.jquery.js", + "./resources/js/extensions/pGenerator.jquery.js", "./node_modules/chart.js/dist/Chart.js", - "./resources/assets/js/signature_pad.js", + "./resources/js/signature_pad.js", "./node_modules/jquery-form-validator/form-validator/jquery.form-validator.js" ], "public/js/vendor.js" @@ -95,7 +95,7 @@ mix "node_modules/bootstrap-table/dist/extentions/mobile/bootstrap-table-mobile.js", "node_modules/bootstrap-table/dist/extensions/export/bootstrap-table-export.js", "node_modules/bootstrap-table/dist/extensions/cookie/bootstrap-table-cookie.js", - "resources/assets/js/extensions/jquery.base64.js", + "resources/js/extensions/jquery.base64.js", "node_modules/tableexport.jquery.plugin/tableExport.js", "node_modules/tableexport.jquery.plugin/libs/jsPDF/jspdf.min.js", "node_modules/tableexport.jquery.plugin/libs/jsPDF-AutoTable/jspdf.plugin.autotable.js"