From c9d053d1c09ddba4720316878a0ed36acf816b34 Mon Sep 17 00:00:00 2001
From: Anthony LC <anthony.le-courric@mail.numerique.gouv.fr>
Date: Fri, 11 Apr 2025 17:10:55 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84(frontend)=20add=20generic=20favico?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The favicons were still with the dsfr color.
We added the generic favicon in the assets folder.
The favicon can be a url loaded from the theme,
so when Drive will be running, we will be able
to store the dsfr favicons there, and remove them
from the repo.
---
 src/frontend/apps/impress/cunningham.ts       |  18 ++++++++++++++----
 .../favicon-dark-dsfr.png}                    | Bin
 .../impress/public/assets/favicon-dark.png    | Bin 0 -> 1054 bytes
 .../{favicon.ico => assets/favicon-dsfr.ico}  | Bin
 .../{favicon.png => assets/favicon-dsfr.png}  | Bin
 .../impress/public/assets/favicon-light.ico   | Bin 0 -> 5430 bytes
 .../impress/public/assets/favicon-light.png   | Bin 0 -> 1059 bytes
 .../src/cunningham/cunningham-tokens.css      |   6 ++++++
 .../src/cunningham/cunningham-tokens.ts       |  16 +++++++++++++++-
 src/frontend/apps/impress/src/pages/_app.tsx  |  11 +++++++----
 10 files changed, 42 insertions(+), 9 deletions(-)
 rename src/frontend/apps/impress/public/{favicon-dark.png => assets/favicon-dark-dsfr.png} (100%)
 create mode 100644 src/frontend/apps/impress/public/assets/favicon-dark.png
 rename src/frontend/apps/impress/public/{favicon.ico => assets/favicon-dsfr.ico} (100%)
 rename src/frontend/apps/impress/public/{favicon.png => assets/favicon-dsfr.png} (100%)
 create mode 100644 src/frontend/apps/impress/public/assets/favicon-light.ico
 create mode 100644 src/frontend/apps/impress/public/assets/favicon-light.png

diff --git a/src/frontend/apps/impress/cunningham.ts b/src/frontend/apps/impress/cunningham.ts
index d0df17aa..1b6481ab 100644
--- a/src/frontend/apps/impress/cunningham.ts
+++ b/src/frontend/apps/impress/cunningham.ts
@@ -36,10 +36,6 @@ const customColors = {
   'yellow-500': '#B7A73F',
   'yellow-600': '#66673D',
 };
-tokens.themes.default.theme.colors = {
-  ...tokens.themes.default.theme.colors,
-  ...customColors,
-};
 
 tokens.themes.default.theme = {
   ...tokens.themes.default.theme,
@@ -50,6 +46,10 @@ tokens.themes.default.theme = {
       widthHeader: '',
       widthFooter: '',
     },
+    colors: {
+      ...tokens.themes.default.theme.colors,
+      ...customColors,
+    },
   },
 };
 
@@ -60,6 +60,11 @@ tokens.themes.default.components = {
     'home-proconnect': false,
     beta: false,
     'image-system-filter': '',
+    favicon: {
+      ico: '/assets/favicon-light.ico',
+      'png-light': '/assets/favicon-light.png',
+      'png-dark': '/assets/favicon-dark.png',
+    },
   },
 };
 
@@ -80,6 +85,11 @@ const dsfrTheme = {
       'la-gaufre': true,
       'home-proconnect': true,
       beta: true,
+      favicon: {
+        ico: '/assets/favicon-dsfr.ico',
+        'png-light': '/assets/favicon-dsfr.png',
+        'png-dark': '/assets/favicon-dark-dsfr.png',
+      },
     },
   },
 };
