Add sort-import eslint rule

dnum-mi · Jun 4, 2024 · 1f90244 · 1f90244
1 parent 6ab1e13
commit 1f90244
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 19 deletions.
diff --git a/frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs
@@ -31,6 +31,7 @@ module.exports = {
     '@typescript-eslint/comma-dangle': [2, 'always-multiline'],
     'vue/no-v-html': 0,
     'no-irregular-whitespace': 0,
+    'sort-imports': 1
   },
   overrides: [
     {

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, onMounted, onBeforeUnmount } from 'vue'
+import { onBeforeUnmount, onMounted, ref } from 'vue'
 import { registerSW } from 'virtual:pwa-register'
 
 import HeaderMain from '@/components/HeaderMain.vue'

diff --git a/frontend/src/components/AskingExpert.vue b/frontend/src/components/AskingExpert.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { computed, ref } from 'vue'
 import axios from 'axios'
 import { useRoute, useRouter } from 'vue-router'
 

diff --git a/frontend/src/components/ResultPage.vue b/frontend/src/components/ResultPage.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-import { ref, computed } from 'vue'
+import { MEASURED_GUNS_TYPOLOGIES, TYPOLOGIES } from '@/utils/firearms-utils/index'
+import { computed, ref } from 'vue'
 import axios from 'axios'
 import SnackbarAlert from '@/components/SnackbarAlert.vue'
-import { TYPOLOGIES, MEASURED_GUNS_TYPOLOGIES } from '@/utils/firearms-utils/index'
 import { isUserUsingCrosscall } from '@/utils/isUserUsingCrosscall'
 import { useSnackbarStore } from '@/stores/snackbar'
 import { useStepsStore } from '@/stores/steps'

diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createWebHistory, createRouter, type RouteRecordRaw, type RouteLocation } from 'vue-router'
+import { type RouteLocation, type RouteRecordRaw, createRouter, createWebHistory } from 'vue-router'
 
 import { clearLocalStorage } from '@/utils/storage-utils.js'
 

diff --git a/frontend/src/utils/firearms-utils/epaule-a-levier-sous-garde.ts b/frontend/src/utils/firearms-utils/epaule-a-levier-sous-garde.ts
@@ -2,7 +2,7 @@ import levierSousGardeMagasinAvantImg from '@/assets/guide-mise-en-securite/phot
 import levierSousGardePasMagasinImg from '@/assets/guide-mise-en-securite/photos/epaule_a_levier_sous_garde/epaule_levier_ss_garde_magasin_fixe.jpg'
 import levierSousGardeMagasinAvantVideo from '@/assets/guide-mise-en-securite/videos/epaule_a_levier_sous_garde/epaule_levier_ss_garde_magasin_avant.mp4'
 import levierSousGardePasMagasinVideo from '@/assets/guide-mise-en-securite/videos/epaule_a_levier_sous_garde/epaule_levier_ss_garde_magasin_fixe.mp4'
