diff --git a/src/assets/icons/19334d4fd3fc6b625204b907041f2e5e-aboard-exit-symbol.png b/src/assets/icons/19334d4fd3fc6b625204b907041f2e5e-aboard-exit-symbol.png new file mode 100644 index 0000000..dbc2f3d Binary files /dev/null and b/src/assets/icons/19334d4fd3fc6b625204b907041f2e5e-aboard-exit-symbol.png differ diff --git a/src/assets/images/pxfuel.jpg b/src/assets/images/pxfuel.jpg new file mode 100644 index 0000000..49c3480 Binary files /dev/null and b/src/assets/images/pxfuel.jpg differ diff --git a/src/components/_sign-in/FormHeadlines.tsx b/src/components/_sign-in/FormHeadlines.tsx index 4c15fb3..b767740 100644 --- a/src/components/_sign-in/FormHeadlines.tsx +++ b/src/components/_sign-in/FormHeadlines.tsx @@ -1,19 +1,33 @@ import React, { FC } from 'react'; import { Box, styled, Typography } from '@mui/material'; +import RegistrImg from '../../assets/icons/19334d4fd3fc6b625204b907041f2e5e-aboard-exit-symbol.png'; interface IFormHeadlinesProps { [key: string]: unknown; } -const StyledFormHeadlines = styled(Box)(() => ({ +const StyledFormHeadlines = styled(Box)(({ theme }) => ({ + display: 'flex', + alignItems: 'center', + justifyContent: 'center', textAlign: 'center', - padding: '1rem 0', + padding: theme.spacing(4), + gap: theme.spacing(2), + + '& img': { + width: '250px', + height: '250px' + }, + + '& .title': { + fontSize: '1.5rem' + } })); const FormHeadlines: FC = () => { return ( - Sign In + Form Image ); }; diff --git a/src/components/_sign-in/MainSignIn.tsx b/src/components/_sign-in/MainSignIn.tsx index 87b2d29..912592c 100644 --- a/src/components/_sign-in/MainSignIn.tsx +++ b/src/components/_sign-in/MainSignIn.tsx @@ -13,7 +13,7 @@ const StyledMainSignIn = styled(Box)(() => ({ height: '100vh', display: 'flex', alignItems: 'center', - justifyContent: 'center', + justifyContent: 'center' })); const MainSignIn: FC = () => { diff --git a/src/components/_sign-in/SignInForm.tsx b/src/components/_sign-in/SignInForm.tsx index f954727..a565750 100644 --- a/src/components/_sign-in/SignInForm.tsx +++ b/src/components/_sign-in/SignInForm.tsx @@ -10,21 +10,6 @@ interface ISignInFormProps { [key: string]: unknown; } -const StyledSignInForm = styled('form')(() => ({ - width: '30vw', - background: '#fff', - padding: '0.5rem', - borderRadius: '5px', -})); - -const StyledFormAction = styled(Box)(() => ({ - display: 'flex', - alignItems: 'center', - justifyContent: 'space-between', - gap: '1.5rem', - padding: '1rem 0.5rem', -})); - const SignInForm: FC = () => { const dispatch = useAppDispatch(); const navigate = useNavigate(); @@ -41,7 +26,7 @@ const SignInForm: FC = () => { .catch((e) => { console.log(e); }); - }, + } }); const handleCancel = () => { @@ -51,8 +36,8 @@ const SignInForm: FC = () => { return ( - - Email + + = () => { type="email" value={values.email} onChange={handleChange} + label={'Please Enter your email'} /> - - - Password + - - - - - + + + Sign In + ); }; export default SignInForm; + + + +const StyledSignInForm = styled('form')(({ theme }) => ({ + width: '30vw', + background: '#fff', + padding: theme.spacing(2), + borderRadius: '5px', + boxShadow: '0px 0px 10px rgba(0, 0, 0, 0.1)' +})); + +const StyledFormFields = styled('div')(({ theme }) => ({ + display: 'flex', + flexDirection: 'column', + gap: theme.spacing(2) +})); + +const StyledButton = styled(Button)(({ theme }) => ({ + marginTop: theme.spacing(2) +})); \ No newline at end of file diff --git a/src/components/_sign-up/FormHeadLines.tsx b/src/components/_sign-up/FormHeadLines.tsx index 66bad0d..df04938 100644 --- a/src/components/_sign-up/FormHeadLines.tsx +++ b/src/components/_sign-up/FormHeadLines.tsx @@ -7,7 +7,7 @@ interface IFormHeadLinesProps { const StyledFormHeadLines = styled(Box)(() => ({ textAlign: 'center', - padding: '1rem 0', + padding: '2rem 0' })); const FormHeadLines: FC = () => { diff --git a/src/components/_sign-up/MainSignUp.tsx b/src/components/_sign-up/MainSignUp.tsx index 2c8276f..c0a863d 100644 --- a/src/components/_sign-up/MainSignUp.tsx +++ b/src/components/_sign-up/MainSignUp.tsx @@ -1,5 +1,5 @@ import React, { FC } from 'react'; -import { Box, styled } from '@mui/material'; +import { Box, Card, styled } from '@mui/material'; import SignUpForm from './SignUpForm'; interface IMainSignUpProps { @@ -14,6 +14,7 @@ const StyledMainSignUp = styled(Box)(() => ({ display: 'flex', alignItems: 'center', justifyContent: 'center', + padding: '2rem' })); const MainSignUp: FC = () => { diff --git a/src/components/_sign-up/SignUpForm.tsx b/src/components/_sign-up/SignUpForm.tsx index e61474c..26cea00 100644 --- a/src/components/_sign-up/SignUpForm.tsx +++ b/src/components/_sign-up/SignUpForm.tsx @@ -1,28 +1,43 @@ import React, { FC } from 'react'; -import { Box, Button, FormControl, FormLabel, styled, TextField } from '@mui/material'; -import FormHeadLines from './FormHeadLines'; +import { Button, styled, TextField } from '@mui/material'; import { useNavigate } from 'react-router-dom'; import { useFormik } from 'formik'; import { SignUpThunk } from 'store/thunk/authentication-thunk'; import { useAppDispatch } from 'hooks/dispatch'; +import FormHeadlines from 'components/_sign-in/FormHeadlines'; interface ISignUpFormProps { [key: string]: unknown; } -const StyledSignUpForm = styled('form')(() => ({ +const StyledSignInForm = styled('form')(({ theme }) => ({ width: '30vw', background: '#fff', - padding: '0.5rem', - borderRadius: '5px' + padding: theme.spacing(2), + borderRadius: '5px', + boxShadow: '0px 0px 10px rgba(0, 0, 0, 0.1)' })); -const StyledFormAction = styled(Box)(() => ({ +const StyledFormFields = styled('div')(({ theme }) => ({ + display: 'flex', + flexDirection: 'column', + gap: theme.spacing(2) +})); + +const StyledButton = styled(Button)(({ theme }) => ({ + marginTop: theme.spacing(2), + display: 'flex', + alignItems: 'center' +})); + +const StyledImage = styled('img')(({ theme }) => ({ + width: '250px', + height: '250px', + marginBottom: theme.spacing(2), display: 'flex', alignItems: 'center', - justifyContent: 'space-between', - gap: '1.5rem', - padding: '1rem 0rem' + justifyContent: 'center', + textAlign: 'center' })); const SignUpForm: FC = () => { @@ -47,15 +62,10 @@ const SignUpForm: FC = () => { } }); - const handleCancel = () => { - navigate(-1); - }; - return ( - - - - Email + + + = () => { type="email" value={values.email} onChange={handleChange} + label={'Please Enter a your email'} /> - - - Password + - - - - - - + + + Sign Up + + ); }; diff --git a/src/components/table/Table.tsx b/src/components/table/Table.tsx index daddcb4..90e2d31 100644 --- a/src/components/table/Table.tsx +++ b/src/components/table/Table.tsx @@ -28,6 +28,7 @@ const StyledMuiTableCell = styled(MuiTableCell)(() => ({ } })); + const Table: React.FC = () => { const columns = useMemo[]>( () => [ diff --git a/src/containers/SignUp.tsx b/src/containers/SignUp.tsx index a524a77..3d8cab5 100644 --- a/src/containers/SignUp.tsx +++ b/src/containers/SignUp.tsx @@ -2,13 +2,9 @@ import React, { FC } from 'react'; import { Box, styled } from '@mui/material'; import { MainSignUp } from 'components/_sign-up'; -interface ISignOutProps { - [key: string]: unknown; -} +const StyledSignOut = styled(Box)({}); -const StyledSignOut = styled(Box)(() => ({})); - -const SignOut: FC = () => { +const SignOut: FC = () => { return (