Merge branch 'frontend-devel' of...

Merge branch 'frontend-devel' of gitlab.inf.unibz.it:Roland.Bernard/wie_202021_csbillero11 into frontend-devel

client/src/App.tsx

 
 import { Suspense, lazy } from 'react';
 import { BrowserRouter as Router, Switch, Route,  } from 'react-router-dom';
-import ProtectedRoute from 'components/helpers/Rerouters/ProtectedRoute'; 
+
 import LoginRoute from 'components/helpers/Rerouters/LoginRoute'; 
+import AppWrapper from 'pages/AppWrapper'; 
 
 const Home = lazy(() => import('pages/Home'));
 const Login = lazy(() => import('pages/Login'));
 const Register = lazy(() => import('pages/Register'));
-const Tasks = lazy(() => import('pages/Tasks'));
-const Projects = lazy(() => import('pages/Projects'));
-const Stats = lazy(() => import('pages/Stats'));
 
 export default function App() {
     return (
         <Router>
             <Suspense fallback={false}>
                 <Switch>
-                    <ProtectedRoute path="/tasks" component={Tasks} />
-                    <ProtectedRoute path="/projects" component={Projects} />
-                    <ProtectedRoute path="/stats" component={Stats} />
                     <LoginRoute path="/login" component={Login} />
                     <LoginRoute path="/register" component={Register} />
+                    <Route path={["/tasks", "/projects", "/stats"]} component={AppWrapper} />
                     <Route path="/" component={Home} />
                 </Switch>
             </Suspense>

client/src/components/helpers/Rerouters/LoginRoute.tsx

@@ -10,7 +10,7 @@ export default function LoginRoute(props: RouteProps) {
             if (history.length === 0) {
                 history.push('/tasks');
             } else {
-                history.goBack();;
+                history.goBack();
             }
         }
     })

client/src/pages/AppWrapper/index.tsx

+
+import { Suspense, lazy } from 'react';
+
+import ProtectedRoute from 'components/helpers/Rerouters/ProtectedRoute'; 
+import Header from 'components/ui/Header';
+import Navigation from 'components/ui/Navigation';
+
+const Tasks = lazy(() => import('pages/Tasks'));
+const Projects = lazy(() => import('pages/Projects'));
+const Stats = lazy(() => import('pages/Stats'));
+
+export default function AppWrapper() {
+    return (<>
+        <Header />
+        <Navigation />
+        <Suspense fallback={false}>
+            <ProtectedRoute path="/tasks" component={Tasks} />
+            <ProtectedRoute path="/projects" component={Projects} />
+            <ProtectedRoute path="/stats" component={Stats} />
+        </Suspense>
+    </>);
+}
+

client/src/pages/Home/index.tsx

@@ -29,7 +29,6 @@ export default function Home() {
                             <div className="inner">
                             </div>
                         </div>
-                    </div>
                     <div className="content-container">
                         <div className="text-container">
                             <h1>ryoko</h1>

client/src/pages/Projects/index.tsx

 
-import Navigation from 'components/ui/Navigation';
 import './projects.scss';
 
 export default function Tasks() {
     return (
         <div className="projects-page">
-            <Navigation />
             <main>
                 <h1>Projects</h1>
             </main>
         </div>
     );
-}
\ No newline at end of file
+}

client/src/pages/Stats/index.tsx

 
-import Navigation from 'components/ui/Navigation';
 import './stats.scss';
 
 export default function Tasks() {
     return (
         <div className="stats-page">
-            <Navigation />
             <main>
                 <h1>Stats</h1>
             </main>
         </div>
     );
-}
\ No newline at end of file
+}

client/src/pages/Tasks/index.tsx

@@ -3,13 +3,12 @@ import './tasks.scss';
 
 export default function Tasks() {
     return (
-        <>
-            <Page className="tasks-page">
-                <main className="content-container">
-                    <h1>Tasks</h1>
-                    <p>Hey Daniel, you have <strong>10</strong> Tasks for today.</p>
-                </main>
-            </Page>
-        </>
+        <Page className="tasks-page">
+            <main className="content-container">
+                <h1>Tasks</h1>
+                <p>Hey Daniel, you have <strong>10</strong> Tasks for today.</p>
+            </main>
+        </Page>
     );
-}
\ No newline at end of file
+}
+