Skip to content

Commit 06e2e2b

Browse files
committed
imp(layout): Add sies logo
1 parent 9d9f1bc commit 06e2e2b

File tree

6 files changed

+46
-19
lines changed

6 files changed

+46
-19
lines changed

client/src/components/footer/index.tsx

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from "react";
2-
import { Container, Link, Logo } from "@dataesr/dsfr-plus";
2+
import { Container, Link } from "@dataesr/dsfr-plus";
33
import { IntlProvider } from "react-intl";
44

55
const modules = import.meta.glob("./locales/*.json", {
@@ -70,15 +70,37 @@ export function FooterBody({
7070
const links = React.Children.toArray(children).filter(
7171
(child) => React.isValidElement(child) && child.type === Link
7272
);
73-
const logo = React.Children.toArray(children).filter(
74-
(child) => React.isValidElement(child) && child.type === Logo
75-
)?.[0];
7673

7774
return (
7875
<div className="fr-container fr-footer__body">
79-
{logo ? (
80-
<div className="fr-footer__brand fr-enlarge-link">{logo}</div>
81-
) : null}
76+
<div className="fr-footer__brand fr-enlarge-link">
77+
<p className="fr-logo">
78+
Ministère
79+
<br />
80+
chargé
81+
<br />
82+
de l'enseignement
83+
<br />
84+
supérieur
85+
<br />
86+
et de la recherche
87+
</p>
88+
<a title="Retour à l'accueil du site" href="/" className="fr-footer__brand-link">
89+
<svg
90+
aria-hidden="true"
91+
viewBox="0 0 1167.77 752.85"
92+
width="100%"
93+
>
94+
<use
95+
className="fr-text-black-white--grey"
96+
href="logos/sies_logo_signature.svg#sies-logo-text"
97+
/>
98+
<use
99+
href="logos/sies_logo_signature.svg#sies-logo-artwork"
100+
/>
101+
</svg>
102+
</a>
103+
</div>
82104
<div className="fr-footer__content">
83105
{description ? (
84106
<p className="fr-footer__content-desc">{description}</p>

client/src/layout/components/footer/index.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {
33
Col,
44
Container,
55
Link,
6-
Logo,
76
Row,
87
Title,
98
useDSFRConfig,
@@ -251,13 +250,7 @@ export default function MainFooter() {
251250
</Row>
252251
</Container>
253252
</FooterTop>
254-
<FooterBody
255-
description={intl.formatMessage({ id: "layout.footer.tagline" })}
256-
>
257-
<Logo
258-
splitCharacter="|"
259-
text="Ministère|chargé|de l'enseignement|supérieur|et de la recherche"
260-
/>
253+
<FooterBody description={intl.formatMessage({ id: "layout.footer.tagline" })}>
261254
<Link
262255
className="fr-footer__content-link"
263256
target="_blank"

client/src/layout/components/header/index.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
// useAutocompleteList,
1616
// useDSFRConfig,
1717
} from '@dataesr/dsfr-plus';
18+
1819
import { createIntl } from 'react-intl';
1920
import SwitchLanguage from '../../../components/switch-language';
2021
import { isInProduction } from "../../../utils/helpers"
@@ -123,6 +124,11 @@ export default function Header() {
123124
{intl.formatMessage({ id: "layout.header.nav.analyze.trends" })}
124125
</Link>
125126
)}
127+
{!isInProduction() && (
128+
<Link current={pathname.split("/").includes("analytics")} href="/analytics">
129+
{intl.formatMessage({ id: "layout.header.nav.analyze.analytics" })}
130+
</Link>
131+
)}
126132
<Link current={pathname.split("/").includes("studio")} href="/studio">
127133
{intl.formatMessage({ id: "layout.header.nav.analyze.studio" })}
128134
</Link>

client/src/layout/components/header/locales/en.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
"layout.header.nav.analyze": "Analyze",
1212
"layout.header.nav.analyze.networks": "Communities",
1313
"layout.header.nav.analyze.trends": "Trends",
14-
"layout.header.nav.analyze.studio": "Local versions"
15-
}
14+
"layout.header.nav.analyze.studio": "Local versions",
15+
"layout.header.nav.analyze.analytics": "Thematic analysis"
16+
}

client/src/layout/components/header/locales/fr.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
"layout.header.nav.analyze": "Analyser",
1212
"layout.header.nav.analyze.networks": "Communautés",
1313
"layout.header.nav.analyze.trends": "Tendances",
14-
"layout.header.nav.analyze.studio": "Déclinaisons locales"
15-
}
14+
"layout.header.nav.analyze.studio": "Déclinaisons locales",
15+
"layout.header.nav.analyze.analytics": "Analyse thématique"
16+
}

client/src/styles.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,3 +217,7 @@ $icons:
217217
margin-right: -.25rem;
218218
}
219219
}
220+
221+
.fr-text-black-white--grey {
222+
fill: var(--text-black-white-grey);
223+
}

0 commit comments

Comments
 (0)