diff --git a/src/frontend/apps/impress/public/favicon-dark.png b/src/frontend/apps/impress/public/assets/favicon-dark-dsfr.png
similarity index 100%
rename from src/frontend/apps/impress/public/favicon-dark.png
rename to src/frontend/apps/impress/public/assets/favicon-dark-dsfr.png
diff --git a/src/frontend/apps/impress/public/assets/favicon-dark.png b/src/frontend/apps/impress/public/assets/favicon-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d05fec801204169fe89129616fa3f4e05c2958d
GIT binary patch
literal 1054
zcmV+(1mXLMP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1G7m)K~#7F?O9P$
z+b|Ga8JOuG(UdaNulNRaPf+&+r6&MR0Gt4N0?G**Za_}}oS^OrYQ8$t!pQtF6C!n2
za)|51vaMK2KJsQf^4L<c>)n0YT>-4ITrgN5g!ml-Y{dbncM5_SAN2rKssJuI-x+`d
zyeJ@qK*5F~KoA*WSp@o0y{a_|)CuQrzCug1QosoIgx3aMjINNz0A!y=BPfJ6K`qF7
ze1}6z)G9ziqku<f<^vQg1dmW4-*dj3<o_FT&eOUzf$b#;&p=+IdCz<cpNkVs?uTcO
z;^DM*h5hB|90iYHNuUoW#QlM7PGJ857Q>Q(KE7{zU#Wlz*hRQaEn*|fY}hQ|!X%#X
z<fOoyU@2Z1c*Z6;K?|1AE=nW%X(mD48KEW8;8uzhm=P5+82tc`)@-c+GQ%xy`*FkR
zt7rk1RK3Y_9ZDNQlS0TCJjYUN1<+lNGI8H0w^2H6pp*hijD>c}N8fOa0oa>}=3ht~
zJhIRjEJbS#a8o=%yL?oz!O^uYp(D6jpafzcVk4DEkdOFXk|G<GXAAL{;%FZ_fJ+c#
z0U{3po>PEV*(?EP!R)5bSRVu*(CLo5ay=Is{f>pljcv{}8&OU*3W)+#$1&r;LhKV}
zh&h!K14*nGSYK%-(gjU#QqcHkBL^2!xVyr){2t6#eR&6qMn^$h2TDEE4aUwL1vpyq
zw5v?FV+C}Mlo~c-KTWPQOgMj=7H6Rg!o-U6!G(oz2Oc4hZ=@(-p3pUCB&5(dw*Yj3
z_CXw|tKRnRaos$7Yo)tbX-}gPLQ0cCXPQ)KY=*`5iZb_+p-r>VtC!|S_d)Iw1Ly*y
zU*>kJ@K|{jv<eHzh5W*k0y;Ok%15toEh!VCO1hhrk`xoeq{v35F{a&ZbxKMWz+ij(
z^<l&5UaK*J3kyvNWs)~)_)=?-*l0|f5}&VFNr~9Y#6zLeP)-RJS56WfV_<px(lS<z
zMs=S_gF(=5vSP&)*etYcSlDF6$|!)5^QAz)VbgTm76ab9Y6g_u$_p%0&&E&iT;jAT
z1z3-muz_`rLkyjRQ3vD7)C|F(n1<umkMe%%3-Ii$Qcf!iky+W?ha9HJ!5ZS$v|ENZ
z<pO66Q!B_)p;O(;Bv=)o?gLg&pHYc(yHAc&36+{ob#*m1TX21lh;E~%+Aa9(!nU^Y
zF{==NqP!0ZrV<-zvo{eCW(Yj#5vdp|+%!J`Kd}AQLQd-cKcTNX^wtf4WS-OeHP&c>
Yf80Zid|n3k_5c6?07*qoM6N<$g5xd9BLDyZ

literal 0
HcmV?d00001

