From b053b1b7ce8be3e26f53504d9a18b22a053a1a01 Mon Sep 17 00:00:00 2001
From: Shamzic <shamery@free.fr>
Date: Fri, 22 Nov 2024 17:18:03 +0100
Subject: [PATCH 1/5] =?UTF-8?q?feat:=20ajout=20boutons=20d=C3=A9marrage=20?=
 =?UTF-8?q?simulation=20(page=20liste=20des=20aides)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buttons/home-simulation-group-buttons.vue | 31 ++++++++-----
 src/views/liste-aides.vue                     | 44 ++++++++++++++-----
 2 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/src/components/buttons/home-simulation-group-buttons.vue b/src/components/buttons/home-simulation-group-buttons.vue
index e3dc38c466..9636facf03 100644
--- a/src/components/buttons/home-simulation-group-buttons.vue
+++ b/src/components/buttons/home-simulation-group-buttons.vue
@@ -1,32 +1,39 @@
 <script setup lang="ts">
 import { computed, getCurrentInstance } from "vue"
 import { useStore } from "@/stores/index.js"
-import { useRoute } from "vue-router"
+import { useRoute, useRouter } from "vue-router"
 import { EventAction, EventCategory } from "@lib/enums/event.js"
 
-const { proxy } = getCurrentInstance() as any
-
 const store = useStore()
 const route = useRoute()
+const router = useRouter()
+
+const { proxy } = getCurrentInstance() as any
+const SIMULATION_START_PATH = "/simulation/individu/demandeur/date_naissance"
 
 const hasExistingSituation = computed(() => store.passSanityCheck)
 
 const ctaLabel = computed(() =>
   hasExistingSituation.value
     ? "Commencer une nouvelle simulation"
-    : "Je commence"
+    : "Commencer une simulation"
 )
 
