Merge remote-tracking branch 'origin/ticket559' into develop

.gitignore

@@ -1,6 +1,15 @@
 /node_modules
 /public/hot
 /public/storage
+/public/css
+/public/js
+/public/images
+/public/fonts
+/public/medias
+/public/uploads
+/public/assets
+/public/mix-manifest.json
+.vscode
 
 public/uploads/*
 !public/uploads/.gitkeep

app/Console/Commands/ImportMedia.php

@@ -143,7 +143,7 @@ class ImportMedia extends Command
                     } else {
                         // on applique une image par défaut
                         $record->extension = "jpg";
-                        Storage::disk('local')->copy("images/default.jpg", $destinationPath . $record->uid . '.' . $record->extension);
+                        Storage::disk('local')->copy("assets/images/default.jpg", $destinationPath . $record->uid . '.' . $record->extension);
 
                         // calcul de la taille du média
                         $record->taille = $this->formatBytes($this->get_file_size("public/" . $destinationPath . $record->uid . '.' . $record->extension));

app/Http/Controllers/MediaController.php

@@ -896,7 +896,7 @@ class MediaController extends Controller
             $destinationPath = $this->get_mediaFolder() . "/";
             $uid = sprintf('%04x%04x-%04x-%04x-%04x-%04x%04x%04x', mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0x0fff) | 0x4000, mt_rand(0, 0x3fff) | 0x8000, mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff));
             $filename = $uid . ".jpg";
-            Storage::copy("images/default.jpg", $destinationPath . $filename);
+            Storage::copy("assets/images/default.jpg", $destinationPath . $filename);
 
             $n->arcadia_id = NULL;
             $n->libelle = (strlen($n->libelle) + 5) >= 50 ? substr($n->libelle, 0,  -((strlen($n->libelle) - 50) + 5)) . '_copy' : $n->libelle . '_copy';

package.json

@@ -2,35 +2,35 @@
     "private": true,
     "scripts": {
         "dev": "npm run development",
-        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch": "npm run development -- --watch",
-        "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
+        "development": "mix",
+        "watch": "mix watch",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
+        "hot": "mix watch --hot",
         "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "wp": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+        "production": "mix --production"
     },
     "devDependencies": {
-        "axios": "^0.18",
-        "bootstrap": "^4.0.0",
-        "cross-env": "^5.1",
-        "jquery": "^3.2",
-        "laravel-mix": "^4.0.7",
-        "lodash": "^4.17.5",
+        "@fortawesome/fontawesome-free": "^6.1.1",
+        "axios": "^0.26.1",
+        "bootstrap": "^4.6.1",
+        "clean-webpack-plugin": "^4.0.0",
+        "core-js": "^3.21.1",
+        "jquery": "^3.6",
+        "laravel-mix": "^6.0.43",
+        "laravel-mix-polyfill": "^3.0.1",
+        "lodash": "^4.17.21",
         "moment": "^2.29.1",
-        "popper.js": "^1.12",
-        "resolve-url-loader": "^2.3.1",
-        "sass": "^1.15.2",
-        "sass-loader": "^7.1.0",
-        "vue": "^2.5.17",
-        "vue-template-compiler": "^2.6.10"
-    },
-    "dependencies": {
+        "popper.js": "^1.16.1-lts",
+        "resolve-url-loader": "^5.0.0",
         "resumablejs": "^1.1.0",
+        "sass": "^1.32.13",
+        "sass-loader": "^8.0.2",
+        "vue": "^2.6.14",
         "vue-clipboards": "^1.3.0",
-        "vue-dialog-loading": "^0.5.3",
-        "vue-infinite-loading": "^2.4.4",
-        "vue-select": "^3.10.3",
-        "vuex": "^3.4.0"
+        "vue-dialog-loading": "^0.1.7",
+        "vue-infinite-loading": "^2.4.5",
+        "vue-select": "^3.18.3",
+        "vue-template-compiler": "^2.6.14",
+        "vuex": "^3.6.2"
     }
 }

public/mix-manifest.json

@@ -1,4 +0,0 @@
-{
-    "/js/app.js": "/js/app.js",
-    "/css/app.css": "/css/app.css"
-}

resources/assets/images/image.dzi

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Image xmlns="http://schemas.microsoft.com/deepzoom/2008"
+       Format="png" 
+       Overlap="2" 
+       TileSize="256" >
+    <Size Height="9221" 
+          Width="7026"/>
+</Image>

resources/js/app.js

@@ -264,7 +264,7 @@ $.fancyConfirm = function( opts ) {
       src  :
       '<div class="fc-content">' +
       '<h3>' + opts.title   + '</h3><hr/>' +
-	   '<p class="tcenter"><i class="fal fa-question-circle"></i>' +
+       '<p class="tcenter"><i class="fa fa-question-circle"></i>' +
       opts.message + '</p>' +
       '<hr/><p class="button_bar">' +
       '<a data-value="0" data-fancybox-close class="btn btn-black mr-10 btn-square" >' + opts.noButton + '</a>' +
@@ -306,7 +306,7 @@ $.fancyMessage = function( opts ) {
       src  :
      '<div class="fc-content '+opts.type+'">' +
       '<h3>' + opts.title   + '</h3><hr/>' +
-	  '<p class="tcenter"><i class="fal fa-info-circle"></i></i><i class="fal fa-exclamation-triangle"></i>' +
+          '<p class="tcenter"><i class="fa fa-info-circle"></i></i><i class="fa fa-exclamation-triangle"></i>' +
 	 opts.message + '</p>' +
 	 '<hr/><p class="button_bar">' +
 	 '<a data-value="0" data-fancybox-close class="btn btn-square '+

resources/js/components/media-manager/ActionsComponent.vue

@@ -48,7 +48,7 @@
                     <div v-for="(file, key) in files">
                         <div>
                             <span>{{file.fileName}}</span>
-                            <button v-on:click="removeFile(file)" class="cancel"><i class="fal fa-times"></i></button>
+                            <button v-on:click="removeFile(file)" class="cancel"><i class="fa fa-times"></i></button>
                         </div>
                         <div>
                             <span>{{FileConvertSize(file.size)}}</span>

resources/js/components/media-manager/DisplayComponent.vue

@@ -1,8 +1,8 @@
 <template>
     <div>
-        <div v-show="scrollLoader" class="scrollLoader"><div class="animated slideInUp"><i  class="fal fa-circle-notch fa-spin"></i> Chargements des médias</div></div>
+        <div v-show="scrollLoader" class="scrollLoader"><div class="animated slideInUp"><i  class="fa fa-circle-notch fa-spin"></i> Chargements des médias</div></div>
         <div class="media_container">
-            <div v-show="loader" class="loader"><i  class="fal fa-circle-notch fa-spin"></i></div>
+            <div v-show="loader" class="loader"><i  class="fa fa-circle-notch fa-spin"></i></div>
             <div class="wrapper" v-if="medias.data">
                 <div v-if="showDateSeparators()" class="date-separator">{{formatDate(medias.data[0].updated_at)}}</div>
                 <template v-for="media,index in medias.data">

resources/js/components/media-manager/FiltersComponent.vue

@@ -44,7 +44,7 @@
         <div class="filter_wrapper">
             <span>Filtres :</span>
             <div class="search_filters_list">
-                <a v-for="(filter, index) in storeFilters" :id="filter.type" class="filter_item" href="#"><span class="libelle">{{ filter.legend }}</span><span class="value">{{ filter.libelle }}</span><i @click="deleteFilter(index)" class="delete_filter fal fa-times"></i></a>
+                <a v-for="(filter, index) in storeFilters" :id="filter.type" class="filter_item" href="#"><span class="libelle">{{ filter.legend }}</span><span class="value">{{ filter.libelle }}</span><i @click="deleteFilter(index)" class="delete_filter fa fa-times"></i></a>
             </div>
             <a v-if="storeFilters.length > 0" @click="reset" class="reinit_search_btn" href="#">Réinitialiser</a>
         </div>

resources/js/components/media-manager/FolderComponent.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="folder_container">
         <div :style="isLoading === true ? 'display:block' : 'display:none;'" class="loader">
-            <i class="fal fa-circle-notch fa-spin"></i>
+            <i class="fa fa-circle-notch fa-spin"></i>
         </div>
         <a href="#" @click="selectFolder({id: 0, libelle: 'racine'})" ondragstart="return false;"
            :class="storeFolder === 0 ? 'root_folder selected' : 'root_folder'" data-id="0">/racine <span class="count">{{racineCount}}</span></a>
@@ -16,7 +16,7 @@
                         <input type="text" value="" class="input_rename" maxlength="100">
                         <span>{{item.libelle}}</span>
                         <div class="count">{{item.mediacount}}</div>
-                        <i v-if="item.system === 0" :class="item.favoris === true ? 'fas fa-star' : 'fal fa-star'"
+                        <i v-if="item.system === 0" :class="item.favoris === true ? 'fas fa-star' : 'fa fa-star'"
                            @click="toggleFav(item)"></i>
                     </div>
                     <ol v-if="item.sousdossiers.length > 0" class='dd-list' :parent-id="item.id">
@@ -30,7 +30,7 @@
                                 <span>{{item2.libelle}}</span>
                                 <div class="count">{{item2.mediacount}}</div>
                                 <i v-if="item2.system === 0"
-                                   :class="item2.favoris === true ? 'fas fa-star' : 'fal fa-star'"
+                                   :class="item2.favoris === true ? 'fas fa-star' : 'fa fa-star'"
                                    @click="toggleFav(item2)"></i>
                             </div>
                             <ol v-if="item2.sousdossiers.length > 0" class='dd-list' :parent-id="item2.id">
@@ -45,7 +45,7 @@
                                         <span>{{item3.libelle}}</span>
                                         <div class="count">{{item3.mediacount}}</div>
                                         <i v-if="item3.system === 0"
-                                           :class="item3.favoris === true ? 'fas fa-star' : 'fal fa-star'"
+                                           :class="item3.favoris === true ? 'fas fa-star' : 'fa fa-star'"
                                            @click="toggleFav(item3)"></i>
                                     </div>
                                 </li>

resources/js/components/media-manager/media-editor/EditComponents.vue

@@ -8,11 +8,11 @@
                 <a href="#" @click="currentTab = 'links'" :class="currentTab === 'links' ? 'tabbtn form_media_links active' : 'tabbtn form_media_links'" data-tab="2">Vignettes</a>
                 <a href="#" @click="currentTab = 'history'" :class="currentTab === 'history' ? 'tabbtn form_media_history active' : 'tabbtn form_media_history'" data-tab="3">Historique</a>
 
-                <a @click="close" href="#" class="form_media_close"><i class="fal fa-times"></i></a>
+                <a @click="close" href="#" class="form_media_close"><i class="fa fa-times"></i></a>
                 <a href="#" class="float-right mr-10 copyclipboard" v-clipboard="'https://dam.lesidc.com/media/' + this.storeMedia.uid" title="Copier le lien"><i class="fas fa-link"></i></a>
                 <a v-show="currentTab === 'edit' && storeMedia.isLocked === 0" @click="$refs.newMedia.click()" href="#" class="form_media_replace" title="Chargez un autre média"><i class="fas fa-file-upload"></i></a>
             </div>
-            <a v-show="this.storeMedia.dossier_id === 1" @click="close" href="#" class="form_media_close"><i class="fal fa-times"></i></a>
+            <a v-show="this.storeMedia.dossier_id === 1" @click="close" href="#" class="form_media_close"><i class="fa fa-times"></i></a>
         </header>
         <div class="main_content">
             <mm-me-tab-preview :currentTab="currentTab"></mm-me-tab-preview>

resources/js/components/media-manager/media-editor/tabs/LinksComponent.vue

@@ -18,7 +18,7 @@
                             <input type="text" readonly :value="item.url">
                         </td>
                         <td class="ctas">
-                            <i class="fal fa-copy" v-clipboard="item.url"></i>
+                            <i class="fa fa-copy" v-clipboard="item.url"></i>
                             <a :href="item.url" :download="storeMedia.libelle.replaceAll(' ', '_').replaceAll('.','') + '_' + item.largeur + 'x' + item.hauteur + 'px'"><i class="fas fa-arrow-circle-down"></i></a>
                         </td>
                     </tr>

resources/js/depot.js

@@ -15,7 +15,7 @@ $(document).ready(function() {
 		var dossier_id = 0;
   		var cancel_btn = $('<button/>')
   			.addClass('cancel')
-  			.html('<i class="fal fa-times"></i>');
+				.html('<i class="fa fa-times"></i>');
   		var upload_btn = $('<button/>')
   			.addClass('upload')
   			.css('display', 'none');
@@ -33,7 +33,7 @@ $(document).ready(function() {
 				return false;
 			}
 
-			$("#submit").html('<i  class="fal fa-circle-notch fa-spin"></i> Transférer');
+				$("#submit").html('<i  class="fa fa-circle-notch fa-spin"></i> Transférer');
 			$("#submit").css("pointer-events", "none");
 
 			var currentdate = new Date();

resources/sass/app.scss

@@ -1,21 +1,16 @@
 
 // Variables
-@import "vue-select/src/scss/vue-select.scss";
-@import  'partials/app_variables.scss',
-'partials/reset.scss',
-'partials/animate.scss',
-'partials/nestable.scss',
- 'partials/fontawesome/fontawesome.scss',
-'partials/fontawesome/solid.scss',
-'partials/fontawesome/regular.scss',
-'partials/fontawesome/light.scss',
-'partials/fontawesome/brands.scss',
-'partials/fileupload.scss',
-'partials/darkroom.scss',
-'partials/tag-editor.scss',
-'partials/common.scss',
-'partials/form.scss',
-'partials/media.scss',
-'partials/panier.scss',
-'partials/user.scss',
-'partials/vselect-custom.scss';
+@import 'vue-select/src/scss/vue-select.scss';
+@import 'partials/app_variables.scss';
+@import 'partials/reset.scss';
+@import 'partials/animate.scss';
+@import 'partials/nestable.scss';
+@import 'partials/fileupload.scss';
+@import 'partials/darkroom.scss';
+@import 'partials/tag-editor.scss';
+@import 'partials/common.scss';
+@import 'partials/form.scss';
+@import 'partials/media.scss';
+@import 'partials/panier.scss';
+@import 'partials/user.scss';
+@import 'partials/vselect-custom.scss';

resources/sass/partials/common.scss

@@ -515,7 +515,7 @@
 
 .home{
 	.search{
-		background: url("/images/home_bg.jpg");
+		background: url("~@/images/home_bg.jpg");
 		background-size: cover;
 		width: 100%;
 		height: 380px;

resources/sass/partials/fontawesome/_animated.scss

@@ -1,20 +0,0 @@
-// Animated Icons
-// --------------------------
-
-.#{$fa-css-prefix}-spin {
-  animation: fa-spin 1s infinite linear;
-}
-
-.#{$fa-css-prefix}-pulse {
-  animation: fa-spin 1s infinite steps(8);
-}
-
-@keyframes fa-spin {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}

resources/sass/partials/fontawesome/_bordered-pulled.scss

@@ -1,20 +0,0 @@
-// Bordered & Pulled
-// -------------------------
-
-.#{$fa-css-prefix}-border {
-  border: solid .08em $fa-border-color;
-  border-radius: .1em;
-  padding: .2em .25em .15em;
-}
-
-.#{$fa-css-prefix}-pull-left { float: left; }
-.#{$fa-css-prefix}-pull-right { float: right; }
-
-.#{$fa-css-prefix},
-.fas,
-.far,
-.fal,
-.fab {
-  &.#{$fa-css-prefix}-pull-left { margin-right: .3em; }
-  &.#{$fa-css-prefix}-pull-right { margin-left: .3em; }
-}

resources/sass/partials/fontawesome/_core.scss

@@ -1,20 +0,0 @@
-// Base Class Definition
-// -------------------------
-
-.#{$fa-css-prefix},
-.fas,
-.far,
-.fal,
-.fab {
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  text-rendering: auto;
-  line-height: 1;
-}
-
-%fa-icon {
-  @include fa-icon;
-}

resources/sass/partials/fontawesome/_fixed-width.scss

@@ -1,6 +0,0 @@
-// Fixed Width Icons
-// -------------------------
-.#{$fa-css-prefix}-fw {
-  text-align: center;
-  width: $fa-fw-width;
-}

resources/sass/partials/fontawesome/_larger.scss

@@ -1,23 +0,0 @@
-// Icon Sizes
-// -------------------------
-
-// makes the font 33% larger relative to the icon container
-.#{$fa-css-prefix}-lg {
-  font-size: (4em / 3);
-  line-height: (3em / 4);
-  vertical-align: -.0667em;
-}
-
-.#{$fa-css-prefix}-xs {
-  font-size: .75em;
-}
-
-.#{$fa-css-prefix}-sm {
-  font-size: .875em;
-}
-
-@for $i from 1 through 10 {
-  .#{$fa-css-prefix}-#{$i}x {
-    font-size: $i * 1em;
-  }
-}

resources/sass/partials/fontawesome/_list.scss

@@ -1,18 +0,0 @@
-// List Icons
-// -------------------------
-
-.#{$fa-css-prefix}-ul {
-  list-style-type: none;
-  margin-left: $fa-li-width * 5/4;
-  padding-left: 0;
-
-  > li { position: relative; }
-}
-
-.#{$fa-css-prefix}-li {
-  left: -$fa-li-width;
-  position: absolute;
-  text-align: center;
-  width: $fa-li-width;
-  line-height: inherit;
-}

resources/sass/partials/fontawesome/_mixins.scss

@@ -1,56 +0,0 @@
-// Mixins
-// --------------------------
-
-@mixin fa-icon {
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  display: inline-block;
-  font-style: normal;
-  font-variant: normal;
-  font-weight: normal;
-  line-height: 1;
-}
-
-@mixin fa-icon-rotate($degrees, $rotation) {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation})";
-  transform: rotate($degrees);
-}
-
-@mixin fa-icon-flip($horiz, $vert, $rotation) {
-  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}, mirror=1)";
-  transform: scale($horiz, $vert);
-}
-
-
-// Only display content to screen readers. A la Bootstrap 4.
-//
-// See: http://a11yproject.com/posts/how-to-hide-content/
-
-@mixin sr-only {
-  border: 0;
-  clip: rect(0, 0, 0, 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px;
-}
-
-// Use in conjunction with .sr-only to only display content when it's focused.
-//
-// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
-//
-// Credit: HTML5 Boilerplate
-
-@mixin sr-only-focusable {
-  &:active,
-  &:focus {
-    clip: auto;
-    height: auto;
-    margin: 0;
-    overflow: visible;
-    position: static;
-    width: auto;
-  }
-}

resources/sass/partials/fontawesome/_rotated-flipped.scss

@@ -1,24 +0,0 @@
-// Rotated & Flipped Icons
-// -------------------------
-
-.#{$fa-css-prefix}-rotate-90  { @include fa-icon-rotate(90deg, 1);  }
-.#{$fa-css-prefix}-rotate-180 { @include fa-icon-rotate(180deg, 2); }
-.#{$fa-css-prefix}-rotate-270 { @include fa-icon-rotate(270deg, 3); }
-
-.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); }
-.#{$fa-css-prefix}-flip-vertical   { @include fa-icon-flip(1, -1, 2); }
-.#{$fa-css-prefix}-flip-both, .#{$fa-css-prefix}-flip-horizontal.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(-1, -1, 2); }
-
-// Hook for IE8-9
-// -------------------------
-
-:root {
-  .#{$fa-css-prefix}-rotate-90,
-  .#{$fa-css-prefix}-rotate-180,
-  .#{$fa-css-prefix}-rotate-270,
-  .#{$fa-css-prefix}-flip-horizontal,
-  .#{$fa-css-prefix}-flip-vertical,
-  .#{$fa-css-prefix}-flip-both {
-    filter: none;
-  }
-}

resources/sass/partials/fontawesome/_screen-reader.scss

@@ -1,5 +0,0 @@
-// Screen Readers
-// -------------------------
-
-.sr-only { @include sr-only; }
-.sr-only-focusable { @include sr-only-focusable; }

resources/sass/partials/fontawesome/_stacked.scss

@@ -1,31 +0,0 @@
-// Stacked Icons
-// -------------------------
-
-.#{$fa-css-prefix}-stack {
-  display: inline-block;
-  height: 2em;
-  line-height: 2em;
-  position: relative;
-  vertical-align: middle;
-  width: ($fa-fw-width*2);
-}
-
-.#{$fa-css-prefix}-stack-1x,
-.#{$fa-css-prefix}-stack-2x {
-  left: 0;
-  position: absolute;
-  text-align: center;
-  width: 100%;
-}
-
-.#{$fa-css-prefix}-stack-1x {
-  line-height: inherit;
-}
-
-.#{$fa-css-prefix}-stack-2x {
-  font-size: 2em;
-}
-
-.#{$fa-css-prefix}-inverse {
-  color: $fa-inverse;
-}

resources/sass/partials/fontawesome/brands.scss

@@ -1,22 +0,0 @@
-/*!
- * Font Awesome Pro 5.8.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@import 'variables';
-
-@font-face {
-  font-family: 'Font Awesome 5 Brands';
-  font-style: normal;
-  font-weight: normal;
-  font-display: $fa-font-display;
-  src: url('#{$fa-font-path}/fa-brands-400.eot');
-  src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-brands-400.woff') format('woff'),
-  url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg');
-}
-
-.fab {
-  font-family: 'Font Awesome 5 Brands';
-}

resources/sass/partials/fontawesome/fontawesome.scss

@@ -1,16 +0,0 @@
-/*!
- * Font Awesome Pro 5.8.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@import 'variables';
-@import 'mixins';
-@import 'core';
-@import 'larger';
-@import 'fixed-width';
-@import 'list';
-@import 'bordered-pulled';
-@import 'animated';
-@import 'rotated-flipped';
-@import 'stacked';
-@import 'icons';
-@import 'screen-reader';

resources/sass/partials/fontawesome/light.scss

@@ -1,23 +0,0 @@
-/*!
- * Font Awesome Pro 5.8.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@import 'variables';
-
-@font-face {
-  font-family: 'Font Awesome 5 Pro';
-  font-style: normal;
-  font-weight: 300;
-  font-display: $fa-font-display;
-  src: url('#{$fa-font-path}/fa-light-300.eot');
-  src: url('#{$fa-font-path}/fa-light-300.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-light-300.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-light-300.woff') format('woff'),
-  url('#{$fa-font-path}/fa-light-300.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-light-300.svg#fontawesome') format('svg');
-}
-
-.fal {
-  font-family: 'Font Awesome 5 Pro';
-  font-weight: 300;
-}

resources/sass/partials/fontawesome/regular.scss

@@ -1,23 +0,0 @@
-/*!
- * Font Awesome Pro 5.8.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@import 'variables';
-
-@font-face {
-  font-family: 'Font Awesome 5 Pro';
-  font-style: normal;
-  font-weight: 400;
-  font-display: $fa-font-display;
-  src: url('#{$fa-font-path}/fa-regular-400.eot');
-  src: url('#{$fa-font-path}/fa-regular-400.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-regular-400.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-regular-400.woff') format('woff'),
-  url('#{$fa-font-path}/fa-regular-400.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-regular-400.svg#fontawesome') format('svg');
-}
-
-.far {
-  font-family: 'Font Awesome 5 Pro';
-  font-weight: 400;
-}

resources/sass/partials/fontawesome/solid.scss

@@ -1,24 +0,0 @@
-/*!
- * Font Awesome Pro 5.8.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@import 'variables';
-
-@font-face {
-  font-family: 'Font Awesome 5 Pro';
-  font-style: normal;
-  font-weight: 900;
-  font-display: $fa-font-display;
-  src: url('#{$fa-font-path}/fa-solid-900.eot');
-  src: url('#{$fa-font-path}/fa-solid-900.eot?#iefix') format('embedded-opentype'),
-  url('#{$fa-font-path}/fa-solid-900.woff2') format('woff2'),
-  url('#{$fa-font-path}/fa-solid-900.woff') format('woff'),
-  url('#{$fa-font-path}/fa-solid-900.ttf') format('truetype'),
-  url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg');
-}
-
-.fa,
-.fas {
-  font-family: 'Font Awesome 5 Pro';
-  font-weight: 900;
-}

resources/sass/partials/fontawesome/v4-shims.scss

@@ -1,6 +0,0 @@
-/*!
- * Font Awesome Pro 5.8.1 by @fontawesome - https://fontawesome.com
- * License - https://fontawesome.com/license (Commercial License)
- */
-@import 'variables';
-@import 'shims';

