From cd8c75b3d4948a812b9e68f4974a683b13aec9c6 Mon Sep 17 00:00:00 2001
From: Jalil Arfaoui <jalil@arfaoui.net>
Date: Thu, 13 Jan 2022 17:36:10 +0100
Subject: [PATCH] fix(profiles): fix routes

---
 src/app/profiles/App/Pages/index.tsx               | 14 +++++++-------
 .../profiles/store/sagas/locationChange.saga.ts    |  2 +-
 src/app/website/server/routes.ts                   |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/app/profiles/App/Pages/index.tsx b/src/app/profiles/App/Pages/index.tsx
index cc32019ca..29e5f7fde 100644
--- a/src/app/profiles/App/Pages/index.tsx
+++ b/src/app/profiles/App/Pages/index.tsx
@@ -17,31 +17,31 @@ const Pages = () => {
     <>
       <Switch>
         <Route
-          path={`${prefix}/${t('path.profiles.contributors')}`}
+          path={`${prefix}${t('path.profiles.contributors')}`}
           component={Profiles}
         />
         <Route
-          path={`${prefix}/${t('path.profiles.subscriptions')}`}
+          path={`${prefix}${t('path.profiles.subscriptions')}`}
           component={Subscriptions}
         />
         {getFacet() !== 'lmel' && (
           <Redirect
             exact
-            from={`/${t('path.profiles.contributors')}`}
-            to={`/${i18n.language}/${t('path.profiles.contributors')}`}
+            from={`${t('path.profiles.contributors')}`}
+            to={`/${i18n.language}${t('path.profiles.contributors')}`}
           />
         )}
         {getFacet() !== 'lmel' && (
           <Redirect
             exact
-            from={`/${t('path.profiles.subscriptions')}`}
-            to={`/${i18n.language}/${t('path.profiles.subscriptions')}`}
+            from={`${t('path.profiles.subscriptions')}`}
+            to={`/${i18n.language}${t('path.profiles.subscriptions')}`}
           />
         )}
         <Redirect
           exact
           from="/"
-          to={`${prefix}/${t('path.profiles.contributors')}`}
+          to={`${prefix}${t('path.profiles.contributors')}`}
         />
         <Route render={() => <Error message="Introuvable" />} />
       </Switch>
diff --git a/src/app/profiles/store/sagas/locationChange.saga.ts b/src/app/profiles/store/sagas/locationChange.saga.ts
index 013a1158a..cc0e1df69 100644
--- a/src/app/profiles/store/sagas/locationChange.saga.ts
+++ b/src/app/profiles/store/sagas/locationChange.saga.ts
@@ -19,7 +19,7 @@ function* contributorLocationSaga(match: Match<{ id: string }>) {
   yield put(refreshContributors());
 }
 
-const prefix = getFacet() === 'lmel' ? '/' : '/:lang/';
+const prefix = getFacet() === 'lmel' ? '' : '/:lang';
 
 export default function* locationChangeSaga() {
   yield takeLatestLocationChange(
diff --git a/src/app/website/server/routes.ts b/src/app/website/server/routes.ts
index ef8edcda4..4e9eb6b08 100644
--- a/src/app/website/server/routes.ts
+++ b/src/app/website/server/routes.ts
@@ -26,4 +26,5 @@ router
   .get(`/en${en.path.profiles.subscriptions}`, serveProfiles)
   .get(`/fr${fr.path.profiles.subscriptions}`, serveProfiles)
   .get(`${fr.path.profiles.contributors}/:id?/:name?`, serveProfiles)
+  .get(`${fr.path.profiles.contributors}`, serveProfiles)
   .get(`${fr.path.profiles.subscriptions}`, serveProfiles);