diff --git a/package-lock.json b/package-lock.json index abf6245..f4a1992 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,17 @@ { - "name": "loue", + "name": "srcs", "lockfileVersion": 2, "requires": true, "packages": { "": { + "name": "srcs", "devDependencies": { "@ckpack/vue-color": "^1.1.9", - "@fortawesome/fontawesome-free": "^6.1.1", + "@fortawesome/fontawesome-svg-core": "^6.1.2", + "@fortawesome/free-brands-svg-icons": "^6.1.2", + "@fortawesome/free-regular-svg-icons": "^6.1.2", + "@fortawesome/free-solid-svg-icons": "^6.1.2", + "@fortawesome/vue-fontawesome": "^3.0.1", "@popperjs/core": "^2.11.5", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.1.12", @@ -1870,16 +1875,78 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@fortawesome/fontawesome-free": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz", - "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg==", + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz", + "integrity": "sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==", "dev": true, "hasInstallScript": true, "engines": { "node": ">=6" } }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz", + "integrity": "sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-brands-svg-icons": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz", + "integrity": "sha512-fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-regular-svg-icons": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.0.tgz", + "integrity": "sha512-M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz", + "integrity": "sha512-UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "6.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/vue-fontawesome": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.1.tgz", + "integrity": "sha512-CdXZJoCS+aEPec26ZP7hWWU3SaJlQPZSCGdgpQ2qGl2HUmtUUNrI3zC4XWdn1JUmh3t5OuDeRG1qB4eGRNSD4A==", + "dev": true, + "peerDependencies": { + "@fortawesome/fontawesome-svg-core": "~1 || ~6", + "vue": ">= 3.0.0 < 4" + } + }, "node_modules/@humanwhocodes/config-array": { "version": "0.10.4", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", @@ -7206,9 +7273,9 @@ } }, "node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -13015,12 +13082,55 @@ } } }, - "@fortawesome/fontawesome-free": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.1.1.tgz", - "integrity": "sha512-J/3yg2AIXc9wznaVqpHVX3Wa5jwKovVF0AMYSnbmcXTiL3PpRPfF58pzWucCwEiCJBp+hCNRLWClTomD8SseKg==", + "@fortawesome/fontawesome-common-types": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz", + "integrity": "sha512-rBevIsj2nclStJ7AxTdfsa3ovHb1H+qApwrxcTVo+NNdeJiB9V75hsKfrkG5AwNcRUNxrPPiScGYCNmLMoh8pg==", "dev": true }, + "@fortawesome/fontawesome-svg-core": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.0.tgz", + "integrity": "sha512-Cf2mAAeMWFMzpLC7Y9H1I4o3wEU+XovVJhTiNG8ZNgSQj53yl7OCJaS80K4YjrABWZzbAHVaoHE1dVJ27AAYXw==", + "dev": true, + "requires": { + "@fortawesome/fontawesome-common-types": "6.2.0" + } + }, + "@fortawesome/free-brands-svg-icons": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.2.0.tgz", + "integrity": "sha512-fm1y4NyZ2qKYNmYhdMz9VAWRw1Et7PMHNunSw3W0SVAwKwv6o0qiJworLH3Y9SnmhHzAymXJwCX1op22FFvGiA==", + "dev": true, + "requires": { + "@fortawesome/fontawesome-common-types": "6.2.0" + } + }, + "@fortawesome/free-regular-svg-icons": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.2.0.tgz", + "integrity": "sha512-M1dG+PAmkYMTL9BSUHFXY5oaHwBYfHCPhbJ8qj8JELsc9XCrUJ6eEHWip4q0tE+h9C0DVyFkwIM9t7QYyCpprQ==", + "dev": true, + "requires": { + "@fortawesome/fontawesome-common-types": "6.2.0" + } + }, + "@fortawesome/free-solid-svg-icons": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.2.0.tgz", + "integrity": "sha512-UjCILHIQ4I8cN46EiQn0CZL/h8AwCGgR//1c4R96Q5viSRwuKVo0NdQEc4bm+69ZwC0dUvjbDqAHF1RR5FA3XA==", + "dev": true, + "requires": { + "@fortawesome/fontawesome-common-types": "6.2.0" + } + }, + "@fortawesome/vue-fontawesome": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@fortawesome/vue-fontawesome/-/vue-fontawesome-3.0.1.tgz", + "integrity": "sha512-CdXZJoCS+aEPec26ZP7hWWU3SaJlQPZSCGdgpQ2qGl2HUmtUUNrI3zC4XWdn1JUmh3t5OuDeRG1qB4eGRNSD4A==", + "dev": true, + "requires": {} + }, "@humanwhocodes/config-array": { "version": "0.10.4", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.10.4.tgz", @@ -17144,9 +17254,9 @@ "dev": true }, "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", + "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", "dev": true, "requires": { "big.js": "^5.2.2", diff --git a/package.json b/package.json index 0bded15..d9914a3 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,11 @@ }, "devDependencies": { "@ckpack/vue-color": "^1.1.9", - "@fortawesome/fontawesome-free": "^6.1.1", + "@fortawesome/fontawesome-svg-core": "^6.1.2", + "@fortawesome/free-brands-svg-icons": "^6.1.2", + "@fortawesome/free-regular-svg-icons": "^6.1.2", + "@fortawesome/free-solid-svg-icons": "^6.1.2", + "@fortawesome/vue-fontawesome": "^3.0.1", "@popperjs/core": "^2.11.5", "@sipec/vue3-tags-input": "^3.0.4", "@types/bootstrap": "^5.1.12", diff --git a/resources/scss/back.scss b/resources/scss/back.scss index 38c45bc..de61aac 100644 --- a/resources/scss/back.scss +++ b/resources/scss/back.scss @@ -1,16 +1,10 @@ -// LIBS -@import "./common"; +//LIBS +@import "./vendor/bootstrap"; +@import "./vendor/fontawesome"; -.table.fix-action { - th:last-child, - td:last-child { - background-color: $gray-200; - color: $gray-900; - // * Sticky - position: sticky; - right: 0; - white-space: nowrap; - // * Shrink - width: 0.1%; - } -} +// UTILITIES +@import "./utilities/variables"; + +// BASE +@import "./bo/base/common"; +@import "./bo/base/fonts"; diff --git a/resources/scss/_common.scss b/resources/scss/bo/base/_common.scss similarity index 61% rename from resources/scss/_common.scss rename to resources/scss/bo/base/_common.scss index 416f30e..cc12de3 100644 --- a/resources/scss/_common.scss +++ b/resources/scss/bo/base/_common.scss @@ -1,7 +1,3 @@ -@import "./variables"; -@import "./fonts"; -@import "~bootstrap"; - .bg-loue-blue { background-color: $loue-blue !important; } @@ -25,3 +21,17 @@ @extend %icon-size; color: #2e8b57; } + +.table.fix-action { + th:last-child, + td:last-child { + background-color: $gray-200; + color: $gray-900; + // * Sticky + position: sticky; + right: 0; + white-space: nowrap; + // * Shrink + width: 0.1%; + } +} diff --git a/resources/scss/_fonts.scss b/resources/scss/bo/base/_fonts.scss similarity index 100% rename from resources/scss/_fonts.scss rename to resources/scss/bo/base/_fonts.scss diff --git a/resources/scss/front.scss b/resources/scss/front.scss index d4d332b..e69de29 100644 --- a/resources/scss/front.scss +++ b/resources/scss/front.scss @@ -1,4 +0,0 @@ -// LIBS -@import "./common"; - -// Local diff --git a/resources/scss/_variables.scss b/resources/scss/utilities/_variables.scss similarity index 100% rename from resources/scss/_variables.scss rename to resources/scss/utilities/_variables.scss diff --git a/resources/scss/vendor/_bootstrap.scss b/resources/scss/vendor/_bootstrap.scss new file mode 100644 index 0000000..a465d03 --- /dev/null +++ b/resources/scss/vendor/_bootstrap.scss @@ -0,0 +1 @@ +@import "~bootstrap"; diff --git a/resources/scss/vendor/_fontawesome.scss b/resources/scss/vendor/_fontawesome.scss new file mode 100644 index 0000000..731daea --- /dev/null +++ b/resources/scss/vendor/_fontawesome.scss @@ -0,0 +1 @@ +@import "~@fortawesome/fontawesome-svg-core/styles.css"; diff --git a/resources/ts/back.ts b/resources/ts/back.ts index 154a8a9..8427bca 100644 --- a/resources/ts/back.ts +++ b/resources/ts/back.ts @@ -1,4 +1,5 @@ // LIBS -import "./common"; -import "./vue"; -import "./confirm"; +import "./utilities/bootstrap"; +import "./utilities/vue"; +import "./utilities/sweetalert"; +import "./utilities/fontawesome"; diff --git a/resources/ts/components/bo/RecipeIngredientComponent.vue b/resources/ts/components/bo/RecipeIngredientComponent.vue index 4bb2f56..309fcae 100644 --- a/resources/ts/components/bo/RecipeIngredientComponent.vue +++ b/resources/ts/components/bo/RecipeIngredientComponent.vue @@ -51,7 +51,7 @@ :title="__('Supprimer cet ingrédient')" data-bs-toggle="tooltip" > - {{ __('Supprimer') }} + @@ -75,9 +75,13 @@ - @stack('scripts') diff --git a/tsconfig.json b/tsconfig.json index a87c053..55e4a14 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,4 +1,5 @@ { + "sourceMap": true, "compilerOptions": { "target": "esnext", "lib": ["es5", "es6", "es2021", "dom", "dom.iterable"], @@ -10,5 +11,6 @@ }, "include": ["resources/**/*.js", "resources/**/*.ts", "resources/**/*.vue"], "exclude": ["node_modules"], - "compileOnSave": false + "compileOnSave": false, + "experimentalDecorators": true } diff --git a/webpack.mix.js b/webpack.mix.js index bb1b890..86ccca5 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -86,8 +86,8 @@ mix.ts("resources/ts/back.ts", "public/js/back.js", { transpileOnly: true }) files: ["**/*.scss"], }) .polyfill(polyfill) - .version(); - // .sourceMaps(false) + .version() + .sourceMaps(false, "inline-source-map"); // * FO mix.ts("resources/ts/front.ts", "public/js/front.js", { transpileOnly: true }) @@ -106,12 +106,8 @@ mix.ts("resources/ts/front.ts", "public/js/front.js", { transpileOnly: true }) globalStyles: false, }) .polyfill(polyfill) - .version(); - // .sourceMaps(false) + .version() + .sourceMaps(false, "inline-source-map"); // Copy Blade Images Assets mix.copyDirectory('resources/assets', 'public/assets') - -// fontawesome compile -mix.copy('node_modules/@fortawesome/fontawesome-free/js/all.min.js', 'public/js/fontawesome.min.js') - .copy('node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css', 'public/css/fontawesome.min.css')