From 8b57cdd86145d6e17c651b3646133641e65270e2 Mon Sep 17 00:00:00 2001 From: ilyayudovin Date: Mon, 15 Jun 2020 18:41:33 +0300 Subject: fix: resolve conflicts --- src/pages/AuthPage/AuthPage.tsx | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) (limited to 'src/pages/AuthPage/AuthPage.tsx') diff --git a/src/pages/AuthPage/AuthPage.tsx b/src/pages/AuthPage/AuthPage.tsx index 72733f0..9b8040c 100644 --- a/src/pages/AuthPage/AuthPage.tsx +++ b/src/pages/AuthPage/AuthPage.tsx @@ -1,12 +1,47 @@ -import React from 'react'; +import React, {useState} from 'react'; +import { Authorization} from '../../types'; import SignInForm from './SignInForm'; +import {makeStyles} from "@material-ui/core"; +import Registration from "./Registration"; interface PropTypes { logIn: (name: string, password: string) => Promise; } -const AuthPage: React.FC = ({ logIn }) => { - return ; +const useStyles = makeStyles(theme => ({ + authorize: { + display: 'flex', + width: 200, + justifyContent: 'space-around', + margin: '0 auto' + } +})); + +const AuthPage: React.FC = ({logIn}) => { + const classes = useStyles(); + const[authorization,setAuthorization] = useState({authorize: 'signUp'}); + + const handleSignUp = () => { + setAuthorization({authorize: 'signUp'}); + console.log(authorization.authorize); + }; + + const handleRegistration = () => { + setAuthorization({authorize: 'registration'}); + console.log(authorization.authorize); + }; + + return ( + <> +
+
SignUp
+
or
+
Registrate
+
+ { authorization.authorize === 'signUp' && } + { authorization.authorize === 'registration' && } + + ); }; export default AuthPage; -- cgit v1.2.3