diff --git a/src/App.tsx b/src/App.tsx
index 9e71f7c..dbfd211 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,44 +1,63 @@
import { useEffect } from 'react';
import { Switch } from 'react-router-dom';
-import { ProtectedRoute, AuthRoute } from './components';
-import { tokenVar } from './graphql/state';
+import { useReactiveVar } from '@apollo/client';
+import { ProtectedRoute, AuthRoute, Navbar, Sidebar } from './components';
+import { roleVar, tokenVar } from './graphql/state';
import {
AdditionalInfo,
ForgotPassword,
Login,
RecoverAccount,
Signup,
- Main,
+ Project,
+ Settings,
} from './pages';
const App = () => {
- useEffect(() => {
- const token = localStorage.getItem('token');
+ const token = useReactiveVar(tokenVar);
+ const role = useReactiveVar(roleVar);
- if (token) tokenVar(token);
+ useEffect(() => {
+ const localStorageToken = localStorage.getItem('token');
+
+ if (localStorageToken) tokenVar(localStorageToken);
}, []);
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ <>
+ {token && (
+ <>
+
+ {role !== 'admin' && }
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
};