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

Nest authuser components route

parent 6b8d2a60
No related branches found
No related tags found
2 merge requests!56Refined auth flow and new website pages.,!40Sign up/Log in form nest into AuthUser
...@@ -9,12 +9,13 @@ import { NotFound } from 'components/NotFound/NotFound'; ...@@ -9,12 +9,13 @@ import { NotFound } from 'components/NotFound/NotFound';
import { ProfilePage } from 'components/ProfilePage/ProfilePage'; import { ProfilePage } from 'components/ProfilePage/ProfilePage';
import { Roles } from 'components/api/userRoles'; import { Roles } from 'components/api/userRoles';
import { Unauthorized } from 'components/Unauthorized/Unauthorized'; import { Unauthorized } from 'components/Unauthorized/Unauthorized';
import { SignUpForm } from 'components/AuthUser/SignUpForm/SignUpForm';
export const App: FC = () => ( export const App: FC = () => (
<Router> <Router>
<div data-testid="App"> <div data-testid="App">
<Switch> <Switch>
<Route path={NonAuthRoutes.signIn} component={AuthUser} /> <Route path={NonAuthRoutes.auth} component={AuthUser} />
<Route exact path={NonAuthRoutes.home} component={LandingPage} /> <Route exact path={NonAuthRoutes.home} component={LandingPage} />
<PrivateRoute <PrivateRoute
path={AuthRoutes.dashboard} path={AuthRoutes.dashboard}
......
import React, { FC, useEffect } from 'react'; import React, { FC, useEffect } from 'react';
import axios from 'axios'; import axios from 'axios';
import Container from '@material-ui/core/Container'; import Container from '@material-ui/core/Container';
import { SignInForm } from './SignInForm/SignInForm'; import { Route, useRouteMatch } from 'react-router-dom';
import { NonAuthRoutes } from 'components/api/routes';
import { SignInForm } from 'components/AuthUser/SignInForm/SignInForm';
import { SignUpForm } from 'components/AuthUser/SignUpForm/SignUpForm';
const configDjangoCookieName = (): void => { const configDjangoCookieName = (): void => {
axios.defaults.xsrfHeaderName = 'X-CSRFTOKEN'; axios.defaults.xsrfHeaderName = 'X-CSRFTOKEN';
...@@ -10,6 +13,7 @@ const configDjangoCookieName = (): void => { ...@@ -10,6 +13,7 @@ const configDjangoCookieName = (): void => {
}; };
export const AuthUser: FC = () => { export const AuthUser: FC = () => {
const { path } = useRouteMatch();
configDjangoCookieName(); configDjangoCookieName();
useEffect(() => { useEffect(() => {
axios axios
...@@ -23,7 +27,8 @@ export const AuthUser: FC = () => { ...@@ -23,7 +27,8 @@ export const AuthUser: FC = () => {
}, []); }, []);
return ( return (
<Container maxWidth="sm"> <Container maxWidth="sm">
<SignInForm /> <Route path={`${path}${NonAuthRoutes.signIn}`} component={SignInForm} />
<Route path={`${path}${NonAuthRoutes.signUp}`} component={SignUpForm} />
</Container> </Container>
); );
}; };
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