Skip to content

Commit c8334e9

Browse files
kevbarnskevbarns
authored
feat(lba-2898): Road to DSFR (#2334)
* feat: convert * feat: migrate to MUI-DSFR * feat: last components * feat: fin * feat: review dsfr setup p1 * feat: clean-up post DSFR (#2342) * feat: upgrade deps * fix: image size ?? * fix: review * fix: remove claude file * fix: faq * fix: a propos image * fix: image * fix: page stat * fix: retour Claire + light mode only * fix: ressource page * fix: dedupe * fix: sentry server
1 parent 7404525 commit c8334e9

File tree

118 files changed

+953
-2900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+953
-2900
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ npm-debug.log*
3535
yarn-debug.log*
3636
yarn-error.log*
3737

38+
3839
# Runtime data
3940
pids
4041
*.pid
@@ -173,4 +174,5 @@ assets/*
173174
tmp
174175

175176
venv
177+
CLAUDE.md
176178

‎.talismanrc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,8 @@ fileignoreconfig:
323323
checksum: 324cd501354cfff65447c2599c4cc8966aa8aac30dda7854623dd6f7f7b0d34e
324324
- filename: yarn.lock
325325
checksum: 21c8c4f9064194196622ad215768893c1756eec1cbc175efffcb1428d8821c9f
326+
- filename: ui/public/images/logosPartenaires/minimal/affelnet.svg
327+
checksum: 4c266b3914e199bddb3d1c57c16cfac44e0dd1a8a672f74c09d0a2795631485b
326328
scopeconfig:
327329
- scope: node
328330
custom_patterns:

‎server/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"@getbrevo/brevo": "^2.2.0",
3232
"@hapi/boom": "^10.0.1",
3333
"@mistralai/mistralai": "^1.6.0",
34-
"@sentry/node": "^9.13.0",
35-
"@sentry/profiling-node": "^9.13.0",
34+
"@sentry/node": "^9.46.0",
35+
"@sentry/profiling-node": "^9.46.0",
3636
"@smithy/types": "^4.2.0",
3737
"@turf/distance": "^6.5.0",
3838
"@types/netmask": "^2.0.5",

‎server/src/common/sentry/sentry.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ function getOptions(): Sentry.NodeOptions {
3131
Sentry.mongoIntegration(),
3232
Sentry.captureConsoleIntegration({ levels: ["error"] }),
3333
Sentry.extraErrorDataIntegration({ depth: 16 }),
34-
Sentry.anrIntegration({ captureStackTrace: true }),
3534
nodeProfilingIntegration(),
3635
],
3736
}

‎ui/app/(candidat)/(recherche)/recherche/_components/RechercheResultats/CardStyling.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { Box } from "@chakra-ui/react"
21
import { fr } from "@codegouvfr/react-dsfr"
2+
import { Box } from "@mui/material"
33
import React from "react"
44

55
export const CardStyling = ({ children }: { children: React.ReactNode }) => (

‎ui/app/(candidat)/emploi/[type]/[id]/[intitule-offre]/JobDetailRendererClient.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function JobDetail({
128128
<div>
129129
{kind === LBA_ITEM_TYPE.OFFRES_EMPLOI_LBA && hasValidEmail(selectedItem) && <CandidatureLba item={selectedItem as ILbaItemLbaJobJson} />}
130130
{kind === LBA_ITEM_TYPE.RECRUTEURS_LBA && <RecruteurLbaCandidater item={selectedItem as ILbaItemLbaCompanyJson} />}
131-
{kind === LBA_ITEM_TYPE.OFFRES_EMPLOI_PARTENAIRES && <PartnerJobPostuler isCollapsedHeader={isCollapsedHeader} job={selectedItem} />}
131+
{kind === LBA_ITEM_TYPE.OFFRES_EMPLOI_PARTENAIRES && <PartnerJobPostuler job={selectedItem} />}
132132
</div>
133133
<div>
134134
<ShareLink item={selectedItem} />

‎ui/app/(candidat)/formulaire-intention/page.tsx‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"use client"
22

3-
// import { NextSeo } from "next-seo"
43
import { parseEnum } from "shared"
54
import { ApplicationIntention } from "shared/constants/application"
65

@@ -10,10 +9,5 @@ import { useSearchParamsRecord } from "@/utils/useSearchParamsRecord"
109
export default function FormulaireIntentionPage() {
1110
const { token, id, company_recruitment_intention } = useSearchParamsRecord()
1211

13-
return (
14-
<>
15-
{/* <NextSeo title="Formulaire d'intention | La bonne alternance | Trouvez votre alternance" description="Formulaire d'intention." /> */}
16-
<IntentionPage id={id} company_recruitment_intention={parseEnum(ApplicationIntention, company_recruitment_intention)} token={token} />
17-
</>
18-
)
12+
return <IntentionPage id={id} company_recruitment_intention={parseEnum(ApplicationIntention, company_recruitment_intention)} token={token} />
1913
}

