generated from IvettaGoIT/react_vite
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/README_file
- Loading branch information
Showing
80 changed files
with
1,508 additions
and
852 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -29,7 +29,9 @@ export default function AuthForm({ nameIsShown, btnTitle, onSubmit }) { | |
| const authSchema = Yup.object().shape({ | ||
| name: validateName(nameIsShown), | ||
| email: Yup.string() | ||
| .matches(emailLyout, { message: 'Email must be valid! For example: [email protected]' }) | ||
| .matches(emailLyout, { | ||
| message: 'Email must be valid! For example: [email protected]', | ||
| }) | ||
| .email('Invalid email') | ||
| .required('Email is required'), | ||
| password: Yup.string() | ||
|
|
@@ -68,13 +70,82 @@ export default function AuthForm({ nameIsShown, btnTitle, onSubmit }) { | |
| onSubmit={onSubmit} | ||
| validationSchema={authSchema} | ||
| > | ||
| <FormContainer> | ||
| <InputContainer> | ||
| {nameIsShown && ( | ||
| {({ handleBlur, touched, errors }) => ( | ||
| <FormContainer> | ||
| <InputContainer> | ||
| {nameIsShown && ( | ||
| <InputWrapper> | ||
| <TextInput | ||
| id="name" | ||
| type="text" | ||
| placeholder="name" | ||
| name="name" | ||
| onBlur={handleBlur} | ||
| data-touch={touched.name && !errors.name} | ||
| /> | ||
| <Warning> | ||
| <ErrorMessage name="name"> | ||
| {msg => ( | ||
| <Error> | ||
| <svg width="20" height="20"> | ||
| <use | ||
| href={sprite + `#icon-checkbox-circle-fill`} | ||
| ></use> | ||
| </svg> | ||
| {msg} | ||
| </Error> | ||
| )} | ||
| </ErrorMessage> | ||
| </Warning> | ||
| </InputWrapper> | ||
| )} | ||
| <InputWrapper> | ||
| <TextInput | ||
| id="email" | ||
| type="email" | ||
| placeholder="Email" | ||
| name="email" | ||
| onBlur={handleBlur} | ||
| data-touch={touched.email && !errors.email} | ||
| /> | ||
| <Warning> | ||
| <ErrorMessage name="email"> | ||
| {msg => ( | ||
| <Error> | ||
| <svg width="20" height="20"> | ||
| <use href={sprite + `#icon-checkbox-circle-fill`}></use> | ||
| </svg> | ||
| {msg} | ||
| </Error> | ||
| )} | ||
| </ErrorMessage> | ||
| </Warning> | ||
| </InputWrapper> | ||
| <InputWrapper> | ||
| <TextInput id="name" type="text" placeholder="Name" name="name" /> | ||
| <TextInput | ||
| id="password" | ||
| type={typePasswordInput} | ||
| placeholder="Password" | ||
| name="password" | ||
| onBlur={handleBlur} | ||
| data-touch={touched.password && !errors.password} | ||
| /> | ||
| <ButtonIconForInput | ||
| type="button" | ||
| right="16px" | ||
| onClick={toglePassword} | ||
| > | ||
| <svg width="20" height="20"> | ||
| <use | ||
| href={ | ||
| sprite + | ||
| `${isPasswordShown ? `#icon-eye-off` : `#icon-eye`}` | ||
| } | ||
| ></use> | ||
| </svg> | ||
| </ButtonIconForInput> | ||
| <Warning> | ||
| <ErrorMessage name="name"> | ||
| <ErrorMessage name="password"> | ||
| {msg => ( | ||
| <Error> | ||
| <svg width="20" height="20"> | ||
|
|
@@ -86,64 +157,10 @@ export default function AuthForm({ nameIsShown, btnTitle, onSubmit }) { | |
| </ErrorMessage> | ||
| </Warning> | ||
| </InputWrapper> | ||
| )} | ||
| <InputWrapper> | ||
| <TextInput | ||
| id="email" | ||
| type="email" | ||
| placeholder="Email" | ||
| name="email" | ||
| /> | ||
| <Warning> | ||
| <ErrorMessage name="email"> | ||
| {msg => ( | ||
| <Error> | ||
| <svg width="20" height="20"> | ||
| <use href={sprite + `#icon-checkbox-circle-fill`}></use> | ||
| </svg> | ||
| {msg} | ||
| </Error> | ||
| )} | ||
| </ErrorMessage> | ||
| </Warning> | ||
| </InputWrapper> | ||
| <InputWrapper> | ||
| <TextInput | ||
| id="password" | ||
| type={typePasswordInput} | ||
| placeholder="Password" | ||
| name="password" | ||
| /> | ||
| <ButtonIconForInput | ||
| type="button" | ||
| right="16px" | ||
| onClick={toglePassword} | ||
| > | ||
| <svg width="20" height="20"> | ||
| <use | ||
| href={ | ||
| sprite + | ||
| `${isPasswordShown ? `#icon-eye-off` : `#icon-eye`}` | ||
| } | ||
| ></use> | ||
| </svg> | ||
| </ButtonIconForInput> | ||
| <Warning> | ||
| <ErrorMessage name="password"> | ||
| {msg => ( | ||
| <Error> | ||
| <svg width="20" height="20"> | ||
| <use href={sprite + `#icon-checkbox-circle-fill`}></use> | ||
| </svg> | ||
| {msg} | ||
| </Error> | ||
| )} | ||
| </ErrorMessage> | ||
| </Warning> | ||
| </InputWrapper> | ||
| </InputContainer> | ||
| <BtnSubmit title={btnTitle} fontSize="20px" /> | ||
| </FormContainer> | ||
| </InputContainer> | ||
| <BtnSubmit title={btnTitle} fontSize="20px" /> | ||
| </FormContainer> | ||
| )} | ||
| </Formik> | ||
| ); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.