Fix more router issues/prettify it (#354)

ShokoAnime · Jul 25, 2022 · 4aca4e3 · 4aca4e3
1 parent b0fc74a
commit 4aca4e3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/core/router/index.tsx b/src/core/router/index.tsx
@@ -54,12 +54,12 @@ function Router(props: Props) {
             <Route path="login" element={<LoginPage />} />
             <Route path="error" element={<ErrorPage />} />
             <Route path="firstrun" element={<FirstRunPage />}>
-              <Route index element={<Navigate to="acknowledgement" />} />
+              <Route index element={<Navigate to="acknowledgement" replace />} />
               <Route path="acknowledgement" element={<Acknowledgement />} />
               <Route path="db-setup" element={<DatabaseSetup />} />
               <Route path="local-account" element={<LocalAccount />} />
               <Route path="anidb-account" element={<AniDBAccount />} />
-              <Route path="community-sites" element={<MetadataSources />} />
+              <Route path="metadata-sources" element={<MetadataSources />} />
               <Route path="start-server" element={<StartServer />} />
               <Route path="import-folders" element={<ImportFolders />} />
               <Route path="data-collection" element={<DataCollection />} />

diff --git a/src/core/sagas/auth.ts b/src/core/sagas/auth.ts
@@ -49,7 +49,7 @@ function* login(action) {
   }));
 
   if ((payload.redirect) ?? true) {
-    yield put(push({ pathname: '/webui/dashboard' }));
+    yield put(push({ pathname: 'dashboard' }));
   }
   yield put(stopFetching('login'));
 }
@@ -64,7 +64,7 @@ function* logout(action) {
   if (payload && payload.clearState) {
     yield put({ type: Events.STORE_CLEAR_STATE });
   } else {
-    yield put(replace({ pathname: '/webui/login' }));
+    yield put(replace({ pathname: 'login' }));
   }
 }
 

diff --git a/src/pages/firstrun/FirstRunPage.tsx b/src/pages/firstrun/FirstRunPage.tsx
@@ -26,7 +26,7 @@ function FirstRunPage() {
 
   useEffect(() => {
     if (status.State !== 4) {
-      dispatch(replace('/login'));
+      dispatch(replace('login'));
       return;
     }
 

diff --git a/src/pages/login/LoginPage.tsx b/src/pages/login/LoginPage.tsx
@@ -68,7 +68,7 @@ function LoginPage() {
     }
   };
 
-  const openFirstRunWizard = () => dispatch(push({ pathname: '/firstrun/acknowledgement' }));
+  const openFirstRunWizard = () => dispatch(push({ pathname: 'firstrun' }));
 
   return (
     <React.Fragment>