-const newSituation = () => {
-  store.clear(route.query.external_id as string)
-  next()
-}
-
-const next = () => {
+const initializeOpenfiscaParameters = () => {
   store.setOpenFiscaParameters()
   if (process.env.VITE_CONTEXT !== "production") {
     store.verifyBenefitVariables()
   }
+}
+
+const newSituation = () => {
+  store.clear(route.query.external_id as string)
+  initializeOpenfiscaParameters()
+  router.push(SIMULATION_START_PATH)
+}
+
+const resumeSimulation = () => {
+  initializeOpenfiscaParameters()
   proxy?.$push()
 }
 </script>
@@ -40,7 +47,7 @@ const next = () => {
           category: EventCategory.Home,
         }"
         class="fr-btn"
-        @click="next"
+        @click="resumeSimulation"
       >
         Reprendre ma simulation
       </button>
@@ -60,7 +67,7 @@ const next = () => {
         v-analytics="{ action: ctaLabel, category: EventCategory.Home }"
         class="fr-btn"
         data-testid="new-simulation"
-        to="/simulation/individu/demandeur/date_naissance"
+        :to="SIMULATION_START_PATH"
         @click="newSituation"
       >
         {{ ctaLabel }}
diff --git a/src/views/liste-aides.vue b/src/views/liste-aides.vue
index e5a18b0405..6b699fe47f 100644
--- a/src/views/liste-aides.vue
+++ b/src/views/liste-aides.vue
@@ -1,18 +1,26 @@
 <template>
   <article class="fr-article">
-    <h1>Toutes les aides</h1>
-    <BackButton
-      size="small"
-      data-testid="benefits-liste-back-button"
-      class="fr-mb-2w"
-      as-link
-      to="/"
-    >
-      Retour à l'accueil
-    </BackButton>
+    <div class="fr-grid-row fr-grid-row--gutters">
+      <div class="fr-col-12 fr-col-md-4">
+        <h1>Toutes les aides</h1>
+        <BackButton
+          size="small"
+          data-testid="benefits-liste-back-button"
+          as-link
+          to="/"
+        >
+          Retour à l'accueil
+        </BackButton>
+      </div>
+      <div class="fr-col-12 fr-col-md-5 fr-col-offset-md-3">
+        <HomeSimulationGroupButtons />
+      </div>
+    </div>
+
     <div>
-      <p class="fr-badge fr-mb-2w">Total : {{ benefitsCount }} aides</p>
+      <p class="fr-badge fr-my-2w">Total : {{ benefitsCount }} aides</p>
     </div>
+
     <div class="fr-grid-row fr-grid-row--gutters">
       <div class="fr-col-12 fr-col-md-6">
         <div class="fr-form-group">
@@ -123,7 +131,7 @@ import CommuneMethods from "@/lib/commune.js"
 import { Commune } from "@lib/types/commune.d.js"
 import { capitalize, normalizeString } from "@lib/utils.js"
 import BackButton from "@/components/buttons/back-button.vue"
-
+import HomeSimulationGroupButtons from "@/components/buttons/home-simulation-group-buttons.vue"
 const zipCode = ref<string | null>(null)
 const selectedCommune = ref<Commune | null>(null)
 const searchTerms = ref<string | null>(null)
@@ -232,3 +240,15 @@ const alertClass = computed(() =>
   countFilteredBenefits() > 0 ? "fr-alert--success" : "fr-alert--error"
 )
 </script>
+
+<style scoped>
+:deep(.fr-btns-group) {
+  justify-content: flex-end;
+}
+
+@media (max-width: 768px) {
+  :deep(.fr-btns-group) {
+    justify-content: flex-start;
+  }
+}
+</style>

From 399ee48ce1eedb9813a323595dd2600fc4dc39fc Mon Sep 17 00:00:00 2001
From: Shamzic <shamery@free.fr>
Date: Fri, 22 Nov 2024 17:19:00 +0100
Subject: [PATCH 2/5] =?UTF-8?q?refactor:=20renommage=20variable=20plus=20p?=
 =?UTF-8?q?r=C3=A9cis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buttons/home-simulation-group-buttons.vue        |  2 +-
 src/router.ts                                        |  2 +-
 src/stores/index.ts                                  |  2 +-
 src/views/liste-aides.vue                            | 12 ------------
 4 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/components/buttons/home-simulation-group-buttons.vue b/src/components/buttons/home-simulation-group-buttons.vue
index 9636facf03..5bedfa571e 100644
--- a/src/components/buttons/home-simulation-group-buttons.vue
+++ b/src/components/buttons/home-simulation-group-buttons.vue
@@ -22,7 +22,7 @@ const ctaLabel = computed(() =>
 const initializeOpenfiscaParameters = () => {
   store.setOpenFiscaParameters()
   if (process.env.VITE_CONTEXT !== "production") {
-    store.verifyBenefitVariables()
+    store.verifyOpenfiscaBenefitVariables()
   }
 }
 
diff --git a/src/router.ts b/src/router.ts
index af1d9b2f8b..0689ada983 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -322,7 +322,7 @@ router.beforeEach((to, from, next) => {
       process.env.VITE_CONTEXT !== "production" ||
       to?.redirectedFrom?.fullPath === "/init-ci"
     ) {
-      store.verifyBenefitVariables()
+      store.verifyOpenfiscaBenefitVariables()
     }
 
     if (
diff --git a/src/stores/index.ts b/src/stores/index.ts
index 21d398b57d..5d29f9f2e5 100644
--- a/src/stores/index.ts
+++ b/src/stores/index.ts
@@ -546,7 +546,7 @@ export const useStore = defineStore("store", {
           this.openFiscaParameters = response.data
         })
     },
-    verifyBenefitVariables() {
+    verifyOpenfiscaBenefitVariables() {
       return axios
         .get("/api/openfisca/missingbenefits")
         .then((response) => response.data)
diff --git a/src/views/liste-aides.vue b/src/views/liste-aides.vue
index 6b699fe47f..c4e7f57f5e 100644
--- a/src/views/liste-aides.vue
+++ b/src/views/liste-aides.vue
@@ -240,15 +240,3 @@ const alertClass = computed(() =>
   countFilteredBenefits() > 0 ? "fr-alert--success" : "fr-alert--error"
 )
 </script>
-
-<style scoped>
-:deep(.fr-btns-group) {
-  justify-content: flex-end;
-}
-
-@media (max-width: 768px) {
-  :deep(.fr-btns-group) {
-    justify-content: flex-start;
-  }
-}
-</style>

From 08655fd1004750c25d0368a88f47c97d21fe2736 Mon Sep 17 00:00:00 2001
From: Shamzic <shamery@free.fr>
Date: Tue, 10 Dec 2024 17:55:51 +0100
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20alignement=20responsive=20-=20bouto?=
 =?UTF-8?q?ns=20de=20d=C3=A9marrage=20de=20simulation=20(liste=20des=20aid?=
 =?UTF-8?q?es)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../buttons/home-simulation-group-buttons.vue | 27 +++++++++++++++--
 src/styles/aides-jeunes.css                   | 12 ++++++++
 src/views/liste-aides.vue                     | 30 ++++++++++++-------
 3 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/src/components/buttons/home-simulation-group-buttons.vue b/src/components/buttons/home-simulation-group-buttons.vue
index 5bedfa571e..f25ee82f46 100644
--- a/src/components/buttons/home-simulation-group-buttons.vue
+++ b/src/components/buttons/home-simulation-group-buttons.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, getCurrentInstance } from "vue"
+import { computed, getCurrentInstance, defineProps } from "vue"
 import { useStore } from "@/stores/index.js"
 import { useRoute, useRouter } from "vue-router"
 import { EventAction, EventCategory } from "@lib/enums/event.js"
@@ -36,10 +36,33 @@ const resumeSimulation = () => {
   initializeOpenfiscaParameters()
   proxy?.$push()
 }
+
+const props = defineProps({
+  horizontal: {
+    type: Boolean,
+    default: false,
+  },
+  size: {
+    type: String,
+    default: null,
+  },
+  reverse: {
+    type: Boolean,
+    default: false,
+  },
+})
 </script>
 
 <template>
-  <ul class="fr-btns-group">
+  <ul
+    class="fr-btns-group"
+    :class="{
+      'fr-btns-group--inline-md': props.horizontal,
+      'fr-btns-group--sm': props.size === 'small',
+      'fr-btns-group--inline-reverse': props.reverse,
+      'fr-btns-group--right': props.reverse,
+    }"
+  >
     <li v-if="hasExistingSituation">
       <button
         v-analytics="{
diff --git a/src/styles/aides-jeunes.css b/src/styles/aides-jeunes.css
index 92a46c40d4..d0150befb1 100644
--- a/src/styles/aides-jeunes.css
+++ b/src/styles/aides-jeunes.css
@@ -280,6 +280,13 @@ textarea {
   text-align: right;
 }
 
+.aj-home-group-buttons-container {
+  display: flex;
+  flex-direction: row;
+  width: 100%;
+  align-items: center;
+}
+
 @media (max-width: 576px) {
   .aj-hero-section {
     max-height: none;
@@ -297,6 +304,11 @@ textarea {
     padding-bottom: 72px;
   }
 
+  .aj-home-group-buttons-container {
+    flex-direction: column;
+    align-items: stretch;
+  }
+
   .aj-action-buttons {
     position: fixed;
     inset: auto 0 0 0;
diff --git a/src/views/liste-aides.vue b/src/views/liste-aides.vue
index c4e7f57f5e..0b012a250a 100644
--- a/src/views/liste-aides.vue
+++ b/src/views/liste-aides.vue
@@ -1,19 +1,25 @@
 <template>
   <article class="fr-article">
     <div class="fr-grid-row fr-grid-row--gutters">
-      <div class="fr-col-12 fr-col-md-4">
+      <div class="fr-col-12">
         <h1>Toutes les aides</h1>
-        <BackButton
-          size="small"
-          data-testid="benefits-liste-back-button"
-          as-link
-          to="/"
-        >
-          Retour à l'accueil
-        </BackButton>
       </div>
-      <div class="fr-col-12 fr-col-md-5 fr-col-offset-md-3">
-        <HomeSimulationGroupButtons />
+      <div class="aj-home-group-buttons-container">
+        <div class="fr-mb-2w fr-mr-2w">
+          <BackButton
+            data-testid="benefits-liste-back-button"
+            as-link
+            to="/"
+            size="small"
+          >
+            Retour à l'accueil
+          </BackButton>
+        </div>
+        <HomeSimulationGroupButtons
+          :horizontal="true"
+          size="small"
+          :reverse="true"
+        />
       </div>
     </div>
 
@@ -240,3 +246,5 @@ const alertClass = computed(() =>
   countFilteredBenefits() > 0 ? "fr-alert--success" : "fr-alert--error"
 )
 </script>
+
+<style scoped></style>

From 12da805fe9c1234fb6630bd5bee769e1ac778133 Mon Sep 17 00:00:00 2001
From: Shamzic <shamery@free.fr>
Date: Fri, 3 Jan 2025 17:33:02 +0100
Subject: [PATCH 4/5] feat: ajoute la class tertiary du DSFR au back-button

---
 src/components/buttons/back-button.vue | 13 +++++++++++--
 src/styles/aides-jeunes.css            |  4 +++-
 src/views/liste-aides.vue              |  1 +
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/components/buttons/back-button.vue b/src/components/buttons/back-button.vue
index 647913acf3..157bc34ae9 100644
--- a/src/components/buttons/back-button.vue
+++ b/src/components/buttons/back-button.vue
@@ -2,8 +2,13 @@
 <template>
   <component
     :is="asLink ? 'router-link' : 'button'"
-    class="fr-btn fr-btn--secondary fr-btn--icon-left fr-icon-arrow-left-line"
-    :class="{ 'fr-btn--sm': size === 'small' }"
+    :class="[
+      'fr-btn',
+      `fr-btn--${size === 'small' ? 'sm' : 'md'}`,
+      `fr-btn--${btnType}`,
+      'fr-btn--icon-left',
+      'fr-icon-arrow-left-line',
+    ]"
     :type="asLink ? undefined : 'button'"
     :to="asLink ? to : undefined"
     @click="asLink ? undefined : goBack()"
@@ -36,6 +41,10 @@ const props = defineProps({
     type: String,
     default: "/",
   },
+  btnType: {
+    type: String,
+    default: "secondary",
+  },
 })
 const route = useRoute()
 const router = useRouter()
diff --git a/src/styles/aides-jeunes.css b/src/styles/aides-jeunes.css
index d0150befb1..3e435636f2 100644
--- a/src/styles/aides-jeunes.css
+++ b/src/styles/aides-jeunes.css
@@ -149,9 +149,11 @@ textarea {
 }
 
 .fr-btn--close,
-.fr-btn--tertiary-no-outline {
+.fr-btn--tertiary-no-outline,
+.fr-btn--tertiary {
   color: var(--main-color);
 }
+
 .fr-btn--icon-center {
   justify-content: center !important;
 }
diff --git a/src/views/liste-aides.vue b/src/views/liste-aides.vue
index 0b012a250a..11be9c7c96 100644
--- a/src/views/liste-aides.vue
+++ b/src/views/liste-aides.vue
@@ -11,6 +11,7 @@
             as-link
             to="/"
             size="small"
+            btn-type="tertiary"
           >
             Retour à l'accueil
           </BackButton>

From 582c9821f76a60bea75532da5929d80ccea519f4 Mon Sep 17 00:00:00 2001
From: Shamzic <shamery@free.fr>
Date: Fri, 3 Jan 2025 17:37:57 +0100
Subject: [PATCH 5/5] refactor: liste-aides

---
 src/views/liste-aides.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/liste-aides.vue b/src/views/liste-aides.vue
index 11be9c7c96..f053b65691 100644
--- a/src/views/liste-aides.vue
+++ b/src/views/liste-aides.vue
@@ -247,5 +247,3 @@ const alertClass = computed(() =>
   countFilteredBenefits() > 0 ? "fr-alert--success" : "fr-alert--error"
 )
 </script>
-
-<style scoped></style>