fix: 🐛 fix navigation for revolver typology

dnum-mi · Sep 21, 2023 · 1e984e7 · 1e984e7
1 parent 9e47cd5
commit 1e984e7
Show file tree

Hide file tree

Showing 18 changed files with 139 additions and 160 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -29,11 +29,11 @@
     "vue-router": "^4.2.4"
   },
   "devDependencies": {
-    "@testing-library/cypress": "^9.0.0",
+    "@testing-library/cypress": "^10.0.1",
     "@unocss/transformer-directives": "^0.55.7",
     "@unocss/transformer-variant-group": "^0.55.7",
     "@vitejs/plugin-vue": "^4.3.4",
-    "cypress": "^12.17.4",
+    "cypress": "^13.2.0",
     "eslint": "^8.48.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-cypress": "^2.14.0",

diff --git a/...-mise-en-securite/photos/epaule_a_un_coup_par_canon/ep_un_coup_cle_oreilles.jpg b/...-mise-en-securite/photos/epaule_a_un_coup_par_canon/ep_un_coup_cle_oreilles.jpg
diff --git a/...rite/photos/epaule_a_un_coup_par_canon/epaule_a_un_coup_par_canon_cle_darne.jpg b/...rite/photos/epaule_a_un_coup_par_canon/epaule_a_un_coup_par_canon_cle_darne.jpg
diff --git a/...mise-en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_darne.jpg b/...mise-en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_darne.jpg
diff --git a/...en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_lefaucheux.jpg b/...en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_lefaucheux.jpg
diff --git a/...mise-en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_pouce.jpg b/...mise-en-securite/photos/epaule_a_un_coup_par_canon/epaule_un_coup_cle_pouce.jpg
diff --git a/frontend/src/components/AskingExpert.vue b/frontend/src/components/AskingExpert.vue
@@ -31,7 +31,7 @@ async function sendTutorialFeedback () {
     image_url: imgUrl.value,
     tutorial_feedback: stepsStore.tutorialFeedback,
     label: typology.value,
-    tutorial_option: stepsStore.selectedOptionStep2 || null,
+    tutorial_option: stepsStore.selectedOptionStep || null,
     route_name: route.name,
     confidence: confidence.value,
     confidence_level: confidenceLevel.value,

diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js
@@ -15,9 +15,6 @@ const ContactPage = () => import('@/views/ContactPage.vue')
 const GuideSecuringFirearm = () => import('@/views/GuideSecuringFirearm/GuideSecuringFirearm.vue')
 const SecuringIntroduction = () => import('@/views/GuideSecuringFirearm/SecuringIntroduction.vue')
 const SecuringInstructions = () => import('@/views/GuideSecuringFirearm/SecuringInstructions.vue')
-const SecuringSelectOptionStep1 = () => import('@/views/GuideSecuringFirearm/SecuringSelectOptionStep1.vue')
-const SecuringSelectOptionStep3 = () => import('@/views/GuideSecuringFirearm/SecuringSelectOptionStep3.vue')
-const SecuringSelectOptionStep2 = () => import('@/views/GuideSecuringFirearm/SecuringSelectOptionStep2.vue')
 const SecuringSelectOptionContent = () => import('@/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue')
 const SecuringTutorialContent = () => import('@/views/GuideSecuringFirearm/SecuringTutorialContent.vue')
 const SecuringRecommendations = () => import('@/views/GuideSecuringFirearm/SecuringRecommendations.vue')
@@ -82,21 +79,6 @@ const routes = [
     component: SecuringSelectOptionContent,
     props: true,
   },
-  {
-    path: '/mise-en-securite-choix-option-etape-1',
-    name: 'SecuringSelectOptionStep1',
-    component: SecuringSelectOptionStep1,
-  },
-  {
-    path: '/mise-en-securite-choix-option-etape-2',
-    name: 'SecuringSelectOptionStep2',
-    component: SecuringSelectOptionStep2,
-  },
-  {
-    path: '/mise-en-securite-choix-option-etape-3',
-    name: 'SecuringSelectOptionStep3',
-    component: SecuringSelectOptionStep3,
-  },
   {
     path: '/mise-en-securite-tutoriel',
     name: 'SecuringTutorialContent',

diff --git a/frontend/src/stores/result.js b/frontend/src/stores/result.js
@@ -31,8 +31,8 @@ export const useResultStore = defineStore('result', () => {
     geolocation.value = geoloc
   }
 
-  const updateTypology = (selectedOptionStep1) => {
-    typology.value = typology.value + (selectedOptionStep1 === 'revolver_black_powder' ? '_black_powder' : '')
+  const updateTypology = (selectedOptionStep) => {
+    typology.value = typology.value + (selectedOptionStep === 'revolver_black_powder' ? '_black_powder' : '')
   }
 
   return {

diff --git a/frontend/src/stores/steps.js b/frontend/src/stores/steps.js
@@ -7,9 +7,9 @@ export const useStepsStore = defineStore('steps', () => {
   const currentStep = useLocalStorage('currentStep', 1)
   const currentOptionStep = useLocalStorage('currentOptionStep', {})
 
-  const selectedOptionStep2 = useLocalStorage('selectedOptionStep2', undefined, { serializer })
   const selectedAmmo = useLocalStorage('selectedAmmo', undefined, { serializer })
   const selectedOptionStep1 = useLocalStorage('selectedOptionStep1', undefined, { serializer })
+  const selectedOptionStep2 = useLocalStorage('selectedOptionStep2', undefined, { serializer })
   const selectedOptionStep3 = useLocalStorage('selectedOptionStep3', undefined, { serializer })
   const tutorialFeedback = useLocalStorage('tutorialFeedback', '')
 
@@ -29,22 +29,22 @@ export const useStepsStore = defineStore('steps', () => {
     currentOptionStep.value = { ...currentOptionStep, [step]: value }
   }
 
-  function setOptionStep1 (selection) {
-    selectedOptionStep1.value = selection
+  function setOptionStep1 (option) {
+    selectedOptionStep1.value = option
   }
   function setOptionStep2 (option) {
     selectedOptionStep2.value = option
   }
-  function setOptionStep3 (selection) {
-    selectedOptionStep3.value = selection
+  function setOptionStep3 (option) {
+    selectedOptionStep3.value = option
   }
 
   return {
     currentStep,
     currentOptionStep,
-    selectedOptionStep2,
     selectedAmmo,
     selectedOptionStep1,
+    selectedOptionStep2,
     selectedOptionStep3,
     tutorialFeedback,
     setOptionStep,