Merge branch 'feature/authorization/curry' into 'dev'

Feature/authorization/curry

See merge request !53

src/components/AuthUser/Dashboard/Dashboard.tsx → src/components/Dashboard/Dashboard.tsx

@@ -2,9 +2,9 @@ import React, { FC } from 'react';
 import Container from '@material-ui/core/Container';
 import { Route, useRouteMatch } from 'react-router-dom';
 import { AuthRoutes } from 'api/routes';
-import { HomePage } from 'components/AuthUser/Dashboard/HomePage/HomePage';
-import { ProfilePage } from 'components/AuthUser/Dashboard/ProfilePage/ProfilePage';
-import { ReservationPage } from 'components/AuthUser/Dashboard/ReservationPage/ReservationPage';
+import { HomePage } from './HomePage/HomePage';
+import { ProfilePage } from './ProfilePage/ProfilePage';
+import { ReservationPage } from './ReservationPage/ReservationPage';
 
 export const Dashboard: FC = () => {
   const { path } = useRouteMatch();

src/components/AuthUser/Dashboard/HomePage/HomePage.tsx → src/components/Dashboard/HomePage/HomePage.tsx

@@ -10,12 +10,11 @@ import {
   MuiThemeProvider,
   Container,
 } from '@material-ui/core';
-import { MapElement } from 'components/AuthUser/Dashboard/HomePage/MapElement';
-import { NavBarLogin } from 'components/AuthUser/Dashboard/HomePage/NavBarLogin';
-import { Numbers } from 'components/AuthUser/Dashboard/HomePage/Numbers';
-import { Steps } from 'components/AuthUser/Dashboard/HomePage/Steps';
-import { NavBar } from 'components/AuthUser/Dashboard/HomePage/NavBar';
-import { Reservation } from 'components/AuthUser/Dashboard/ReservationPage/Reservation/Reservation';
+import { MapElement } from 'components/Dashboard/HomePage/MapElement';
+import { NavBar } from 'components/Dashboard/HomePage/NavBar';
+import { Numbers } from 'components/Dashboard/HomePage/Numbers';
+import { Steps } from 'components/Dashboard/HomePage/Steps';
+import { Reservation } from '../ReservationPage/Reservation/Reservation';
 
 let themeResp = createMuiTheme();
 themeResp = responsiveFontSizes(themeResp);

src/components/AuthUser/Dashboard/HomePage/NavBarLogin.tsx → src/components/Dashboard/HomePage/NavBarLogin.tsx

@@ -3,8 +3,8 @@ import { makeStyles } from '@material-ui/core/styles';
 import { Tabs, Tab } from '@material-ui/core';
 import LockIcon from '@material-ui/icons/Lock';
 
-import { Link, useHistory } from 'react-router-dom';
-import { NonAuthRoutes } from 'api/routes';
+import { useHistory } from 'react-router-dom';
+import { AuthRoutes } from 'api/routes';
 
 const useStyles = makeStyles(() => ({
   tabs: {
@@ -53,7 +53,7 @@ export const NavBarLogin: FC = () => {
       TabIndicatorProps={{ style: { display: 'none' } }}
     >
       <Tab
-        value={`/auth${NonAuthRoutes.signIn}`}
+        value={`${AuthRoutes.dashboard}${AuthRoutes.home}`}
         label="Login"
         icon={<LockIcon className={classes.tabIcon} />}
         className={`${classes.tabPan} ${classes.rightAlign}`}

src/components/AuthUser/Dashboard/ProfilePage/ProfilePage.tsx → src/components/Dashboard/ProfilePage/ProfilePage.tsx

-import React, { FC } from 'react';
+import React, { FC, useContext } from 'react';
 import Button from '@material-ui/core/Button';
 import axios from 'axios';
 import { NonAuthRoutes } from 'api/routes';
 import { useHistory } from 'react-router-dom';
+import { AuthContext } from 'components/Auth/AuthContext';
 
 export const ProfilePage: FC = () => {
   const history = useHistory();
-
+  const { setIsAuth } = useContext(AuthContext);
   const logout = (): void => {
-    axios
-      .get('/api/web/login/logout')
-      .then(() => history.replace(NonAuthRoutes.home));
+    axios.get('/api/web/login/logout').then(() => {
+      setIsAuth(false);
+      history.replace(NonAuthRoutes.home);
+    });
   };
 
   return (

src/components/AuthUser/Dashboard/ReservationPage/ReservationPage.tsx → src/components/Dashboard/ReservationPage/ReservationPage.tsx

@@ -19,8 +19,8 @@ import {
 import AddIcon from '@material-ui/icons/Add';
 import Fab from '@material-ui/core/Fab';
 
-import { Reservation } from 'components/AuthUser/Dashboard/ReservationPage/Reservation/Reservation';
-import { NavBar } from '../HomePage/NavBar';
+import { NavBar } from 'components/Dashboard/HomePage/NavBar';
+import { Reservation } from 'components/Dashboard/ReservationPage/Reservation/Reservation';
 
 let themeResp = createMuiTheme();
 themeResp = responsiveFontSizes(themeResp);

src/components/NonAuthUser/LandingPage/LandingPage.tsx → src/components/LandingPage/LandingPage.tsx

@@ -10,10 +10,10 @@ import {
   MuiThemeProvider,
   Container,
 } from '@material-ui/core';
-import { MapElement } from 'components/AuthUser/Dashboard/HomePage/MapElement';
-import { NavBarLogin } from 'components/AuthUser/Dashboard/HomePage/NavBarLogin';
-import { Numbers } from 'components/AuthUser/Dashboard/HomePage/Numbers';
-import { Steps } from 'components/AuthUser/Dashboard/HomePage/Steps';
+import { MapElement } from 'components/Dashboard/HomePage/MapElement';
+import { NavBarLogin } from 'components/Dashboard/HomePage/NavBarLogin';
+import { Numbers } from 'components/Dashboard/HomePage/Numbers';
+import { Steps } from 'components/Dashboard/HomePage/Steps';
 
 let themeResp = createMuiTheme();
 themeResp = responsiveFontSizes(themeResp);

src/components/NonAuthUser/LandingPage/TeamPage.tsx

-import React, { FC } from 'react';
-
-export const TeamPage: FC = () => (
-  <>
-    <section>
-      <h2>These are the students of the MoveAid project</h2>
-
-      <div>
-        <h3>Alberto Defendi</h3>
-        <table>
-          <tr>
-            <td> </td>
-            <td>
-              <p>
-                Age: 19 <br />
-                Role: Front End Developer
-                <br />
-                Hobbys: Sports, maths
-                <br />
-              </p>
-            </td>
-          </tr>
-        </table>
-      </div>
-
-      <div>
-        <h3>Andrea Esposito</h3>
-        <table>
-          <tr>
-            <td> </td>
-            <td>
-              <p>
-                Age: 19 <br />
-                Role: xxxxx
-                <br />
-                Hobbys: xxxxxxxxx
-                <br />
-              </p>
-            </td>
-          </tr>
-        </table>
-      </div>
-
-      <div>
-        <h3>Marco Marinello</h3>
-        <table>
-          <tr>
-            <td> </td>
-            <td>
-              <p>
-                Age: 19 <br />
-                Role: xxxxx
-                <br />
-                Hobbys: xxxxxxxxx
-                <br />
-              </p>
-            </td>
-          </tr>
-        </table>
-      </div>
-
-      <div>
-        <h3>Francesco Mazzini</h3>
-        <table>
-          <tr>
-            <td> </td>
-            <td>
-              <p>
-                <strong>Age:</strong> 19 <br />
-                <br />
-                <strong>Role:</strong> Front End Developer
-                <br />
-                <br />
-                <strong>Hobbys:</strong> I like Graphic and Programing.
-                <br />
-                I also like playing videogames, hanging out <br />
-                with friends, watching tv series and <br />
-                training in gym!
-              </p>
-            </td>
-          </tr>
-        </table>
-      </div>
-    </section>
-  </>
-);