updates on validation form

Tasitaforme · Dec 28, 2023 · 46cca9c · 46cca9c
1 parent 0714d48
commit 46cca9c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 27 deletions.
diff --git a/src/components/ForgotPasswordForm/ForgotPasswordForm.jsx b/src/components/ForgotPasswordForm/ForgotPasswordForm.jsx
@@ -32,7 +32,7 @@ export default function ForgotPasswordForm() {
       validationSchema={forgotPasswordSchema}
       onSubmit={onSubmit}
     >
-      {({ errors, touched, isSubmitting, isValid }) => (
+      {({ errors, touched }) => (
         <Form>
           <FormikStyledField
             type="email"
@@ -49,9 +49,7 @@ export default function ForgotPasswordForm() {
           />
           <Error component="p" name="email" />
 
-          <Button type="submit" disabled={!isValid || isSubmitting}>
-            Send
-          </Button>
+          <Button type="submit">Send</Button>
         </Form>
       )}
     </Formik>

diff --git a/src/components/SignInForm/SignInForm.jsx b/src/components/SignInForm/SignInForm.jsx
@@ -46,7 +46,7 @@ export default function SignInForm() {
         validationSchema={loginSchema}
         onSubmit={onSubmit}
       >
-        {({ errors, touched, isSubmitting, isValid }) => (
+        {({ errors, touched }) => (
           <SignInFormikForm>
             <FlexWrapper>
               <FieldWrapper>
@@ -108,9 +108,7 @@ export default function SignInForm() {
               </FieldWrapper>
             </FlexWrapper>
 
-            <Button type="submit" disabled={!isValid || isSubmitting}>
-              Sign in
-            </Button>
+            <Button type="submit">Sign in</Button>
             <ForgotLink to="/forgot-password">Forgot your password?</ForgotLink>
           </SignInFormikForm>
         )}

diff --git a/src/components/SignUpForm/FormGenderAndAge/FormGenderAndAge.jsx b/src/components/SignUpForm/FormGenderAndAge/FormGenderAndAge.jsx
@@ -30,7 +30,7 @@ export default function FormGenderAndAge({
       validationSchema={genderAndAgeSchema}
       onSubmit={onSubmit}
     >
-      {({ errors, touched, isSubmitting, isValid }) => (
+      {({ errors, touched }) => (
         <GenderAndAgeForm>
           <Text>Gender</Text>
           <GenderWrapper>
@@ -61,9 +61,7 @@ export default function FormGenderAndAge({
             <Error component="p" name="age" />
           </AgeWrapper>
 
-          <GenderAndAgeButton type="submit" disabled={!isValid || isSubmitting}>
-            Next
-          </GenderAndAgeButton>
+          <GenderAndAgeButton type="submit">Next</GenderAndAgeButton>
           <BackButton onClick={handlePrevStep}>Back</BackButton>
         </GenderAndAgeForm>
       )}

diff --git a/src/components/SignUpForm/FormGoal/FormGoal.jsx b/src/components/SignUpForm/FormGoal/FormGoal.jsx
@@ -26,7 +26,7 @@ export default function FormGoal({
       validationSchema={goalSchema}
       onSubmit={onSubmit}
     >
-      {({ isValid, isSubmitting }) => (
+      {() => (
         <GoalForm>
           <FlexWrapper>
             <Label>
@@ -44,9 +44,7 @@ export default function FormGoal({
             <Error component="p" name="goal" />
           </FlexWrapper>
 
-          <GoalButton type="submit" disabled={!isValid || isSubmitting}>
-            Next
-          </GoalButton>
+          <GoalButton type="submit">Next</GoalButton>
           <BackButton onClick={handlePrevStep}>Back</BackButton>
         </GoalForm>
       )}

diff --git a/src/components/SignUpForm/FormParameters/FormParameters.jsx b/src/components/SignUpForm/FormParameters/FormParameters.jsx
@@ -29,7 +29,7 @@ export default function FormParameters({
       validationSchema={parametersSchema}
       onSubmit={onSubmit}
     >
-      {({ errors, touched, isSubmitting, isValid }) => (
+      {({ errors, touched }) => (
         <ParametersForm>
           <Label>
             Height
@@ -64,9 +64,7 @@ export default function FormParameters({
             <Error component="p" name="weight" />
           </Label>
 
-          <ParametersButton type="submit" disabled={!isValid || isSubmitting}>
-            Next
-          </ParametersButton>
+          <ParametersButton type="submit">Next</ParametersButton>
           <BackButton onClick={handlePrevStep}>Back</BackButton>
         </ParametersForm>
       )}

diff --git a/src/components/SignUpForm/FormUserData/FormUserData.jsx b/src/components/SignUpForm/FormUserData/FormUserData.jsx
@@ -31,7 +31,7 @@ export default function FormUserData({
       validationSchema={registerSchema}
       onSubmit={onSubmit}
     >
-      {({ errors, touched, isValid, isSubmitting }) => (
+      {({ errors, touched }) => (
         <SignUpFormikForm>
           <FieldWrapper>
             <SignUpField
@@ -110,9 +110,7 @@ export default function FormUserData({
             </IconsWrapper>
           </FieldWrapper>
 
-          <SignUpButton type="submit" disabled={!isValid || isSubmitting}>
-            Next
-          </SignUpButton>
+          <SignUpButton type="submit">Next</SignUpButton>
         </SignUpFormikForm>
       )}
     </Formik>

diff --git a/src/components/SignUpForm/SignUpForm.jsx b/src/components/SignUpForm/SignUpForm.jsx
@@ -40,10 +40,12 @@ export default function SignUpForm({
     try {
       await dispatch(registration(userData)).unwrap();
 
-      toast.success('You have successfully signed up!');
+      toast.success(
+        'You have successfully signed up! \n A confirmation letter has been sent to your email, please check it!'
+      );
       navigate('/signin');
     } catch (error) {
-      toast.error(`Something went wrong! ${error.message}`);
+      toast.error(`Something went wrong! \n ${error.message}`);
     }
   };
 

diff --git a/src/pages/SignInPage/SignInPage.jsx b/src/pages/SignInPage/SignInPage.jsx
@@ -52,7 +52,7 @@ export default function SignInPage() {
             <HeadlineFirst>Sign in</HeadlineFirst>
             <HeadSecond>You need to login to use the service</HeadSecond>
             <SignInForm />
-            <SubText>If you don't have an account yet</SubText>``
+            <SubText>If you don't have an account yet</SubText>
             <SubLink to="/signup">Sign up</SubLink>
           </TextWrapper>
         </FlexBox>