Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
подготовка к мерджу
DNLHC committed Apr 11, 2023
commit 16dfd95fd73c2fad35f6d45fdee86c84507a36f1
13 changes: 8 additions & 5 deletions packages/client/src/routes.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { ProtectedRoutes } from 'utils/protected-routes';
import { HowToModal } from 'components/how-to-modal';
import { MainLayout } from 'components/main-layout';
import { NewThreadModal } from 'components/modal-new-thread';
import { AuthLayout, getCurrentUser } from 'components/auth-layout';
@@ -30,10 +29,14 @@ export const createRoutes = (store: AppStore) => {
>
<Route path={RouterPaths.REGISTER} element={<RegisterPage />} />
<Route path={RouterPaths.LOGIN} element={<LoginPage />} />
<Route element={<MainLayout />}>
<Route path={RouterPaths.MAIN} element={<MainPage />}>
<Route path={RouterPaths.HOW_TO} element={<HowToModal />} />
</Route>
<Route
element={<MainLayout />}
loader={({ request }) => {
const url = new URL(request.url);
return url.searchParams.get('modal');
}}
>
<Route path={RouterPaths.MAIN} element={<MainPage />} />
<Route path={RouterPaths.LEADERBOARD} element={<Leaderboard />} />
<Route path={RouterPaths.FORUM} element={<Forum />}>
<Route path={RouterPaths.NEW_THREAD} element={<NewThreadModal />} />