Skip to content

Commit 4ed8ab7

Browse files
th-180: * correct PageLayout, add useEffect (#225)
1 parent bdf5844 commit 4ed8ab7

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

frontend/src/libs/components/router/router.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
import { Route } from 'react-router-dom';
22

33
import { AppRoute } from '~/libs/enums/enums.js';
4-
import { useGetCurrentUser } from '~/libs/hooks/hooks.js';
4+
import { useEffect, useGetCurrentUser } from '~/libs/hooks/hooks.js';
55
import { UserGroupKey } from '~/packages/users/libs/enums/enums.js';
66
import { Auth } from '~/pages/auth/auth.js';
77
import { Dashboard } from '~/pages/dashboard/dashboard.js';
88
import { NotFound } from '~/pages/not-found/not-found.js';
99
import { WelcomePage } from '~/pages/welcome/welcome.js';
1010

11-
import { App, PageLayout, ProtectedRoute } from '../components.js';
11+
import { PageLayout, ProtectedRoute } from '../components.js';
1212
import { RouterProvider } from '../router-provider/router-provider.js';
1313

1414
const Router = (): JSX.Element => {
1515
const { getCurrentUser } = useGetCurrentUser();
16-
void getCurrentUser();
16+
17+
useEffect(() => {
18+
void getCurrentUser();
19+
}, [getCurrentUser]);
1720

1821
return (
1922
<RouterProvider>
20-
<Route path={AppRoute.ROOT} element={<App />}>
23+
<Route path={AppRoute.ROOT} element={<PageLayout isSidebarHidden />}>
2124
<Route path={AppRoute.WELCOME} element={<WelcomePage />} />
2225
<Route path={AppRoute.SIGN_IN} element={<Auth />} />
2326
<Route path={AppRoute.SIGN_UP} element={<Auth />} />

0 commit comments

Comments
 (0)