Update app routing

This commit is contained in:
Hazem Krimi
2021-05-06 01:45:13 +01:00
parent 2c3d11772c
commit 3e589f0e24
+14 -2
View File
@@ -1,6 +1,6 @@
import jwtDecode from 'jwt-decode'; import jwtDecode from 'jwt-decode';
import { useEffect } from 'react'; import { useEffect } from 'react';
import { Switch } from 'react-router-dom'; import { Redirect, Switch } from 'react-router-dom';
import { useLazyQuery, useReactiveVar } from '@apollo/client'; import { useLazyQuery, useReactiveVar } from '@apollo/client';
import { import {
ProtectedRoute, ProtectedRoute,
@@ -17,7 +17,9 @@ import {
RecoverAccount, RecoverAccount,
Signup, Signup,
Project, Project,
Clients,
Settings, Settings,
UserSettings,
} from './pages'; } from './pages';
import { GetUserByIdQuery, GetUserByIdQueryVariables } from './graphql/types'; import { GetUserByIdQuery, GetUserByIdQueryVariables } from './graphql/types';
import { GET_USER_BY_ID } from './graphql/auth.api'; import { GET_USER_BY_ID } from './graphql/auth.api';
@@ -75,14 +77,24 @@ const App = () => {
)} )}
<Switch> <Switch>
<ProtectedRoute path='/' exact> <ProtectedRoute path='/' exact>
<Project /> {role !== 'admin' ? (
<Redirect to='/project' />
) : (
<Redirect to='/clients' />
)}
</ProtectedRoute> </ProtectedRoute>
<ProtectedRoute path='/project' exact> <ProtectedRoute path='/project' exact>
<Project /> <Project />
</ProtectedRoute> </ProtectedRoute>
<ProtectedRoute path='/clients' exact>
<Clients />
</ProtectedRoute>
<ProtectedRoute path='/settings' exact> <ProtectedRoute path='/settings' exact>
<Settings /> <Settings />
</ProtectedRoute> </ProtectedRoute>
<ProtectedRoute path='/user-settings/:id' exact>
<UserSettings />
</ProtectedRoute>
<AuthRoute path='/login' exact> <AuthRoute path='/login' exact>
<Login /> <Login />
</AuthRoute> </AuthRoute>