diff --git a/frontend/src/components/FooterMES.vue b/frontend/src/components/FooterMES.vue deleted file mode 100644 index 4b261ff9..00000000 --- a/frontend/src/components/FooterMES.vue +++ /dev/null @@ -1,28 +0,0 @@ - - - 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 index 51e5d259..8aae4bc5 100644 --- 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,6 +1,6 @@ import { TYPOLOGIES, MEASURED_GUNS_TYPOLOGIES } from '@/utils/firearms-utils/index' -export const getNextRouteAfterResult = ({ securingTutorial, confidenceLevel, typology, gunLength, gunBarrelLength }) => { +export const getNextRouteAfterResult = (securingTutorial: boolean, confidenceLevel: string, typology: string, gunLength: number, gunBarrelLength: number) => { const isCardDetected = gunLength !== null && gunBarrelLength !== null const isMeasuredGun = MEASURED_GUNS_TYPOLOGIES.includes(typology) diff --git a/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue b/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue index c54a3e23..09b55df7 100644 --- a/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue +++ b/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue @@ -2,6 +2,7 @@ import { isUserUsingCrosscall } from '@/utils/isUserUsingCrosscall' import StepsGuide from '@/components/StepsGuide.vue' +import SecuringFooter from './SecuringFooter.vue' const steps = ['Mise en garde', 'Consignes de sécurité', 'Photo'] const currentStep = ref(0) @@ -79,24 +80,9 @@ const currentStep = ref(0) - + diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue b/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue index b4b06563..6f07cebf 100644 --- a/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue +++ b/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue @@ -66,33 +66,22 @@ function goToMissingCardPageIfMissing () { diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringFooter.vue b/frontend/src/views/GuideSecuringFirearm/SecuringFooter.vue index beac20c2..a7586fdb 100644 --- a/frontend/src/views/GuideSecuringFirearm/SecuringFooter.vue +++ b/frontend/src/views/GuideSecuringFirearm/SecuringFooter.vue @@ -1,66 +1,32 @@ - - diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue b/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue index 06da0357..cf8a0af3 100644 --- a/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue +++ b/frontend/src/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue @@ -1,6 +1,8 @@ @@ -173,10 +162,9 @@ const backTo = computed(() => {
@@ -187,10 +175,6 @@ const backTo = computed(() => { margin-bottom: 1rem; } -.fr-content-media { - margin-block: 0.5rem; -} - .video-container { margin: 0 !important; padding: 0 !important; @@ -234,6 +218,6 @@ const backTo = computed(() => { } .footer button { -width: 50%; + width: 50%; } diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue b/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue index d9821135..aec4e1f6 100644 --- a/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue +++ b/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue @@ -1,15 +1,14 @@