Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
9 changes: 8 additions & 1 deletion e-commerce-app/src/routes/AppRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { UserPage } from '../pages/UserPage/UserPage';
import { ProductPage } from '../pages/ProductPage/ProductPage';
import { ErrorPage } from '../pages/ErrorPage/ErrorPage';
import { LogoutPage } from '../pages/LogoutPage/LogoutPage';
import { PrivateRoute } from './PrivateRoute';
import ProductsQuery from '../requestsComponents/ProductsQuery/ProductsQuery';
import CategoriesQuery from '../requestsComponents/CategoriesQuery/CategoriesQuery';
import TokenGuard from '../requestsComponents/TokenGuard/TokenGuard';
Expand All @@ -26,10 +27,16 @@ const router = createHashRouter(
<Route path="/about" element={<AboutPage />} />
<Route path="/login" element={<LoginPage />} />
<Route path="/logout" element={<LogoutPage />} />

<Route element={<TokenGuard />}>
<Route path="/registration" element={<RegistrationPage />} />
<Route path="/basket" element={<BasketPage />} />
<Route path="/user" element={<UserPage />} />
<Route element={<PrivateRoute />}>
<Route path="/user" element={<UserPage />}>
{/*TODO : add redirect to the user page */}
<Route path={':customerId'} element={<HomePage />}></Route>
</Route>
</Route>
<Route element={<CategoriesQuery />} path={'/products'}>
<Route index element={<ProductsQuery />} />
<Route path=":productId" element={<ProductPage />} />
Expand Down
15 changes: 15 additions & 0 deletions e-commerce-app/src/routes/PrivateRoute.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { FC } from 'react';
import { getLoggedIn } from '../store/slices/userSlice';
import { useAppSelector } from '../store/hooks';
import { Outlet, Navigate } from 'react-router-dom';

export const PrivateRoute: FC = () => {
const isLoggedIn = useAppSelector(getLoggedIn);
if (isLoggedIn) {
return <Outlet />;
} else {
return <Navigate to="/" />;
}
};

export default PrivateRoute;