diff --git a/packages/site/app/global.css b/packages/site/app/global.css index 9f995ffec5..2b97679baa 100644 --- a/packages/site/app/global.css +++ b/packages/site/app/global.css @@ -61,7 +61,7 @@ nav.md-toc ~ h2:before { } /** listes ul / ol */ -ul:not(.fr-footer__content-list, .fr-btns-group), +ul:not(.fr-btns-group), ol { list-style: inside; } diff --git a/packages/site/app/layout.tsx b/packages/site/app/layout.tsx index e8d462363c..e49607480f 100644 --- a/packages/site/app/layout.tsx +++ b/packages/site/app/layout.tsx @@ -1,9 +1,9 @@ import './global.css'; import AppHeader from './AppHeader'; -import {Footer} from '@components/footer/Footer'; import {Metadata, Viewport} from 'next'; import {getMetaData} from './utils'; import {Amplitude} from './Amplitude'; +import Footer from '@components/layout/Footer'; export const viewport: Viewport = { width: 'device-width', diff --git a/packages/site/components/footer/Footer.tsx b/packages/site/components/footer/Footer.tsx deleted file mode 100644 index f784c86d75..0000000000 --- a/packages/site/components/footer/Footer.tsx +++ /dev/null @@ -1,124 +0,0 @@ -'use client'; - -import LogoRepubliqueFrancaise from 'components/logo/LogoRepubliqueFrancaise'; -import {usePathname} from 'next/navigation'; - -export const Footer = () => { - const pathname = usePathname(); - - return ( - - ); -}; diff --git a/packages/site/components/layout/Footer.tsx b/packages/site/components/layout/Footer.tsx new file mode 100644 index 0000000000..4c8cfdab34 --- /dev/null +++ b/packages/site/components/layout/Footer.tsx @@ -0,0 +1,25 @@ +'use client'; + +import {usePathname} from 'next/navigation'; +import {FooterTeT} from '@tet/ui'; + +const Footer = () => { + const pathname = usePathname(); + + return ( + + ); +}; + +export default Footer; diff --git a/packages/ui/src/components/layout/FooterTeT.tsx b/packages/ui/src/components/layout/FooterTeT.tsx index 22124c3dae..a78e5fc2ae 100644 --- a/packages/ui/src/components/layout/FooterTeT.tsx +++ b/packages/ui/src/components/layout/FooterTeT.tsx @@ -2,7 +2,7 @@ import RepubliqueFrancaiseLogo from '@assets/RepubliqueFrancaiseLogo'; import AdemeLogo from '@assets/AdemeLogo'; import {Footer, LinkObject} from '../../design-system/Footer/Footer'; import {Button} from '@design-system/Button'; -import {BASE_URL} from 'utils/constants'; +import {SITE_BASE_URL} from 'utils/constants'; type FooterTeTProps = { /** Liens supplémentaires à afficher en fonction de la page visitée */ @@ -45,11 +45,11 @@ export const FooterTeT = ({customLinks, customLogos}: FooterTeTProps) => { bottomLinks={[ { label: 'Accessibilité : non conforme', - href: `${BASE_URL}/accessibilite`, + href: `${SITE_BASE_URL}/accessibilite`, }, { label: 'Mentions légales', - href: `${BASE_URL}/mentions`, + href: `${SITE_BASE_URL}/mentions`, }, { label: 'Données personnelles', @@ -58,7 +58,7 @@ export const FooterTeT = ({customLinks, customLogos}: FooterTeTProps) => { }, { label: 'Gestion des cookies', - href: `${BASE_URL}/cookies`, + href: `${SITE_BASE_URL}/cookies`, }, { label: 'Code source', @@ -67,7 +67,7 @@ export const FooterTeT = ({customLinks, customLogos}: FooterTeTProps) => { }, { label: 'Conditions générales d’utilisation', - href: `${BASE_URL}/cgu`, + href: `${SITE_BASE_URL}/cgu`, }, ...(customLinks ?? []), ]} diff --git a/packages/ui/src/components/layout/HeaderTeT.stories.tsx b/packages/ui/src/components/layout/HeaderTeT.stories.tsx index c77a69c015..886bc077b4 100644 --- a/packages/ui/src/components/layout/HeaderTeT.stories.tsx +++ b/packages/ui/src/components/layout/HeaderTeT.stories.tsx @@ -1,7 +1,7 @@ import {Meta, StoryObj} from '@storybook/react'; import {HeaderTeT} from './HeaderTeT'; import {Button} from '@design-system/Button'; -import {APP_BASE_URL, BASE_URL} from 'utils/constants'; +import {APP_BASE_URL, SITE_BASE_URL} from 'utils/constants'; import TeTeLogo from '@assets/TeTeLogo'; const meta: Meta = { @@ -48,7 +48,7 @@ export const HeaderPanier: Story = { {...props} key="outil" icon="seedling-line" - href={`${BASE_URL}/outil-numerique`} + href={`${SITE_BASE_URL}/outil-numerique`} iconPosition="left" external > diff --git a/packages/ui/src/components/layout/__snapshots__/FooterTeT.stories.tsx.snap b/packages/ui/src/components/layout/__snapshots__/FooterTeT.stories.tsx.snap index cc2ca0633c..cbe8864d5f 100644 --- a/packages/ui/src/components/layout/__snapshots__/FooterTeT.stories.tsx.snap +++ b/packages/ui/src/components/layout/__snapshots__/FooterTeT.stories.tsx.snap @@ -247,7 +247,7 @@ exports[`Components/Layout/Footer TeT Default smoke-test 1`] = `

Territoires en Transitions est une startup d'État portée par l'Agence de la Transition Écologique (ADEME) avec le soutien de l'Agence Nationale de la Cohésion des Territoires (ANCT).

-