resources/sass/partials/form.scss

@@ -230,7 +230,7 @@ table{
 
 				li:hover:after{
 					content: "\f056";
-					font-family: "Font Awesome 5 Pro";
+					font-family: "Font Awesome 6 Free";
 					font-weight: 900;
 					position: absolute;
 					right: 15px;

resources/sass/partials/media.scss

@@ -350,7 +350,7 @@
 						&.son{
 							&::before {
 								content: "\f58f";
-								font-family: "Font Awesome 5 Pro";
+								font-family: "Font Awesome 6 Free";
 								font-weight: 900;
 
 							}
@@ -358,7 +358,7 @@
 						&.doc{
 							&::before {
 								content: "\f15c";
-								font-family: "Font Awesome 5 Pro";
+								font-family: "Font Awesome 6 Free";
 								font-weight: 900;
 
 							}
@@ -402,7 +402,7 @@
 					&[aria-grabbed="true"] {
 						&::before {
 						    content: "\f058";
-						    font-family: "Font Awesome 5 Pro";
+						    font-family: "Font Awesome 6 Free";
 						    font-weight: 900;
 						    display: block;
 						    position: absolute;
@@ -711,7 +711,7 @@
 						&.son{
 							&::before {
 								content: "\f58f";
-								font-family: "Font Awesome 5 Pro";
+								font-family: "Font Awesome 6 Free";
 								font-weight: 900;
 
 							}
@@ -719,7 +719,7 @@
 						&.doc{
 							&::before {
 								content: "\f15c";
-								font-family: "Font Awesome 5 Pro";
+								font-family: "Font Awesome 6 Free";
 								font-weight: 900;
 
 							}

resources/sass/partials/nestable.scss

@@ -75,7 +75,7 @@
     text-align: center;
     text-indent: 0;
 	color: white;
-	font-family: "Font Awesome 5 Pro";
+	font-family: "Font Awesome 6 Free";
     font-weight: 900;
 	top: 3px;
 }
@@ -254,7 +254,7 @@
 
 .dd3-handle:before {
    content: '\f07b';
-   font-family: "Font Awesome 5 Pro";
+   font-family: "Font Awesome 6 Free";
    font-weight: 900;
    display: block;
    position: absolute;
@@ -269,7 +269,7 @@
 
 .openable:before {
     content: '\f0da';
-    font-family: "Font Awesome 5 Pro";
+    font-family: "Font Awesome 6 Free";
     font-weight: 900;
     display: block;
     position: absolute;
@@ -284,7 +284,7 @@
 
  .opened:before {
     content: '\f0d7';
-    font-family: "Font Awesome 5 Pro";
+    font-family: "Font Awesome 6 Free";
     font-weight: 900;
     display: block;
     position: absolute;

resources/sass/partials/panier.scss

@@ -195,7 +195,7 @@
 						&.son{
 							&::before {
 								content: "\f58f";
-								font-family: "Font Awesome 5 Pro";
+								font-family: "Font Awesome 6 Free";
 								font-weight: 900;
 
 							}
@@ -203,7 +203,7 @@
 						&.doc{
 							&::before {
 								content: "\f15c";
-								font-family: "Font Awesome 5 Pro";
+								font-family: "Font Awesome 6 Free";
 								font-weight: 900;
 
 							}
@@ -229,7 +229,7 @@
 					&[aria-grabbed="true"] {
 						&::before {
 							content: "\f058";
-							font-family: "Font Awesome 5 Pro";
+							font-family: "Font Awesome 6 Free";
 							font-weight: 900;
 							display: block;
 							position: absolute;

resources/sass/partials/reset.scss

@@ -35,7 +35,7 @@ footer, header, hgroup, menu, nav, section {
 }
 body {
 	line-height: 1;
-	background-image: url("/images/mosaic.jpg");
+	background-image: url("~@/images/mosaic.jpg");
 	font-family: "Arial", sans-serif;
 	font-size: 13px;
 	color: $grey2;

resources/sass/partials/user.scss

@@ -35,7 +35,7 @@
 			margin-bottom: 17px;
 		}
 		&:first-child{
-			background: url("/images/login_bg.jpg");
+			background: url("~@/images/login_bg.jpg");
 			background-size: cover;
 			text-align: center;