Merge pull request #953 from betagouv/main

MEP
betagouv · Nov 14, 2024 · 7596054 · 7596054
2 parents 0999de5 + ed36b4e
commit 7596054
Show file tree

Hide file tree

Showing 9 changed files with 65 additions and 34 deletions.
diff --git a/website/src/landings/manualLandingsUtils.tsx b/website/src/landings/manualLandingsUtils.tsx
@@ -70,19 +70,19 @@ export function NarrowAndCentered({children, narrower = false}: ChildrenProps &
   )
 }
 
-export function LinkToFichePratique({url, url2}: {url: string; url2?: string}) {
+export function LinkToFichePratique({url, url2, text, text2}: {url: string; url2?: string; text?: string; text2?: string}) {
   return (
     <p className="mt-8 mb-0">
       Pour en savoir plus sur vos droits, rendez-vous sur{' '}
       <Link target="_blank" href={url}>
-        {url}
+        {text ?? url}
       </Link>
       {url2 ? (
         <>
           {' '}
           et{' '}
           <Link target="_blank" href={url2}>
-            {url2}
+            {text2 ?? url2}
           </Link>
         </>
       ) : null}

diff --git a/website/src/reusablePages/manual_landings/blackFridayAboFraisCaches.tsx b/website/src/reusablePages/manual_landings/blackFridayAboFraisCaches.tsx
@@ -1,16 +1,17 @@
-import {FullWidthPageContainer} from '@/components_simple/PageContainers'
-import {PageComponentProps} from '@/core/metadatas'
 import {
   AlternatingPurpleBands,
-  getManualLpButtonProps,
   HighlightBlue,
   HighlightPurple,
   LinkToFichePratique,
   LpColoredBand,
   NarrowAndCentered,
   WithSuperheroIllustration,
+  getManualLpButtonProps,
 } from '@/landings/manualLandingsUtils'
+
 import Button from '@codegouvfr/react-dsfr/Button'
+import {FullWidthPageContainer} from '@/components_simple/PageContainers'
+import {PageComponentProps} from '@/core/metadatas'
 import {notFound} from 'next/navigation'
 
 export function blackFridayAboFraisCaches(props: PageComponentProps) {
@@ -108,7 +109,9 @@ export function blackFridayAboFraisCaches(props: PageComponentProps) {
         </NarrowAndCentered>
         <LinkToFichePratique
           url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/pieges-sur-les-sites-de-commerce-en-ligne-attention-aux-dark-patterns"
+          text="la fiche pratique Dark pattern"
           url2="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/abonnements-caches"
+          text2="la fiche pratique Abonnements cachés"
         />
       </LpColoredBand>
     </FullWidthPageContainer>

diff --git a/website/src/reusablePages/manual_landings/blackFridayColis.tsx b/website/src/reusablePages/manual_landings/blackFridayColis.tsx
@@ -1,16 +1,17 @@
-import {FullWidthPageContainer} from '@/components_simple/PageContainers'
-import {PageComponentProps} from '@/core/metadatas'
 import {
   AlternatingPurpleBands,
-  getManualLpButtonProps,
   HighlightBlue,
   HighlightPurple,
   LinkToFichePratique,
   LpColoredBand,
   NarrowAndCentered,
   WithSuperheroIllustration,
+  getManualLpButtonProps,
 } from '@/landings/manualLandingsUtils'
+
 import Button from '@codegouvfr/react-dsfr/Button'
+import {FullWidthPageContainer} from '@/components_simple/PageContainers'
+import {PageComponentProps} from '@/core/metadatas'
 import {notFound} from 'next/navigation'
 
 export function blackFridayColis(props: PageComponentProps) {
@@ -112,7 +113,10 @@ export function blackFridayColis(props: PageComponentProps) {
           </p>
           {button}
         </NarrowAndCentered>
-        <LinkToFichePratique url="https://www.economie.gouv.fr/dgccrf/les-fiches-pratiques/livraison-quelles-sont-les-obligations-du-professionnel-et-les-recours" />
+        <LinkToFichePratique
+          url="https://www.economie.gouv.fr/dgccrf/les-fiches-pratiques/livraison-quelles-sont-les-obligations-du-professionnel-et-les-recours"
+          text="la fiche pratique Droits et obligations du professionnel en matière de livraison"
+        />
       </LpColoredBand>
     </FullWidthPageContainer>
   )

diff --git a/website/src/reusablePages/manual_landings/blackFridayDarkPatterns.tsx b/website/src/reusablePages/manual_landings/blackFridayDarkPatterns.tsx
@@ -1,16 +1,17 @@
-import {FullWidthPageContainer} from '@/components_simple/PageContainers'
-import {PageComponentProps} from '@/core/metadatas'
 import {
   AlternatingPurpleBands,
-  getManualLpButtonProps,
   HighlightBlue,
   HighlightPurple,
   LinkToFichePratique,
   LpColoredBand,
   NarrowAndCentered,
   WithSuperheroIllustration,
+  getManualLpButtonProps,
 } from '@/landings/manualLandingsUtils'
+
 import Button from '@codegouvfr/react-dsfr/Button'
+import {FullWidthPageContainer} from '@/components_simple/PageContainers'
+import {PageComponentProps} from '@/core/metadatas'
 import {notFound} from 'next/navigation'
 
 export function blackFridayDarkPatterns(props: PageComponentProps) {
@@ -117,7 +118,10 @@ export function blackFridayDarkPatterns(props: PageComponentProps) {
           </p>
           {button}
         </NarrowAndCentered>
-        <LinkToFichePratique url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/pieges-sur-les-sites-de-commerce-en-ligne-attention-aux-dark-patterns" />
+        <LinkToFichePratique
+          url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/pieges-sur-les-sites-de-commerce-en-ligne-attention-aux-dark-patterns"
+          text="la fiche pratique Dark pattern"
+        />
       </LpColoredBand>
     </FullWidthPageContainer>
   )

diff --git a/website/src/reusablePages/manual_landings/blackFridayFausseReduction.tsx b/website/src/reusablePages/manual_landings/blackFridayFausseReduction.tsx
@@ -1,16 +1,17 @@
-import {FullWidthPageContainer} from '@/components_simple/PageContainers'
-import {PageComponentProps} from '@/core/metadatas'
 import {
   AlternatingPurpleBands,
-  getManualLpButtonProps,
   HighlightBlue,
   HighlightPurple,
   LinkToFichePratique,
   LpColoredBand,
   NarrowAndCentered,
   WithSuperheroIllustration,
+  getManualLpButtonProps,
 } from '@/landings/manualLandingsUtils'
+
 import Button from '@codegouvfr/react-dsfr/Button'
+import {FullWidthPageContainer} from '@/components_simple/PageContainers'
+import {PageComponentProps} from '@/core/metadatas'
 import {notFound} from 'next/navigation'
 
 export function blackFridayFausseReduction(props: PageComponentProps) {
@@ -100,7 +101,10 @@ export function blackFridayFausseReduction(props: PageComponentProps) {
           </p>
           {button}
         </NarrowAndCentered>
-        <LinkToFichePratique url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/Annonce-de-reduction-de-prix" />
+        <LinkToFichePratique
+          url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/Annonce-de-reduction-de-prix"
+          text="la fiche pratique Fausses réductions de prix"
+        />
       </LpColoredBand>
     </FullWidthPageContainer>
   )

diff --git a/website/src/reusablePages/manual_landings/blackFridayFauxStocks.tsx b/website/src/reusablePages/manual_landings/blackFridayFauxStocks.tsx
@@ -1,15 +1,16 @@
-import {FullWidthPageContainer} from '@/components_simple/PageContainers'
-import {PageComponentProps} from '@/core/metadatas'
 import {
   AlternatingPurpleBands,
-  getManualLpButtonProps,
   HighlightBlue,
   HighlightPurple,
   LinkToFichePratique,
   LpColoredBand,
   NarrowAndCentered,
+  getManualLpButtonProps,
 } from '@/landings/manualLandingsUtils'
+
 import Button from '@codegouvfr/react-dsfr/Button'
+import {FullWidthPageContainer} from '@/components_simple/PageContainers'
+import {PageComponentProps} from '@/core/metadatas'
 import {notFound} from 'next/navigation'
 
 export function blackFridayFauxStocks(props: PageComponentProps) {
@@ -94,7 +95,10 @@ export function blackFridayFauxStocks(props: PageComponentProps) {
           </p>
           {button}
         </NarrowAndCentered>
-        <LinkToFichePratique url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/pieges-sur-les-sites-de-commerce-en-ligne-attention-aux-dark-patterns" />
+        <LinkToFichePratique
+          url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/pieges-sur-les-sites-de-commerce-en-ligne-attention-aux-dark-patterns"
+          text="la fiche pratique Dark pattern"
+        />
       </LpColoredBand>
     </FullWidthPageContainer>
   )

diff --git a/website/src/reusablePages/manual_landings/blackFridayRetractation.tsx b/website/src/reusablePages/manual_landings/blackFridayRetractation.tsx
@@ -1,16 +1,17 @@
-import {FullWidthPageContainer} from '@/components_simple/PageContainers'
-import {PageComponentProps} from '@/core/metadatas'
 import {
   AlternatingPurpleBands,
-  getManualLpButtonProps,
   HighlightBlue,
   HighlightPurple,
   LinkToFichePratique,
   LpColoredBand,
   NarrowAndCentered,
   WithSuperheroIllustration,
+  getManualLpButtonProps,
 } from '@/landings/manualLandingsUtils'
+
 import Button from '@codegouvfr/react-dsfr/Button'
+import {FullWidthPageContainer} from '@/components_simple/PageContainers'
+import {PageComponentProps} from '@/core/metadatas'
 import {notFound} from 'next/navigation'
 
 export function blackFridayRetractation(props: PageComponentProps) {
@@ -113,7 +114,10 @@ export function blackFridayRetractation(props: PageComponentProps) {
           </p>
           {button}
         </NarrowAndCentered>
-        <LinkToFichePratique url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/Delais-de-reflexion-ou-de-retractation" />
+        <LinkToFichePratique
+          url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/Delais-de-reflexion-ou-de-retractation"
+          text="la fiche pratique Délai de réflexion ou de rétractation"
+        />
       </LpColoredBand>
     </FullWidthPageContainer>
   )

diff --git a/website/src/reusablePages/manual_landings/blackFridaySav.tsx b/website/src/reusablePages/manual_landings/blackFridaySav.tsx
@@ -1,16 +1,17 @@
-import {FullWidthPageContainer} from '@/components_simple/PageContainers'
-import {PageComponentProps} from '@/core/metadatas'
 import {
   AlternatingPurpleBands,
-  getManualLpButtonProps,
   HighlightBlue,
   HighlightPurple,
   LinkToFichePratique,
   LpColoredBand,
   NarrowAndCentered,
   WithSuperheroIllustration,
+  getManualLpButtonProps,
 } from '@/landings/manualLandingsUtils'
+
 import Button from '@codegouvfr/react-dsfr/Button'
+import {FullWidthPageContainer} from '@/components_simple/PageContainers'
+import {PageComponentProps} from '@/core/metadatas'
 import {notFound} from 'next/navigation'
 
 export function blackFridaySav(props: PageComponentProps) {
@@ -112,7 +113,10 @@ export function blackFridaySav(props: PageComponentProps) {
           </p>
           {button}
         </NarrowAndCentered>
-        <LinkToFichePratique url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/le-service-apres-vente" />
+        <LinkToFichePratique
+          url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/le-service-apres-vente"
+          text="la fiche pratique Service Après Vente"
+        />
       </LpColoredBand>
     </FullWidthPageContainer>
   )

diff --git a/website/src/reusablePages/manual_landings/blackFridaySitesFrauduleux.tsx b/website/src/reusablePages/manual_landings/blackFridaySitesFrauduleux.tsx
@@ -1,15 +1,16 @@
-import {FullWidthPageContainer} from '@/components_simple/PageContainers'
-import {PageComponentProps} from '@/core/metadatas'
 import {
   AlternatingPurpleBands,
-  getManualLpButtonProps,
   HighlightBlue,
   HighlightPurple,
   LinkToFichePratique,
   LpColoredBand,
   NarrowAndCentered,
+  getManualLpButtonProps,
 } from '@/landings/manualLandingsUtils'
+
 import Button from '@codegouvfr/react-dsfr/Button'
+import {FullWidthPageContainer} from '@/components_simple/PageContainers'
+import {PageComponentProps} from '@/core/metadatas'
 import {notFound} from 'next/navigation'
 
 export function blackFridaySitesFrauduleux(props: PageComponentProps) {
@@ -108,7 +109,10 @@ export function blackFridaySitesFrauduleux(props: PageComponentProps) {
           </p>
           {button}
         </NarrowAndCentered>
-        <LinkToFichePratique url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/acheter-sur-internet" />
+        <LinkToFichePratique
+          url="https://www.economie.gouv.fr/dgccrf/Publications/Vie-pratique/Fiches-pratiques/acheter-sur-internet"
+          text="la fiche pratique Acheter sur internet"
+        />
       </LpColoredBand>
     </FullWidthPageContainer>
   )