Skip to content
Snippets Groups Projects
Verified Commit 4dc1ec24 authored by Defendi Alberto's avatar Defendi Alberto
Browse files

Rebase directory structure.

parent ec9c1d13
No related branches found
No related tags found
3 merge requests!56Refined auth flow and new website pages.,!53Feature/authorization/curry,!52Change folder structure and fix auth flow.
This commit is part of merge request !53. Comments created here will be created in the context of that merge request.
Showing
with 18 additions and 22 deletions
...@@ -2,10 +2,9 @@ import React, { FC } from 'react'; ...@@ -2,10 +2,9 @@ import React, { FC } from 'react';
import Container from '@material-ui/core/Container'; import Container from '@material-ui/core/Container';
import { Redirect, Route, useRouteMatch } from 'react-router-dom'; import { Redirect, Route, useRouteMatch } from 'react-router-dom';
import { AuthRoutes, NonAuthRoutes } from 'api/routes'; import { AuthRoutes, NonAuthRoutes } from 'api/routes';
import { SignInForm } from 'components/AuthUser/SignInForm/SignInForm'; import { ChoseRole } from 'components/Auth/ChoseRole/ChoseRole';
import { SignUpForm } from 'components/AuthUser/SignUpForm/SignUpForm'; import { SignInForm } from 'components/Auth/SignInForm/SignInForm';
import { ChoseRole } from 'components/AuthUser/ChoseRole/ChoseRole'; import { SignUpForm } from 'components/Auth/SignUpForm/SignUpForm';
import { RestrictedRoute } from 'components/RestrictedRoute/RestrictedRoute';
/** /**
* Keeps all components related to SignIn/SignOut logic. * Keeps all components related to SignIn/SignOut logic.
......
...@@ -2,11 +2,11 @@ import React, { FC, useCallback, useContext, useState } from 'react'; ...@@ -2,11 +2,11 @@ import React, { FC, useCallback, useContext, useState } from 'react';
import axios from 'axios'; import axios from 'axios';
import { SubmitHandler, useForm } from 'react-hook-form'; import { SubmitHandler, useForm } from 'react-hook-form';
import { Button } from '@material-ui/core'; import { Button } from '@material-ui/core';
import { InputField } from 'components/AuthUser/InputField/InputField';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { AuthRoutes, NonAuthRoutes } from 'api/routes'; import { AuthRoutes, NonAuthRoutes } from 'api/routes';
import { AuthContext } from 'components/AuthUser/AuthContext';
import { fetchCookie } from 'api/fetchCookie'; import { fetchCookie } from 'api/fetchCookie';
import { AuthContext } from 'components/Auth/AuthContext';
import { InputField } from 'components/Auth/InputField/InputField';
import { useStyles } from './useStyles'; import { useStyles } from './useStyles';
import { CredentialsType } from './CredentialsType'; import { CredentialsType } from './CredentialsType';
......
import React, { FC } from 'react'; import React, { FC } from 'react';
import { SubmitHandler, useForm } from 'react-hook-form'; import { SubmitHandler, useForm } from 'react-hook-form';
import { Button } from '@material-ui/core'; import { Button } from '@material-ui/core';
import { InputField } from 'components/AuthUser/InputField/InputField';
import { useStyles } from 'components/AuthUser/SignUpForm/useStyles';
import axios from 'axios'; import axios from 'axios';
import { InputField } from 'components/Auth/InputField/InputField';
import { useStyles } from 'components/Auth/SignUpForm/useStyles';
// TODO: Data validation // TODO: Data validation
// TODO: Replace notes with big input field // TODO: Replace notes with big input field
export const SignUpForm: FC = () => { export const SignUpForm: FC = () => {
......
import React, { ComponentType, FC, useContext } from 'react'; import React, { ComponentType, FC, useContext } from 'react';
import { BlurCircular } from '@material-ui/icons'; import { BlurCircular } from '@material-ui/icons';
import { NonAuthRoutes } from 'api/routes'; import { NonAuthRoutes } from 'api/routes';
import { AuthContext } from 'components/AuthUser/AuthContext';
import { Unauthorized } from 'components/NonAuthUser/Unauthorized/Unauthorized';
import { useAuth } from 'hooks/useAuth';
import { useRole } from 'hooks/useRole';
import { Redirect } from 'react-router-dom'; import { Redirect } from 'react-router-dom';
import { CircularProgressClassKey } from '@material-ui/core'; import { Unauthorized } from 'components/Unauthorized/Unauthorized';
import { AuthContext } from 'components/Auth/AuthContext';
const HandleIsAuth: FC<{ isAuth: boolean }> = ({ isAuth }) => const HandleIsAuth: FC<{ isAuth: boolean }> = ({ isAuth }) =>
isAuth ? ( isAuth ? (
......
...@@ -2,9 +2,9 @@ import React, { FC } from 'react'; ...@@ -2,9 +2,9 @@ import React, { FC } from 'react';
import Container from '@material-ui/core/Container'; import Container from '@material-ui/core/Container';
import { Route, useRouteMatch } from 'react-router-dom'; import { Route, useRouteMatch } from 'react-router-dom';
import { AuthRoutes } from 'api/routes'; import { AuthRoutes } from 'api/routes';
import { HomePage } from 'components/AuthUser/Dashboard/HomePage/HomePage'; import { HomePage } from './HomePage/HomePage';
import { ProfilePage } from 'components/AuthUser/Dashboard/ProfilePage/ProfilePage'; import { ProfilePage } from './ProfilePage/ProfilePage';
import { ReservationPage } from 'components/AuthUser/Dashboard/ReservationPage/ReservationPage'; import { ReservationPage } from './ReservationPage/ReservationPage';
export const Dashboard: FC = () => { export const Dashboard: FC = () => {
const { path } = useRouteMatch(); const { path } = useRouteMatch();
......
...@@ -10,12 +10,11 @@ import { ...@@ -10,12 +10,11 @@ import {
MuiThemeProvider, MuiThemeProvider,
Container, Container,
} from '@material-ui/core'; } from '@material-ui/core';
import { MapElement } from 'components/AuthUser/Dashboard/HomePage/MapElement'; import { MapElement } from 'components/Dashboard/HomePage/MapElement';
import { NavBarLogin } from 'components/AuthUser/Dashboard/HomePage/NavBarLogin'; import { NavBar } from 'components/Dashboard/HomePage/NavBar';
import { Numbers } from 'components/AuthUser/Dashboard/HomePage/Numbers'; import { Numbers } from 'components/Dashboard/HomePage/Numbers';
import { Steps } from 'components/AuthUser/Dashboard/HomePage/Steps'; import { Steps } from 'components/Dashboard/HomePage/Steps';
import { NavBar } from 'components/AuthUser/Dashboard/HomePage/NavBar'; import { Reservation } from '../ReservationPage/Reservation/Reservation';
import { Reservation } from 'components/AuthUser/Dashboard/ReservationPage/Reservation/Reservation';
let themeResp = createMuiTheme(); let themeResp = createMuiTheme();
themeResp = responsiveFontSizes(themeResp); themeResp = responsiveFontSizes(themeResp);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment