From 6e46b686abc674b87042429c02a1fb3030e1a9da Mon Sep 17 00:00:00 2001 From: Anthony LC Date: Mon, 27 May 2024 11:52:00 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84(frontend)=20change=20gouvernement?= =?UTF-8?q?=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the gourvernement logo. --- .../impress/src/assets/icons/icon-devise.svg | 20 +++++++++ .../impress/src/assets/icons/icon-gouv.svg | 30 ------------- .../apps/impress/src/components/LogoGouv.tsx | 42 +++++++++++++++++++ .../impress/src/features/footer/Footer.tsx | 22 +++------- .../impress/src/features/header/Header.tsx | 18 ++++---- 5 files changed, 76 insertions(+), 56 deletions(-) create mode 100644 src/frontend/apps/impress/src/assets/icons/icon-devise.svg delete mode 100644 src/frontend/apps/impress/src/assets/icons/icon-gouv.svg create mode 100644 src/frontend/apps/impress/src/components/LogoGouv.tsx diff --git a/src/frontend/apps/impress/src/assets/icons/icon-devise.svg b/src/frontend/apps/impress/src/assets/icons/icon-devise.svg new file mode 100644 index 00000000..5834b975 --- /dev/null +++ b/src/frontend/apps/impress/src/assets/icons/icon-devise.svg @@ -0,0 +1,20 @@ + + + + + diff --git a/src/frontend/apps/impress/src/assets/icons/icon-gouv.svg b/src/frontend/apps/impress/src/assets/icons/icon-gouv.svg deleted file mode 100644 index 5cce8b51..00000000 --- a/src/frontend/apps/impress/src/assets/icons/icon-gouv.svg +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - diff --git a/src/frontend/apps/impress/src/components/LogoGouv.tsx b/src/frontend/apps/impress/src/components/LogoGouv.tsx new file mode 100644 index 00000000..e7264cea --- /dev/null +++ b/src/frontend/apps/impress/src/components/LogoGouv.tsx @@ -0,0 +1,42 @@ +import Image from 'next/image'; +import React from 'react'; +import { useTranslation } from 'react-i18next'; + +import { default as IconDevise } from '@/assets/icons/icon-devise.svg?url'; +import { default as IconMarianne } from '@/assets/icons/icon-marianne.svg?url'; + +import { Box } from './Box'; +import { Text, TextType } from './Text'; + +interface LogoGouvProps { + imagesWidth?: number; + textProps?: TextType; +} + +const LogoGouv = ({ imagesWidth, textProps }: LogoGouvProps) => { + const { t } = useTranslation(); + + return ( + + + {t('Marianne + + + Gouvernement + + {t('Freedom + + ); +}; + +export default LogoGouv; diff --git a/src/frontend/apps/impress/src/features/footer/Footer.tsx b/src/frontend/apps/impress/src/features/footer/Footer.tsx index 8addd850..a6fc098a 100644 --- a/src/frontend/apps/impress/src/features/footer/Footer.tsx +++ b/src/frontend/apps/impress/src/features/footer/Footer.tsx @@ -1,11 +1,9 @@ -import Image from 'next/image'; import React from 'react'; import { useTranslation } from 'react-i18next'; import styled from 'styled-components'; -import { default as IconGouv } from '@/assets/icons/icon-gouv.svg?url'; -import { default as IconMarianne } from '@/assets/icons/icon-marianne.svg?url'; import { Box, StyledLink, Text } from '@/components/'; +import LogoGouv from '@/components/LogoGouv'; import IconLink from './assets/external-link.svg'; @@ -24,14 +22,6 @@ export const Footer = () => { - - {t('Marianne - { > - {t('Freedom diff --git a/src/frontend/apps/impress/src/features/header/Header.tsx b/src/frontend/apps/impress/src/features/header/Header.tsx index 66f496d8..7f18c0c7 100644 --- a/src/frontend/apps/impress/src/features/header/Header.tsx +++ b/src/frontend/apps/impress/src/features/header/Header.tsx @@ -3,9 +3,8 @@ import React from 'react'; import { useTranslation } from 'react-i18next'; import styled from 'styled-components'; -import { default as IconGouv } from '@/assets/icons/icon-gouv.svg?url'; -import { default as IconMarianne } from '@/assets/icons/icon-marianne.svg?url'; import { Box, StyledLink, Text } from '@/components/'; +import LogoGouv from '@/components/LogoGouv'; import { LanguagePicker } from '../language/'; @@ -36,20 +35,19 @@ export const Header = () => { $css="box-shadow: 0 1px 4px #00000040;" > - - {t('Marianne - - - {t('Freedom +