diff --git a/net/web/src/access/useAccess.hook.js b/net/web/src/access/useAccess.hook.js index 75f72b7e..84cf4f41 100644 --- a/net/web/src/access/useAccess.hook.js +++ b/net/web/src/access/useAccess.hook.js @@ -19,8 +19,8 @@ export function useAccess() { } useEffect(() => { - if (app.state.status) { - navigate('/session'); + if (app.state.status || app.state.adminToken) { + navigate('/'); } }, [app.state, navigate]); diff --git a/net/web/src/dashboard/useDashboard.hook.js b/net/web/src/dashboard/useDashboard.hook.js index 02093663..dfbda6a3 100644 --- a/net/web/src/dashboard/useDashboard.hook.js +++ b/net/web/src/dashboard/useDashboard.hook.js @@ -36,7 +36,7 @@ export function useDashboard() { useEffect(() => { if (!app.state.adminToken) { - navigate('/admin'); + navigate('/'); } else { syncConfig(); diff --git a/net/web/src/root/Root.jsx b/net/web/src/root/Root.jsx index db8cf3e0..7fec70b3 100644 --- a/net/web/src/root/Root.jsx +++ b/net/web/src/root/Root.jsx @@ -8,14 +8,14 @@ export function Root() { const app = useContext(AppContext); useEffect(() => { -console.log(app.state); - if (app.state) { - if (app.state.status) { - navigate('/session'); - } - else { - navigate('/login'); - } + if (app.state.adminToken) { + navigate('/dashboard'); + } + else if (app.state.status) { + navigate('/session'); + } + else { + navigate('/login'); } }, [app.state, navigate]); diff --git a/net/web/test/Access.test.js b/net/web/test/Access.test.js index 2c0c4cc2..99ed3450 100644 --- a/net/web/test/Access.test.js +++ b/net/web/test/Access.test.js @@ -82,7 +82,7 @@ test('nav to session after login', async () => { }); await waitFor(async () => { - expect(navPath).toBe('/session'); + expect(navPath).toBe('/'); }); });