From e11f49721f7b288d1c3bc57f9b43d3dbb830deca Mon Sep 17 00:00:00 2001
From: Alan Le Ruyet <alan.leruyet@beta.gouv.fr>
Date: Mon, 16 Sep 2024 10:44:22 +0200
Subject: [PATCH 1/6] =?UTF-8?q?feat:=20hackaton=20-=20am=C3=A9lioration=20?=
 =?UTF-8?q?marges=20d=C3=A9p=C3=B4t=20d'offre=20+=20affichage=20localisati?=
 =?UTF-8?q?on=20fiche=20(#1507)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: améliorations présentation localisation

* feat: amélioration affichage localisation

* feat: progress marges

* feat: mt page de création

* feat: réduction du padding du container
---
 .../ItemDetailServices/ItemDetailCard.tsx     | 28 +++++++++++--------
 .../ItemDistanceToCenter.tsx                  |  2 +-
 .../Authentification/CreationCompte.tsx       |  2 +-
 .../espace_pro/AuthentificationLayout.tsx     | 12 ++++----
 ui/components/espace_pro/Layout/index.tsx     |  2 +-
 ui/theme/components/logos_pro/LbaNew.tsx      |  2 +-
 6 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/ui/components/ItemDetail/ItemDetailServices/ItemDetailCard.tsx b/ui/components/ItemDetail/ItemDetailServices/ItemDetailCard.tsx
index e584a1554a..835d220d17 100644
--- a/ui/components/ItemDetail/ItemDetailServices/ItemDetailCard.tsx
+++ b/ui/components/ItemDetail/ItemDetailServices/ItemDetailCard.tsx
@@ -28,18 +28,22 @@ export default function ItemDetailCard({ selectedItem }) {
       </Flex>
     </Box>
   ) : (
-    <Flex color="grey.700" direction="row" alignItems="center" mt={6}>
-      <svg width="18" height="22" viewBox="0 0 18 22" fill="none" xmlns="http://www.w3.org/2000/svg">
-        <path
-          d="M9 21.7279L2.636 15.3639C1.37734 14.1052 0.520187 12.5016 0.172928 10.7558C-0.17433 9.00995 0.00390685 7.20035 0.685099 5.55582C1.36629 3.91129 2.51984 2.50569 3.99988 1.51677C5.47992 0.527838 7.21998 0 9 0C10.78 0 12.5201 0.527838 14.0001 1.51677C15.4802 2.50569 16.6337 3.91129 17.3149 5.55582C17.9961 7.20035 18.1743 9.00995 17.8271 10.7558C17.4798 12.5016 16.6227 14.1052 15.364 15.3639L9 21.7279ZM13.95 13.9499C14.9289 12.9709 15.5955 11.7236 15.8656 10.3658C16.1356 9.00795 15.9969 7.60052 15.4671 6.32148C14.9373 5.04244 14.04 3.94923 12.8889 3.18009C11.7378 2.41095 10.3844 2.00043 9 2.00043C7.61557 2.00043 6.26222 2.41095 5.11109 3.18009C3.95996 3.94923 3.06275 5.04244 2.53292 6.32148C2.00308 7.60052 1.86442 9.00795 2.13445 10.3658C2.40449 11.7236 3.07111 12.9709 4.05 13.9499L9 18.8999L13.95 13.9499ZM9 10.9999C8.46957 10.9999 7.96086 10.7892 7.58579 10.4141C7.21072 10.0391 7 9.53035 7 8.99992C7 8.46949 7.21072 7.96078 7.58579 7.58571C7.96086 7.21064 8.46957 6.99992 9 6.99992C9.53044 6.99992 10.0391 7.21064 10.4142 7.58571C10.7893 7.96078 11 8.46949 11 8.99992C11 9.53035 10.7893 10.0391 10.4142 10.4141C10.0391 10.7892 9.53044 10.9999 9 10.9999Z"
-          fill="#2A2A2A"
-        />
-      </svg>
-      <Text ml={1}>{selectedItem?.place?.zipCode}</Text>
-      <Text ml={1} mr={2}>
-        {selectedItem?.place?.city || selectedItem?.place?.address}
-      </Text>
-      <ItemDistanceToCenter item={selectedItem} />
+    <Flex color="grey.700" direction="row" mt={6}>
+      <Box pt={1}>
+        <svg width="18" height="22" viewBox="0 0 18 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+          <path
+            d="M9 21.7279L2.636 15.3639C1.37734 14.1052 0.520187 12.5016 0.172928 10.7558C-0.17433 9.00995 0.00390685 7.20035 0.685099 5.55582C1.36629 3.91129 2.51984 2.50569 3.99988 1.51677C5.47992 0.527838 7.21998 0 9 0C10.78 0 12.5201 0.527838 14.0001 1.51677C15.4802 2.50569 16.6337 3.91129 17.3149 5.55582C17.9961 7.20035 18.1743 9.00995 17.8271 10.7558C17.4798 12.5016 16.6227 14.1052 15.364 15.3639L9 21.7279ZM13.95 13.9499C14.9289 12.9709 15.5955 11.7236 15.8656 10.3658C16.1356 9.00795 15.9969 7.60052 15.4671 6.32148C14.9373 5.04244 14.04 3.94923 12.8889 3.18009C11.7378 2.41095 10.3844 2.00043 9 2.00043C7.61557 2.00043 6.26222 2.41095 5.11109 3.18009C3.95996 3.94923 3.06275 5.04244 2.53292 6.32148C2.00308 7.60052 1.86442 9.00795 2.13445 10.3658C2.40449 11.7236 3.07111 12.9709 4.05 13.9499L9 18.8999L13.95 13.9499ZM9 10.9999C8.46957 10.9999 7.96086 10.7892 7.58579 10.4141C7.21072 10.0391 7 9.53035 7 8.99992C7 8.46949 7.21072 7.96078 7.58579 7.58571C7.96086 7.21064 8.46957 6.99992 9 6.99992C9.53044 6.99992 10.0391 7.21064 10.4142 7.58571C10.7893 7.96078 11 8.46949 11 8.99992C11 9.53035 10.7893 10.0391 10.4142 10.4141C10.0391 10.7892 9.53044 10.9999 9 10.9999Z"
+            fill="#2A2A2A"
+          />
+        </svg>
+      </Box>
+      <Flex pl={2} alignItems="center" flexWrap="wrap">
+        <Text>{selectedItem?.place?.zipCode}</Text>
+        <Text whiteSpace="nowrap" ml={1} mr={2}>
+          {selectedItem?.place?.city || selectedItem?.place?.address}
+        </Text>
+        <ItemDistanceToCenter item={selectedItem} />
+      </Flex>
     </Flex>
   )
 
diff --git a/ui/components/ItemDetail/ItemDetailServices/ItemDistanceToCenter.tsx b/ui/components/ItemDetail/ItemDetailServices/ItemDistanceToCenter.tsx
index c6eb644617..4a8d152c5e 100644
--- a/ui/components/ItemDetail/ItemDetailServices/ItemDistanceToCenter.tsx
+++ b/ui/components/ItemDetail/ItemDetailServices/ItemDistanceToCenter.tsx
@@ -8,7 +8,7 @@ export default function ItemDistanceToCenter({ item }: { item: ILbaItemFormation
   const { formValues } = useContext(DisplayContext)
 
   return formValues?.location?.value && (item?.place?.distance ?? -1) >= 0 ? (
-    <Text color="grey.425" fontSize={14}>
+    <Text color="grey.425" whiteSpace="nowrap" fontSize={14}>
       {item?.place?.distance} km(s) du lieu de recherche
     </Text>
   ) : (
diff --git a/ui/components/espace_pro/Authentification/CreationCompte.tsx b/ui/components/espace_pro/Authentification/CreationCompte.tsx
index c9ccb7ffe4..8f1e867294 100644
--- a/ui/components/espace_pro/Authentification/CreationCompte.tsx
+++ b/ui/components/espace_pro/Authentification/CreationCompte.tsx
@@ -267,7 +267,7 @@ export default function CreationCompte({ type, isWidget = false, origin = "lba"
     <AuthentificationLayout>
       <AnimationContainer>
         {bandeau && <Bandeau {...bandeau} />}
-        <SimpleGrid columns={[1, 1, 1, 2]} spacing={[0, 0, 0, "75px"]} mt={wid.isWidget ? 0 : 12}>
+        <SimpleGrid columns={[1, 1, 1, 2]} spacing={[0, 0, 0, "75px"]} mt={wid.isWidget ? 0 : { base: 4, md: 12 }}>
           <Box>
             {wid.isWidget && (
               <Text textTransform="uppercase" fontSize="20px" color="#666666">
diff --git a/ui/components/espace_pro/AuthentificationLayout.tsx b/ui/components/espace_pro/AuthentificationLayout.tsx
index 74a5f12511..62406727ab 100644
--- a/ui/components/espace_pro/AuthentificationLayout.tsx
+++ b/ui/components/espace_pro/AuthentificationLayout.tsx
@@ -27,13 +27,13 @@ export default function AuthentificationLayout(props) {
   }
 
   return (
-    <Container maxW="container.xl" px={4} py={4}>
+    <Container maxW="container.xl" py={4}>
       <InfoBanner showInfo={true} />
-      <Flex direction="column" px={[0, 4]}>
+      <Flex direction="column">
         <Flex justifyContent="space-between" align="center" justify="center" mb={["4", "0"]}>
           <Link href="/" aria-label="Retour à la page d'accueil">
-            <Flex direction="row" align="center" px={[0, 4]}>
-              <Image src="/images/espace_pro/logo.svg" alt="marianne" />
+            <Flex direction="row" align="center">
+              <Image src="/images/espace_pro/logo.svg" aria-hidden={true} alt="" />
               <LbaNew ml={4} w="143px" h="37px" />
             </Flex>
           </Link>
@@ -48,7 +48,9 @@ export default function AuthentificationLayout(props) {
             {props.fromDashboard ? "fermer" : "Retour à l'accueil"}
           </Button>
         </Flex>
-        <Container maxW="full">{props.children}</Container>
+        <Container px={1} maxW="full">
+          {props.children}
+        </Container>
       </Flex>
     </Container>
   )
diff --git a/ui/components/espace_pro/Layout/index.tsx b/ui/components/espace_pro/Layout/index.tsx
index 69eb657efe..978c09834c 100644
--- a/ui/components/espace_pro/Layout/index.tsx
+++ b/ui/components/espace_pro/Layout/index.tsx
@@ -33,7 +33,7 @@ export default function Layout({
             {adminPage && <NavigationAdmin currentPage={adminPage} />}
           </Box>
         )}
-        <Container as="main" maxW="container.xl" flexGrow="1">
+        <Container as="main" p={0} maxW="container.xl" flexGrow="1">
           {children}
         </Container>
         {!widget && footer && <Footer />}
diff --git a/ui/theme/components/logos_pro/LbaNew.tsx b/ui/theme/components/logos_pro/LbaNew.tsx
index c11ccdb4a8..8ef3d4107d 100644
--- a/ui/theme/components/logos_pro/LbaNew.tsx
+++ b/ui/theme/components/logos_pro/LbaNew.tsx
@@ -2,7 +2,7 @@ import { Icon } from "@chakra-ui/react"
 
 export function LbaNew(props) {
   return (
-    <Icon width="179px" height="66px" viewBox="0 0 352 91" {...props}>
+    <Icon aria-hidden={true} width="179px" height="66px" viewBox="0 0 352 91" {...props}>
       <path
         d="M41.4 90.36C64.2646 90.36 82.8 82.7847 82.8 73.44C82.8 64.0954 64.2646 56.52 41.4 56.52C18.5354 56.52 0 64.0954 0 73.44C0 82.7847 18.5354 90.36 41.4 90.36Z"
         fill="#A558A0"

From d27130ff1ea1b895fea5779705cea2996640bcf0 Mon Sep 17 00:00:00 2001
From: Alan Le Ruyet <alan.leruyet@beta.gouv.fr>
Date: Mon, 16 Sep 2024 11:45:06 +0200
Subject: [PATCH 2/6] feat: LBA-1326 Modification du lien catalogue des CFAs
 delegations (#1508)

---
 .../etablissementRecruteur.controller.ts      |   4 +-
 .../src/http/controllers/jobs.controller.ts   |   5 +-
 server/src/services/catalogue.service.ts      |  15 +--
 .../services/etablissement.service.types.ts   | 107 ------------------
 .../generateOpenapi.test.ts.snap              |  10 +-
 shared/interface/etablissement.types.ts       |  33 ++++--
 shared/routes/recruiters.routes.ts            |  19 +---
 shared/routes/v1Jobs.routes.ts                |  17 +--
 ui/components/espace_pro/CreationOffre.tsx    |   4 +-
 ...rVoeux.tsx => FormulaireCreationOffre.tsx} |  11 +-
 ui/components/espace_pro/index.ts             |   4 +-
 .../espace-pro/creation/mise-en-relation.tsx  |  19 ++--
 ui/pages/espace-pro/creation/offre.tsx        |   4 +-
 .../espace-pro/widget/entreprise/offre.tsx    |   4 +-
 ui/utils/api.ts                               |   5 +-
 15 files changed, 79 insertions(+), 182 deletions(-)
 rename ui/components/espace_pro/{AjouterVoeux.tsx => FormulaireCreationOffre.tsx} (98%)

diff --git a/server/src/http/controllers/etablissementRecruteur.controller.ts b/server/src/http/controllers/etablissementRecruteur.controller.ts
index 2e140c4997..241af0ff86 100644
--- a/server/src/http/controllers/etablissementRecruteur.controller.ts
+++ b/server/src/http/controllers/etablissementRecruteur.controller.ts
@@ -51,8 +51,8 @@ export default (server: Server) => {
       schema: zRoutes.get["/etablissement/cfas-proches"],
     },
     async (req, res) => {
-      const { latitude, longitude, rome } = req.query
-      const etablissements = await getNearEtablissementsFromRomes({ rome: [rome], origin: { latitude: latitude, longitude: longitude } })
+      const { latitude, longitude, rome, limit } = req.query
+      const etablissements = await getNearEtablissementsFromRomes({ rome: [rome], origin: { latitude: latitude, longitude: longitude }, limit })
       res.send(etablissements)
     }
   )
diff --git a/server/src/http/controllers/jobs.controller.ts b/server/src/http/controllers/jobs.controller.ts
index 55285f2a5c..b1b6fc5870 100644
--- a/server/src/http/controllers/jobs.controller.ts
+++ b/server/src/http/controllers/jobs.controller.ts
@@ -228,15 +228,14 @@ export default (server: Server) => {
           latitude: parseFloat(latitude),
           longitude: parseFloat(longitude),
         },
+        limit: 10,
       })
 
       if (!etablissements.length) {
         throw notFound("No delegations found")
       }
 
-      const top10 = etablissements.slice(0, 10)
-
-      return res.status(200).send(top10)
+      return res.status(200).send(etablissements)
     }
   )
 
diff --git a/server/src/services/catalogue.service.ts b/server/src/services/catalogue.service.ts
index e916509e45..745f2115ac 100644
--- a/server/src/services/catalogue.service.ts
+++ b/server/src/services/catalogue.service.ts
@@ -6,6 +6,7 @@ import { got } from "got"
 import { sortBy } from "lodash-es"
 import { ObjectId } from "mongodb"
 import { compose } from "oleoduc"
+import { IEtablissementCatalogue, IEtablissementCatalogueProche, IEtablissementCatalogueProcheWithDistance } from "shared/interface/etablissement.types"
 
 import { getDbCollection } from "@/common/utils/mongodbUtils"
 import { sentryCaptureException } from "@/common/utils/sentryUtils"
@@ -140,7 +141,7 @@ export const countFormations = async (): Promise<number | boolean> => {
  * @param {Object} query
  * @returns {Promise<Object[]>}
  */
-export const getCatalogueEtablissements = (query: object = {}, select: object = {}): Promise<any> =>
+export const getCatalogueEtablissements = (query: object = {}, select: object = {}): Promise<{ etablissements: IEtablissementCatalogue[] }> =>
   got(`${config.catalogueUrl}/api/v1/entity/etablissements`, {
     method: "POST",
     json: {
@@ -156,7 +157,7 @@ export const getCatalogueEtablissements = (query: object = {}, select: object =
  * @param {{latitude: string, longitude: string}} origin
  * @returns {Promise<Object[]>}
  */
-export const getNearEtablissementsFromRomes = async ({ rome, origin }: { rome: string[]; origin: { latitude: number; longitude: number } }) => {
+export const getNearEtablissementsFromRomes = async ({ rome, origin, limit }: { rome: string[]; origin: { latitude: number; longitude: number }; limit: number }) => {
   const formations = await getCatalogueFormations(
     {
       rome_codes: { $in: rome },
@@ -173,12 +174,12 @@ export const getNearEtablissementsFromRomes = async ({ rome, origin }: { rome: s
   const etablissementsToRetrieve = new Set()
   formations.forEach((formation) => etablissementsToRetrieve.add(formation.etablissement_formateur_id))
 
-  const { etablissements } = await getCatalogueEtablissements(
+  const { etablissements }: { etablissements: IEtablissementCatalogueProche[] } = await getCatalogueEtablissements(
     {
       _id: { $in: Array.from(etablissementsToRetrieve) },
       certifie_qualite: true,
     },
-    { _id: 1, numero_voie: 1, type_voie: 1, nom_voie: 1, code_postal: 1, nom_departement: 1, entreprise_raison_sociale: 1, geo_coordonnees: 1 }
+    { _id: 1, siret: 1, numero_voie: 1, type_voie: 1, nom_voie: 1, code_postal: 1, nom_departement: 1, entreprise_raison_sociale: 1, geo_coordonnees: 1 }
   )
 
   let etablissementsRefined = etablissements.flatMap((etablissement) => {
@@ -193,9 +194,9 @@ export const getNearEtablissementsFromRomes = async ({ rome, origin }: { rome: s
     return [
       {
         ...etablissement,
-        distance_en_km: getDistanceInKm({ origin, destination: { latitude, longitude } }),
+        distance_en_km: getDistanceInKm({ origin, destination: { latitude: parseFloat(latitude), longitude: parseFloat(longitude) } }),
       },
-    ]
+    ] as IEtablissementCatalogueProcheWithDistance[]
   })
   etablissementsRefined = sortBy(etablissementsRefined, "distance_en_km")
   const unsubscribedEtablissements = await getDbCollection("unsubscribedofs")
@@ -203,7 +204,7 @@ export const getNearEtablissementsFromRomes = async ({ rome, origin }: { rome: s
     .toArray()
   const unsubscribedIds = unsubscribedEtablissements.map((unsubscribeOF) => unsubscribeOF.catalogue_id)
   etablissementsRefined = etablissementsRefined.filter((etablissement) => !unsubscribedIds.includes(etablissement._id))
-  return etablissementsRefined
+  return etablissementsRefined.slice(0, limit)
 }
 
 /**
diff --git a/server/src/services/etablissement.service.types.ts b/server/src/services/etablissement.service.types.ts
index 872474f092..0173372f16 100644
--- a/server/src/services/etablissement.service.types.ts
+++ b/server/src/services/etablissement.service.types.ts
@@ -193,113 +193,6 @@ interface IUaiPotentiel {
   sources: string[]
   date_collecte: Date
 }
-
-interface IEtablissementCatalogueRaw {
-  _id: string
-  siege_social: boolean
-  etablissement_siege_siret: string
-  siret: string
-  siren: string
-  nda: string
-  naf_code: string
-  naf_libelle: string
-  date_creation: Date
-  diffusable_commercialement: boolean
-  enseigne: null
-  onisep_nom: null
-  onisep_url: null
-  onisep_code_postal: null
-  adresse: string
-  numero_voie: string
-  type_voie: string
-  nom_voie: string
-  complement_adresse: string
-  code_postal: string
-  num_departement: string
-  nom_departement: string
-  localite: string
-  code_insee_localite: string
-  cedex: null
-  date_fermeture: Date
-  ferme: boolean
-  region_implantation_code: string
-  region_implantation_nom: string
-  commune_implantation_code: string
-  commune_implantation_nom: string
-  num_academie: number
-  nom_academie: string
-  uai: string
-  info_datagouv_ofs: null
-  info_datagouv_ofs_info: null
-  info_qualiopi_info: string
-  api_entreprise_reference: boolean
-  entreprise_siren: string
-  entreprise_procedure_collective: boolean
-  entreprise_enseigne: null
-  entreprise_numero_tva_intracommunautaire: null
-  entreprise_raison_sociale: string
-  entreprise_nom_commercial: null
-  entreprise_date_creation: Date
-  entreprise_date_radiation: Date
-  entreprise_naf_code: string
-  entreprise_naf_libelle: string
-  entreprise_date_fermeture: Date
-  entreprise_ferme: boolean
-  entreprise_siret_siege_social: string
-  entreprise_nom: null
-  entreprise_prenom: null
-  formations_attachees: null
-  formations_ids: any[]
-  formations_uais: null
-  published: boolean
-  updates_history: any[]
-  tags: string[]
-  rco_uai: string
-  rco_adresse: null
-  rco_code_postal: string
-  rco_code_insee_localite: string
-  idcc: null
-  opco_nom: null
-  opco_siren: null
-  created_at: Date
-  last_update_at: Date
-  __v: number
-  entreprise_tranche_effectif_salarie: null
-  etablissement_siege_id: null
-  geo_coordonnees: string
-  rco_geo_coordonnees: null
-  uai_valide: boolean
-  certifie_qualite: boolean
-  date_mise_a_jour: null
-  ds_id_dossier: null
-  ds_questions_ask_for_certificaton_date: null
-  ds_questions_declaration_code: null
-  ds_questions_has_2020_training: null
-  ds_questions_has_agrement_cfa: null
-  ds_questions_has_ask_for_certificaton: null
-  ds_questions_has_certificaton_2015: null
-  ds_questions_nom: null
-  ds_questions_siren: null
-  ds_questions_uai: null
-  entreprise_capital_social: null
-  entreprise_categorie: null
-  entreprise_code_effectif_entreprise: null
-  entreprise_forme_juridique: string
-  entreprise_forme_juridique_code: string
-  formations_n3: null
-  formations_n4: null
-  formations_n5: null
-  formations_n6: null
-  formations_n7: null
-  pays_implantation_code: string
-  pays_implantation_nom: string
-  tranche_effectif_salarie: null
-  uais_potentiels: null
-  update_error: null
-}
-
-export type IEtablissementCatalogue = Jsonify<IEtablissementCatalogueRaw>
-
 export interface IAPIAdresse {
   type: string
   version: string
diff --git a/shared/helpers/openapi/__snapshots__/generateOpenapi.test.ts.snap b/shared/helpers/openapi/__snapshots__/generateOpenapi.test.ts.snap
index aa66a3c1cd..f3c359f687 100644
--- a/shared/helpers/openapi/__snapshots__/generateOpenapi.test.ts.snap
+++ b/shared/helpers/openapi/__snapshots__/generateOpenapi.test.ts.snap
@@ -8005,7 +8005,7 @@ Limite : 5 appel(s) / 1 seconde(s)
                     "additionalProperties": false,
                     "properties": {
                       "_id": {
-                        "description": "Identifiant unique",
+                        "type": "string",
                       },
                       "code_postal": {
                         "type": "string",
@@ -8034,6 +8034,9 @@ Limite : 5 appel(s) / 1 seconde(s)
                           "null",
                         ],
                       },
+                      "siret": {
+                        "type": "string",
+                      },
                       "type_voie": {
                         "type": [
                           "string",
@@ -8042,6 +8045,11 @@ Limite : 5 appel(s) / 1 seconde(s)
                       },
                     },
                     "required": [
+                      "_id",
+                      "siret",
+                      "numero_voie",
+                      "type_voie",
+                      "nom_voie",
                       "code_postal",
                       "nom_departement",
                       "entreprise_raison_sociale",
diff --git a/shared/interface/etablissement.types.ts b/shared/interface/etablissement.types.ts
index 280f8a790d..9239b1e80c 100644
--- a/shared/interface/etablissement.types.ts
+++ b/shared/interface/etablissement.types.ts
@@ -1,10 +1,8 @@
 import { z } from "zod"
 
-import { zObjectId } from "../models/common"
-
-export const zEtablissementCatalogue = z
+export const ZEtablissementCatalogue = z
   .object({
-    _id: zObjectId,
+    _id: z.string(),
     siege_social: z.boolean(),
     etablissement_siege_siret: z.string(),
     siret: z.string(),
@@ -19,9 +17,9 @@ export const zEtablissementCatalogue = z
     onisep_url: z.null(),
     onisep_code_postal: z.null(),
     adresse: z.string(),
-    numero_voie: z.string(),
-    type_voie: z.string(),
-    nom_voie: z.string(),
+    numero_voie: z.string().nullable(),
+    type_voie: z.string().nullable(),
+    nom_voie: z.string().nullable(),
     complement_adresse: z.string(),
     code_postal: z.string(),
     num_departement: z.string(),
@@ -107,3 +105,24 @@ export const zEtablissementCatalogue = z
     update_error: z.null(),
   })
   .strict()
+
+export type IEtablissementCatalogue = z.output<typeof ZEtablissementCatalogue>
+
+export const ZEtablissementCatalogueProche = ZEtablissementCatalogue.pick({
+  _id: true,
+  siret: true,
+  numero_voie: true,
+  type_voie: true,
+  nom_voie: true,
+  code_postal: true,
+  nom_departement: true,
+  entreprise_raison_sociale: true,
+  geo_coordonnees: true,
+})
+
+export type IEtablissementCatalogueProche = z.output<typeof ZEtablissementCatalogueProche>
+
+export const ZEtablissementCatalogueProcheWithDistance = ZEtablissementCatalogueProche.extend({
+  distance_en_km: z.number(),
+})
+export type IEtablissementCatalogueProcheWithDistance = z.output<typeof ZEtablissementCatalogueProcheWithDistance>
diff --git a/shared/routes/recruiters.routes.ts b/shared/routes/recruiters.routes.ts
index 6813ee4e9e..76fe67875f 100644
--- a/shared/routes/recruiters.routes.ts
+++ b/shared/routes/recruiters.routes.ts
@@ -2,6 +2,7 @@ import { Jsonify } from "type-fest"
 
 import { extensions } from "../helpers/zodHelpers/zodPrimitives"
 import { z } from "../helpers/zodWithOpenApi"
+import { ZEtablissementCatalogueProcheWithDistance } from "../interface/etablissement.types"
 import { ZPointGeometry, ZRecruiter } from "../models"
 import { zCFA } from "../models/cfa.model"
 import { zObjectId } from "../models/common"
@@ -41,25 +42,11 @@ export const zRecruiterRoutes = {
           latitude: z.coerce.number(),
           longitude: z.coerce.number(),
           rome: z.string(),
+          limit: z.coerce.number(),
         })
         .strict(),
       response: {
-        // TODO ANY TO BE FIXED
-        "200": z.array(z.any()),
-        // "2xx": zEtablissementCatalogue
-        //   .pick({
-        //     _id: true,
-        //     numero_voie: true,
-        //     type_voie: true,
-        //     nom_voie: true,
-        //     nom_departement: true,
-        //     entreprise_raison_sociale: true,
-        //     geo_coordonnees: true,
-        //   })
-        //   .extend({
-        //     distance_en_km: z.string(),
-        //   })
-        //   .strict(),
+        "200": z.array(ZEtablissementCatalogueProcheWithDistance),
       },
       securityScheme: null,
     },
diff --git a/shared/routes/v1Jobs.routes.ts b/shared/routes/v1Jobs.routes.ts
index 4797965e2d..3bdd9922ca 100644
--- a/shared/routes/v1Jobs.routes.ts
+++ b/shared/routes/v1Jobs.routes.ts
@@ -1,5 +1,6 @@
 import { extensions } from "../helpers/zodHelpers/zodPrimitives"
 import { z } from "../helpers/zodWithOpenApi"
+import { ZEtablissementCatalogueProcheWithDistance } from "../interface/etablissement.types"
 import { ZJob, ZJobFields, ZJobStartDateCreate } from "../models"
 import { zObjectId } from "../models/common"
 import { ZApiError, ZLbacError, ZLbarError } from "../models/lbacError.model"
@@ -141,21 +142,7 @@ export const zV1JobsRoutes = {
         })
         .strict(),
       response: {
-        "200": z.array(
-          z
-            .object({
-              _id: zObjectId,
-              numero_voie: z.string().nullish(),
-              type_voie: z.string().nullish(),
-              nom_voie: z.string().nullish(),
-              code_postal: z.string(),
-              nom_departement: z.string(),
-              entreprise_raison_sociale: z.string(),
-              geo_coordonnees: z.string(),
-              distance_en_km: z.number(),
-            })
-            .strict()
-        ),
+        "200": z.array(ZEtablissementCatalogueProcheWithDistance),
         "4xx": z.union([ZLbarError, ZResError]),
       },
       securityScheme: {
diff --git a/ui/components/espace_pro/CreationOffre.tsx b/ui/components/espace_pro/CreationOffre.tsx
index 34f02ada15..32b287b412 100644
--- a/ui/components/espace_pro/CreationOffre.tsx
+++ b/ui/components/espace_pro/CreationOffre.tsx
@@ -9,7 +9,7 @@ import { AUTHTYPE } from "../../common/contants"
 import { ArrowDropRightLine } from "../../theme/components/icons"
 import { createOffre, getOffre } from "../../utils/api"
 
-import { AjouterVoeux, LoadingEmptySpace } from "."
+import { FormulaireCreationOffre, LoadingEmptySpace } from "."
 
 export default function CreationOffre() {
   const toast = useToast()
@@ -81,7 +81,7 @@ export default function CreationOffre() {
           )}
         </Breadcrumb>
       </Box>
-      <AjouterVoeux fromDashboard handleSave={handleSave} offre={offre} />
+      <FormulaireCreationOffre fromDashboard handleSave={handleSave} offre={offre} />
     </Container>
   )
 }
diff --git a/ui/components/espace_pro/AjouterVoeux.tsx b/ui/components/espace_pro/FormulaireCreationOffre.tsx
similarity index 98%
rename from ui/components/espace_pro/AjouterVoeux.tsx
rename to ui/components/espace_pro/FormulaireCreationOffre.tsx
index c84a9517c9..7b71471505 100644
--- a/ui/components/espace_pro/AjouterVoeux.tsx
+++ b/ui/components/espace_pro/FormulaireCreationOffre.tsx
@@ -63,7 +63,7 @@ const ChampNombre = ({ value, max, name, handleChange, label, dataTestId }) => {
   )
 }
 
-const AjouterVoeuxForm = ({
+const FormikCreationOffre = ({
   offre,
   onSubmit,
   onRomeChange,
@@ -285,7 +285,7 @@ const AjouterVoeuxForm = ({
   )
 }
 
-export const PageAjouterVoeux = ({
+export const FormulaireCreationOffre = ({
   fromDashboard,
   offre,
   handleSave,
@@ -316,10 +316,11 @@ export const PageAjouterVoeux = ({
 
   const { geo_coordinates } = formulaire ?? {}
   const [latitude, longitude] = geo_coordinates?.split(",")?.map((str) => parseFloat(str)) ?? []
-  const relatedEtablissementQuery = useQuery(["relatedEtablissement", rome, latitude, longitude], () => getRelatedEtablissementsFromRome({ rome, latitude, longitude }), {
+  const relatedEtablissementQuery = useQuery(["relatedEtablissement", rome, latitude, longitude], () => getRelatedEtablissementsFromRome({ rome, latitude, longitude, limit: 1 }), {
     retry: false,
     enabled: Boolean(rome && latitude && longitude),
   })
+
   const haveProposals = Boolean(relatedEtablissementQuery.data?.length)
 
   const {
@@ -441,7 +442,7 @@ export const PageAjouterVoeux = ({
           Merci de renseigner les champs ci-dessous pour créer votre offre
         </Text>
         <Box>
-          <AjouterVoeuxForm onRomeChange={onRomeChange} onSubmit={onSubmit} offre={offre} competencesDirty={competencesDirty} />
+          <FormikCreationOffre onRomeChange={onRomeChange} onSubmit={onSubmit} offre={offre} competencesDirty={competencesDirty} />
         </Box>
       </Box>
       <Box>
@@ -464,4 +465,4 @@ export const PageAjouterVoeux = ({
   )
 }
 
-export default PageAjouterVoeux
+export default FormulaireCreationOffre
diff --git a/ui/components/espace_pro/index.ts b/ui/components/espace_pro/index.ts
index 694604b20f..81bc9f6573 100644
--- a/ui/components/espace_pro/index.ts
+++ b/ui/components/espace_pro/index.ts
@@ -1,5 +1,4 @@
 import AdresseAutocomplete from "./AdresseAutocomplete"
-import AjouterVoeux from "./AjouterVoeux"
 import AnimationContainer from "./AnimationContainer"
 import AuthentificationLayout from "./AuthentificationLayout"
 import Bandeau from "./Bandeau"
@@ -11,6 +10,7 @@ import ConfirmationSuppressionEntreprise from "./ConfirmationSuppressionEntrepri
 import ConfirmationSuppressionOffre from "./ConfirmationSuppressionOffre"
 import CustomInput from "./CustomInput"
 import DropdownCombobox from "./DropdownCombobox"
+import FormulaireCreationOffre from "./FormulaireCreationOffre"
 // import Etablissement from "./Etablissement"
 // import ExportButtonNew from "./ExportButton/ExportButtonNew"
 import InfoPopover from "./InfoPopover"
@@ -29,7 +29,7 @@ import UserValidationHistory from "./UserValidationHistory"
 export {
   Pagination,
   Layout,
-  AjouterVoeux,
+  FormulaireCreationOffre,
   DropdownCombobox,
   AdresseAutocomplete,
   AnimationContainer,
diff --git a/ui/pages/espace-pro/creation/mise-en-relation.tsx b/ui/pages/espace-pro/creation/mise-en-relation.tsx
index 89b8ae78e6..b3a9985c23 100644
--- a/ui/pages/espace-pro/creation/mise-en-relation.tsx
+++ b/ui/pages/espace-pro/creation/mise-en-relation.tsx
@@ -2,6 +2,7 @@ import { ExternalLinkIcon } from "@chakra-ui/icons"
 import { Box, Button, Center, Checkbox, Container, Divider, Flex, Grid, GridItem, Heading, Link, Spinner, Square, Text } from "@chakra-ui/react"
 import { useRouter } from "next/router"
 import { useEffect, useState } from "react"
+import { IEtablissementCatalogueProcheWithDistance } from "shared/interface/etablissement.types"
 
 import { ArrowRightLine, Check } from "../../../theme/components/icons"
 import { createEtablissementDelegation, createEtablissementDelegationByToken, getRelatedEtablissementsFromRome } from "../../../utils/api"
@@ -77,13 +78,15 @@ function CreationMiseEnRelationPage({ isWidget }: { isWidget?: boolean }) {
     if (geo_coordinates) {
       const [latitude, longitude] = (geo_coordinates as string).split(",")
 
-      getRelatedEtablissementsFromRome({ rome: job?.rome_detail?.code || job?.rome_code[0], latitude: parseFloat(latitude), longitude: parseFloat(longitude) }).then((data) => {
-        const etablissementUpdated = data.slice(0, 10).map((data, index) => ({
-          ...data,
-          checked: index < 3,
-        }))
-        setEtablissements(etablissementUpdated)
-      })
+      getRelatedEtablissementsFromRome({ rome: job?.rome_detail?.code || job?.rome_code[0], latitude: parseFloat(latitude), longitude: parseFloat(longitude), limit: 10 }).then(
+        (data: IEtablissementCatalogueProcheWithDistance[]) => {
+          const etablissementUpdated = data.map((data, index) => ({
+            ...data,
+            checked: index < 3,
+          }))
+          setEtablissements(etablissementUpdated)
+        }
+      )
     }
   }, [geo_coordinates])
 
@@ -122,7 +125,7 @@ function CreationMiseEnRelationPage({ isWidget }: { isWidget?: boolean }) {
                           {etablissement?.numero_voie} {etablissement?.type_voie} {etablissement?.nom_voie}, {etablissement?.code_postal} {etablissement?.nom_departement}
                         </Text>
                         <Link
-                          href={`https://catalogue.apprentissage.beta.gouv.fr/etablissement/${etablissement._id}`}
+                          href={`https://catalogue-apprentissage.intercariforef.org/etablissement/${etablissement.siret}`}
                           isExternal
                           aria-label="Etablissement sur le site du catalogue des formations en apprentissage - nouvelle fenêtre"
                         >
diff --git a/ui/pages/espace-pro/creation/offre.tsx b/ui/pages/espace-pro/creation/offre.tsx
index 2de6ceed9e..45467a04cf 100644
--- a/ui/pages/espace-pro/creation/offre.tsx
+++ b/ui/pages/espace-pro/creation/offre.tsx
@@ -3,7 +3,7 @@ import { useRouter } from "next/router"
 
 import { DepotSimplifieLayout } from "@/components/espace_pro/common/components/DepotSimplifieLayout"
 
-import { AjouterVoeux, Bandeau } from "../../../components/espace_pro"
+import { FormulaireCreationOffre, Bandeau } from "../../../components/espace_pro"
 
 export default function DepotRapideAjouterVoeux() {
   const router = useRouter()
@@ -19,7 +19,7 @@ export default function DepotRapideAjouterVoeux() {
         />
       )}
       <Box mt={10}>
-        <AjouterVoeux />
+        <FormulaireCreationOffre />
       </Box>
     </DepotSimplifieLayout>
   )
diff --git a/ui/pages/espace-pro/widget/entreprise/offre.tsx b/ui/pages/espace-pro/widget/entreprise/offre.tsx
index 8b537ac004..fb1bf74d53 100644
--- a/ui/pages/espace-pro/widget/entreprise/offre.tsx
+++ b/ui/pages/espace-pro/widget/entreprise/offre.tsx
@@ -1,7 +1,7 @@
 import { Box } from "@chakra-ui/react"
 import { useRouter } from "next/router"
 
-import { AjouterVoeux, Bandeau } from "@/components/espace_pro"
+import { FormulaireCreationOffre, Bandeau } from "@/components/espace_pro"
 import { WidgetFooter } from "@/components/WidgetFooter/WidgetFooter"
 
 export const WidgetEntrepriseOffre = () => {
@@ -18,7 +18,7 @@ export const WidgetEntrepriseOffre = () => {
         />
       )}
       <Box mt={10}>
-        <AjouterVoeux />
+        <FormulaireCreationOffre />
       </Box>
       <WidgetFooter />
     </Box>
diff --git a/ui/utils/api.ts b/ui/utils/api.ts
index 0660371cde..f1a5ccd3f4 100644
--- a/ui/utils/api.ts
+++ b/ui/utils/api.ts
@@ -166,9 +166,8 @@ export const putCompanyContactInfo = async ({ siret, phone, email }: { siret: st
 export const createEtablissement = (etablissement) => apiPost("/etablissement/creation", { body: etablissement })
 
 export const getRomeDetail = (rome: string) => apiGet("/rome/detail/:rome", { params: { rome } })
-export const getRelatedEtablissementsFromRome = async ({ rome, latitude, longitude }: { rome: string; latitude: number; longitude: number }) => {
-  return apiGet(`/etablissement/cfas-proches`, { querystring: { rome, latitude, longitude } })
-}
+export const getRelatedEtablissementsFromRome = async ({ rome, latitude, longitude, limit }: { rome: string; latitude: number; longitude: number; limit: number }) =>
+  apiGet(`/etablissement/cfas-proches`, { querystring: { rome, latitude, longitude, limit } })
 
 export const etablissementUnsubscribeDemandeDelegation = (establishment_siret: any, token: string) =>
   apiPost("/etablissement/:establishment_siret/proposition/unsubscribe", {

From 0076364c538df7ac0faa7847610e9cc5a3cc17e2 Mon Sep 17 00:00:00 2001
From: Kevin Barnoin <k.barnoin@gmail.com>
Date: Mon, 16 Sep 2024 11:51:20 +0200
Subject: [PATCH 3/6] fix: hackaton: margin, logo and espace-pro header (#1504)

* fix: margin, logo and espace-pro header

* feat: fullscrean candidature popin

* fix: header
---
 .talismanrc                                   |   3 +-
 .../CandidatureLba/CandidatureLba.tsx         |   2 +-
 .../espace_pro/AuthentificationLayout.tsx     |  34 +-
 .../Candidat/FormCreatePageFooter.tsx         |   4 +-
 ui/components/espace_pro/Layout/Header.tsx    |   4 +-
 ui/components/footer.tsx                      | 293 +++++++++---------
 ui/components/navigation.tsx                  |  12 +-
 ui/public/images/marianne.svg                 |  24 +-
 ui/theme/components/container.ts              |   8 +-
 9 files changed, 194 insertions(+), 190 deletions(-)

diff --git a/.talismanrc b/.talismanrc
index 6b9d30925d..e1c40f521f 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -190,7 +190,7 @@ fileignoreconfig:
 - filename: ui/components/espace_pro/AjouterVoeux.tsx
   checksum: 8ba50b9d7127114cd71789bbf7c26dc19b4b915ab4ae2e2e033c1ca65accee94
 - filename: ui/components/footer.tsx
-  checksum: d82b5a7d6905070fb32383864566fc16eae4797ca18f82782fb32c95a0d50369
+  checksum: e0dd3ec2ac813053ee5e672472b545719c95e49f0891cf2f8e1b5db484d00479
 - filename: ui/pages/accessibilite.tsx
   checksum: d6a7c57500f9de5e47e305f89435b21d717f505acac7b45656931f7ecdd0fcca
 - filename: ui/pages/espace-pro/admin/eligible-trainings-for-appointment/search.tsx
@@ -205,6 +205,7 @@ fileignoreconfig:
   checksum: 1ad48425b890a5ed3de19d079692e2ef7eac76483339a469a6cd9bc6d796ad26
 - filename: ui/utils/api.utils.ts
   checksum: 324cd501354cfff65447c2599c4cc8966aa8aac30dda7854623dd6f7f7b0d34e
+threshold: medium
 scopeconfig:
 - scope: node
 custom_patterns:
diff --git a/ui/components/ItemDetail/CandidatureLba/CandidatureLba.tsx b/ui/components/ItemDetail/CandidatureLba/CandidatureLba.tsx
index a72ed2609f..2e4499a608 100644
--- a/ui/components/ItemDetail/CandidatureLba/CandidatureLba.tsx
+++ b/ui/components/ItemDetail/CandidatureLba/CandidatureLba.tsx
@@ -83,7 +83,7 @@ const CandidatureLba = ({ item }) => {
               >
                 J&apos;envoie ma candidature{kind === LBA_ITEM_TYPE_OLD.LBA ? " spontanée" : ""}
               </Button>
-              <Modal isOpen={isOpen} onClose={onModalClose} closeOnOverlayClick={false} size="3xl">
+              <Modal isOpen={isOpen} onClose={onModalClose} closeOnOverlayClick={false} size={["full", "full", "full", "3xl"]}>
                 <ModalOverlay />
                 <ModalContent>
                   {/* @ts-expect-error: Chakra error */}
diff --git a/ui/components/espace_pro/AuthentificationLayout.tsx b/ui/components/espace_pro/AuthentificationLayout.tsx
index 62406727ab..787fa56f23 100644
--- a/ui/components/espace_pro/AuthentificationLayout.tsx
+++ b/ui/components/espace_pro/AuthentificationLayout.tsx
@@ -4,7 +4,7 @@ import { useRouter } from "next/router"
 import { useContext } from "react"
 
 import { WidgetContext } from "../../context/contextWidget"
-import { Close } from "../../theme/components/icons"
+import { ArrowLeft } from "../../theme/components/icons"
 import { LbaNew } from "../../theme/components/logos_pro"
 import InfoBanner from "../InfoBanner/InfoBanner"
 
@@ -27,26 +27,28 @@ export default function AuthentificationLayout(props) {
   }
 
   return (
-    <Container maxW="container.xl" py={4}>
+    <Container maxW="container.xl" px={4} py={4}>
       <InfoBanner showInfo={true} />
-      <Flex direction="column">
-        <Flex justifyContent="space-between" align="center" justify="center" mb={["4", "0"]}>
+      <Flex direction="column" px={[0, 4]}>
+        <Flex direction={["column", "row"]} justifyContent="space-between" align={["left", "center"]} justify={["left", "center"]} mb={["4", "0"]}>
           <Link href="/" aria-label="Retour à la page d'accueil">
-            <Flex direction="row" align="center">
-              <Image src="/images/espace_pro/logo.svg" aria-hidden={true} alt="" />
+            <Flex direction="row" align="center" px={[0, 4]}>
+              <Image src="/images/marianne.svg" aria-hidden={true} alt="" width="108" height="90" />
               <LbaNew ml={4} w="143px" h="37px" />
             </Flex>
           </Link>
-          <Button
-            display="flex"
-            onClick={props.fromDashboard ? () => props.onClose() : () => redirectFn()}
-            fontWeight="normal"
-            variant="pill"
-            color="bluefrance.500"
-            rightIcon={<Close width={3} />}
-          >
-            {props.fromDashboard ? "fermer" : "Retour à l'accueil"}
-          </Button>
+          <Box pt={[3, 0]}>
+            <Button
+              onClick={props.fromDashboard ? () => props.onClose() : () => redirectFn()}
+              fontWeight="normal"
+              variant="pill"
+              color="bluefrance.500"
+              // rightIcon={<Close width={3} />}
+              leftIcon={<ArrowLeft w="w" />}
+            >
+              {props.fromDashboard ? "fermer" : "Retour à l'accueil"}
+            </Button>
+          </Box>
         </Flex>
         <Container px={1} maxW="full">
           {props.children}
diff --git a/ui/components/espace_pro/Candidat/FormCreatePageFooter.tsx b/ui/components/espace_pro/Candidat/FormCreatePageFooter.tsx
index 747f1b395e..ed16b03acc 100644
--- a/ui/components/espace_pro/Candidat/FormCreatePageFooter.tsx
+++ b/ui/components/espace_pro/Candidat/FormCreatePageFooter.tsx
@@ -1,5 +1,5 @@
 import { ExternalLinkIcon } from "@chakra-ui/icons"
-import { Grid, GridItem, Box, Image, Link, Text, UnorderedList, ListItem } from "@chakra-ui/react"
+import { Box, Grid, GridItem, Image, Link, ListItem, Text, UnorderedList } from "@chakra-ui/react"
 
 export const FormCreatePageFooter = () => {
   return (
@@ -7,7 +7,7 @@ export const FormCreatePageFooter = () => {
       <Box as="nav" pl={{ base: 8, lg: 0 }} mt="12" borderTop="2px solid #3A55D1">
         <Grid templateColumns={{ base: "1fr", lg: "repeat(4, 1fr)" }} mb={{ base: 8, lg: 0 }} px={{ base: 0, lg: 10 }}>
           <GridItem colSpan={{ base: 1, lg: 1 }}>
-            <Image src="/images/marianne.svg#svgView(viewBox(12 0 162 78))" alt="" width="290" height="130" />
+            <Image src="/images/marianne.svg" aria-hidden={true} alt="" width="134" height="122" />
           </GridItem>
           <GridItem colSpan={{ base: 1, lg: 1 }}>
             <Box pl={{ base: 0, lg: 2 }} height="100%" display="flex" alignItems="center">
diff --git a/ui/components/espace_pro/Layout/Header.tsx b/ui/components/espace_pro/Layout/Header.tsx
index 536dfc441f..5ffb16f184 100644
--- a/ui/components/espace_pro/Layout/Header.tsx
+++ b/ui/components/espace_pro/Layout/Header.tsx
@@ -34,8 +34,8 @@ const Header = () => {
           <Flex alignItems="center" px={[0, 4]}>
             <Link href="/" aria-label="Retour à la page d'accueil">
               <Flex direction="row" align="center" px={[0, 4]}>
-                <Image src="/images/espace_pro/logo.svg" alt="marianne" />
-                <LbaNew ml={4} w="143px" h="37px" />
+                <Image src="/images/marianne.svg" aria-hidden={true} alt="" width="108" height="90" />
+                <LbaNew w="143px" h="37px" />
               </Flex>
             </Link>
             {organisation?.includes("akto") && <LogoAkto display={["none", "flex"]} w="100px" h={6} />}
diff --git a/ui/components/footer.tsx b/ui/components/footer.tsx
index 7e48891885..66d2ea2615 100644
--- a/ui/components/footer.tsx
+++ b/ui/components/footer.tsx
@@ -1,5 +1,5 @@
 import { ExternalLinkIcon } from "@chakra-ui/icons"
-import { Box, Divider, Flex, Grid, GridItem, Image, Link, ListItem, UnorderedList } from "@chakra-ui/react"
+import { Box, Container, Divider, Flex, Grid, GridItem, Image, Link, ListItem, UnorderedList } from "@chakra-ui/react"
 import NextLink from "next/link"
 
 import { publicConfig } from "../config.public"
@@ -17,161 +17,162 @@ const basicLink = {
   paddingLeft: { base: 0, lg: 4 },
 }
 
+const lastLink = {
+  display: { base: "inherit", lg: "inline-block" },
+  mt: { base: 3, lg: 3 },
+  // paddingRight: { base: 0, lg: 4 },
+  paddingLeft: { base: 0, lg: 4 },
+}
+
 const Footer = ({ ressources = "" }: { ressources?: string }) => {
   return (
     <Box as="footer" borderTop="1px solid" borderTopColor="info" paddingTop={6} marginTop={12}>
-      <Box maxWidth="1350px" mx="auto" pl={{ base: 0, lg: 6 }}>
-        <Box as="nav" pl={{ base: 8, lg: 0 }}>
-          <Grid templateColumns={{ base: "1fr", lg: "repeat(4, 1fr)" }}>
-            <GridItem colSpan={{ base: 1, lg: 1 }}>
-              <Image src="/images/marianne.svg#svgView(viewBox(12 0 162 78))" alt="" width="290" height="130" />
-            </GridItem>
-            <GridItem colSpan={{ base: 1, lg: 1 }}>
-              <Box pl={{ base: 0, lg: 2 }} height="100%" display="flex" alignItems="center">
-                <Image src="/images/france_relance.svg" alt="" width="81" height="81" />
+      <Container variant={"responsiveContainer"}>
+        <Grid templateColumns={{ base: "1fr", lg: "repeat(4, 1fr)" }}>
+          <GridItem>
+            <Image src="/images/marianne.svg" aria-hidden={true} alt="" width="134" height="122" />
+          </GridItem>
+          <GridItem display="flex" height="100%" alignItems="center">
+            <Image src="/images/france_relance.svg" alt="" width="81" height="81" />
+          </GridItem>
+          <GridItem colSpan={{ base: 1, lg: 2 }}>
+            <Box pl={{ base: 0, lg: 4 }} mt={{ base: 8, lg: 0 }}>
+              <Box fontSize="14px" color="grey.800">
+                La bonne alternance. Trouvez votre alternance.
               </Box>
-            </GridItem>
-            <GridItem colSpan={{ base: 1, lg: 2 }}>
-              <Box pl={{ base: 0, lg: 4 }} mt={{ base: 8, lg: 0 }}>
-                <Box fontSize="14px" color="grey.800">
-                  La bonne alternance. Trouvez votre alternance.
-                </Box>
-                <Box fontSize="14px" color="grey.800" mt="6">
-                  La bonne alternance est proposée par les services suivants :
-                </Box>
-                <Flex flexDirection={{ base: "column", lg: "row" }} mt="6">
-                  <Link
-                    href="https://www.francetravail.fr"
-                    aria-label="Accès au site de France Travail - nouvelle fenêtre"
-                    isExternal
-                    fontSize={14}
-                    fontWeight={700}
-                    color="grey.425"
-                    mr={4}
-                  >
-                    francetravail.fr <ExternalLinkIcon mx="2px" />
-                  </Link>
-                  <Link
-                    href="https://gouvernement.fr"
-                    aria-label="Accès au site gouvernement.fr - nouvelle fenêtre"
-                    isExternal
-                    fontSize={14}
-                    fontWeight={700}
-                    color="grey.425"
-                    mr={4}
-                  >
-                    gouvernement.fr <ExternalLinkIcon mx="2px" />
-                  </Link>
-                  <Link
-                    href="https://service-public.fr"
-                    aria-label="Accès au site service-public.fr - nouvelle fenêtre"
-                    isExternal
-                    fontSize={14}
-                    fontWeight={700}
-                    color="grey.425"
-                    mr={4}
-                  >
-                    service-public.fr <ExternalLinkIcon mx="2px" />
-                  </Link>
-                  <Link href="https://data.gouv.fr" aria-label="Accès au site data.gouv - nouvelle fenêtre" isExternal fontSize={14} fontWeight={700} color="grey.425" mr={4}>
-                    data.gouv.fr <ExternalLinkIcon mx="2px" />
-                  </Link>
-                </Flex>
+              <Box fontSize="14px" color="grey.800" mt="6">
+                La bonne alternance est proposée par les services suivants :
               </Box>
-            </GridItem>
-          </Grid>
-        </Box>
-      </Box>
-      <Divider mt={6} mb={3}></Divider>
-      <Box maxWidth="1350px" mx="auto" pl={{ base: 0, lg: 6 }}>
-        <Box as="nav" pl={{ base: 8, lg: 0 }}>
-          <Grid>
-            <GridItem>
-              <UnorderedList listStyleType="none" color="grey.425" fontSize={12} marginInlineStart={0}>
-                <ListItem {...firstBasicLink}>
-                  <NextLink legacyBehavior passHref href="/mentions-legales">
-                    <Link aria-label="Accès aux mentions légales">Mentions légales</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="/cgu">
-                    <Link aria-label="Accès aux conditions générales d'utilisation">CGU</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="/politique-de-confidentialite">
-                    <Link aria-label="Accès à la politique de confidentialité">Politique de confidentialité</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="/stats">
-                    <Link aria-label="Accès aux statistiques du service">Statistiques</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="/faq">
-                    <Link aria-label="Accès à la foire aux questions">FAQ</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href={`/ressources${ressources ? "#" + ressources : ""}`}>
-                    <Link aria-label="Accès à la page Ressources">Ressources</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="https://mission-apprentissage.notion.site/Blog-f583f6fb051843bc8e3097b2e8bab9e3?pvs=25">
-                    <Link isExternal aria-label="Accès au blog de La bonne alternance">
-                      Blog
-                    </Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="/contact">
-                    <Link aria-label="Accès à la page Contact">Contact</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="/metiers">
-                    <Link aria-label="Accès à la page Métiers">Métiers</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="/a-propos">
-                    <Link aria-label="Accès à la page A propos">A propos</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="/developpeurs">
-                    <Link aria-label="Accès à la page Développeurs">Développeurs</Link>
-                  </NextLink>
-                </ListItem>
-                <ListItem {...basicLink}>
-                  <NextLink legacyBehavior passHref href="/accessibilite">
-                    <Link aria-label="Accès à la déclaration d'accessibilité">Accessibilité: non conforme</Link>
-                  </NextLink>
-                </ListItem>
-              </UnorderedList>
-            </GridItem>
-            <GridItem>
-              <Box color="grey.425" fontSize={12} mt={6}>
-                Sauf mention contraire, tous les contenus de ce site sont sous licence{" "}
+              <Flex flexDirection={{ base: "column", lg: "row" }} mt="6">
                 <Link
-                  href="https://www.etalab.gouv.fr/licence-version-2-0-de-la-licence-ouverte-suite-a-la-consultation-et-presentation-du-decret"
-                  aria-label="Accès au site Etalab - nouvelle fenêtre"
-                  textDecoration="underline"
+                  href="https://www.francetravail.fr"
+                  aria-label="Accès au site de France Travail - nouvelle fenêtre"
                   isExternal
+                  fontSize={14}
+                  fontWeight={700}
+                  color="grey.425"
                   mr={4}
                 >
-                  etalab-2.0 <ExternalLinkIcon mx="2px" />
+                  francetravail.fr <ExternalLinkIcon mx="2px" />
                 </Link>
-              </Box>
-              <Box color="grey.425" fontSize={12} mt={6} pb={12}>
-                v.{publicConfig.version} © République française {new Date().getFullYear()}
-              </Box>
-            </GridItem>
-          </Grid>
-        </Box>
-      </Box>
+                <Link
+                  href="https://gouvernement.fr"
+                  aria-label="Accès au site gouvernement.fr - nouvelle fenêtre"
+                  isExternal
+                  fontSize={14}
+                  fontWeight={700}
+                  color="grey.425"
+                  mr={4}
+                >
+                  gouvernement.fr <ExternalLinkIcon mx="2px" />
+                </Link>
+                <Link
+                  href="https://service-public.fr"
+                  aria-label="Accès au site service-public.fr - nouvelle fenêtre"
+                  isExternal
+                  fontSize={14}
+                  fontWeight={700}
+                  color="grey.425"
+                  mr={4}
+                >
+                  service-public.fr <ExternalLinkIcon mx="2px" />
+                </Link>
+                <Link href="https://data.gouv.fr" aria-label="Accès au site data.gouv - nouvelle fenêtre" isExternal fontSize={14} fontWeight={700} color="grey.425" mr={4}>
+                  data.gouv.fr <ExternalLinkIcon mx="2px" />
+                </Link>
+              </Flex>
+            </Box>
+          </GridItem>
+        </Grid>
+
+        <Divider mt={6} mb={3}></Divider>
+
+        <Grid>
+          <GridItem>
+            <UnorderedList listStyleType="none" color="grey.425" fontSize={12} m={0}>
+              <ListItem {...firstBasicLink}>
+                <NextLink legacyBehavior passHref href="/mentions-legales">
+                  <Link aria-label="Accès aux mentions légales">Mentions légales</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href="/cgu">
+                  <Link aria-label="Accès aux conditions générales d'utilisation">CGU</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href="/politique-de-confidentialite">
+                  <Link aria-label="Accès à la politique de confidentialité">Politique de confidentialité</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href="/stats">
+                  <Link aria-label="Accès aux statistiques du service">Statistiques</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href="/faq">
+                  <Link aria-label="Accès à la foire aux questions">FAQ</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href={`/ressources${ressources ? "#" + ressources : ""}`}>
+                  <Link aria-label="Accès à la page Ressources">Ressources</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href="https://mission-apprentissage.notion.site/Blog-f583f6fb051843bc8e3097b2e8bab9e3?pvs=25">
+                  <Link isExternal aria-label="Accès au blog de La bonne alternance">
+                    Blog
+                  </Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href="/contact">
+                  <Link aria-label="Accès à la page Contact">Contact</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href="/metiers">
+                  <Link aria-label="Accès à la page Métiers">Métiers</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href="/a-propos">
+                  <Link aria-label="Accès à la page A propos">A propos</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...basicLink}>
+                <NextLink legacyBehavior passHref href="/developpeurs">
+                  <Link aria-label="Accès à la page Développeurs">Développeurs</Link>
+                </NextLink>
+              </ListItem>
+              <ListItem {...lastLink}>
+                <NextLink legacyBehavior passHref href="/accessibilite">
+                  <Link aria-label="Accès à la déclaration d'accessibilité">Accessibilité: non conforme</Link>
+                </NextLink>
+              </ListItem>
+            </UnorderedList>
+          </GridItem>
+          <GridItem>
+            <Box color="grey.425" fontSize={12} mt={6}>
+              Sauf mention contraire, tous les contenus de ce site sont sous licence{" "}
+              <Link
+                href="https://www.etalab.gouv.fr/licence-version-2-0-de-la-licence-ouverte-suite-a-la-consultation-et-presentation-du-decret"
+                aria-label="Accès au site Etalab - nouvelle fenêtre"
+                textDecoration="underline"
+                isExternal
+                mr={4}
+              >
+                etalab-2.0 <ExternalLinkIcon mx="2px" />
+              </Link>
+            </Box>
+            <Box color="grey.425" fontSize={12} mt={6} pb={12}>
+              v.{publicConfig.version} © République française {new Date().getFullYear()}
+            </Box>
+          </GridItem>
+        </Grid>
+      </Container>
     </Box>
   )
 }
diff --git a/ui/components/navigation.tsx b/ui/components/navigation.tsx
index d007e88537..93ee69492b 100644
--- a/ui/components/navigation.tsx
+++ b/ui/components/navigation.tsx
@@ -1,5 +1,5 @@
 import { CloseIcon, HamburgerIcon, LockIcon } from "@chakra-ui/icons"
-import { Box, Container, Flex, Image, Show, Stack, useDisclosure } from "@chakra-ui/react"
+import { Box, Container, Flex, Image, Stack, useDisclosure } from "@chakra-ui/react"
 import NextLink from "next/link"
 
 import { LbaNew } from "../theme/components/logos"
@@ -31,13 +31,11 @@ const Navigation = ({ currentPage = undefined }) => {
             <Flex flexGrow={1}>
               <Flex alignItems="center">
                 <NextLink href="/" aria-label="Retour à l'accueil">
-                  <Image src="/images/marianne.svg#svgView(viewBox(12 0 162 78))" alt="" width="162" height="78" />
+                  <Image src="/images/marianne.svg" aria-hidden={true} alt="" width="108" height="90" />
+                </NextLink>
+                <NextLink href="/" aria-label="Retour à l'accueil">
+                  <LbaNew w="143px" h="37px" />
                 </NextLink>
-                <Show above="md">
-                  <NextLink href="/" aria-label="Retour à l'accueil">
-                    <LbaNew ml={4} w="143px" h="37px" />
-                  </NextLink>
-                </Show>
               </Flex>
             </Flex>
             <HamburgerIcon
diff --git a/ui/public/images/marianne.svg b/ui/public/images/marianne.svg
index 56a0aed63d..496d11caec 100644
--- a/ui/public/images/marianne.svg
+++ b/ui/public/images/marianne.svg
@@ -1,12 +1,14 @@
-<svg width="162" height="78" viewBox="0 0 162 78" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="33" height="12" transform="translate(12 12)" fill="white"/>
-<path d="M22.6562 22.5498C22.6602 22.5498 22.6642 22.5439 22.6642 22.5439C22.696 22.5203 22.7279 22.4909 22.7558 22.4556C22.7518 22.4556 22.7478 22.4556 22.7438 22.4498C22.7159 22.4792 22.6841 22.5145 22.6562 22.5498Z" fill="#000091"/>
-<path d="M27.0694 21.0629L26.9997 21.1229C27.0396 21.1129 27.0694 21.1029 27.0694 21.0629Z" fill="#000091"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.6426 22.5817C25.7704 22.4532 25.8983 22.3168 26.0261 22.1765H26.0222C26.2624 21.9038 26.4948 21.6428 26.7737 21.4051C26.8589 21.3272 26.9402 21.261 27.0177 21.2064C27.0291 21.195 27.0349 21.1779 27.0406 21.1612C27.0465 21.1438 27.0523 21.1268 27.0642 21.1168C27.009 21.1379 26.965 21.1712 26.9207 21.2047C26.8749 21.2394 26.8289 21.2742 26.7698 21.296C26.7466 21.296 26.7233 21.2727 26.7466 21.2493C26.8279 21.1908 26.9092 21.1285 26.9867 21.0662H26.9712C26.948 21.0662 26.948 21.0428 26.948 21.0194C26.6596 20.9736 26.4381 21.1708 26.2399 21.3473L26.2275 21.3584C26.1966 21.3739 26.1675 21.3585 26.1446 21.3464C26.133 21.3403 26.123 21.335 26.1152 21.335C25.9398 21.3938 25.7885 21.5022 25.6362 21.6114C25.4959 21.7119 25.3548 21.813 25.1933 21.8765V21.8298C25.1384 21.8487 25.0842 21.8734 25.0298 21.8981C24.9498 21.9345 24.8696 21.971 24.7865 21.9895C24.6349 22.0247 24.4943 22.0202 24.358 22.0158C24.3133 22.0143 24.2689 22.0129 24.2249 22.0129C23.9768 22.0375 23.7319 22.0906 23.4872 22.1437L23.4076 22.161C23.4037 22.1629 23.3998 22.1639 23.3959 22.1649C23.3921 22.1658 23.3882 22.1668 23.3843 22.1688C23.2371 22.2077 23.1016 22.2623 22.966 22.3402L22.9505 22.348C22.9452 22.3551 22.9398 22.3614 22.9349 22.3673C22.929 22.3743 22.9237 22.3806 22.9195 22.3869C22.873 22.4415 22.8304 22.4882 22.7646 22.5233C22.6673 22.5722 22.5832 22.6476 22.5005 22.7219C22.4647 22.754 22.429 22.7861 22.3927 22.8155C22.385 22.8233 22.3695 22.8272 22.3578 22.8272C22.2378 22.9441 22.1177 23.061 21.9937 23.1739C21.986 23.1817 21.9511 23.1856 21.924 23.1817C21.924 23.1817 21.9279 23.1817 21.9279 23.1778L21.9395 23.1545L21.9976 23.061C22.0092 23.0434 22.0199 23.0259 22.0305 23.0084C22.0412 22.9908 22.0518 22.9733 22.0634 22.9558C22.0944 22.909 22.1255 22.8622 22.1603 22.8194C22.168 22.8077 22.168 22.796 22.1603 22.7882C22.1525 22.7804 22.1409 22.7765 22.1293 22.7765C22.2416 22.6675 22.3733 22.5739 22.5089 22.4921V22.4882C22.4934 22.4921 22.4702 22.4804 22.4818 22.4649C22.4932 22.4506 22.5024 22.4342 22.5112 22.4188L22.5205 22.4025C22.5225 22.3986 22.5234 22.3957 22.5244 22.3928C22.5254 22.3899 22.5263 22.3869 22.5283 22.383C22.5263 22.3791 22.5234 22.3762 22.5205 22.3733C22.5176 22.3704 22.5147 22.3675 22.5128 22.3636L22.4893 22.3791C22.4612 22.3974 22.4324 22.4163 22.4082 22.4376C22.3911 22.4523 22.3751 22.4725 22.3588 22.4932C22.3232 22.5382 22.2857 22.5856 22.23 22.5856C22.2261 22.5856 22.2068 22.5856 22.1952 22.5817C22.1835 22.5817 22.1758 22.5778 22.1719 22.5739C22.1719 22.572 22.1719 22.571 22.1724 22.5705C22.1729 22.57 22.1738 22.57 22.1758 22.57C22.1758 22.57 22.1797 22.5662 22.1797 22.5623C22.1797 22.5623 22.1797 22.5584 22.1835 22.5584C22.1855 22.5545 22.1874 22.5515 22.1893 22.5486C22.1913 22.5457 22.1932 22.5428 22.1952 22.5389C22.1971 22.535 22.199 22.5321 22.201 22.5291C22.2029 22.5262 22.2048 22.5233 22.2068 22.5194C22.2087 22.5175 22.2097 22.5145 22.2106 22.5116C22.2116 22.5087 22.2126 22.5058 22.2145 22.5038L22.2189 22.4958C22.2227 22.4889 22.2273 22.4808 22.23 22.4726C22.2319 22.4688 22.2339 22.4658 22.2358 22.4629C22.2378 22.46 22.2397 22.4571 22.2416 22.4532C22.2474 22.4454 22.2523 22.4366 22.2571 22.4278C22.262 22.4191 22.2668 22.4103 22.2726 22.4025C22.2765 22.3947 22.2804 22.3869 22.2881 22.3791C22.292 22.3713 22.2959 22.3645 22.2997 22.3577C22.3036 22.3509 22.3075 22.3441 22.3114 22.3363C22.323 22.3168 22.3114 22.3012 22.2959 22.2973C22.3385 22.2428 22.3888 22.196 22.4508 22.161H22.4431C22.4965 22.1341 22.5515 22.1026 22.6062 22.0713C22.6384 22.0528 22.671 22.0341 22.7026 22.0168C22.7142 22.0051 22.7258 21.9934 22.7413 21.9856C22.6135 22.0285 22.4973 22.0869 22.385 22.1649C22.385 22.1649 22.354 22.1765 22.3462 22.1843C22.3462 22.1843 22.323 22.1921 22.292 22.1649C22.2881 22.161 22.2881 22.1571 22.2881 22.1493C22.3016 22.1222 22.3293 22.1043 22.3594 22.0849C22.3812 22.0708 22.4041 22.056 22.4237 22.0363C22.4469 22.0363 22.4663 22.0363 22.4663 22.0597C22.9124 21.7099 23.4625 21.6289 24.0144 21.5477C24.3539 21.4978 24.6941 21.4478 25.0112 21.335C25.0441 21.3116 25.078 21.2892 25.1119 21.2668C25.1458 21.2444 25.1797 21.222 25.2126 21.1986C25.2691 21.1751 25.3198 21.1348 25.3734 21.0922C25.4263 21.0501 25.4822 21.0056 25.5496 20.9727C25.7278 20.8363 25.8634 20.6805 25.9331 20.4506C25.9331 20.4272 25.9099 20.4038 25.9099 20.4038C25.6155 20.7194 25.2785 20.9688 24.9182 21.1519C24.5747 21.3331 24.2067 21.36 23.8423 21.3866C23.7054 21.3966 23.569 21.4065 23.4347 21.4246C23.4579 21.3778 23.5044 21.3779 23.547 21.3779C23.547 21.3225 23.5735 21.2987 23.6075 21.2682C23.6166 21.26 23.6263 21.2514 23.6361 21.2415H23.702C23.7136 21.2415 23.7194 21.2298 23.7252 21.2181C23.731 21.2064 23.7368 21.1947 23.7484 21.1947C23.7949 21.1947 23.8608 21.1714 23.8375 21.1714C23.802 21.1257 23.7504 21.1438 23.6934 21.1637C23.6386 21.1829 23.5789 21.2038 23.5238 21.1714C23.5443 21.1489 23.5504 21.1219 23.556 21.0974C23.5621 21.0708 23.5675 21.0471 23.5896 21.035H23.6787C23.6787 20.9882 23.7252 20.9454 23.7252 20.9454C23.9272 20.8239 24.1223 20.7179 24.3137 20.6138C24.4416 20.5443 24.568 20.4756 24.6936 20.4038C24.6682 20.4038 24.6456 20.4143 24.6238 20.4244C24.589 20.4406 24.5558 20.4559 24.5154 20.4272C24.5386 20.4272 24.5386 20.4107 24.5386 20.3941C24.5386 20.3775 24.5386 20.361 24.5619 20.361C24.7072 20.3222 24.8365 20.2592 24.9686 20.195C25.0619 20.1496 25.1565 20.1036 25.2591 20.0649C25.2287 20.0649 25.2005 20.0731 25.173 20.0811C25.1201 20.0964 25.0699 20.111 25.0112 20.0649C25.0266 20.0571 25.039 20.0473 25.0513 20.0375C25.076 20.0178 25.1002 19.9986 25.1468 19.9986V19.9324C25.1468 19.909 25.17 19.909 25.1933 19.909C25.17 19.909 25.1468 19.8857 25.1468 19.8857C25.1591 19.8609 25.1833 19.8558 25.2103 19.8501C25.2343 19.8451 25.2605 19.8396 25.2824 19.8194C25.2591 19.8194 25.2165 19.8194 25.2165 19.796C25.2824 19.7064 25.3947 19.6831 25.507 19.6597C25.4954 19.6363 25.4731 19.6363 25.4538 19.6363C25.4344 19.6363 25.4179 19.6363 25.4179 19.6129C25.4179 19.5896 25.4412 19.5896 25.4644 19.5896H25.4179C25.3815 19.5712 25.3879 19.5385 25.3924 19.5158C25.3936 19.5096 25.3947 19.5041 25.3947 19.4999C25.4857 19.3927 25.5156 19.2662 25.5454 19.1404C25.5599 19.0788 25.5745 19.0173 25.5961 18.9584C25.5729 18.9584 25.5496 18.9584 25.5496 18.935C25.3318 19.1767 24.9866 19.2683 24.6587 19.3554L24.6277 19.3636H24.5154C24.4031 19.4103 24.2443 19.4103 24.1319 19.3402C24.0785 19.3122 24.0404 19.2771 23.9993 19.2393C23.9718 19.214 23.9429 19.1875 23.9073 19.161C23.7252 19.048 23.547 18.9584 23.3456 18.8883C22.7839 18.709 22.199 18.6155 21.6141 18.6389C21.7775 18.5491 21.9509 18.5133 22.1266 18.4771C22.2176 18.4584 22.3093 18.4395 22.4004 18.4129C22.458 18.396 22.515 18.3785 22.5716 18.3611C22.8929 18.2626 23.2046 18.1671 23.547 18.187C23.5022 18.1711 23.4448 18.1768 23.392 18.1821C23.3672 18.1846 23.3434 18.187 23.3224 18.187C23.0634 18.1677 22.8019 18.2253 22.529 18.2855C22.4712 18.2982 22.4129 18.3111 22.354 18.3233C22.2471 18.3456 22.1455 18.3775 22.0437 18.4095C21.9315 18.4448 21.8191 18.4801 21.6993 18.5025C21.6474 18.5205 21.6056 18.551 21.565 18.5807C21.4996 18.6285 21.437 18.6743 21.3391 18.6623V18.5922C21.5638 18.3194 21.8349 18.0506 22.1952 18.0272C22.5434 17.9705 22.8717 18.0109 23.2142 18.053C23.2718 18.0601 23.3297 18.0673 23.3882 18.074C23.669 18.0966 23.9317 18.1592 24.2148 18.2267L24.2443 18.2337C24.3062 18.2337 24.3411 18.2883 24.3748 18.3411C24.4023 18.384 24.429 18.4258 24.4689 18.4363C24.5241 18.4553 24.5792 18.4589 24.6344 18.4624C24.7148 18.4676 24.7952 18.4728 24.8756 18.5259C24.8756 18.5102 24.873 18.4949 24.8704 18.4798C24.8653 18.4499 24.8602 18.4206 24.8756 18.3896C24.9256 18.3393 24.9829 18.3528 25.0393 18.3661C25.0834 18.3764 25.127 18.3867 25.1662 18.3662C25.289 18.29 25.1738 18.1729 25.0585 18.0558C25.0029 17.9993 24.9472 17.9428 24.9182 17.8909C24.9182 17.8675 24.9415 17.8441 24.9415 17.8441C24.9924 17.8897 25.0398 17.9369 25.0867 17.9837C25.2043 18.1008 25.3194 18.2153 25.4799 18.2961C25.5922 18.3428 25.8634 18.409 25.8169 18.2727C25.7373 18.0961 25.6014 17.9429 25.4642 17.7883C25.4077 17.7246 25.351 17.6607 25.2979 17.5948V17.5052C25.2625 17.5052 25.2541 17.4917 25.2435 17.4749C25.2402 17.4696 25.2367 17.464 25.232 17.4584V17.3688C25.1752 17.339 25.1625 17.2918 25.1497 17.2443C25.1424 17.2173 25.1351 17.1902 25.1197 17.1662C25.0808 17.1033 25.0781 17.0259 25.0752 16.946C25.0729 16.8825 25.0705 16.8175 25.0499 16.7571C25.0035 16.6207 24.9841 16.5078 24.9609 16.3714C24.9356 16.2319 24.9079 16.0985 24.8807 15.9679C24.8328 15.7374 24.7866 15.5157 24.7594 15.2844C24.7236 14.9538 24.8905 14.6743 25.0612 14.3885C25.1118 14.3037 25.1627 14.2185 25.2088 14.1312C25.3676 13.8584 25.5458 13.5896 25.8401 13.4065C25.9044 13.1405 26.0791 12.919 26.253 12.6985L26.2662 12.6818C26.4379 12.4679 26.7245 12.3371 26.9357 12.2408L26.9596 12.2299C27.2734 12.0896 27.5561 12 27.56 12H12V23.996H23.0396C23.3348 23.782 23.6283 23.6469 23.9775 23.4862C24.1369 23.4129 24.3079 23.3342 24.496 23.2402C24.5359 23.2201 24.5832 23.1968 24.6357 23.171C24.951 23.0159 25.4534 22.7687 25.6426 22.5817ZM22.1396 20.9633C22.0958 20.9677 22.0494 20.9723 22.0669 20.9372C22.0832 20.8583 22.1639 20.8347 22.2428 20.8116C22.2765 20.8017 22.31 20.7919 22.3378 20.7779L22.3505 20.7714L22.3598 20.7664C22.4035 20.7432 22.457 20.7148 22.4965 20.7313C22.5231 20.7692 22.5561 20.779 22.5881 20.7884C22.612 20.7955 22.6353 20.8024 22.6551 20.8207C22.5714 20.9047 22.4737 20.913 22.3747 20.9214C22.3089 20.9269 22.2425 20.9326 22.1791 20.9605C22.1678 20.9605 22.1538 20.9619 22.1396 20.9633ZM18.7126 20.4154C18.7126 20.4388 18.7359 20.4622 18.7359 20.4622C19.2782 19.8505 19.7701 19.3284 20.4673 18.8959C20.486 18.8881 20.4791 18.8979 20.4698 18.9109C20.4561 18.9302 20.4373 18.9567 20.4906 18.9427C20.7214 18.8901 20.8251 18.6923 20.9259 18.5C20.952 18.4502 20.9779 18.4008 21.0058 18.3544C21.1115 18.1823 21.2618 18.0721 21.4132 17.9611C21.5223 17.881 21.6321 17.8004 21.7262 17.696C21.7262 17.7193 21.7262 17.7427 21.703 17.7661C21.7262 17.7895 21.7495 17.7895 21.7727 17.7895C21.8136 17.7586 21.8582 17.7459 21.901 17.7336C21.9555 17.718 22.007 17.7033 22.0439 17.6531C21.8657 17.583 21.6372 17.5596 21.459 17.6297C20.9864 17.8557 20.5836 18.218 20.2001 18.6271C19.9677 18.8726 19.7275 19.1024 19.4331 19.2622C19.2317 19.6674 19.007 20.0297 18.7126 20.4154ZM20.6037 18.9664C20.5916 18.9908 20.5794 19.0035 20.5678 19.0156C20.5573 19.0266 20.5471 19.0372 20.5379 19.0557C20.5147 19.1023 20.4915 19.1217 20.4489 19.145C20.4257 19.145 20.4025 19.145 20.4025 19.1217C20.4257 19.0324 20.4915 18.9431 20.5805 18.9198C20.6037 18.9237 20.6037 18.947 20.6037 18.9664ZM21.5942 22.4264C21.6136 22.4069 21.6368 22.3835 21.6484 22.3601C21.6677 22.3134 21.5478 22.3251 21.5284 22.3368C21.5109 22.3509 21.4997 22.365 21.4862 22.3821L21.482 22.3874C21.4659 22.406 21.447 22.4232 21.4278 22.4406C21.4148 22.4525 21.4016 22.4644 21.3891 22.477C21.3349 22.5316 21.2808 22.5861 21.2227 22.6368C21.184 22.6718 21.3078 22.6874 21.3349 22.664C21.3659 22.6407 21.393 22.6134 21.4201 22.5861C21.4304 22.5861 21.4407 22.5844 21.4476 22.5832L21.4523 22.5825L21.4549 22.5822C21.5191 22.5607 21.5668 22.516 21.6132 22.4726L21.6252 22.4614C21.6407 22.4459 21.6213 22.4303 21.5942 22.4264ZM21.244 22.173C21.2436 22.1731 21.2433 22.1732 21.243 22.1734C21.2426 22.1739 21.2426 22.1749 21.2426 22.1768C21.2188 22.1931 21.1953 22.2097 21.1719 22.2263C21.1114 22.2691 21.0512 22.3117 20.9869 22.3483C20.9255 22.3829 20.8625 22.4128 20.7989 22.4429C20.7623 22.4603 20.7255 22.4778 20.6886 22.4963C20.6886 22.4963 20.6886 22.4924 20.6848 22.4924C20.677 22.4807 20.6615 22.4768 20.646 22.4846C20.5608 22.5314 20.4872 22.5937 20.4214 22.6599C20.4097 22.6677 20.3981 22.6794 20.3904 22.6911L20.3555 22.7262V22.7301C20.34 22.7457 20.3245 22.7612 20.3052 22.7846C20.3011 22.7887 20.298 22.7927 20.2951 22.7966C20.2895 22.8039 20.2843 22.8107 20.2742 22.8158C20.2587 22.8236 20.2199 22.8236 20.2238 22.8002V22.7963C20.2122 22.8041 20.1967 22.8119 20.1851 22.8158C20.1793 22.8197 20.1735 22.8226 20.1677 22.8255C20.1618 22.8284 20.156 22.8314 20.1502 22.8353C20.1463 22.8314 20.1386 22.8314 20.1347 22.8314C20.1309 22.8314 20.1231 22.8314 20.1192 22.8353C20.1102 22.8431 20.1012 22.8504 20.0921 22.8578C20.074 22.8725 20.056 22.8872 20.0379 22.9054C19.9914 22.9483 19.9488 22.995 19.9062 23.0457C19.9062 23.0457 19.9062 23.0495 19.9023 23.0495C19.9023 23.0515 19.9013 23.0525 19.9004 23.0534C19.8994 23.0544 19.8984 23.0554 19.8984 23.0573L19.8907 23.0651C19.8892 23.0666 19.8883 23.0681 19.8875 23.0694C19.8863 23.0714 19.8853 23.0729 19.8829 23.0729L19.8791 23.0768C19.8752 23.0846 19.8713 23.0924 19.8636 23.1002C19.8597 23.1041 19.852 23.108 19.8442 23.108C19.8403 23.1041 19.8365 23.1002 19.8365 23.0963C19.8345 23.0944 19.8336 23.0924 19.8326 23.0905C19.8316 23.0885 19.8307 23.0866 19.8287 23.0846C19.8248 23.0788 19.8219 23.0729 19.819 23.0671C19.8161 23.0612 19.8132 23.0554 19.8094 23.0495V23.0457C19.8094 23.0437 19.8084 23.0418 19.8074 23.0398C19.8064 23.0379 19.8055 23.0359 19.8055 23.034L19.8752 22.9521L19.8791 22.9483C19.8829 22.9444 19.8868 22.9395 19.8907 22.9346C19.8946 22.9298 19.8984 22.9249 19.9023 22.921C19.9081 22.9132 19.9149 22.9054 19.9217 22.8976C19.9285 22.8898 19.9352 22.882 19.9411 22.8742C19.943 22.8703 19.9449 22.8674 19.9469 22.8645C19.9488 22.8616 19.9507 22.8586 19.9527 22.8547C19.9759 22.8236 19.9992 22.7924 20.0224 22.7573V22.7534C20.0263 22.7496 20.0301 22.7457 20.0301 22.7379C20.0418 22.7223 20.0534 22.7067 20.0611 22.6911L20.0844 22.6444V22.6405L20.0882 22.6366C20.0882 22.6346 20.0892 22.6336 20.0902 22.6327C20.0912 22.6317 20.0921 22.6307 20.0921 22.6288C20.096 22.619 20.0999 22.6103 20.1037 22.6015C20.1076 22.5928 20.1115 22.584 20.1154 22.5742V22.5703L20.1192 22.5547C20.1212 22.5509 20.1221 22.547 20.1231 22.5431C20.1241 22.5392 20.125 22.5353 20.127 22.5314V22.5275C20.1289 22.5216 20.1299 22.5158 20.1309 22.5099C20.1318 22.5041 20.1328 22.4983 20.1347 22.4924C20.1347 22.4885 20.1347 22.4807 20.1309 22.4768C20.1541 22.434 20.1851 22.395 20.2199 22.356C20.218 22.356 20.2161 22.357 20.2141 22.358C20.213 22.3586 20.2119 22.3591 20.2108 22.3595C20.21 22.3598 20.2092 22.3599 20.2083 22.3599C20.1911 22.3708 20.1762 22.3852 20.1611 22.4C20.1491 22.4117 20.1369 22.4236 20.1231 22.434C20.0999 22.4535 20.0534 22.4223 20.0844 22.3989C20.1037 22.3833 20.1192 22.3677 20.1347 22.3522C20.1347 22.3522 20.1347 22.3483 20.1386 22.3483C20.154 22.3343 20.1689 22.3184 20.1838 22.3025C20.2064 22.2784 20.2292 22.254 20.2548 22.2353C20.2819 22.2158 20.3013 22.2002 20.3245 22.1807C20.3284 22.1768 20.3323 22.1729 20.3362 22.1729C20.3516 22.1535 20.3671 22.134 20.3865 22.1145C20.3865 22.1145 20.3904 22.1145 20.3904 22.1106C20.5234 21.9816 20.7103 21.9361 20.9011 21.8896C21.0214 21.8603 21.1433 21.8307 21.2542 21.7794C21.3168 21.7534 21.3866 21.7636 21.4556 21.7738C21.5104 21.7818 21.5647 21.7898 21.6144 21.7794C21.6803 21.7794 21.75 21.7794 21.8158 21.8262C21.6627 21.9077 21.5165 22.001 21.3719 22.0933C21.33 22.12 21.2882 22.1467 21.2464 22.1729C21.2454 22.1729 21.2446 22.1729 21.244 22.173ZM21.7281 20.5851C21.7099 20.5872 21.6982 20.5885 21.7082 20.5986C21.7741 20.6649 21.9097 20.6415 22.0026 20.5909C22.0685 20.5441 22.1382 20.5441 22.2273 20.5441C22.2505 20.5441 22.2505 20.5012 22.2505 20.4779C22.3164 20.5012 22.3629 20.5012 22.4287 20.5012C22.9671 20.3883 23.4862 20.2753 23.982 20.0259C23.4803 19.6383 22.8618 19.4656 22.256 19.2965C22.1555 19.2684 22.0554 19.2405 21.9561 19.2116C21.978 19.2116 21.9998 19.2189 22.0217 19.2262C22.066 19.241 22.1109 19.2559 22.1576 19.2116C22.0961 19.1626 22.0277 19.1532 21.9599 19.144C21.9038 19.1363 21.8482 19.1286 21.7973 19.0987C21.8026 19.0987 21.809 19.0999 21.8158 19.1012C21.839 19.1057 21.8685 19.1114 21.8864 19.0753C21.7688 19.0161 21.6511 18.996 21.5323 18.9757C21.4712 18.9653 21.4098 18.9548 21.348 18.9389C21.4603 18.9155 21.5301 18.8259 21.5301 18.7129C21.5301 18.6896 21.4836 18.6896 21.4603 18.6896C21.1931 18.8259 21.011 19.0753 20.8987 19.3675C20.9999 19.4271 21.1091 19.4202 21.2161 19.4134C21.2769 19.4096 21.3369 19.4058 21.3945 19.4142C21.3437 19.4625 21.2703 19.4756 21.1997 19.4882C21.1734 19.4929 21.1475 19.4975 21.1233 19.5038C21.0536 19.5194 20.9878 19.5701 21.011 19.6168C21.0265 19.6363 21.042 19.6441 21.0614 19.648C21.011 19.6636 20.9645 19.687 20.9219 19.7298C20.9857 19.78 21.0514 19.7703 21.1163 19.7608C21.1421 19.757 21.1677 19.7532 21.1931 19.7532C21.1931 19.7815 21.2116 19.7911 21.2309 19.8011C21.2409 19.8062 21.251 19.8115 21.2589 19.8194C21.1466 19.8623 21.0575 19.9558 21.0342 20.022C21.0065 20.0895 20.9552 20.1334 20.9044 20.1768C20.8701 20.2062 20.8361 20.2353 20.8096 20.2714V20.3415C20.7347 20.4078 20.6578 20.4671 20.582 20.5255C20.4262 20.6455 20.2748 20.7621 20.155 20.9298C20.1782 20.9298 20.1782 20.9532 20.1782 20.9766C20.1568 21.0089 20.1263 21.0313 20.0974 21.0525C20.0636 21.0774 20.0319 21.1006 20.0194 21.1363C20.0194 21.1597 20.0194 21.1831 20.0426 21.1831C20.1848 21.1361 20.3077 21.057 20.4283 20.9794C20.5377 20.9091 20.6452 20.84 20.7631 20.7973C20.8595 20.7742 20.9434 20.7305 21.0253 20.6878C21.0948 20.6516 21.1628 20.6162 21.2357 20.5947C21.2918 20.5831 21.3538 20.5665 21.4158 20.5499C21.4778 20.5334 21.5397 20.5168 21.5959 20.5051C21.5959 20.5285 21.5959 20.5519 21.6192 20.5519H21.7973C21.7864 20.5784 21.7518 20.5824 21.7281 20.5851Z" fill="#000091"/>
-<path d="M45 12H32.0966C32.0966 12 32.12 12.0039 32.2175 12.0546C32.3228 12.1092 32.4594 12.1834 32.5413 12.2263C32.709 12.3121 32.8689 12.4213 32.9743 12.5891C33.0211 12.6554 33.0874 12.7919 33.0445 12.8817C32.9977 12.9948 32.9743 13.1782 32.8611 13.2211C32.7246 13.2913 32.5452 13.2913 32.3853 13.2679C32.2955 13.2679 32.2058 13.2445 32.1122 13.2211C32.4516 13.3576 32.7714 13.5176 32.9977 13.8336C33.0211 13.8804 33.1108 13.8999 33.2005 13.8999C33.2239 13.8999 33.2239 13.9467 33.2239 13.9662C33.1771 14.013 33.1342 14.0364 33.1576 14.1027H33.2239C33.337 14.0559 33.3136 13.8296 33.4735 13.8999C33.5867 13.9662 33.6335 14.1261 33.5633 14.2393C33.4735 14.329 33.3838 14.3992 33.2902 14.4655C33.2668 14.5124 33.2668 14.5787 33.2902 14.6255C33.3565 14.7152 33.3799 14.8049 33.4033 14.8986C33.4735 15.0585 33.493 15.238 33.5633 15.3979C33.653 15.7373 33.7427 16.0767 33.7232 16.42C33.7232 16.5995 33.6335 16.7594 33.6998 16.9428C33.7466 17.1222 33.8597 17.2588 33.9494 17.4187C34.0391 17.5553 34.1288 17.645 34.1991 17.7815C34.3356 18.0078 34.5852 18.2341 34.4721 18.5072C34.4058 18.6671 34.1562 18.6437 33.9962 18.7334C33.8597 18.8466 33.9728 19.0299 34.043 19.143C34.1562 19.3459 33.9065 19.4824 33.7466 19.5527C33.7934 19.6229 33.8831 19.5995 33.9065 19.6424C33.9299 19.7555 34.043 19.8218 33.9728 19.9389C33.8831 20.0754 33.6101 20.1417 33.7466 20.3485C33.8363 20.5085 33.7778 20.684 33.7232 20.8479C33.6569 21.0507 33.4735 21.1404 33.3136 21.1873C33.1771 21.2341 33.0172 21.2341 32.8845 21.2107C32.8377 21.1873 32.7948 21.1638 32.748 21.1638C32.3618 21.117 31.9757 21.0078 31.5934 21.0078C31.4803 21.0312 31.3672 21.0507 31.2775 21.0975C31.176 21.1717 31.0824 21.2536 31.0044 21.3394C31.0044 21.3394 31.0044 21.3394 31.0005 21.3433C30.9849 21.3628 30.9654 21.3784 30.9498 21.3979C30.942 21.4096 30.9303 21.4213 30.9225 21.433C30.9147 21.4408 30.9108 21.4486 30.903 21.4564C30.8367 21.5384 30.7782 21.6281 30.7236 21.7178C30.7197 21.7256 30.7158 21.7295 30.7119 21.7334C30.708 21.7451 30.7002 21.7529 30.6924 21.7646C30.6183 21.9012 30.5636 22.0416 30.5207 22.1821C30.3647 22.7009 30.4349 23.1456 30.5441 23.2549C30.5753 23.2861 31.2931 23.5085 31.7924 23.7308C32.0264 23.8362 32.1902 23.9142 32.3267 24H44.9961V12H45Z" fill="#E1000F"/>
-<path d="M32.8631 16.3752C32.9526 16.3985 33.0888 16.3985 33.0888 16.4453C33.0421 16.6245 32.7736 16.6713 32.6375 16.8544H32.5674C32.5013 16.9011 32.5208 17.0141 32.4546 17.0141C32.3885 16.9907 32.3185 17.0141 32.2523 17.0375C32.3418 17.1271 32.4546 17.1972 32.5908 17.1739C32.6141 17.1739 32.6569 17.2206 32.6569 17.2635C32.6569 17.2635 32.6803 17.2635 32.7036 17.2401C32.727 17.2401 32.7503 17.2401 32.7503 17.2635V17.3531C32.6842 17.4427 32.5674 17.3998 32.478 17.4193C32.6608 17.4661 32.8398 17.4661 32.9993 17.4193C33.1355 17.3726 32.9993 17.1466 33.0888 17.0336C33.0421 17.0336 33.0888 16.9635 33.0421 16.9635C33.0888 16.9167 33.1316 16.8505 33.1782 16.8271C33.2249 16.8271 33.2911 16.8037 33.3144 16.757C33.3144 16.7102 33.2249 16.6907 33.2444 16.644C33.3806 16.5544 33.4934 16.418 33.4467 16.2817C33.4233 16.2115 33.2444 16.2115 33.1316 16.1687C33.0187 16.1258 32.8826 16.1687 32.7464 16.192C32.6336 16.192 32.5208 16.2622 32.4079 16.2817C32.2484 16.3284 32.1123 16.418 31.98 16.5076C32.1395 16.4414 32.2951 16.418 32.478 16.3713C32.6141 16.3752 32.727 16.344 32.8631 16.3752Z" fill="#808080"/>
-<path d="M13.236 39H14.94V35.604H15.816L18.06 39H20.064L17.436 35.28C18.3 34.884 18.792 34.128 18.792 33.108C18.792 31.548 17.652 30.6 15.804 30.6H13.236V39ZM15.9 32.016C16.62 32.016 17.04 32.448 17.04 33.084C17.04 33.768 16.62 34.188 15.9 34.188H14.94V32.016H15.9ZM24.5273 29.88L26.0873 28.26H24.3353L22.9793 29.88H24.5273ZM21.3233 39H26.2193V37.584H23.0273V35.424H25.7393V34.008H23.0273V32.016H26.2193V30.6H21.3233V39ZM28.3794 39H30.0834V35.604H31.1514C32.9994 35.604 34.1274 34.656 34.1274 33.108C34.1274 31.548 32.9994 30.6 31.1514 30.6H28.3794V39ZM31.2234 32.016C31.9434 32.016 32.3754 32.448 32.3754 33.084C32.3754 33.768 31.9434 34.188 31.2234 34.188H30.0834V32.016H31.2234ZM40.6705 35.856C40.6705 36.984 40.0225 37.644 38.9785 37.644C37.9105 37.644 37.2745 36.984 37.2745 35.856V30.6H35.5705V35.712C35.5705 37.92 36.8665 39.24 38.9665 39.24C41.0785 39.24 42.3745 37.92 42.3745 35.712V30.6H40.6705V35.856ZM44.6713 39H47.3233C49.2553 39 50.4433 38.064 50.4433 36.528C50.4433 35.652 49.9513 34.932 49.0633 34.536C49.6513 34.152 49.9633 33.564 49.9633 32.88C49.9633 31.464 48.8953 30.6 47.1433 30.6H44.6713V39ZM47.1793 32.016C47.8273 32.016 48.2113 32.364 48.2113 32.952C48.2113 33.564 47.8273 33.912 47.1793 33.912H46.3753V32.016H47.1793ZM47.4193 35.328C48.2113 35.328 48.6913 35.736 48.6913 36.456C48.6913 37.164 48.2113 37.584 47.4193 37.584H46.3753V35.328H47.4193ZM52.3719 39H57.2679V37.452H54.0759V30.6H52.3719V39ZM58.9476 39H60.6516V30.6H58.9476V39ZM70.2234 38.784L69.7194 38.304C70.7514 37.488 71.3754 36.204 71.3754 34.8C71.3754 32.4 69.5634 30.36 66.9234 30.36C64.2714 30.36 62.4594 32.4 62.4594 34.8C62.4594 37.2 64.2714 39.24 66.9234 39.24C67.3314 39.24 67.7154 39.192 68.0754 39.096L69.0714 39.984C69.8994 40.704 70.7634 41.088 71.6994 41.088C72.0714 41.088 72.3114 41.04 72.5874 40.932V39.492C72.4074 39.564 72.1674 39.588 71.9874 39.588C71.4474 39.588 70.8714 39.372 70.2234 38.784ZM66.9234 37.644C65.3394 37.644 64.2114 36.408 64.2114 34.8C64.2114 33.192 65.3394 31.956 66.9234 31.956C68.4954 31.956 69.6234 33.192 69.6234 34.8C69.6234 36.408 68.4954 37.644 66.9234 37.644ZM78.1424 35.856C78.1424 36.984 77.4944 37.644 76.4504 37.644C75.3824 37.644 74.7464 36.984 74.7464 35.856V30.6H73.0424V35.712C73.0424 37.92 74.3384 39.24 76.4384 39.24C78.5504 39.24 79.8464 37.92 79.8464 35.712V30.6H78.1424V35.856ZM82.1432 39H87.0392V37.584H83.8472V35.424H86.5592V34.008H83.8472V32.016H87.0392V30.6H82.1432V39ZM92.4937 39H94.1977V35.424H96.9097V34.008H94.1977V32.016H97.3897V30.6H92.4937V39ZM99.0693 39H100.773V35.604H101.649L103.893 39H105.897L103.269 35.28C104.133 34.884 104.625 34.128 104.625 33.108C104.625 31.548 103.485 30.6 101.637 30.6H99.0693V39ZM101.733 32.016C102.453 32.016 102.873 32.448 102.873 33.084C102.873 33.768 102.453 34.188 101.733 34.188H100.773V32.016H101.733ZM106.464 39H108.276L109.08 36.816H112.44L113.244 39H115.056L111.876 30.6H109.644L106.464 39ZM109.608 35.364L110.76 32.208L111.912 35.364H109.608ZM116.533 39H118.237V32.928L121.993 39H124.177V30.6H122.473V36.672L118.717 30.6H116.533V39ZM130.45 37.644C128.866 37.644 127.738 36.408 127.738 34.8C127.738 33.192 128.866 31.956 130.45 31.956C131.41 31.956 132.166 32.424 132.646 33.108L133.99 32.064C133.222 31.044 131.974 30.36 130.45 30.36C127.798 30.36 125.986 32.4 125.986 34.8C125.986 36.936 127.426 38.784 129.61 39.168L128.554 40.932H130.066L131.11 39.192C132.334 39.036 133.342 38.412 133.99 37.524L132.646 36.492C132.166 37.176 131.41 37.644 130.45 37.644ZM134.535 39H136.347L137.151 36.816H140.511L141.315 39H143.127L139.947 30.6H137.715L134.535 39ZM137.679 35.364L138.831 32.208L139.983 35.364H137.679ZM144.604 39H146.308V30.6H144.604V39ZM148.08 37.836C148.824 38.724 149.772 39.24 151.188 39.24C152.736 39.24 153.96 38.292 153.984 36.708C153.984 33.828 150.168 34.26 150.168 32.736C150.168 32.232 150.564 31.848 151.164 31.848C151.8 31.848 152.352 32.268 152.844 32.904L154.092 31.776C153.372 30.924 152.412 30.36 151.152 30.36C149.544 30.36 148.44 31.464 148.44 32.796C148.44 35.64 152.256 35.22 152.256 36.768C152.256 37.368 151.848 37.728 151.176 37.728C150.492 37.728 149.82 37.344 149.316 36.696L148.08 37.836ZM155.95 39H160.846V37.584H157.654V35.424H160.366V34.008H157.654V32.016H160.846V30.6H155.95V39Z" fill="#161616"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M43.18 60.6147L42.0638 61.6346H41.7758L42.4359 60.4707H43.18V60.6147ZM42.3759 64.5621H42.1359C41.8358 64.9221 41.4998 65.21 41.1757 65.21C40.8397 65.21 40.6717 65.0061 40.6717 64.5621C40.6717 64.3821 40.6957 64.1901 40.7317 64.0221L42.688 63.3742C43.072 62.4622 42.6159 62.0662 42.0759 62.0662C41.1517 62.0662 40.0956 63.6861 40.0956 64.9821C40.0956 65.594 40.3836 65.93 40.8397 65.93C41.3678 65.918 41.9198 65.402 42.3759 64.5621ZM41.7046 62.5945C41.9686 62.5945 42.1966 62.7985 42.0766 63.2665L40.8644 63.5905C41.0565 63.0145 41.4165 62.5945 41.7046 62.5945ZM37.8886 62.6182H38.5367L37.5045 65.4501C37.4085 65.69 37.5405 65.93 37.7925 65.93C38.5247 65.93 39.4008 65.3061 39.7368 64.4181H39.5568C39.2928 64.7901 38.7167 65.1981 38.2846 65.2701L39.2328 62.6182H40.2049L40.3249 62.2102H39.3768L39.7368 61.1903H39.3648L38.6927 62.2102L37.8886 62.3182V62.6182ZM36.9878 62.0789C37.1198 62.0789 37.2998 62.2229 37.2158 62.4869L36.0516 65.3067C36.3517 65.2587 36.6637 64.9708 36.8438 64.7068H37.0358C36.7597 65.4147 36.1356 65.9307 35.5956 65.9307C35.4636 65.9307 35.2715 65.7867 35.3675 65.5227L36.4477 62.7029C36.1477 62.7509 35.8356 63.0389 35.6556 63.3029H35.4756C35.7516 62.5829 36.4237 62.0789 36.9878 62.0789ZM37.3246 61.3587C37.5647 61.3587 37.7687 61.1667 37.7687 60.9147C37.7687 60.6747 37.5647 60.4707 37.3246 60.4707C37.0726 60.4707 36.8806 60.6747 36.8806 60.9147C36.8806 61.1547 37.0846 61.3587 37.3246 61.3587ZM32.0797 63.6988C32.3437 63.1229 32.2477 62.8589 32.0797 62.8589C31.9357 62.8589 31.7676 63.0149 31.5996 63.3029H31.4196C31.6956 62.6909 32.0557 62.0789 32.4517 62.0789C32.7878 62.0789 32.9078 62.4149 32.9078 62.7869V63.3149C32.9618 63.252 33.0144 63.1903 33.0658 63.1301L33.0667 63.1289L33.0675 63.1281C33.5745 62.5331 33.9617 62.0789 34.408 62.0789C34.7561 62.0789 34.9361 62.2949 34.9361 62.6189C34.9361 62.8109 34.8761 63.0509 34.7441 63.3029L33.7479 65.3067C34.048 65.2587 34.36 64.9708 34.54 64.7068H34.7201C34.444 65.4267 33.7719 65.9307 33.2079 65.9307C32.9558 65.9307 32.8118 65.6667 32.9198 65.4507L34.072 63.2309C34.204 62.9789 34.228 62.8109 34.024 62.8109C33.7479 62.8109 33.0998 63.2669 32.7518 63.6868L31.9957 65.6787C31.9117 65.8827 31.8277 65.9307 31.6356 65.9307C31.3236 65.9307 31.1676 65.7267 31.3116 65.4027L32.0797 63.6988ZM31.2987 62.9302C31.4307 62.4742 31.3587 62.0662 31.0106 62.0662C30.5766 62.0662 30.4407 62.3528 30.02 63.2399L29.9905 63.3022V62.7742C29.9905 62.4022 29.8705 62.0662 29.5344 62.0662C29.1384 62.0662 28.7783 62.6782 28.5023 63.2902H28.6823C28.8743 63.0142 29.0544 62.8462 29.1984 62.8462C29.3664 62.8462 29.4624 63.1102 29.1984 63.6861L28.4303 65.39C28.2863 65.714 28.4423 65.918 28.7543 65.918C28.9464 65.918 29.0304 65.87 29.1144 65.666L29.8705 63.6741C30.0865 63.4102 30.2785 63.1822 30.5186 62.9302H31.2987ZM27.5064 63.2665C27.6264 62.7985 27.3984 62.5945 27.1344 62.5945C26.8463 62.5945 26.4863 63.0145 26.2942 63.5905L27.5064 63.2665ZM27.8057 64.5621H27.5657C27.2656 64.9221 26.9296 65.21 26.6055 65.21C26.2695 65.21 26.1015 65.0061 26.1015 64.5621C26.1015 64.3821 26.1255 64.1901 26.1615 64.0221L28.1178 63.3742C28.5018 62.4622 28.0458 62.0662 27.5057 62.0662C26.5815 62.0662 25.5254 63.6861 25.5254 64.9821C25.5254 65.594 25.8134 65.93 26.2695 65.93C26.7976 65.918 27.3497 65.402 27.8057 64.5621ZM23.9665 62.6182H23.3184V62.3182L24.1225 62.2102L24.7946 61.1903H25.1666L24.8066 62.2102H25.7547L25.6347 62.6182H24.6626L23.7144 65.2701C24.1465 65.1981 24.7226 64.7901 24.9866 64.4181H25.1666C24.8306 65.3061 23.9545 65.93 23.2224 65.93C22.9703 65.93 22.8383 65.69 22.9343 65.4501L23.9665 62.6182ZM19.8865 64.8144C19.8865 63.9384 20.8586 62.7625 21.3987 62.7625C21.5187 62.7625 21.6387 62.7745 21.7347 62.8105L21.1707 64.3224C20.8466 64.7184 20.3425 65.1983 20.1025 65.1983C19.9705 65.1983 19.8865 65.0783 19.8865 64.8144ZM22.5632 61.8866L22.8632 61.9106L21.8191 64.3104C21.567 64.8864 21.675 65.1504 21.8191 65.1504C21.9631 65.1504 22.1431 64.9824 22.3351 64.7064H22.5152C22.2391 65.3184 21.8791 65.9303 21.483 65.9303C21.147 65.9303 20.9429 65.5703 21.0029 64.9224L21.0269 64.6944L20.9616 64.7857C20.5317 65.3866 20.1427 65.9303 19.7428 65.9303C19.3947 65.9303 19.2147 65.7143 19.2147 65.3904C19.2147 63.9984 20.7389 62.2225 22.1671 62.2225H22.2271L22.5632 61.8866ZM19.814 62.9302C19.946 62.4742 19.874 62.0662 19.526 62.0662C19.0919 62.0662 18.956 62.3529 18.5354 63.2399L18.5058 63.3022V62.7742C18.5058 62.4022 18.3858 62.0662 18.0498 62.0662C17.6537 62.0662 17.2937 62.6782 17.0176 63.2902H17.1976C17.3897 63.0142 17.5697 62.8462 17.7017 62.8462C17.8697 62.8462 17.9658 63.1102 17.7017 63.6861L16.9336 65.402C16.7896 65.726 16.9456 65.93 17.2576 65.93C17.4497 65.93 17.5337 65.882 17.6177 65.678L18.3738 63.6861C18.5898 63.4222 18.7819 63.1942 19.0219 62.9422H19.814V62.9302ZM14.8684 65.5693L14.7964 65.7853H12L12.072 65.5573C12.9361 65.4013 13.0802 65.3293 13.4402 64.3574L14.2203 62.2695C14.5684 61.2975 14.4964 61.2255 13.7403 61.0696L13.8123 60.8536H17.4488L17.2328 62.0175H16.9687C16.9687 61.3215 16.8967 61.1416 16.2366 61.1416H16.0686C15.4205 61.1416 15.3365 61.2375 15.1565 61.7415L14.6404 63.1454H15.3965C15.9006 63.1454 16.0926 62.8335 16.3206 62.4255H16.5847L15.9606 64.1294H15.6965C15.7565 63.6134 15.7565 63.4094 15.2885 63.4094H14.5324L14.1843 64.3694C13.8081 65.3685 13.9156 65.3889 14.8115 65.5585C14.8301 65.562 14.8491 65.5656 14.8684 65.5693Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M17.2448 51.4331L16.1286 52.2375V52.2495H15.8405L16.5006 51.2891H17.2448V51.4331ZM25.0472 57.0638L26.8355 52.3095L26.7755 52.2374L25.5393 52.3815V52.5256L25.7793 52.7057C25.9843 52.8651 25.93 53.0138 25.76 53.4795L25.7313 53.5581L24.3631 57.2079C24.2551 57.424 24.3991 57.6881 24.6511 57.6881C25.2152 57.6881 25.8153 57.1719 26.0914 56.4635H25.9114C25.7193 56.7277 25.3353 57.0158 25.0472 57.0638ZM33.2438 53.402L34.36 52.3815V52.2374H33.6159L32.9558 53.402H33.2438ZM33.315 56.3194H33.5551C33.111 57.1719 32.5589 57.6881 32.0308 57.6881C31.5747 57.6881 31.2867 57.3519 31.2867 56.7396C31.2867 55.443 32.3429 53.8222 33.267 53.8222C33.7951 53.8222 34.2632 54.2184 33.8791 55.1309L31.9108 55.7792C31.8748 55.9473 31.8508 56.1393 31.8508 56.3194C31.8508 56.7637 32.0188 56.9678 32.3549 56.9678C32.6789 56.9678 33.015 56.6796 33.315 56.3194ZM33.2544 55.0228C33.3745 54.5666 33.1464 54.3625 32.8824 54.3625C32.6063 54.3625 32.2463 54.7827 32.0422 55.347L33.2544 55.0228ZM29.7258 54.3862H29.0777V54.0861L29.8818 53.978L30.554 52.9575H30.926L30.566 53.978H31.5141L31.3941 54.3862H30.4219L29.4738 57.0395C29.9058 56.9675 30.4819 56.5593 30.746 56.1871H30.926C30.59 57.0756 29.7138 57.6999 28.9817 57.6999C28.7296 57.6999 28.5976 57.4597 28.6936 57.2196L29.7258 54.3862ZM28.4055 54.2421C28.4775 53.978 28.3095 53.8339 28.1655 53.8339C27.6014 53.8339 26.9292 54.3502 26.6532 55.0585H26.8332C27.0133 54.7944 27.3253 54.5063 27.6254 54.4582L26.5452 57.2796C26.4492 57.5438 26.6412 57.6878 26.7732 57.6878C27.3133 57.6878 27.9374 57.1716 28.2135 56.4632H28.0334C27.8534 56.7274 27.5413 57.0155 27.2413 57.0635L28.4055 54.2421ZM28.9585 52.6817C28.9585 52.9218 28.7544 53.1259 28.5144 53.1259C28.2744 53.1259 28.0703 52.9218 28.0703 52.6817C28.0703 52.4415 28.2624 52.2374 28.5144 52.2374C28.7544 52.2374 28.9585 52.4415 28.9585 52.6817ZM22.8987 54.5306C22.3586 54.5306 21.3864 55.7071 21.3864 56.5836C21.3864 56.8477 21.4704 56.9678 21.6145 56.9678C21.8425 56.9678 22.3466 56.4875 22.6706 56.0913L23.2347 54.5786C23.1267 54.5426 23.0187 54.5306 22.8987 54.5306ZM24.3632 53.6782L24.0632 53.6542L23.7271 53.9903H23.6671C22.2389 53.9903 20.7146 55.7672 20.7146 57.1599C20.7146 57.484 20.8946 57.7001 21.2427 57.7001C21.6426 57.7001 22.0316 57.1561 22.4616 56.5549L22.5269 56.4635L22.5029 56.6917C22.4429 57.34 22.6469 57.7001 22.983 57.7001C23.3791 57.7001 23.7391 57.0878 24.0152 56.4755H23.8351C23.6431 56.7517 23.4631 56.9198 23.3191 56.9198C23.175 56.9198 23.067 56.6556 23.3191 56.0793L24.3632 53.6782ZM18.3135 57.5682C17.7974 57.7723 17.4373 58.0124 17.4373 58.3846C17.4373 58.7328 17.7614 58.8768 18.4335 58.8768C19.3337 58.8768 19.8258 58.6127 19.8258 58.2645C19.8258 58.1085 19.6217 58.0364 19.0816 57.8563C18.7336 57.7483 18.4815 57.6522 18.3135 57.5682ZM18.9128 56.0914C18.6728 56.0914 18.5888 55.8873 18.5888 55.6712C18.5888 54.9749 18.9248 54.1104 19.4649 54.1104C19.705 54.1104 19.789 54.3145 19.789 54.5306C19.777 55.239 19.4409 56.0914 18.9128 56.0914ZM19.3701 57.2199C20.0302 57.424 20.4383 57.5801 20.4383 58.0363C20.4383 58.6246 19.3581 59.3209 18.0499 59.3089C17.2937 59.3089 16.6456 59.1048 16.6456 58.6126C16.6456 58.1443 17.0777 57.7601 18.1339 57.448C17.9899 57.3519 17.9299 57.2319 17.9299 57.0638C17.9299 56.7757 18.1939 56.5475 18.65 56.3314C18.2059 56.2714 17.9178 55.9352 17.9178 55.443C17.9178 54.6866 18.542 53.8222 19.5261 53.8222C19.7302 53.8222 19.9102 53.8702 20.0542 53.9663H21.1344L21.0144 54.3745H20.3783C20.4143 54.4825 20.4383 54.6026 20.4383 54.7347C20.4383 55.467 19.8502 56.3074 18.914 56.3555C18.674 56.4875 18.554 56.6676 18.554 56.8117C18.554 56.9812 18.7503 57.0385 19.1842 57.1652C19.2419 57.1821 19.3039 57.2001 19.3701 57.2199ZM15.5646 55.167C16.0327 55.167 16.0447 55.3711 15.9727 55.8873H16.2367L16.8609 54.1825H16.5968C16.3688 54.5907 16.1767 54.9028 15.6726 54.9028H14.6405L15.1446 53.4981C15.3246 52.9939 15.4086 52.8978 16.0567 52.8978H16.5128C17.1729 52.8978 17.2449 53.0779 17.2449 53.7743H17.509L17.725 52.6097H13.8123L13.7403 52.8258C14.4964 52.9819 14.5684 53.0539 14.2204 54.0264L13.4403 56.1274C13.0802 57.0999 12.9362 57.1719 12.06 57.328L12 57.5561H16.3448L17.1249 56.3195H16.8248C16.3208 56.8118 15.8167 57.268 14.8325 57.268C13.75 57.268 13.7693 57.215 14.0941 56.3225C14.115 56.265 14.1372 56.204 14.1604 56.1394L14.5204 55.179H15.5646V55.167Z" fill="black"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M19.1496 44.8876C19.3896 44.8876 19.5936 44.6837 19.5936 44.4438C19.5936 44.2039 19.3896 44 19.1496 44C18.8977 44 18.7057 44.2039 18.7057 44.4438C18.7057 44.6957 18.8977 44.8876 19.1496 44.8876ZM22.7022 46.3986C22.7022 45.8229 22.5583 45.607 22.1503 45.607C21.6464 45.607 21.1785 46.1467 20.7106 46.7944L21.7184 44.0956L21.6584 44.0117L20.4227 44.1556V44.2996L20.6626 44.4795C20.8716 44.6419 20.811 44.8044 20.633 45.2818L20.6146 45.3311L19.5229 48.1858C19.4269 48.4257 19.3189 48.7136 19.3189 48.7856C19.3189 49.1214 19.7748 49.4453 20.1947 49.4453C21.1305 49.4573 22.7022 47.73 22.7022 46.3986ZM33.1042 45.1752L34.22 44.1556V44.0117H33.4761L32.8163 45.1752H33.1042ZM33.1765 48.0899H33.4164C32.9605 48.9415 32.4086 49.4573 31.8807 49.4453C31.4248 49.4453 31.1369 49.1214 31.1369 48.5097C31.1369 47.2143 32.1927 45.595 33.1165 45.595C33.6444 45.595 34.1123 45.9908 33.7284 46.9024L31.7727 47.5501C31.7368 47.7181 31.7128 47.91 31.7128 48.0899C31.7128 48.5337 31.8807 48.7376 32.2167 48.7376C32.5406 48.7376 32.8765 48.4497 33.1765 48.0899ZM33.1153 46.7945C33.2353 46.3387 33.0073 46.1348 32.7434 46.1348C32.4555 46.1348 32.0955 46.5546 31.9036 47.1184L33.1153 46.7945ZM29.5747 46.1595H28.9268V45.8596L29.7306 45.7516L30.4025 44.7321H30.7744L30.4145 45.7516H31.3623L31.2423 46.1595H30.2705L29.3227 48.8103C29.7546 48.7383 30.3305 48.3305 30.5945 47.9587H30.7744C30.4385 48.8463 29.5627 49.47 28.8308 49.47C28.5789 49.47 28.4469 49.2301 28.5429 48.9902L29.5747 46.1595ZM28.5931 46.4713C28.7251 46.0155 28.6531 45.6077 28.3052 45.6077C27.8713 45.6077 27.7354 45.8942 27.3149 46.7809L27.2854 46.8431V46.3154C27.2854 45.9435 27.1654 45.6077 26.8295 45.6077C26.4336 45.6077 26.0736 46.2194 25.7977 46.8311H25.9776C26.1696 46.5553 26.3496 46.3873 26.4815 46.3873C26.6495 46.3873 26.7455 46.6512 26.4815 47.227L25.7137 48.9302C25.5697 49.2541 25.7257 49.458 26.0376 49.458C26.2296 49.458 26.3136 49.41 26.3976 49.2061L27.1534 47.215C27.3694 46.9511 27.5613 46.7232 27.8013 46.4713H28.5931ZM24.7902 46.7945C24.9101 46.3387 24.6822 46.1348 24.4182 46.1348C24.1303 46.1348 23.7823 46.5546 23.5784 47.1184L24.7902 46.7945ZM25.0893 48.0899H24.8494C24.5495 48.4497 24.2135 48.7376 23.8896 48.7376C23.5536 48.7376 23.3857 48.5337 23.3857 48.0899C23.3857 47.91 23.4097 47.7181 23.4457 47.5501L25.4013 46.9024C25.7852 45.9908 25.3293 45.595 24.7894 45.595C23.8656 45.595 22.8098 47.2143 22.8098 48.5097C22.8098 49.1214 23.0977 49.4453 23.5536 49.4453C24.0815 49.4573 24.6334 48.9415 25.0893 48.0899ZM20.0512 48.5461C20.0512 48.702 20.3272 48.882 20.5191 48.882C21.299 48.882 22.0308 47.4786 22.0188 46.6989C22.0188 46.435 21.8869 46.3271 21.7069 46.3271C21.419 46.3271 20.8911 46.7589 20.5551 47.1667L20.2432 48.0064C20.1352 48.2822 20.0512 48.4981 20.0512 48.5461ZM18.7917 45.6077C18.9357 45.6077 19.1036 45.7516 19.0316 46.0155L17.8799 48.8343C18.1798 48.7863 18.4917 48.4984 18.6717 48.2345H18.8517C18.5757 48.9422 17.9518 49.458 17.4119 49.458C17.268 49.458 17.076 49.314 17.172 49.0502L18.2518 46.2314C17.9518 46.2794 17.6399 46.5673 17.4599 46.8311H17.28C17.5559 46.1235 18.2278 45.6077 18.7917 45.6077ZM13.8116 44.3602H16.3911L16.3192 44.5881C15.4433 44.744 15.2994 44.816 14.9394 45.7876L14.1716 47.8986C13.7997 48.9062 13.8956 49.0261 14.5555 49.0261C15.3708 49.0261 15.9053 48.4337 16.3721 47.9164C16.4068 47.878 16.4411 47.84 16.4751 47.8027H16.7751L15.9232 49.314H12L12.072 49.0981C12.9358 48.9422 13.0798 48.8702 13.4397 47.8986L14.2196 45.7756C14.5675 44.804 14.4955 44.732 13.7397 44.5761L13.8116 44.3602Z" fill="black"/>
+<svg viewBox="0 0 8500 7670" xmlns="http://www.w3.org/2000/svg">
+  <!-- fond -->
+  <path fill="#fff" d="M0 0h8500v7670h-8500z"/>
+  <!-- Marianne -->
+  <g>
+    <path d="M2145 1884c11-11 22-22 32-34 20-23 40-44 63-64 7-6 14-12 21-16 2-2 2-6 4-8-9 4-15 11-25 15-2 0-4-2-2-4 7-5 14-10 20-15h-1c-2 0-2-2-2-4-25-4-43 13-60 28-4 2-8-2-9-2-28 9-49 34-77 45v-4c-11 4-22 11-34 13-17 4-32 2-47 2-23 2-46 7-69 12-1 0-1 0-2 1-12 3-24 8-35 14l-4 4c-4 4-8 9-13 11-12 6-21 16-31 25-1 1-2 1-3 1-10 10-20 20-30 29-1 1-4 1-6 1 0-1 1-1 1-2 2-3 3-5 5-8l6-9c3-4 5-8 8-11 1-1 1-2 0-2-1-1-2-1-3-1 9-9 21-17 32-24-1 0-3-1-2-2 1-2 2-3 3-5 0-1 0-1 1-2 0-1-1-1-1-2l-9 6c-5 4-8 12-15 12h-3c-1 0-2 0-2-1v-1c0-1 1-1 1-2s1-1 1-2c0 0 0-1 1-1 0-1 1-2 1-2 0-1 1-1 1-2 1-1 2-3 2-4 0-1 1-1 1-2 1-1 1-2 2-3 1-2 0-3-1-3 3-5 8-8 13-11h-1c7-4 15-8 22-12l3-3c-11 4-20 9-30 15 0 0-2 1-3 2 0 0-2 1-5-2v-1c2-4 8-6 11-9 2 0 4 0 4 2 61-47 144-36 214-60 6-4 11-8 17-11 9-4 17-13 28-19 15-11 26-25 32-43 0-2-2-4-2-4-25 26-53 47-83 62-40 21-83 17-125 23 2-4 6-4 9-4 0-6 4-8 8-11h6c2 0 2-4 4-4 4 0 10-2 8-2-6-8-17 6-26 0 4-4 2-9 6-11h8c0-4 4-8 4-8 28-17 55-30 81-45-6 0-9 6-15 2 4 0 0-6 4-6 21-6 38-17 59-25-8 0-13 6-21 0 4-2 6-6 11-6v-6c0-2 2-2 4-2-2 0-4-2-4-2 2-4 8-2 11-6-2 0-6 0-6-2 6-8 15-9 25-11-2-4-8 0-8-4 0-2 2-2 4-2h-4c-4-2-2-6-2-8 11-13 11-30 17-45-2 0-4 0-4-2-19 21-49 28-77 36h-13c-9 4-23 4-32-2-8-4-11-9-19-15-15-9-30-17-47-23-47-15-96-23-145-21 21-11 44-12 66-19 32-9 62-21 96-19-6-2-13 0-19 0-26-2-53 6-81 11-19 4-36 11-55 15-11 4-17 15-30 13v-6c19-23 42-45 72-47 34-6 66 0 100 4 25 2 47 8 72 13 9 0 11 15 19 17 11 4 23 0 34 8 0-4-2-8 0-11 8-8 17 2 25-2 15-9-13-26-21-40 0-2 2-4 2-4 15 13 26 28 45 38 9 4 32 9 28-2-9-21-28-38-44-57v-8c-4 0-4-2-6-4v-8c-8-4-6-11-9-17-6-9-2-23-6-34-4-11-6-21-8-32-6-32-13-60-17-91-4-36 21-64 38-96 13-23 28-45 53-60 6-23 21-42 36-60 15-18 40-30 58-38 26-12 50-19 50-19h-1304v1e3h927c36-26 72-38 122-63 24-10 78-35 96-53m-290-136c-4 0-11 2-9-2 2-9 15-9 23-13 4-2 9-6 13-4 4 6 9 4 13 8-12 11-27 6-40 11m-290-41s-2-2-2-4c25-32 43-62 61-96 25-13 45-32 64-53 32-34 66-64 106-83 15-6 34-4 49 2-6 8-15 6-23 11-2 0-4 0-6-2 2-2 2-4 2-6-19 21-45 30-60 55-11 19-19 43-43 49-8 2 2-6-2-4-59 36-100 80-146 131m157-125c-2 4-4 4-6 8-2 4-4 6-8 8-2 0-4 0-4-2 2-8 8-15 15-17 3-1 3 1 3 3m88 283c-1 2-3 4-5 6 2 0 4 2 2 3-4 4-9 8-14 10h-3c-2 2-5 4-7 7-2 2-13 1-10-2 5-4 9-9 14-13 3-2 6-5 8-8 1-2 2-3 4-4 3-2 13-3 11 1m-34-15c-8 5-15 10-22 15-8 5-17 8-25 12-1-1-2-1-3-1-7 4-13 9-19 15l-3 3-3 3-4 4c-1 1-1 2-3 3-1 1-4 1-4-1-1 1-2 1-3 2-1 1-2 1-3 2h-2c-2 2-5 4-7 6-4 4-8 7-11 12v1l-1 1s0 1-1 1c0 1-1 1-1 2 0 0-1 1-2 1l-1-1s0-1-1-1c-1-1-1-2-2-3v-1c2-2 4-4 6-7 1-1 1-2 2-2 1-1 2-3 3-4 0-1 1-1 1-2 2-3 4-5 6-8l1-1c1-1 2-3 3-4s1-2 2-4v-1c1-2 1-3 2-4v-1c0-1 0-1 1-2 0-1 0-2 1-3v-1c2-4 5-7 8-10h-1c-3 2-5 4-7 6-2 2-6-1-3-3 2-1 3-3 4-4 3-3 6-7 10-10 2-2 4-3 6-4l1-1c1-2 3-3 4-5 18-17 49-17 72-28 9-4 21 2 30 0 6 0 11 0 17 4-17 3-32 14-48 24m39-132c-2-2 6 0 8-4h-15c-2 0-2-2-2-4-9 2-21 6-30 8-13 4-25 13-40 17-21 8-38 25-60 32-2 0-2-2-2-4 2-6 9-8 13-13 0-2 0-4-2-4 15-21 36-32 55-49v-6c6-8 15-11 19-21 2-6 10-13 19-17-2-2-6-2-6-6-8 0-15 4-23-2 4-3 8-5 12-7-2 0-3-1-4-3-2-4 4-8 9-9 8-2 17-2 23-8-13-2-28 4-42-4 9-25 25-45 47-57 2 0 6 0 6 2 0 9-6 17-15 19 15 4 30 4 45 11-2 4-6 2-8 2 9 6 21 2 30 9-6 6-11 0-17 0 59 17 121 30 170 68-42 21-85 30-130 40-6 0-9 0-15-2 0 2 0 6-2 6-8 0-13 0-19 4-7 6-18 8-24 2" fill="#000091"/>
+    <path d="M3755 1e3h-1074s2 0 10 5c9 5 20 11 27 14 14 7 27 16 36 30 4 6 9 17 6 25-4 9-6 25-15 28-11 6-26 6-40 4-8 0-15-2-23-4 28 11 55 25 74 51 2 4 9 6 17 6 2 0 2 4 2 6-4 4-8 6-6 11h6c9-4 8-23 21-17 9 6 13 19 8 28-8 8-15 13-23 19-2 4-2 9 0 13 6 8 8 15 9 23 6 13 8 28 13 42 8 28 15 57 13 85 0 15-8 28-2 43 4 15 13 26 21 40 8 11 15 19 21 30 11 19 32 38 23 60-6 13-26 11-40 19-11 9-2 25 4 34 9 17-11 28-25 33 4 6 11 4 13 8 2 9 11 15 6 25-8 11-30 17-19 34 8 13 3 28-2 42-6 15-19 25-34 28-11 4-25 4-36 2-4-2-8-4-11-4-32-4-64-13-96-13-9 2-19 4-26 7-8 6-16 13-23 20-1 2-3 3-4 5-1 1-2 2-2 3l-2 2c-6 7-10 14-15 22 0 1-1 1-1 1 0 1-1 2-2 3-6 11-11 23-14 35-13 43-7 80 2 89 2 2 62 21 104 40 20 9 33 15 45 23h1055v-1e3z" fill="#e1000f"/>
+    <path d="M2745 1366c8 2 19 2 19 6-4 15-26 19-38 34h-6c-6 4-4 13-9 13-6-2-11 0-17 2 8 8 17 13 28 11 2 0 6 4 6 8 0 0 2 0 4-2 2 0 4 0 4 2v8c-6 8-15 4-23 6 15 4 30 4 44 0 11-4 0-23 8-32-4 0 0-6-4-6 4-4 8-9 11-11 4 0 9-2 11-6 0-4-8-6-6-9 11-8 21-19 17-30-2-6-17-6-26-10s-21 0-32 2c-9 0-19 6-28 8-13 4-25 11-36 19 13-6 26-8 41-11 11-2 20-4 32-2" fill="gray"/>
+  </g>
+  <!-- RF -->
+  <path d="M1e3 3250v-750h228q124 0 194 60 71 60 72 164 0 67-31 116-31 50-88 78l234 332h-181l-199-303h-77v303zm152-432h85q48 0 74-25 27-25 27-71 0-43-27-68-27-25-74-24h-85zm563 432v-750h435v130h-284v173h241v130h-241v187h284v130zm147-814 120-145h156l-138 145zm473 814v-750h247q123 0 193 60 71 60 71 164 0 104-71 163-71 60-193 60h-95v303zm152-432h101q49 0 76-26 27-25 27-70 0-43-28-68-27-25-75-24h-101zm481 139v-457h152v469q0 75 40 118 40 42 111 42 70 0 110-42 40-42 40-118v-469h152v457q0 148-81 231t-222 83q-140 0-221-83-81-84-81-231zm803 293v-750h212q117 0 183 54 67 54 67 150 0 93-79 148 59 27 91 72 32 46 32 105 0 103-75 162-74 59-203 59zm151-130h86q53 0 83-26 30-27 30-73 0-46-30-72-30-25-83-25h-86zm0-326h64q43 0 67-22 24-21 24-61 0-38-24-59-23-22-67-22h-64zm520 456v-750h151v612h284v138zm579 0v-750h151v750zm336-222q-29-73-29-153t29-152q29-73 80-127 52-54 126-86 75-32 161-32 86 0 161 32 75 32 126 86 51 54 80 127 29 72 29 152 0 94-39 176t-108 137l45 43q79 72 156 71 32 0 54-8v129q-35 14-79 13-121 0-233-98l-89-80q-49 13-103 13-86 0-161-32-74-32-126-85-51-54-80-126zm195-334q-68 73-69 181 0 108 69 181 68 73 173 73 69 0 123-33 55-33 86-92 31-58 31-129 0-108-69-181-68-73-172-73-105 0-173 73zm710 263v-457h152v469q0 75 40 118 40 42 111 42 70 0 110-42 40-42 40-118v-469h152v457q0 148-81 231-81 84-222 83-140 0-221-83-81-84-81-231zm803 293v-750h435v130h-284v173h241v130h-241v187h284v130zm-6065 1085v-750h435v130h-283v173h241v130h-241v317zm579 0v-750h228q123 0 195 60 71 60 71 164 0 67-31 117-31 50-88 77l234 332h-181l-199-303h-77v303zm152-432h85q48 0 75-25 27-25 26-71 0-43-26-68-26-25-75-24h-85zm500 432 283-750h198l283 750h-161l-72-195h-299l-71 195zm279-325h206l-103-281zm611 325v-750h194l334 537v-537h151v750h-194l-334-539v539zm836-375q0-80 29-152 29-73 80-127 52-54 126-85 75-32 162-32 99 0 180 40 82 41 134 112l-119 93q-33-47-83-75-50-28-112-28-105 0-173 73-68 73-69 181 0 108 69 182 68 73 173 72 62 0 112-27 50-28 83-76l119 92q-44 61-110 100-66 39-146 49l-93 156h-134l94-158q-95-17-169-73-74-56-114-139-40-83-39-178zm755 375 283-750h198l283 750h-161l-71-195h-299l-72 195zm280-325h205l-103-281zm610 325v-750h152v750zm304-104 110-101q34 44 76 68 43 24 89 24 45 0 70-23 26-23 26-64 0-24-14-44-15-20-39-33-24-14-55-28-31-15-63-29-32-14-62-34-31-20-55-44-24-24-39-61-15-37-15-81 0-91 68-154 68-63 172-63 156 0 261 126l-111 100q-72-94-149-94-38 0-63 23t-24 56q0 21 12 39 12 17 31 31 20 13 46 26l53 25q29 13 57 26 29 14 54 34 26 19 46 44 20 24 31 57 12 34 12 75-2 102-73 163-70 61-175 61-92 0-159-31-67-32-118-94zm694 104v-750h435v130h-283v173h241v130h-241v187h283v130z"/>
+  <!-- devise -->
+  <path d="M3484 6391c22 0 41 17 31 56l-101 27c16-48 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-7-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 0 91-43 129-114m-26-244 93-85v-12h-62l-55 98h24zm-349 82h54l-86 236c-8 20 3 40 24 40 61 0 134-52 162-126h-15c-22 31-70 65-106 72l79-222h81l10-34h-79l30-85h-31l-56 85-67 9zm-56-12c7-22-8-34-19-34-47 0-104 43-126 102h15c15-22 41-46 66-50l-91 236c-8 22 8 34 20 34 45 0 98-43 120-102h-15c-15 22-41 46-66 50zm9-94c20 0 37-17 37-37s-17-37-37-37c-10 0-19 4-26 11-7 7-11 16-11 26 0 21 16 37 37 37m-439 126c14 0 22 22 0 71l-64 142c-12 27 1 44 27 44 16 0 23-4 30-21l63-166c29-36 83-74 107-74 17 0 15 14 4 36l-97 185c-9 18 3 40 24 40 47 0 104-43 126-102h-17c-15 22-41 46-66 50l83-168c11-21 16-41 16-57 0-27-15-45-44-45-41 0-76 46-126 103v-44c0-31-10-59-38-59-33 0-63 52-87 102h15c17-24 32-37 44-37m-65 6c11-39 5-72-24-72-37 0-49 25-85 103v-44c0-31-10-59-38-59-33 0-63 52-87 102h15c16-23 31-37 43-37 14 0 22 22 0 71l-64 142c-12 27 1 44 27 44 16 0 23-4 30-21l61-166c18-22 34-41 54-62h68zm-349-28c22 0 41 17 31 56l-101 27c17-48 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-6-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 0 91-43 129-114m-375-162h54l-86 236c-8 20 3 40 24 40 61 0 135-52 162-126h-15c-22 31-70 65-106 72l79-222h81l10-34h-79l30-85h-31l-56 85-67 9zm-287 184c0-73 81-172 127-172 10 0 20 1 28 4l-47 126c-27 33-69 73-89 73-12 0-19-9-19-31m249-244-25-2-28 28h-5c-119 0-247 148-247 265 0 27 15 45 44 45 35 0 69-50 108-103l-2 19c-5 54 12 84 40 84 33 0 63-52 86-102h-15c-16 23-31 37-43 37s-21-23 0-71zm-255 86c11-39 5-72-24-72-37 0-49 25-85 103v-44c0-31-10-59-39-59-33 0-63 52-86 102h15c16-23 31-37 43-37 14 0 22 22 0 71l-65 143c-12 27 1 44 27 44 16 0 23-4 30-21l63-167c18-22 34-41 54-62h67zm-419 239 6-18c-79-15-89-15-57-101l30-81h63c39 0 40 17 34 60h23l52-143h-23c-20 34-35 60-78 60h-63l43-117c15-42 22-50 76-50h14c55 0 62 15 62 73h22l18-97h-305l-6 18c63 13 69 19 40 101l-65 177c-30 81-42 88-115 101l-5 18h234zm1513-956c22 0 41 17 31 56l-101 27c16-48 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-7-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 1 91-43 129-114m-26-244 93-85v-12h-62l-55 98h24zm-349 82h54l-86 236c-8 20 3 40 24 40 61 0 134-52 162-126h-15c-22 31-70 65-106 72l79-222h81l10-34h-79l30-85h-31l-56 85-67 10zm-56-11c7-22-8-34-20-34-47 0-104 43-126 102h15c15-22 41-46 66-50l-91 236c-8 22 8 34 20 34 45 0 98-43 120-102h-15c-15 22-41 46-66 50zm9-94c20 0 37-17 37-37s-17-37-37-37c-13 0-25 7-32 18-7 11-7 26 0 38 7 11 19 19 32 18m-290 330 150-398-5-7-104 12v12l20 15c18 14 12 27-4 72l-114 304c-10 18 3 40 24 40 47 0 98-43 120-102h-15c-16 23-48 47-72 52m-306-41c0-73 81-172 127-172 10 0 19 1 28 4l-48 126c-27 33-69 73-89 73-11 1-18-9-18-31m249-243-25-2-28 28h-5c-119 0-247 148-247 265 0 27 15 45 44 45 35 0 69-50 108-103l-2 19c-5 54 12 84 40 84 33 0 63-52 86-102h-15c-16 23-31 37-43 37s-21-23 0-70zm-579 393c0-31 30-51 73-68 14 7 36 15 64 24 45 15 62 21 62 34 0 29-41 51-116 51-56 1-83-11-83-41m123-191c-20 0-27-17-27-36 0-59 28-130 73-130 20 0 27 17 27 36 0 58-29 130-73 130m128 162c0-38-34-52-89-68-47-14-69-18-69-34 0-12 10-27 30-38 78-4 127-74 127-136 0-11-2-21-5-30h53l10-34h-90c-12-8-27-12-44-12-82 0-135 72-135 136 0 41 24 69 62 74-38 18-60 37-60 61 0 14 5 24 17 33-88 26-124 59-124 97 0 41 54 58 118 58 108 1 199-58 199-107m-408-240c39 0 40 17 34 60h23l52-143h-23c-20 34-35 60-78 60h-87l43-117c15-42 23-50 76-50h38c55 0 62 15 62 73h22l18-97h-327l-6 18c63 13 69 19 40 101l-65 177c-30 81-42 88-115 101l-5 18h364l65-103h-25c-42 42-85 79-166 79-97 0-88-5-56-95l30-81h86zm47-244 93-68v-12h-62l-55 80zm1390-511c22 0 41 17 31 56l-101 27c16-49 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-7-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 0 91-43 129-114m-26-244 93-85v-12h-62l-55 98h24zm-349 81h55l-86 236c-8 20 3 40 24 40 61 0 135-52 162-126h-15c-22 31-70 65-106 72l79-222h81l10-34h-79l30-85h-31l-56 85-67 9v25zm-28 27c11-39 5-72-24-72-37 0-49 25-85 103v-44c0-31-10-59-38-59-33 0-63 52-87 102h15c16-23 31-37 43-37 14 0 22 22 0 71l-64 142c-12 27 1 44 27 44 16 0 23-4 30-21l63-166c18-22 34-41 54-62h66zm-349-28c22 0 41 17 31 56l-101 27c16-49 46-83 70-83m56 164h-20c-25 30-53 54-80 54-28 0-42-17-42-54 0-15 2-31 5-45l164-54c32-76-6-109-52-109-78 0-166 136-166 243 0 51 24 79 62 79 45 0 91-43 129-114m-382 66c-16 0-39-15-39-28 0-4 7-23 16-46l26-70c28-34 72-71 97-71 15 0 26 10 26 31-1 66-61 184-126 184m182-209c0-48-12-66-46-66-42 0-81 45-121 99l84-226-5-7-104 12v12l20 15c18 14 12 28-4 72l-91 239c-8 20-17 44-17 50 0 28 38 55 73 55 79 2 211-143 211-255m-307-31c6-22-8-34-20-34-47 0-104 43-126 102h15c15-22 41-46 66-50l-91 236c-8 22 8 34 20 34 45 0 98-43 120-102h-15c-15 22-41 46-66 50zm10-94c20 0 37-17 37-37s-17-37-37-37c-13 0-25 7-32 18-7 11-7 26 0 38 7 11 19 19 32 18m-231-45h-216l-6 18c63 13 69 19 40 101l-65 177c-30 81-42 88-115 101l-5 18h328l71-127h-25c-41 45-88 102-161 102-55 0-63-10-32-95l65-177c30-81 42-88 115-101z"/>
 </svg>
diff --git a/ui/theme/components/container.ts b/ui/theme/components/container.ts
index 6d9628d69d..17baf5bc47 100644
--- a/ui/theme/components/container.ts
+++ b/ui/theme/components/container.ts
@@ -1,15 +1,15 @@
 const Container = {
   variants: {
     responsiveContainer: {
-      maxWidth: ["480px", "540px", "720px", "960px", "1140px"],
+      maxWidth: ["576px", "768px", "992px", "1248px"],
     },
     pageContainer: {
       bg: "grey.100",
-      maxWidth: ["480px", "540px", "720px", "960px", "1140px"],
+      maxWidth: ["576px", "768px", "992px", "1248px"],
       borderRadius: ["0px", "0px", "10px"],
     },
     whitePageContainer: {
-      maxWidth: ["480px", "540px", "720px", "960px", "1140px"],
+      maxWidth: ["576px", "768px", "992px", "1248px"],
       borderRadius: ["0px", "0px", "10px"],
     },
     defaultAutocomplete: {
@@ -19,7 +19,7 @@ const Container = {
       position: "absolute",
       borderTop: "0px",
       zIndex: 1000,
-      maxHeight: "480px",
+      maxHeight: "576px",
       background: "#fff",
       overflowY: "auto",
       margin: "4px 0 0",

From 302c8205f5e80a50f762f0e7151ba6c773777321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Auricoste?= <remy.auricoste@gmail.com>
Date: Mon, 16 Sep 2024 14:17:43 +0200
Subject: [PATCH 4/6] fix: suppression de l ancien format de auth scope (#1486)

* fix: suppression de l ancien format de auth scope

* fix: skip manual test
---
 .../e2e/manual/create-many-applications.cy.ts |  2 +-
 server/src/security/accessTokenService.ts     | 36 +++----------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/cypress/e2e/manual/create-many-applications.cy.ts b/cypress/e2e/manual/create-many-applications.cy.ts
index a8b726b151..974e19e403 100644
--- a/cypress/e2e/manual/create-many-applications.cy.ts
+++ b/cypress/e2e/manual/create-many-applications.cy.ts
@@ -2,7 +2,7 @@ import { givenAMatchaOffer } from "../../pages/givenAMatchaOffer"
 import { generateRandomString } from "../../utils/generateRandomString"
 
 describe("create-many-applications", () => {
-  it("create-many-applications", () => {
+  it.skip("create-many-applications", () => {
     cy.viewport(1271, 721)
 
     givenAMatchaOffer((recruiter) => {
diff --git a/server/src/security/accessTokenService.ts b/server/src/security/accessTokenService.ts
index be2c0710b3..0c2dd04c76 100644
--- a/server/src/security/accessTokenService.ts
+++ b/server/src/security/accessTokenService.ts
@@ -5,7 +5,6 @@ import { PathParam, QueryString } from "shared/helpers/generateUri"
 import { IUserRecruteur } from "shared/models"
 import { IUserWithAccount } from "shared/models/userWithAccount.model"
 import { IRouteSchema, WithSecurityScheme } from "shared/routes/common.routes"
-import { assertUnreachable } from "shared/utils"
 import { Jsonify } from "type-fest"
 import { AnyZodObject, z } from "zod"
 
@@ -31,18 +30,7 @@ type AuthorizedValuesRecord<ZodObject> = ZodObject extends AnyZodObject
     }
   : undefined
 
-// TODO à retirer à partir du 01/02/2024
-type OldIScope<Schema extends SchemaWithSecurity> = {
-  schema: Schema
-  options:
-    | "all"
-    | {
-        params: AuthorizedValuesRecord<Schema["params"]>
-        querystring: AuthorizedValuesRecord<Schema["querystring"]>
-      }
-}
-
-type NewIScope<Schema extends SchemaWithSecurity> = {
+type IScope<Schema extends SchemaWithSecurity> = {
   method: Schema["method"]
   path: Schema["path"]
   options:
@@ -52,10 +40,7 @@ type NewIScope<Schema extends SchemaWithSecurity> = {
         querystring: AuthorizedValuesRecord<Schema["querystring"]>
       }
 }
-
-type IScope<Schema extends SchemaWithSecurity> = NewIScope<Schema> | OldIScope<Schema>
-
-export const generateScope = <Schema extends SchemaWithSecurity>(scope: Omit<NewIScope<Schema>, "method" | "path"> & { schema: Schema }): NewIScope<Schema> => {
+export const generateScope = <Schema extends SchemaWithSecurity>(scope: Omit<IScope<Schema>, "method" | "path"> & { schema: Schema }): IScope<Schema> => {
   const { schema, options } = scope
   return { options, path: schema.path, method: schema.method }
 }
@@ -96,7 +81,7 @@ export const applicationToUserForToken = ({ company_siret, jobId }: IApplication
   }
 }
 
-export function generateAccessToken(user: UserForAccessToken, scopes: ReadonlyArray<NewIScope<SchemaWithSecurity>>, options: { expiresIn?: string } = {}): string {
+export function generateAccessToken(user: UserForAccessToken, scopes: ReadonlyArray<IScope<SchemaWithSecurity>>, options: { expiresIn?: string } = {}): string {
   const identity: IAccessToken["identity"] = "_id" in user ? { type: "IUser2", _id: user._id.toString(), email: user.email.toLowerCase() } : user
   const data: IAccessToken<SchemaWithSecurity> = {
     identity,
@@ -113,19 +98,6 @@ export function generateAccessToken(user: UserForAccessToken, scopes: ReadonlyAr
   return token
 }
 
-function getMethodAndPath<Schema extends SchemaWithSecurity>(scope: IScope<Schema>) {
-  if ("schema" in scope) {
-    const { schema } = scope
-    const { method, path } = schema
-    return { method, path }
-  } else if ("method" in scope && "path" in scope) {
-    const { method, path } = scope
-    return { method, path }
-  } else {
-    assertUnreachable(scope)
-  }
-}
-
 function isAllowAllValue(x: unknown): x is AllowAllType {
   return !!x && typeof x === "object" && "allowAll" in x && x.allowAll === true
 }
@@ -142,7 +114,7 @@ export function getAccessTokenScope<Schema extends SchemaWithSecurity>(
 ): IScope<Schema> | null {
   return (
     token?.scopes.find((scope) => {
-      const { method, path } = getMethodAndPath(scope)
+      const { method, path } = scope
       if (path !== schema.path || method !== schema.method) {
         return false
       }

From 2cf1c25cd9a01af24689a15e7382c838166fa625 Mon Sep 17 00:00:00 2001
From: Kevin Barnoin <k.barnoin@gmail.com>
Date: Tue, 17 Sep 2024 13:56:22 +0200
Subject: [PATCH 5/6] feat: update seed (#1513)

---
 .infra/files/configs/mongodb/seed.gpg | 4 ++--
 .talismanrc                           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.infra/files/configs/mongodb/seed.gpg b/.infra/files/configs/mongodb/seed.gpg
index 0311721794..4cc0679849 100644
--- a/.infra/files/configs/mongodb/seed.gpg
+++ b/.infra/files/configs/mongodb/seed.gpg
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ed73ead9c504f21667921bb84b735371b60b60671ea94c700b0db386bebd98e7
-size 216079748
+oid sha256:c9243dac607bf5fa49bea08d9b51f1ada4fc100edbb5a3c3ff36ed0ae4363ae8
+size 223457418
diff --git a/.talismanrc b/.talismanrc
index e1c40f521f..e9db218a04 100644
--- a/.talismanrc
+++ b/.talismanrc
@@ -24,7 +24,7 @@ fileignoreconfig:
 - filename: .infra/files/configs/mongodb/mongod.conf
   checksum: 718bee5f44edc101636be8f11173ede5b728f2858abc3c26466ff9435f0d11de
 - filename: .infra/files/configs/mongodb/seed.gpg
-  checksum: 646eab49f6ff33a2d4d2dc9892ae14ca7871404c81459fc4832b1fb12abbe1c9
+  checksum: 89f95ec4e20c1c7563fc94704501cc71f1c36c4d27092e43e0ebf2fd939dc6da
 - filename: .infra/files/scripts/seed.sh
   checksum: b1361c237cee243b74fc9e66fd59af80c538d6884b8f94c3659d25cdc2b873c2
 - filename: .infra/local/mongod.conf

From 3b613a965275b1a32856166795817b698073d1a3 Mon Sep 17 00:00:00 2001
From: Moroine Bentefrit <moroine.bentefrit@beta.gouv.fr>
Date: Tue, 17 Sep 2024 15:34:51 +0200
Subject: [PATCH 6/6] fix: legacy startJobProcessor (#1511)

Fixes LBA-SERVER-33R
---
 server/src/commands.ts | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/server/src/commands.ts b/server/src/commands.ts
index 3af3221809..ea886ccfa0 100644
--- a/server/src/commands.ts
+++ b/server/src/commands.ts
@@ -14,14 +14,6 @@ import server from "./http/server"
 
 async function startProcessor(signal: AbortSignal) {
   logger.info(`Process jobs queue - start`)
-  if (config.env !== "local" && config.env !== "preview") {
-    await addJob({
-      name: "crons:init",
-      queued: true,
-      payload: {},
-    })
-  }
-
   await startJobProcessor(signal)
   logger.info(`Processor shut down`)
 }