💬(frontend) change text logo Marianne
Change the text of the logo Marianne. It was "Devise" and now it's "République Francaise".
This commit is contained in:
20
src/frontend/apps/desk/src/assets/icons/icon-devise.svg
Normal file
20
src/frontend/apps/desk/src/assets/icons/icon-devise.svg
Normal file
File diff suppressed because one or more lines are too long
|
After Width: | Height: | Size: 13 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 14 KiB |
44
src/frontend/apps/desk/src/components/LogoGouv.tsx
Normal file
44
src/frontend/apps/desk/src/components/LogoGouv.tsx
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
import Image from 'next/image';
|
||||||
|
import React, { PropsWithChildren } 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;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const LogoGouv = ({
|
||||||
|
imagesWidth,
|
||||||
|
children,
|
||||||
|
textProps,
|
||||||
|
}: PropsWithChildren<LogoGouvProps>) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box>
|
||||||
|
<Box>
|
||||||
|
<Image
|
||||||
|
priority
|
||||||
|
src={IconMarianne}
|
||||||
|
alt={t('Marianne Logo')}
|
||||||
|
width={imagesWidth}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
<Text $weight="bold" {...textProps}>
|
||||||
|
{children}
|
||||||
|
</Text>
|
||||||
|
<Image
|
||||||
|
width={imagesWidth}
|
||||||
|
priority
|
||||||
|
src={IconDevise}
|
||||||
|
alt={t('Freedom Equality Fraternity Logo')}
|
||||||
|
/>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -4,5 +4,6 @@ export * from './Card';
|
|||||||
export * from './DropButton';
|
export * from './DropButton';
|
||||||
export * from './IconOptions';
|
export * from './IconOptions';
|
||||||
export * from './Link';
|
export * from './Link';
|
||||||
|
export * from './LogoGouv';
|
||||||
export * from './Text';
|
export * from './Text';
|
||||||
export * from './TextErrors';
|
export * from './TextErrors';
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
import Image from 'next/image';
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { Trans, useTranslation } from 'react-i18next';
|
import { Trans, useTranslation } from 'react-i18next';
|
||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
|
|
||||||
import { default as IconGouv } from '@/assets/icons/icon-gouv.svg?url';
|
import { Box, LogoGouv, StyledLink, Text } from '@/components';
|
||||||
import { default as IconMarianne } from '@/assets/icons/icon-marianne.svg?url';
|
|
||||||
import { Box, StyledLink, Text } from '@/components/';
|
|
||||||
|
|
||||||
import IconLink from './assets/external-link.svg';
|
import IconLink from './assets/external-link.svg';
|
||||||
|
|
||||||
@@ -24,14 +21,6 @@ export const Footer = () => {
|
|||||||
<Box $position="relative" as="footer">
|
<Box $position="relative" as="footer">
|
||||||
<BlueStripe />
|
<BlueStripe />
|
||||||
<Box $padding={{ top: 'large', horizontal: 'big', bottom: 'small' }}>
|
<Box $padding={{ top: 'large', horizontal: 'big', bottom: 'small' }}>
|
||||||
<Box>
|
|
||||||
<Image
|
|
||||||
priority
|
|
||||||
src={IconMarianne}
|
|
||||||
alt={t('Marianne Logo')}
|
|
||||||
width={70}
|
|
||||||
/>
|
|
||||||
</Box>
|
|
||||||
<Box
|
<Box
|
||||||
$direction="row"
|
$direction="row"
|
||||||
$gap="1.5rem"
|
$gap="1.5rem"
|
||||||
@@ -40,14 +29,20 @@ export const Footer = () => {
|
|||||||
$css="flex-wrap: wrap;"
|
$css="flex-wrap: wrap;"
|
||||||
>
|
>
|
||||||
<Box>
|
<Box>
|
||||||
<Box $align="center" $gap="6rem" $direction="row">
|
<LogoGouv
|
||||||
<Image
|
textProps={{
|
||||||
width={100}
|
$size: '1.2rem',
|
||||||
priority
|
$margin: { vertical: '0.3rem' },
|
||||||
src={IconGouv}
|
$css: `
|
||||||
alt={t('Freedom Equality Fraternity Logo')}
|
line-height:18px;
|
||||||
/>
|
text-transform: uppercase;
|
||||||
</Box>
|
`,
|
||||||
|
$maxWidth: '100px',
|
||||||
|
}}
|
||||||
|
imagesWidth={66}
|
||||||
|
>
|
||||||
|
République Française
|
||||||
|
</LogoGouv>
|
||||||
</Box>
|
</Box>
|
||||||
<Box
|
<Box
|
||||||
$direction="row"
|
$direction="row"
|
||||||
|
|||||||
@@ -3,9 +3,7 @@ import React from 'react';
|
|||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import styled from 'styled-components';
|
import styled from 'styled-components';
|
||||||
|
|
||||||
import { default as IconGouv } from '@/assets/icons/icon-gouv.svg?url';
|
import { Box, LogoGouv, StyledLink, Text } from '@/components/';
|
||||||
import { default as IconMarianne } from '@/assets/icons/icon-marianne.svg?url';
|
|
||||||
import { Box, StyledLink, Text } from '@/components/';
|
|
||||||
import { LaGaufre } from '@/features/header/LaGaufre';
|
import { LaGaufre } from '@/features/header/LaGaufre';
|
||||||
|
|
||||||
import { LanguagePicker } from '../language/';
|
import { LanguagePicker } from '../language/';
|
||||||
@@ -36,9 +34,6 @@ export const Header = () => {
|
|||||||
$css="box-shadow: 0 1px 4px #00000040;"
|
$css="box-shadow: 0 1px 4px #00000040;"
|
||||||
>
|
>
|
||||||
<RedStripe />
|
<RedStripe />
|
||||||
<Box $margin={{ horizontal: 'xbig' }}>
|
|
||||||
<Image priority src={IconMarianne} alt={t('Marianne Logo')} />
|
|
||||||
</Box>
|
|
||||||
<Box
|
<Box
|
||||||
$margin={{ horizontal: 'xbig' }}
|
$margin={{ horizontal: 'xbig' }}
|
||||||
$align="center"
|
$align="center"
|
||||||
@@ -46,11 +41,19 @@ export const Header = () => {
|
|||||||
$direction="row"
|
$direction="row"
|
||||||
>
|
>
|
||||||
<Box $align="center" $gap="6rem" $direction="row">
|
<Box $align="center" $gap="6rem" $direction="row">
|
||||||
<Image
|
<LogoGouv
|
||||||
priority
|
textProps={{
|
||||||
src={IconGouv}
|
$size: 't',
|
||||||
alt={t('Freedom Equality Fraternity Logo')}
|
$css: `
|
||||||
/>
|
line-height:11px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
`,
|
||||||
|
$margin: { vertical: '3px' },
|
||||||
|
$maxWidth: '100px',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
République Française
|
||||||
|
</LogoGouv>
|
||||||
<StyledLink href="/">
|
<StyledLink href="/">
|
||||||
<Box $align="center" $gap="1rem" $direction="row">
|
<Box $align="center" $gap="1rem" $direction="row">
|
||||||
<Image priority src={IconApplication} alt={t('Equipes Logo')} />
|
<Image priority src={IconApplication} alt={t('Equipes Logo')} />
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ test.describe('Footer', () => {
|
|||||||
|
|
||||||
await expect(footer.getByAltText('Marianne Logo')).toBeVisible();
|
await expect(footer.getByAltText('Marianne Logo')).toBeVisible();
|
||||||
|
|
||||||
|
await expect(footer.getByText(/République Française/i)).toBeVisible();
|
||||||
|
|
||||||
await expect(
|
await expect(
|
||||||
footer.getByAltText('Freedom Equality Fraternity Logo'),
|
footer.getByAltText('Freedom Equality Fraternity Logo'),
|
||||||
).toBeVisible();
|
).toBeVisible();
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ test.describe('Header', () => {
|
|||||||
|
|
||||||
await expect(header.getByAltText('Marianne Logo')).toBeVisible();
|
await expect(header.getByAltText('Marianne Logo')).toBeVisible();
|
||||||
|
|
||||||
|
await expect(header.getByText(/République Française/i)).toBeVisible();
|
||||||
|
|
||||||
await expect(
|
await expect(
|
||||||
header.getByAltText('Freedom Equality Fraternity Logo'),
|
header.getByAltText('Freedom Equality Fraternity Logo'),
|
||||||
).toBeVisible();
|
).toBeVisible();
|
||||||
|
|||||||
Reference in New Issue
Block a user