‎ui/app/(editorial)/a-propos/page.tsx‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { fr } from "@codegouvfr/react-dsfr"
2-
import { Box, Grid2 as Grid, Typography } from "@mui/material"
2+
import { Box, Grid, Typography } from "@mui/material"
33
import type { Metadata } from "next"
44
import Image from "next/image"
55

@@ -39,8 +39,8 @@ export default function APropos() {
3939
<Breadcrumb pages={[PAGES.static.aPropos]} />
4040
<DefaultContainer>
4141
<Box sx={{ p: fr.spacing("5w"), marginBottom: fr.spacing("5w"), borderRadius: "10px", backgroundColor: fr.colors.decisions.background.default.grey.hover }}>
42-
<Grid container spacing={fr.spacing("5w")}>
43-
<Grid size={{ xs: 12, md: 5 }}>
42+
<Grid container spacing={fr.spacing("1w")}>
43+
<Grid size={{ xs: 12, md: 3 }}>
4444
<Typography id="editorial-content-container" component={"h1"} variant="h1" sx={{ mb: 2, color: fr.colors.decisions.text.default.info.default }}>
4545
A propos
4646
</Typography>
@@ -49,7 +49,7 @@ export default function APropos() {
4949
sx={{ maxWidth: "93px", border: "none", borderBottom: "none", borderTop: `4px solid ${fr.colors.decisions.text.default.info.default}`, opacity: 1 }}
5050
/>
5151
</Grid>
52-
<Grid size={{ xs: 12, md: 7 }}>
52+
<Grid size={{ xs: 12, md: 9 }}>
5353
<Typography variant="h4" mb={fr.spacing("2w")}>
5454
Constat
5555
</Typography>
@@ -149,25 +149,25 @@ export default function APropos() {
149149
},
150150
}}
151151
>
152-
<Image src={franceTravail} alt="France Travail" />
153-
<Image src={parcoursup} alt="Parcoursup" />
154-
<Image src={onisep} alt="Onisep" />
155-
<Image src={portailAlternance} alt="Portail de l'alternance" />
156-
<Image src={j1s} alt="un jeune une solution" />
157-
<Image src={affelnet} alt="affelnet" />
158-
<Image src={ocapiat} alt="opco ocapiat" />
159-
<Image src={opco2i} alt="opco 2i" />
160-
<Image src={sante} alt="opco santé" />
161-
<Image src={atlas} alt="opco atlas" />
162-
<Image src={afdas} alt="opco afdas" />
163-
<Image src={ep} alt="opco ep" />
164-
<Image src={commerce} alt="opco commerce" />
165-
<Image src={constructys} alt="opco constructys" />
166-
<Image src={uniformation} alt="opco uniformation" />
167-
<Image src={akto} alt="opco akto" />
168-
<Image src={diagoriente} alt="Diagoriente" />
169-
<Image src={tbd} alt="Tableau de bord de l'apprentissage" />
170-
<Image src={catalogue} alt="Catalogue intercarif oref" />
152+
<Image src={franceTravail} alt="France Travail" style={{ width: "100%", height: "auto" }} />
153+
<Image src={parcoursup} alt="Parcoursup" style={{ width: "100%", height: "auto" }} />
154+
<Image src={onisep} alt="Onisep" style={{ width: "100%", height: "auto" }} />
155+
<Image src={portailAlternance} alt="Portail de l'alternance" style={{ width: "100%", height: "auto" }} />
156+
<Image src={j1s} alt="un jeune une solution" style={{ width: "100%", height: "auto" }} />
157+
<Image src={affelnet} alt="affelnet" style={{ width: "100%", height: "auto" }} />
158+
<Image src={ocapiat} alt="opco ocapiat" style={{ width: "100%", height: "auto" }} />
159+
<Image src={opco2i} alt="opco 2i" style={{ width: "100%", height: "auto" }} />
160+
<Image src={sante} alt="opco santé" style={{ width: "100%", height: "auto" }} />
161+
<Image src={atlas} alt="opco atlas" style={{ width: "100%", height: "auto" }} />
162+
<Image src={afdas} alt="opco afdas" style={{ width: "100%", height: "auto" }} />
163+
<Image src={ep} alt="opco ep" style={{ width: "100%", height: "auto" }} />
164+
<Image src={commerce} alt="opco commerce" style={{ width: "100%", height: "auto" }} />
165+
<Image src={constructys} alt="opco constructys" style={{ width: "100%", height: "auto" }} />
166+
<Image src={uniformation} alt="opco uniformation" style={{ width: "100%", height: "auto" }} />
167+
<Image src={akto} alt="opco akto" style={{ width: "100%", height: "auto" }} />
168+
<Image src={diagoriente} alt="Diagoriente" style={{ width: "100%", height: "auto" }} />
169+
<Image src={tbd} alt="Tableau de bord de l'apprentissage" style={{ width: "100%", height: "auto" }} />
170+
<Image src={catalogue} alt="Catalogue intercarif oref" style={{ width: "100%", height: "auto" }} />
171171
</Box>
172172

