Skip to content

Commit aff6a04

Browse files
committed
fix(outcomes): add suffix to url
1 parent 9a0cd48 commit aff6a04

4 files changed

Lines changed: 13 additions & 11 deletions

File tree

client/src/boards/outcomes/components/layouts/global-layout.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,15 @@ import "./styles.scss"
1010
import "../../colors.scss";
1111

1212

13+
const BASE = "/devenir-etudiants/entrants-en-L1-2019";
14+
1315
const NAV_ITEMS = [
14-
{ key: "flux", labelKey: "flux", to: "/devenir-etudiants/flux" },
15-
{ key: "repartition", labelKey: "repartition", to: "/devenir-etudiants/repartition" },
16-
{ key: "plus-haut-diplome", labelKey: "plusHautDiplome", to: "/devenir-etudiants/plus-haut-diplome" },
17-
{ key: "croisements", labelKey: "croisements", to: "/devenir-etudiants/croisements" },
18-
{ key: "comparaison-profils", labelKey: "comparaisonProfils", to: "/devenir-etudiants/comparaison-profils" },
19-
{ key: "methodologie", labelKey: "methodologie", to: "/devenir-etudiants/methodologie" },
16+
{ key: "flux", labelKey: "flux", to: `${BASE}/flux` },
17+
{ key: "repartition", labelKey: "repartition", to: `${BASE}/repartition` },
18+
{ key: "plus-haut-diplome", labelKey: "plusHautDiplome", to: `${BASE}/plus-haut-diplome` },
19+
{ key: "croisements", labelKey: "croisements", to: `${BASE}/croisements` },
20+
{ key: "comparaison-profils", labelKey: "comparaisonProfils", to: `${BASE}/comparaison-profils` },
21+
{ key: "methodologie", labelKey: "methodologie", to: `${BASE}/methodologie` },
2022
] as const;
2123

2224
export default function GlobalLayout() {
@@ -89,7 +91,7 @@ export default function GlobalLayout() {
8991
<main id="main-content" tabIndex={-1}>
9092
<Outlet />
9193
</main>
92-
<Footer href="/devenir-etudiants/flux" title="#dataESR tableaux de bord" />
94+
<Footer href={`${BASE}/flux`} title="#dataESR tableaux de bord" />
9395
</>
9496
);
9597
}

client/src/boards/outcomes/pages/plus-haut-diplome/charts/diploma-donut/options.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export function createDiplomaDonutOptions(
3333
{
3434
name: "Non diplômés",
3535
y: nonDiplomes.effectif,
36-
color: "var(--purple-glycine-main-494)",
36+
color: "var(--outcomes-sortants-non-diplomes)",
3737
},
3838
];
3939

client/src/boards/outcomes/routes.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ const RouteWithTitle = ({ titleKey, element }) => {
2222
export default function OutcomesRoutes() {
2323
return (
2424
<Routes>
25-
<Route element={<GlobalLayout />}>
25+
<Route index element={<Navigate to="entrants-en-L1-2019/flux" replace />} />
26+
<Route path="entrants-en-L1-2019" element={<GlobalLayout />}>
2627
<Route index element={<Navigate to="flux" replace />} />
27-
<Route path="" element={<Navigate to="flux" replace />} />
2828
<Route path="flux" element={<RouteWithTitle titleKey="flux" element={<FluxPage />} />} />
2929
<Route path="repartition" element={<RouteWithTitle titleKey="repartition" element={<RepartitionPage />} />} />
3030
<Route path="plus-haut-diplome" element={<RouteWithTitle titleKey="plusHautDiplome" element={<PlusHautDiplomePage />} />} />

client/src/commons/router.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export default function Router() {
3838
<Route path="/contact" element={<Suspense><ContactLayout /></Suspense>}>
3939
<Route index element={<Suspense><ContactPage /></Suspense>} />
4040
</Route>
41-
<Route path="/devenir-etudiants" element={<Navigate to="/devenir-etudiants/flux" replace />} />
41+
<Route path="/devenir-etudiants" element={<Navigate to="/devenir-etudiants/entrants-en-L1-2019/flux" replace />} />
4242
<Route path="/devenir-etudiants/*" element={<Suspense><OutcomesRoutes /></Suspense>} />
4343
<Route path="/financements-par-aap" element={<Navigate to="/financements-par-aap/accueil" replace />} />
4444
<Route path="/financements-par-aap/*" element={<Suspense><FundingsRoutes /></Suspense>} />

0 commit comments

Comments
 (0)