diff --git a/frontend/cypress/e2e/recommendations-civilians-vs-fsi.cy.js b/frontend/cypress/e2e/recommendations-civilians-vs-fsi.cy.js index f0ffa95b..87d03eb9 100644 --- a/frontend/cypress/e2e/recommendations-civilians-vs-fsi.cy.js +++ b/frontend/cypress/e2e/recommendations-civilians-vs-fsi.cy.js @@ -11,7 +11,6 @@ describe('Recommendations Civilians vs FSI', () => { cy.getByDataTestid('secure-firearm') .contains('Je veux mettre en sécurité mon arme') .click() - cy.url().should('contain', '/guide-mise-en-securite/mise-en-securite-recommandations') cy.contains('h2', 'Mettre en sécurité mon arme') cy.contains('p', 'En cas de doute,') }) @@ -28,7 +27,6 @@ describe('Recommendations Civilians vs FSI', () => { cy.getByDataTestid('secure-firearm') .contains('Je veux mettre en sécurité mon arme') .click() - cy.url().should('contain', '/guide-mise-en-securite/mise-en-securite-recommandations') cy.contains('h2', 'Mettre en sécurité mon arme') cy.contains('span', 'extraire des munitions') }) diff --git a/frontend/cypress/support/commands.js b/frontend/cypress/support/commands.js index b8f657da..55207960 100644 --- a/frontend/cypress/support/commands.js +++ b/frontend/cypress/support/commands.js @@ -74,19 +74,16 @@ Cypress.Commands.add('miseEnSecurite', () => { cy.getByDataTestid('secure-firearm') .contains('Je veux mettre en sécurité mon arme') .click() - cy.url().should('contain', '/guide-mise-en-securite/mise-en-securite-recommandations') cy.contains('h2', 'Mettre en sécurité mon arme') cy.contains('span', 'extraire des munitions') cy.getByDataTestid('button-next') .contains('Suivant') .click() - cy.url().should('contain', '/guide-mise-en-securite/mise-en-securite-instructions') cy.contains('h2', 'Mettre en sécurité mon arme') cy.contains('span', 'DIRECTION SÛRE') cy.getByDataTestid('button-next') .contains('Suivant') .click() - cy.url().should('contain', '/guide-mise-en-securite/mise-en-securite-introduction') cy.contains('h2', 'Mettre en sécurité mon arme') cy.contains('span', 'tutoriel adapté') cy.getByDataTestid('button-next') diff --git a/frontend/src/components/FooterMES.vue b/frontend/src/components/FooterMES.vue index 6e2a9715..a80bff71 100644 --- a/frontend/src/components/FooterMES.vue +++ b/frontend/src/components/FooterMES.vue @@ -21,10 +21,6 @@ diff --git a/frontend/src/main.css b/frontend/src/main.css index f7cb36f6..3561e360 100644 --- a/frontend/src/main.css +++ b/frontend/src/main.css @@ -25,7 +25,7 @@ a { top: 100%; left: 50%; transform: translate(-50%, -100%); - background-color: #f5f5fe; + background-color: #ffffff; box-shadow: 0 -4px 16px rgb(0 0 0 / 25%); padding: 15px; width: 100%; @@ -75,6 +75,14 @@ h5 { background-image: var(--underline-img), var(--underline-img) !important; } +.w-60 { + width: 60% !important; +} + +.w-80 { + width: 80% !important; +} + .w-100 { width: 100% !important; } \ No newline at end of file diff --git a/frontend/src/router/index.ts b/frontend/src/router/index.ts index 93584ac8..ef8b9cc3 100644 --- a/frontend/src/router/index.ts +++ b/frontend/src/router/index.ts @@ -15,11 +15,8 @@ const ContactPage = () => import('@/views/ContactPage.vue') const AccessibilityPage = () => import('@/views/AccessibilityPage.vue') const GuideSecuringFirearm = () => import('@/views/GuideSecuringFirearm/GuideSecuringFirearm.vue') -const SecuringIntroduction = () => import('@/views/GuideSecuringFirearm/SecuringIntroduction.vue') -const SecuringInstructions = () => import('@/views/GuideSecuringFirearm/SecuringInstructions.vue') const SecuringSelectOptionContent = () => import('@/views/GuideSecuringFirearm/SecuringSelectOptionContent.vue') const SecuringTutorialContent = () => import('@/views/GuideSecuringFirearm/SecuringTutorialContent.vue') -const SecuringRecommendations = () => import('@/views/GuideSecuringFirearm/SecuringRecommendations.vue') const SecuringAchievement = () => import('@/views/GuideSecuringFirearm/SecuringAchievement.vue') const GuideIdentificationFirearm = () => import('@/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue') const IdentificationTypologyResult = () => import('@/views/GuideIdentificationFirearm/IdentificationTypologyResult.vue') @@ -64,23 +61,6 @@ const routes: RouteRecordRaw[] = [ path: '/guide-mise-en-securite', name: 'GuideSecuringFirearm', component: GuideSecuringFirearm, - children: [ - { - path: 'mise-en-securite-instructions', - name: 'SecuringInstructions', - component: SecuringInstructions, - }, - { - path: 'mise-en-securite-recommandations', - name: 'SecuringRecommendations', - component: SecuringRecommendations, - }, - { - path: 'mise-en-securite-introduction', - name: 'SecuringIntroduction', - component: SecuringIntroduction, - }, - ], }, { path: '/mise-en-securite-choix-option-etape/:step', diff --git a/frontend/src/utils/firearms-utils/index.ts b/frontend/src/utils/firearms-utils/index.ts index e6e483a3..0ed4d2d2 100644 --- a/frontend/src/utils/firearms-utils/index.ts +++ b/frontend/src/utils/firearms-utils/index.ts @@ -29,11 +29,6 @@ export const TYPOLOGIES = { arme_alarme, } as const -// Tuto Mise en sécurité -const securingInstructions = 'SecuringInstructions' -const securingRecommendations = 'SecuringRecommendations' -const securingIntroduction = 'SecuringIntroduction' - // Tuto Mise en securité identification const IdentificationTypologyResult = 'IdentificationTypologyResult' const IdentificationFurtherInformations = 'IdentificationFurtherInformations' @@ -41,12 +36,6 @@ const IdentificationSelectAmmo = 'IdentificationSelectAmmo' const IdentificationBlankGun = 'IdentificationBlankGun' const IdentificationFinalResult = 'IdentificationFinalResult' -export const securingGuideSteps = [ - securingRecommendations, - securingInstructions, - securingIntroduction, -] as const - export const identificationGuideSteps = [ IdentificationTypologyResult, IdentificationFurtherInformations, diff --git a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue index 7caf05f5..535d57e7 100644 --- a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue +++ b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue @@ -238,21 +238,8 @@ const showDiv = ref(false) max-width: 1000px; } -:deep(div.fr-stepper__steps) { - border-radius: 5px 5px 5px 5px; -} - -:deep(.fr-stepper__state::after) { - content: " :\a"; -} - :deep(.fr-icon-home-3-line) { color: var(--blue-france-sun-113-625); } -.footer { - text-align: center; - background-color: #fff; - box-shadow: 0 -4px 16px rgb(0 0 0 / 25%); -} diff --git a/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue b/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue index 994c7bc4..c54a3e23 100644 --- a/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue +++ b/frontend/src/views/GuideSecuringFirearm/GuideSecuringFirearm.vue @@ -1,51 +1,92 @@ - - diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue b/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue index 4791be81..9d4af693 100644 --- a/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue +++ b/frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue @@ -111,8 +111,5 @@ function goToMissingCardPageIfMissing () { :deep(.fr-icon-home-3-line) { color: var(--blue-france-sun-113-625); } -.footer { - text-align: center; -} diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringInstructions.vue b/frontend/src/views/GuideSecuringFirearm/SecuringInstructions.vue deleted file mode 100644 index 71232e31..00000000 --- a/frontend/src/views/GuideSecuringFirearm/SecuringInstructions.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringIntroduction.vue b/frontend/src/views/GuideSecuringFirearm/SecuringIntroduction.vue deleted file mode 100644 index 9e3f783a..00000000 --- a/frontend/src/views/GuideSecuringFirearm/SecuringIntroduction.vue +++ /dev/null @@ -1,20 +0,0 @@ - - - diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringRecommendations.vue b/frontend/src/views/GuideSecuringFirearm/SecuringRecommendations.vue deleted file mode 100644 index f60855a9..00000000 --- a/frontend/src/views/GuideSecuringFirearm/SecuringRecommendations.vue +++ /dev/null @@ -1,44 +0,0 @@ - - - - - diff --git a/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue b/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue index 3149b068..3d51e398 100644 --- a/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue +++ b/frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue @@ -206,19 +206,6 @@ const selectedOptionStep = computed(() => { :deep(.fr-icon-home-3-line) { color: var(--blue-france-sun-113-625); } -.footer { - background-color: #fff; - box-shadow: 0 -4px 16px rgb(0 0 0 / 25%); -} -.footer button { - width: 50%; -} - -:deep(.fr-container) { - display: flex; - align-items: center; - justify-content: center; -} :deep(.fr-col-md-8), :deep(.fr-col-lg-6) { diff --git a/frontend/src/views/StartPage.vue b/frontend/src/views/StartPage.vue index 254dece1..af3b3693 100644 --- a/frontend/src/views/StartPage.vue +++ b/frontend/src/views/StartPage.vue @@ -23,7 +23,7 @@ const resultStore = useResultStore() label="Je veux mettre en sécurité mon arme" size="small" @click=" - $router.push({ name: 'SecuringRecommendations'}); + $router.push({ name: 'GuideSecuringFirearm'}); resultStore.$patch({ securingTutorial: true }); " />