diff --git a/src/core/router/index.tsx b/src/core/router/index.tsx index 964700b46..7a665e54e 100644 --- a/src/core/router/index.tsx +++ b/src/core/router/index.tsx @@ -54,12 +54,12 @@ function Router(props: Props) { } /> } /> }> - } /> + } /> } /> } /> } /> } /> - } /> + } /> } /> } /> } /> diff --git a/src/core/sagas/auth.ts b/src/core/sagas/auth.ts index 976526414..37543f9b3 100644 --- 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 index 54f1ede29..d374c479f 100644 --- 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 index 903109e46..2379242dd 100644 --- 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 (