173173
<Typography variant="h4" mb={fr.spacing("2w")}>

‎ui/app/(editorial)/conditions-generales-utilisation/CGURendererClient.tsx‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use client"
22
import { fr } from "@codegouvfr/react-dsfr"
3-
import { Box, Grid2 as Grid, Typography } from "@mui/material"
3+
import { Box, Grid, Typography } from "@mui/material"
44
import dynamic from "next/dynamic"
55
import Image from "next/image"
66
import Link from "next/link"
@@ -18,16 +18,23 @@ export default function CGURendererClient({ recordMap }: { recordMap: ExtendedRe
1818
<Box>
1919
<Breadcrumb pages={[PAGES.static.cgu]} />
2020
<DefaultContainer>
21-
<Box sx={{ p: fr.spacing("5w"), marginBottom: fr.spacing("5w"), borderRadius: "10px", backgroundColor: fr.colors.decisions.background.default.grey.hover }}>
21+
<Box
22+
sx={{
23+
p: { xs: fr.spacing("2w"), md: fr.spacing("5w") },
24+
marginBottom: fr.spacing("5w"),
25+
borderRadius: "10px",
26+
backgroundColor: fr.colors.decisions.background.default.grey.hover,
27+
}}
28+
>
2229
<Grid container spacing={0}>
2330
<Grid size={{ xs: 12, md: 5 }}>
24-
<Typography id="editorial-content-container" component={"h1"} variant="h1" sx={{ mb: 2 }}>
31+
<Typography id="editorial-content-container" component={"h1"} variant="h1" sx={{ mb: fr.spacing("1w") }}>
2532
Conditions
2633
</Typography>
27-
<Typography component={"h1"} variant="h1" sx={{ mb: 2 }}>
34+
<Typography component={"h1"} variant="h1" sx={{ mb: fr.spacing("1w") }}>
2835
générales
2936
</Typography>
30-
<Typography component={"h1"} variant="h1" sx={{ mb: 2, color: fr.colors.decisions.text.default.info.default }}>
37+
<Typography component={"h1"} variant="h1" sx={{ mb: fr.spacing("1w"), color: fr.colors.decisions.text.default.info.default }}>
3138
d&apos;utilisation
3239
</Typography>
3340
<Box

‎ui/app/(editorial)/contact/page.tsx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { fr } from "@codegouvfr/react-dsfr"
22
import { Button } from "@codegouvfr/react-dsfr/Button"
3-
import { Typography, Box, Grid2 as Grid } from "@mui/material"
3+
import { Typography, Box, Grid } from "@mui/material"
44
import { Metadata } from "next"
55

66
import { Breadcrumb } from "@/app/_components/Breadcrumb"
@@ -19,19 +19,16 @@ export default function Contact() {
1919
<Breadcrumb pages={[PAGES.static.contact]} />
2020
<DefaultContainer>
2121
<Grid container spacing={0}>
22-
<Grid size={{ xs: 12, md: 4 }} sx={{ px: 4 }}>
23-
<Typography id="editorial-content-container" component={"h1"} variant="h1" sx={{ mb: 2, color: fr.colors.decisions.text.default.info.default }}>
22+
<Grid size={{ xs: 12, md: 4 }} sx={{ p: { xs: fr.spacing("2w"), md: fr.spacing("5w") } }}>
23+
<Typography id="editorial-content-container" component={"h1"} variant="h1" sx={{ mb: fr.spacing("1w"), color: fr.colors.decisions.text.default.info.default }}>
2424
Nous contacter
2525
</Typography>
2626
<Box
2727
component="hr"
2828
sx={{ maxWidth: "93px", border: "none", borderBottom: "none", borderTop: `4px solid ${fr.colors.decisions.text.default.info.default}`, opacity: 1 }}
2929
/>
3030
</Grid>
31-
<Grid size={{ xs: 12, md: 8 }} sx={{ px: 4 }}>
32-
<Typography variant="h3" component="h3" sx={{ mb: 2 }}>
33-
Nous contacter
34-
</Typography>
31+
<Grid size={{ xs: 12, md: 8 }} sx={{ p: { xs: fr.spacing("2w"), md: fr.spacing("5w") } }}>
3532
<Typography component="p" sx={{ mb: 2 }}>
3633
Vous avez une question sur nos outils ? Consultez notre foire aux questions.
3734
</Typography>

0 commit comments

Comments
 (0)