diff --git a/src/components/Card/Title.tsx b/src/components/Card/Title.tsx new file mode 100644 index 000000000..2a86035ab --- /dev/null +++ b/src/components/Card/Title.tsx @@ -0,0 +1,19 @@ +import React, { FC } from 'react'; +import { Typography, TypographyProps } from '@mui/material'; + +const CardTitle: FC = (props) => { + return ( + + {props.children} + + ); +}; + +export default CardTitle; diff --git a/src/components/SignUp.tsx b/src/components/SignUp.tsx index 8a2399f86..f99742ebb 100644 --- a/src/components/SignUp.tsx +++ b/src/components/SignUp.tsx @@ -1,25 +1,30 @@ import React, { useState } from 'react'; -import Form from 'react-bootstrap/Form'; -import FormControl from 'react-bootstrap/FormControl'; import constants from 'utils/strings/constants'; import { Formik, FormikHelpers } from 'formik'; import * as Yup from 'yup'; import { getOtt } from 'services/userService'; -import Card from 'react-bootstrap/Card'; import { setData, LS_KEYS } from 'utils/storage/localStorage'; import { useRouter } from 'next/router'; import SubmitButton from 'components/SubmitButton'; -import { Button } from 'react-bootstrap'; import { generateAndSaveIntermediateKeyAttributes, generateKeyAttributes, SaveKeyInSessionStore, } from 'utils/crypto'; import { setJustSignedUp } from 'utils/storage'; -import LogoImg from './LogoImg'; import { logError } from 'utils/sentry'; import { SESSION_KEYS } from 'utils/storage/sessionStorage'; import { PAGES } from 'constants/pages'; +import { + Checkbox, + Container, + Divider, + FormControlLabel, + FormGroup, + TextField, +} from '@mui/material'; +import CardTitle from './Card/Title'; +import LinkButton from './pages/gallery/LinkButton'; interface FormValues { email: string; @@ -87,10 +92,7 @@ export default function SignUp(props: SignUpProps) { return ( <> - - - {constants.SIGN_UP} - + {constants.SIGN_UP} initialValues={{ email: '', @@ -110,83 +112,87 @@ export default function SignUp(props: SignUpProps) { {({ values, errors, - touched, handleChange, handleSubmit, }): JSX.Element => ( -
- - + + + + + + + + + + setAcceptTerms( + e.target.checked + ) + } + color="success" + /> + } + label={constants.TERMS_AND_CONDITIONS()} + /> + + + - - {errors.email} - - - - - - {errors.passphrase} - - - - - - {errors.confirm} - - - - - setAcceptTerms(e.target.checked) - } - type="checkbox" - label={constants.TERMS_AND_CONDITIONS()} - /> - -
- -
- - + + )} diff --git a/src/components/SubmitButton.tsx b/src/components/SubmitButton.tsx index c68c3cfdc..b7c9dd6e4 100644 --- a/src/components/SubmitButton.tsx +++ b/src/components/SubmitButton.tsx @@ -15,7 +15,8 @@ const SubmitButton: FC> = ({ }: Props) => { return (