-import { getEpaulLevierVerrouDisclaimer, getCommonCategory } from '@/utils/firearms-utils/index'
+import { getCommonCategory, getEpaulLevierVerrouDisclaimer } from '@/utils/firearms-utils/index'
 /*
 Armes d’épaule à levier de sous-garde
   Magasin avant

diff --git a/frontend/src/utils/firearms-utils/epaule-a-verrou.ts b/frontend/src/utils/firearms-utils/epaule-a-verrou.ts
@@ -1,7 +1,7 @@
 import epauleAVerrouCartridges from '@/assets/guide-identification/photos/epaule_a_verrou/epaule_a_verrou_chargeur_cartouche.jpg'
 import epauleAVerrouBalls from '@/assets/guide-identification/photos/epaule_a_verrou/epaule_a_verrou_chargeur_bille.jpg'
 import epauleAVerrouVideo from '@/assets/guide-mise-en-securite/videos/epaule_a_verrou/epaule_verrou_chargeur-video.mp4'
-import { getEpaulLevierVerrouDisclaimer, getCommonCategory } from '@/utils/firearms-utils/index'
+import { getCommonCategory, getEpaulLevierVerrouDisclaimer } from '@/utils/firearms-utils/index'
 import PopupVideo from '@/components/PopupVideo.vue'
 
 /*

diff --git a/frontend/src/utils/firearms-utils/get-next-route-after-result.ts b/frontend/src/utils/firearms-utils/get-next-route-after-result.ts
@@ -1,4 +1,4 @@
-import { TYPOLOGIES, MEASURED_GUNS_TYPOLOGIES } from '@/utils/firearms-utils/index'
+import { MEASURED_GUNS_TYPOLOGIES, TYPOLOGIES } from '@/utils/firearms-utils/index'
 
 export const getNextRouteAfterResult = (securingTutorial: boolean, confidenceLevel: string, typology: string, gunLength: number, gunBarrelLength: number) => {
   const isCardDetected = gunLength !== null && gunBarrelLength !== null

diff --git a/frontend/src/views/AccessibilityPage.vue b/frontend/src/views/AccessibilityPage.vue
@@ -76,7 +76,7 @@
       </li>
       <li>
         Mentions légales
-        <strong>https://basegun.interieur.gouv.fr/contact</strong>
+        <strong>https://basegun.interieur.gouv.fr/mentions-legales</strong>
       </li>
       <li>
         Accessibilité

diff --git a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue
@@ -3,10 +3,10 @@ import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
 import {
+  ALARM_GUNS_TYPOLOGIES,
+  TYPOLOGIES,
   identificationGuideSteps,
   identificationGuideStepsWithArmeAlarme,
-  TYPOLOGIES,
-  ALARM_GUNS_TYPOLOGIES,
 } from '@/utils/firearms-utils/index'
 import { useStepsStore } from '@/stores/steps'
 import { useResultStore } from '@/stores/result'

diff --git a/frontend/src/views/GuideIdentificationFirearm/IdentificationBlankGun.vue b/frontend/src/views/GuideIdentificationFirearm/IdentificationBlankGun.vue
@@ -1,11 +1,9 @@
 <script lang="ts" setup>
-import { ref, defineProps } from 'vue'
+import { defineProps, ref } from 'vue'
 
 import { useStepsStore } from '@/stores/steps'
-import { arme_alarme as alarmGuns } from '@/utils/firearms-utils/arme-alarme'
-
 import { useResultStore } from '@/stores/result'
-
+import { arme_alarme as alarmGuns } from '@/utils/firearms-utils/arme-alarme'
 import { TYPOLOGIES } from '@/utils/firearms-utils/index'
 
 const resultStore = useResultStore()

diff --git a/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue b/frontend/src/views/GuideIdentificationFirearm/IdentificationSelectAmmo.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { ref, computed, onMounted } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 
 import { useStepsStore } from '@/stores/steps'
 import { useResultStore } from '@/stores/result'

diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue b/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue'
 
 import { useResultStore } from '@/stores/result'
-import { TYPOLOGIES, MEASURED_GUNS_TYPOLOGIES } from '@/utils/firearms-utils/index'
+import { MEASURED_GUNS_TYPOLOGIES, TYPOLOGIES } from '@/utils/firearms-utils/index'
 import { isUserUsingCrosscall } from '@/utils/isUserUsingCrosscall'
 import { DsfrButton } from '@gouvminint/vue-dsfr'
 

diff --git a/frontend/src/views/InstructionsPage.vue b/frontend/src/views/InstructionsPage.vue
@@ -3,7 +3,7 @@ import GoodExamplePhoto from '@/assets/instruction-screen-gun.webp'
 
 import { ref } from 'vue'
 import axios from 'axios'
-import { useRouter, useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 
 import { useResultStore } from '@/stores/result'
 import { useStepsStore } from '@/stores/steps'

diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -6,8 +6,8 @@ import UnoCSS from 'unocss/vite'
 import AutoImport from 'unplugin-auto-import/vite'
 import Components from 'unplugin-vue-components/vite'
 import {
-  vueDsfrAutoimportPreset,
   ohVueIconAutoimportPreset,
+  vueDsfrAutoimportPreset,
   vueDsfrComponentResolver,
 } from '@gouvminint/vue-dsfr'