forge-joniko/ldc-loue
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix structure .scss/.ts files + update fontawesome

Browse source
This commit is contained in:
Alexis Gousseau 2022-11-07 16:38:30 +01:00
parent 4a78ce9369
commit afea5d3ab1
22 changed files with 238 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

142
package-lock.json generated
View file

@ -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",

6
package.json
View file

@ -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",

24
resources/scss/back.scss
View file

@ -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";

18
resources/scss/_common.scss → resources/scss/bo/base/_common.scss
View file

@ -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%;
}
}

0
resources/scss/_fonts.scss → resources/scss/bo/base/_fonts.scss
View file

4
resources/scss/front.scss
View file

@ -1,4 +0,0 @@
// LIBS
@import "./common";
// Local

0
resources/scss/_variables.scss → resources/scss/utilities/_variables.scss
View file

1
resources/scss/vendor/_bootstrap.scss vendored Normal file
View file

@ -0,0 +1 @@
@import "~bootstrap";

1
resources/scss/vendor/_fontawesome.scss vendored Normal file
View file

@ -0,0 +1 @@
@import "~@fortawesome/fontawesome-svg-core/styles.css";

7
resources/ts/back.ts
View file

@ -1,4 +1,5 @@
// LIBS
import "./common";
import "./vue";
import "./confirm";
import "./utilities/bootstrap";
import "./utilities/vue";
import "./utilities/sweetalert";
import "./utilities/fontawesome";

6
resources/ts/components/bo/RecipeIngredientComponent.vue
View file

@ -51,7 +51,7 @@
:title="__('Supprimer cet ingrédient')"
data-bs-toggle="tooltip"
>
{{ __('Supprimer') }}
<FontAwesomeIcon icon="fa-solid fa-trash" />
</button>
</td>
</tr>
@ -75,9 +75,13 @@
<script lang="ts">
import { defineComponent } from "vue";
import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
import trans from "../../modules/trans";
export default defineComponent({
components: {
FontAwesomeIcon,
},
mixins: [trans],
data(): {
ingredients: Array<{

4
resources/ts/front.ts
View file

@ -1,3 +1,3 @@
// LIBS
import "./common";
import "./vue";
import "./utilities/bootstrap";
import "./utilities/vue";

0
resources/ts/common.ts → resources/ts/utilities/bootstrap.ts
View file

56
resources/ts/utilities/fontawesome.ts Normal file
View file

@ -0,0 +1,56 @@
import { dom, library, config } from "@fortawesome/fontawesome-svg-core";
import {
faEraser,
faArrowLeftLong,
faPlus,
faTrash,
faEye,
faFolderOpen,
faCrop,
faQuestionCircle,
faCheck,
faUndoAlt,
faRedoAlt,
faSyncAlt,
faSearchPlus,
faSearchMinus,
faArrowLeft,
faArrowRight,
faArrowUp,
faArrowDown,
faArrowsAltH,
faArrowsAltV,
faWandMagic,
faPencil,
faTimes,
faBackspace,
faSearch,
} from "@fortawesome/free-solid-svg-icons";
config.autoReplaceSvg = false;
library.add(faEraser);
library.add(faArrowLeftLong);
library.add(faPlus);
library.add(faTrash);
library.add(faEye);
library.add(faFolderOpen);
library.add(faCrop);
library.add(faQuestionCircle);
library.add(faCheck);
library.add(faUndoAlt);
library.add(faRedoAlt);
library.add(faSyncAlt);
library.add(faSearchPlus);
library.add(faSearchMinus);
library.add(faArrowLeft);
library.add(faArrowRight);
library.add(faArrowUp);
library.add(faArrowDown);
library.add(faArrowsAltH);
library.add(faArrowsAltV);
library.add(faWandMagic);
library.add(faPencil);
library.add(faTimes);
library.add(faBackspace);
library.add(faSearch);
dom.watch();

2
resources/ts/confirm.ts → resources/ts/utilities/sweetalert.ts
View file

@ -1,5 +1,5 @@
import { SweetAlertResult } from "sweetalert2";
import confirm from "./modules/confirm";
import confirm from "../modules/confirm";
window.addEventListener("DOMContentLoaded", () => {
let elements = document.getElementsByClassName("confirmDeleteJS");

2
resources/ts/vue.ts → resources/ts/utilities/vue.ts
View file

@ -7,7 +7,7 @@ document.addEventListener("DOMContentLoaded", () => {
};
// Register components
const vues = require.context("./components", true, /\.vue$/i);
const vues = require.context("../components", true, /\.vue$/i);
vues.keys().map((key) => {
let htmlKey = key.split("/").pop();
if (!htmlKey) {

14
resources/views/back/engagements/edit.blade.php
View file

@ -14,14 +14,12 @@
<div class="col-md-12">
@include('back.engagements.form')
@include('back.modules.minicrud-form-inputs', ['model' => $engagement])
<div class="form-group text-center mt-3">
<button type="submit" class="btn btn-primary"
title="{{ __('Modifier la page :model en base', [
'model' => $engagement->title_simple
]) }}" data-bs-toggle="tooltip">
<i class="fa-solid fa-pen"></i>
</button>
</div>
<button type="submit" class="btn btn-primary"
title="{{ __('Modifier la page :model en base', [
'model' => $engagement->title_simple
]) }}" data-bs-toggle="tooltip">
{{ __('Enregister') }}
</button>
</div>
</div>
</form>

1
resources/views/back/layouts/head.blade.php
View file

@ -29,5 +29,4 @@
<!-- STYLES -->
<link rel="stylesheet" href="{{ mix('css/back.css') }}">
<link rel="stylesheet" href="{{ mix('css/fontawesome.min.css') }}">
@stack('styles')

1
resources/views/front/layouts/head.blade.php
View file

@ -61,5 +61,4 @@
<!-- STYLES -->
<link rel="stylesheet" href="{{ mix('css/front.css') }}">
<link rel="stylesheet" href="{{ mix('css/fontawesome.min.css') }}">
@stack('styles')

1
resources/views/layouts/back.blade.php
View file

@ -68,7 +68,6 @@
@stack('scriptsConstants')
@include('back.modules.scriptConstants')
<script src="{{ mix('js/back.js') }}"></script>
<script src="{{ mix('js/fontawesome.min.js') }}"></script>
@stack('scripts')
</body>
</html>

4
tsconfig.json
View file

@ -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
}

12
webpack.mix.js
View file

@ -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')