diff --git a/src/frontend/apps/impress/public/favicon.ico b/src/frontend/apps/impress/public/assets/favicon-dsfr.ico
similarity index 100%
rename from src/frontend/apps/impress/public/favicon.ico
rename to src/frontend/apps/impress/public/assets/favicon-dsfr.ico
diff --git a/src/frontend/apps/impress/public/favicon.png b/src/frontend/apps/impress/public/assets/favicon-dsfr.png
similarity index 100%
rename from src/frontend/apps/impress/public/favicon.png
rename to src/frontend/apps/impress/public/assets/favicon-dsfr.png
diff --git a/src/frontend/apps/impress/public/assets/favicon-light.ico b/src/frontend/apps/impress/public/assets/favicon-light.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b4255b9f049e7c5facd993b9d4ae47164147cad5
GIT binary patch
literal 5430
zcmds*Ylu}<6vxk)X%V6HvWMlZ8RnkHJ!kJd*Bp$(8-1uz3CsG@gCs&Nn0ySS5oJwS
z5~Wb)i%KI5%d(_z8IF<J7tLPyB4|jZ=!K=|sMPJZ_Pu93otZn{nYs3%3yZzaK5MQ2
zUTd$l_Bz*b>YO3Y$dL|X#+f<PaT*=R$z)2;>sVjRn#&qfI7;gbPJ#6S{)SW|m&@g@
z^rEpjSL=*BZrp{1LSbk_OT%zKikbsu=6cG!=SO;B6h-Hy^#w{@&--7zNFRreKnK0Z
z?C_L++gGNI_csQSxz$(txEtzeX?ZtP^8=kP!dvup6Jwc}2lm+<NB$01sh7M^wWsC1
zP(LbsZlu5RBK0x&j9T{dH)M5yvBHnc!|*KVRo;Lf>5aZpt-jWGBliGw7(1*y^JUO1
zSD7b!m1qCF-vw<!=4))n2l_9uN%qFPPx&19@O%h=YY^%CJf&{)w4Q=J%d3&MJR$g@
z?!b;+;C~P8L+74q<OLt!Y{bW{j20h1+{u1cR3k4uex!DTw+%n<F5AD4Gyn4R@@ifg
ze|@0!^b)SRA6-W!7XBsQ%lUC8Z6bdvevJ51VzK-DnJ*&-=E6HaeSVF`DE7G*o-UDz
z&&=Ay`IXORRaW9SFn(HIp0CO0M>K|^o6G6z@Zs&m=^S*fCKk5)+H|^+ncAD&>DKc3
z{Mn+rH@;$r<8+?oI9vKjooFkrF4dU~iVKj`Bl$fgh3EhItHUgzs_J1sT_AcZ{-l;>
zjT!5zrWt;yR}y2Jpl`{u{fv8wldZ%|TQ-|LzoL@V3ooC)jGEg{p1qHb574z1-LJE@
zh#J<GQ|4Z3_YFZ1T$&PfJY&X4J+}2U(kDuBZfn#k_=lzW)6bbg<{ZJ5yb#$mVUN_(
zlkDpdbbvkWkX+zynNEIR+hEMavCbfBx`lmzCv_j*!`v^~_+6!u`(zwBihi5tB3F@Y
zO^|z~Ol96ZvLDHN!N3<&dEaIIV9ZUGaN~9A@<h?s7j9qgL{_li`38SqCGo+0yIs?I
zQjAk+94vmkH@S1A)(Z}6Z<O&TR>F<fd*GLS5!+?`Xz%d8ePsDV^Mu6@)uMsm+jCHQ
zLzXy_JCpljhV%$x4|nJ1#NltTz3DND?}zHSf#a)JrEj8#8YTUaoM-H-Ts~h9uJj^3
z;-wb&RxkO+_%qZ=T<?T7lb`Qk`?J)77s!)iXA)oRkXn$YQZH9I25Moy=)ks3`2Q~K
ze31F`&>C#t%=3@Tr4O)uSh>b@pF^$i@$t&WeEy<zZ`{z*GMt#G&q*(*R6FM)wfc9+
z?x7a=WnI#@NU!&W?SH`ulwOMdnfRq(67^R468LOiR4aU|NA7|omFk<=Dfa;11oT0n
zdClfzvR;()e^B|yw+83EkeFY}xZYLzGcXU7aP`UL{$$R2&HOL==qX=}^F1-vmF`*U
z65l7-zfNoi`)DokMHlwUJ^Lv*A4%RbUqX$Z%{_T@LlljU>yg~;L8#`{8sGXi(Fe$L
z!p|qzlf>p*<iH%xXKk(V(SH!UcNsgl&*a<hC+2@Jo{0A%W9eQx1Lq&ArxWKc(;-><
z81jCy7n()n+!?LEVn4J2dtb465b1|pV<ueP+&qdNuaUU;HTHROv_2VF{!J3uSXa`=
z$#uTBj<GL^&2HZ0yaN7d`ycr~A&HaJ*`IlD_);%ZXW8RX&K8_M2fK$PK7Lxv+3jys
z>WUtKsRj8aB(9#JuRba<9aDVYR=ckfU(@5F9(x|~bLt+ZeSXU%wo(^F5&!9!mx-@8
zZTyjc*sv2_osg}&f{`TFyJNxL$Dy7gI@5P&0;lTf`0?Y<rN&)=uF>4dfg73$j5Daa
z%fa2o_ygmSct6yNt@ZWMB~=3ql96w~%gM*d;6BDaW=YRDNR|JIc+vir6pIU-F<s7~
u5r>>%P#xq5E$OCViMgzgmgi}w-p`lk!l~!k^4ycU9H*nW#R2sbi~J8D03y@?

literal 0
HcmV?d00001

diff --git a/src/frontend/apps/impress/public/assets/favicon-light.png b/src/frontend/apps/impress/public/assets/favicon-light.png
new file mode 100644
index 0000000000000000000000000000000000000000..19cc87d75f8aeb541e5cfecbd80e8781f38408c4
GIT binary patch
literal 1059
zcmV+;1l;?HP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1Gq^<K~#7F?O9t=
z+b|Tpa{2+ZAL$D4CzKY{6*OHz+Z6yS09KH&0?G<Vc0gA^SOKCP3V)a#q%-Y6I}@o#
zl0%G>$d0f=J~%T@{E+N>^*Flcis%_n3q~^p=PNN$twB<5;L8o%s^dsVMji3vqD>wM
z;sEC{40{>t)6`f_ig6-UcU0RG-!H$?l$go^YuEyg8V-g-#Uynr%4K5aS{oV{7&-|(
zIPjXLM4<!5Xt}gQOl^^(m_j0o-V1Rd>~~jUA+D0bDz1mt_{9^nXe+q!8hs440VHej
z^*7C;DozJTEgcYLUOIEA7Js+4<tkC&fNIcFBa)lW$CDm#&h<o$>8YWpVaa1W96fO7
z!z6*Q;N!p}!LUFv)}z39K|U~sDQ#SW3;o|iSKm;?a801WKZy`Y&#b&EI`do?O2Nm0
zQ*r*YQLgA6oLi!h@Nqy)dSGK6gbXr@vG8q>)GVfg&LtlQcKF8XvK=}IC2T-eHw&E{
z6p@-eW&*!Cpy>0=EG$4c78<~^Q5#>{qey+E=vD`89jXX^J&*^xXCr~t`xk;TK^Zp6
z7w7A%`uQeRfax7DEvmN3Q0QH6oPpzDSJPKoAAG>&ZdF5YdIuDJ6X#c5SCJ7mBCwIv
zVM(8=hR+cC#QB<~QX^(SlZ=*Ay3~ROA^3ng!?Tf(1E5QJ^x%$~co7`cOyVNgn5c^h
zeq$!MlFh0FQne0PLle>r#MHSxS3-!(BwGw31!Z%+=m`%Nf{{vf!0QQ?5g6Q0XbMK+
z{4FMQzfdZcg-;J0BYUu0RA^#qMfNL=jXWGsv872JX=<VIB7T@&q10&oFEiEde=3E~
zI?zB%UK1^*H~RVKGe!7VC@{h}U<0^g8zY5<ucS<aHKL)Elv*E%EE}23hWd9sUy>4`
zF(l=7xxzZL5q6aNu+T_rrfG8<3u!j80UXX*Jb#iBY7CMRnFgw-*Qu1uQ|5z{VDOcc
zoaO}cMWZ#7SF$i6dNJl~9r!&=*_4b{=g0xJKcrtx3gsMd%z*{G>@Nj}iEiZ~0>sw+
zJry;}5`c4y32bv>VxOvEb;GgM47crU7!J9rqt~-+aX2^8PB#lNwU5B9L60{!frdD>
z>6U&sFK`A(wZc)ZzHq(X=>Rs_x}2|mK`$IQC)F@7gnwkJ9cpa6;bt$c3FAj~29t-b
zx}~>SP1n*ujMTIeGu>WhCvo&$nH&*A%4PB}?O^z9x!yICo%-Aky?fK!?mcKt-9h8D
d=^4)mi~kC*c~x}fRTuyO002ovPDHLkV1g4@&sG2c

literal 0
HcmV?d00001

diff --git a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css
index a81fac53..2fdb9326 100644
--- a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css
+++ b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.css
@@ -491,6 +491,9 @@
   --c--components--home-proconnect: false;
   --c--components--beta: false;
   --c--components--image-system-filter: ;
+  --c--components--favicon--ico: /assets/favicon-light.ico;
+  --c--components--favicon--png-light: /assets/favicon-light.png;
+  --c--components--favicon--png-dark: /assets/favicon-dark.png;
 }
 
 .cunningham-theme--dark {
@@ -551,6 +554,9 @@
   --c--components--la-gaufre: true;
   --c--components--home-proconnect: true;
   --c--components--beta: true;
+  --c--components--favicon--ico: /assets/favicon-dsfr.ico;
+  --c--components--favicon--png-light: /assets/favicon-dsfr.png;
+  --c--components--favicon--png-dark: /assets/favicon-dark-dsfr.png;
 }
 
 .cunningham-theme--generic {
diff --git a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts
index 7bd34015..a547d659 100644
--- a/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts
+++ b/src/frontend/apps/impress/src/cunningham/cunningham-tokens.ts
@@ -367,6 +367,11 @@ export const tokens = {
         'home-proconnect': false,
         beta: false,
         'image-system-filter': '',
+        favicon: {
+          ico: '/assets/favicon-light.ico',
+          'png-light': '/assets/favicon-light.png',
+          'png-dark': '/assets/favicon-dark.png',
+        },
       },
     },
     dark: {
@@ -431,7 +436,16 @@ export const tokens = {
           alt: 'Gouvernement Logo',
         },
       },
-      components: { 'la-gaufre': true, 'home-proconnect': true, beta: true },
+      components: {
+        'la-gaufre': true,
+        'home-proconnect': true,
+        beta: true,
+        favicon: {
+          ico: '/assets/favicon-dsfr.ico',
+          'png-light': '/assets/favicon-dsfr.png',
+          'png-dark': '/assets/favicon-dark-dsfr.png',
+        },
+      },
     },
     generic: {
       theme: {
diff --git a/src/frontend/apps/impress/src/pages/_app.tsx b/src/frontend/apps/impress/src/pages/_app.tsx
index 73e41fac..2015f7ae 100644
--- a/src/frontend/apps/impress/src/pages/_app.tsx
+++ b/src/frontend/apps/impress/src/pages/_app.tsx
@@ -3,6 +3,7 @@ import Head from 'next/head';
 import { useTranslation } from 'react-i18next';
 
 import { AppProvider } from '@/core/';
+import { useCunninghamTheme } from '@/cunningham';
 import { useOffline, useSWRegister } from '@/features/service-worker/';
 import '@/i18n/initI18n';
 import { NextPageWithLayout } from '@/types/next';
@@ -18,6 +19,8 @@ export default function App({ Component, pageProps }: AppPropsWithLayout) {
   useOffline();
   const getLayout = Component.getLayout ?? ((page) => page);
   const { t } = useTranslation();
+  const { componentTokens } = useCunninghamTheme();
+  const favicon = componentTokens['favicon'];
 
   return (
     <>
@@ -29,17 +32,17 @@ export default function App({ Component, pageProps }: AppPropsWithLayout) {
             'Docs: Your new companion to collaborate on documents efficiently, intuitively, and securely.',
           )}
         />
-        <link rel="icon" href="/favicon.ico" sizes="any" />
-        <link rel="icon" href="/favicon.png" type="image/png" />
+        <link rel="icon" href={favicon['ico']} sizes="any" />
+        <link rel="icon" href={favicon['png-light']} type="image/png" />
         <link
           rel="icon"
-          href="/favicon.png"
+          href={favicon['png-light']}
           type="image/png"
           media="(prefers-color-scheme: light)"
         />
         <link
           rel="icon"
-          href="/favicon-dark.png"
+          href={favicon['png-dark']}
           type="image/png"
           media="(prefers-color-scheme: dark)"
         />