From f9825f8517c8a3dd70700e3d45eedf45e49588c0 Mon Sep 17 00:00:00 2001
From: Marine Heckler <marine.heckler@beta.gouv.fr>
Date: Fri, 4 Oct 2024 10:26:48 +0200
Subject: [PATCH 1/3] Corrections de mise en forme en version mobile

---
 packages/site/app/Temoignages.tsx                         | 4 ++--
 packages/site/app/collectivites/CollectiviteSearch.tsx    | 2 +-
 .../site/app/outil-numerique/TemoignagesPlateforme.tsx    | 2 +-
 packages/site/app/trajectoire/Documentation.tsx           | 4 ++--
 packages/site/app/trajectoire/TemoignagesTrajectoire.tsx  | 2 +-
 packages/site/components/layout/AppHeader.tsx             | 8 ++++----
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/site/app/Temoignages.tsx b/packages/site/app/Temoignages.tsx
index 4ba9acf95c..1432a24189 100644
--- a/packages/site/app/Temoignages.tsx
+++ b/packages/site/app/Temoignages.tsx
@@ -15,11 +15,11 @@ type TemoignagesProps = {
 
 const Temoignages = ({ titre, contenu }: TemoignagesProps) => {
   return contenu.length > 1 ? (
-    <Section>
+    <Section containerClassName="max-md:!py-6 md:max-lg:!py-12 lg:!py-18">
       {!!titre.trim() && <h2 className="text-center max-md:mb-2">{titre}</h2>}
       <TestimonialSlideshow
         contenu={contenu}
-        className="rounded-md md:w-3/4 mx-auto md:border border-primary-3"
+        className="rounded-md max-md:p-2 md:w-3/4 max-w-full mx-auto md:border border-primary-3"
         dotsColor="orange"
         backgroundColor="bg-white md:bg-primary-0"
         displayButtons={false}
diff --git a/packages/site/app/collectivites/CollectiviteSearch.tsx b/packages/site/app/collectivites/CollectiviteSearch.tsx
index cbfa5a76b9..c87883b93f 100644
--- a/packages/site/app/collectivites/CollectiviteSearch.tsx
+++ b/packages/site/app/collectivites/CollectiviteSearch.tsx
@@ -20,7 +20,7 @@ const CollectiviteSearch = ({
   const router = useRouter();
 
   return (
-    <div className="mx-auto w-96">
+    <div className="mx-auto w-96 max-w-full">
       <Select
         placeholder="Rechercher une collectivité"
         debounce={500}
diff --git a/packages/site/app/outil-numerique/TemoignagesPlateforme.tsx b/packages/site/app/outil-numerique/TemoignagesPlateforme.tsx
index df5cd8f4a9..34701425bd 100644
--- a/packages/site/app/outil-numerique/TemoignagesPlateforme.tsx
+++ b/packages/site/app/outil-numerique/TemoignagesPlateforme.tsx
@@ -20,7 +20,7 @@ const TemoignagesPlateforme = ({ temoignages }: TemoignagesPlateformeProps) => {
     >
       <TestimonialSlideshow
         contenu={temoignages}
-        className="rounded-[10px] max-md:border-x-[3px] max-md:border-orange-1 w-3/4 mx-auto"
+        className="rounded-[10px] max-md:border-x-[3px] max-md:border-orange-1 md:w-3/4 max-w-full mx-auto"
         dotsColor="orange"
         displayButtons={false}
         autoSlideDelay={12000}
diff --git a/packages/site/app/trajectoire/Documentation.tsx b/packages/site/app/trajectoire/Documentation.tsx
index c1ff208533..be7192632e 100644
--- a/packages/site/app/trajectoire/Documentation.tsx
+++ b/packages/site/app/trajectoire/Documentation.tsx
@@ -36,7 +36,7 @@ const Documentation = ({
       <Alert description={<Markdown texte={info} />} />
       <CardsWrapper cols={2}>
         {/* Excel */}
-        <div className="p-4 md:p-6 border border-gray-3 bg-primary-0 rounded-lg flex gap-5">
+        <div className="p-4 md:p-6 border border-gray-3 bg-primary-0 rounded-lg flex max-md:flex-col gap-5">
           <div className="shrink-0 w-12 h-12 bg-primary-3 rounded-md flex justify-center items-center">
             <Icon icon="table-line" size="xl" className="text-primary-9" />
           </div>
@@ -54,7 +54,7 @@ const Documentation = ({
         </div>
 
         {/* PDF */}
-        <div className="p-4 md:p-6 border border-gray-3 bg-primary-0 rounded-lg flex gap-5">
+        <div className="p-4 md:p-6 border border-gray-3 bg-primary-0 rounded-lg flex max-md:flex-col gap-5">
           <div className="shrink-0 w-12 h-12 bg-primary-3 rounded-md flex justify-center items-center">
             <Icon icon="file-2-line" size="xl" className="text-primary-9" />
           </div>
diff --git a/packages/site/app/trajectoire/TemoignagesTrajectoire.tsx b/packages/site/app/trajectoire/TemoignagesTrajectoire.tsx
index 0408a93bd3..a2c245053d 100644
--- a/packages/site/app/trajectoire/TemoignagesTrajectoire.tsx
+++ b/packages/site/app/trajectoire/TemoignagesTrajectoire.tsx
@@ -19,7 +19,7 @@ const TemoignagesTrajectoire = ({
     <Section containerClassName="bg-primary-7 max-md:!py-6 md:max-lg:!py-12 lg:!py-20">
       <TestimonialSlideshow
         contenu={temoignages}
-        className="rounded-[10px] md:w-3/4 mx-auto"
+        className="rounded-[10px] md:w-3/4 max-w-full mx-auto"
         dotsColor="orange"
         title="Témoignages de collectivités"
         displayButtons={false}
diff --git a/packages/site/components/layout/AppHeader.tsx b/packages/site/components/layout/AppHeader.tsx
index 057ee24d93..2b214d403e 100644
--- a/packages/site/components/layout/AppHeader.tsx
+++ b/packages/site/components/layout/AppHeader.tsx
@@ -15,14 +15,14 @@ export type MenuProps = {
 function Brand({ menuOpened, setMenuOpened }: MenuProps) {
   return (
     <div className="fr-header__brand-top">
-      <div className="fr-header__logo">
+      <div className="fr-header__logo md:max-xl:p-2 md:max-xl:!mr-0">
         <p className="fr-logo">
           République
           <br />
           Française
         </p>
       </div>
-      <div className="fr-header__operator">
+      <div className="fr-header__operator md:max-xl:p-2 md:max-xl:!mr-0">
         <div className="fr-grid-row" style={{ minWidth: 160 + 'px' }}>
           <Image src="/ademe.jpg" alt="ADEME" width="70" height="80" />
           <Image
@@ -114,7 +114,7 @@ function Body(props: MenuProps) {
         <div className="fr-header__body-row">
           <div className="fr-header__brand fr-enlarge-link">
             <Brand {...props} />
-            <div className="fr-header__service max-md:text-center">
+            <div className="fr-header__service max-md:text-center md:max-xl:p-2">
               <a
                 href="/"
                 aria-current="page"
@@ -130,7 +130,7 @@ function Body(props: MenuProps) {
               </a>
             </div>
           </div>
-          <div className="fr-header__tools">
+          <div className="fr-header__tools md:max-xl:pr-0 md:max-xl:pl-1">
             <div className="fr-header__tools-links">
               <Links />
             </div>

From 106865180c04d31403cf82e030f920220c562fe5 Mon Sep 17 00:00:00 2001
From: Marine Heckler <marine.heckler@beta.gouv.fr>
Date: Fri, 4 Oct 2024 10:31:18 +0200
Subject: [PATCH 2/3] Correction du header csp pour les images axeptio

---
 packages/site/middleware.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/site/middleware.ts b/packages/site/middleware.ts
index 73526a2fc5..c8966457a6 100644
--- a/packages/site/middleware.ts
+++ b/packages/site/middleware.ts
@@ -27,7 +27,7 @@ export function middleware(request: NextRequest) {
     default-src 'self';
     script-src ${scriptSrc} *.axept.io *.posthog.com client.crisp.chat *.googletagmanager.com *.adform.net;
     style-src ${styleSrc} client.crisp.chat;
-    img-src 'self' blob: data: ytimg.com px.ads.linkedin.com server.adform.net https://image.crisp.chat https://client.crisp.chat ${process.env.NEXT_PUBLIC_STRAPI_URL?.replace(
+    img-src 'self' blob: data: ytimg.com px.ads.linkedin.com server.adform.net https://axeptio.imgix.net https://favicons.axept.io https://image.crisp.chat https://client.crisp.chat ${process.env.NEXT_PUBLIC_STRAPI_URL?.replace(
       'strapiapp',
       'media.strapiapp'
     )};

From 9b169540f6249cca3003c4f01969e3d4d09ffed0 Mon Sep 17 00:00:00 2001
From: Marine Heckler <marine.heckler@beta.gouv.fr>
Date: Fri, 4 Oct 2024 10:42:51 +0200
Subject: [PATCH 3/3] Corrige les scripts de tracking

---
 packages/site/app/layout.tsx | 17 +++++++----------
 packages/site/middleware.ts  | 28 ++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/packages/site/app/layout.tsx b/packages/site/app/layout.tsx
index 93f9ae57aa..a6f0e3e5b2 100644
--- a/packages/site/app/layout.tsx
+++ b/packages/site/app/layout.tsx
@@ -112,16 +112,13 @@ export default function RootLayout({ children }: { children: JSX.Element }) {
             _linkedin_partner_id = "1701996";
             window._linkedin_data_partner_ids = window._linkedin_data_partner_ids || [];
             window._linkedin_data_partner_ids.push(_linkedin_partner_id);
-            </script><script type="text/javascript">
-            (function(l) {
-            if (!l){window.lintrk = function(a,b){window.lintrk.q.push([a,b])};
-            window.lintrk.q=[]}
-            var s = document.getElementsByTagName("script")[0];
-            var b = document.createElement("script");
-            b.type = "text/javascript";b.async = true;
-            b.src = "
-            https://snap.licdn.com/li.lms-analytics/insight.min.js";
-            s.parentNode.insertBefore(b, s);})(window.lintrk);
+
+            (function(l) { if (!l){window.lintrk = function(a,b){window.lintrk.q.push([a,b])}; window.lintrk.q=[]}
+              var s = document.getElementsByTagName("script")[0];
+              var b = document.createElement("script");
+              b.type = "text/javascript";b.async = true;
+              b.src = "https://snap.licdn.com/li.lms-analytics/insight.min.js";
+              s.parentNode.insertBefore(b, s);})(window.lintrk);
           `}
         </Script>
 
diff --git a/packages/site/middleware.ts b/packages/site/middleware.ts
index c8966457a6..7de14d984a 100644
--- a/packages/site/middleware.ts
+++ b/packages/site/middleware.ts
@@ -25,12 +25,27 @@ export function middleware(request: NextRequest) {
   // options de la politique de sécurité
   const cspHeader = `
     default-src 'self';
-    script-src ${scriptSrc} *.axept.io *.posthog.com client.crisp.chat *.googletagmanager.com *.adform.net;
+    script-src ${scriptSrc} 
+      *.axept.io 
+      *.posthog.com 
+      client.crisp.chat 
+      *.googletagmanager.com 
+      *.adform.net 
+      https://snap.licdn.com;
     style-src ${styleSrc} client.crisp.chat;
-    img-src 'self' blob: data: ytimg.com px.ads.linkedin.com server.adform.net https://axeptio.imgix.net https://favicons.axept.io https://image.crisp.chat https://client.crisp.chat ${process.env.NEXT_PUBLIC_STRAPI_URL?.replace(
-      'strapiapp',
-      'media.strapiapp'
-    )};
+    img-src 'self' blob: data: 
+      ytimg.com 
+      px.ads.linkedin.com 
+      server.adform.net 
+      https://axeptio.imgix.net 
+      https://favicons.axept.io
+      https://image.crisp.chat 
+      https://client.crisp.chat 
+      https://px4.ads.linkedin.com 
+      ${process.env.NEXT_PUBLIC_STRAPI_URL?.replace(
+        'strapiapp',
+        'media.strapiapp'
+      )};
     font-src 'self' client.crisp.chat;
     object-src 'none';
     connect-src 'self'
@@ -41,7 +56,8 @@ export function middleware(request: NextRequest) {
       *.axept.io
       client.crisp.chat
       wss://client.relay.crisp.chat
-      wss://stream.relay.crisp.chat;
+      wss://stream.relay.crisp.chat
+      https://px.ads.linkedin.com;
     base-uri 'self';
     form-action 'self';
     frame-ancestors 'none';