diff --git a/src/components/SectionTemplateNoAuth/SectionTemplateNoAuth.styled.js b/src/components/SectionTemplateNoAuth/SectionTemplateNoAuth.styled.js index d4fca7a..13af76c 100644 --- a/src/components/SectionTemplateNoAuth/SectionTemplateNoAuth.styled.js +++ b/src/components/SectionTemplateNoAuth/SectionTemplateNoAuth.styled.js @@ -27,7 +27,7 @@ export const SectionNoAuth = styled.section` background-repeat: no-repeat; background-position: right bottom; background-size: contain; - height: 100vh; + height: 812px; /* padding-top: 24px; padding-left: 20px; padding-right: 20px; @@ -52,6 +52,7 @@ export const SectionNoAuth = styled.section` padding-bottom: 0; padding-top: 0; background-image: url(${welcomeTablet}); + height: 1024px; @media only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) { diff --git a/src/components/SignInForm/SignInForm.jsx b/src/components/SignInForm/SignInForm.jsx index fee049f..f11efcb 100644 --- a/src/components/SignInForm/SignInForm.jsx +++ b/src/components/SignInForm/SignInForm.jsx @@ -25,7 +25,7 @@ const initialValues = { const SignInForm = () => { const [toggleIcon, setToggleIcon] = useState(`${sprite}#icon-eye-off`); const [type, setType] = useState('password'); - const [validColor, setValidColor] = useState(''); + // const [validColor, setValidColor] = useState(''); const dispatch = useDispatch(); const handleSubmit = (values, actions) => { diff --git a/src/components/SignUpForm/SignUpForm.jsx b/src/components/SignUpForm/SignUpForm.jsx index 261a05c..6dd3767 100644 --- a/src/components/SignUpForm/SignUpForm.jsx +++ b/src/components/SignUpForm/SignUpForm.jsx @@ -41,7 +41,7 @@ const initialValues = { const SignUpForm = () => { const [toggleIcon, setToggleIcon] = useState(`${sprite}#icon-eye-off`); const [type, setType] = useState('password'); - const [validColor, setValidColor] = useState('red'); + // const [validColor, setValidColor] = useState('red'); const dispatch = useDispatch(); @@ -74,44 +74,56 @@ const SignUpForm = () => {
- {errors.name && touched.name || !errors.name && touched.name ? ( + {(errors.name && touched.name) || + (!errors.name && touched.name) ? ( {errors.name ? errors.name : "Success name"} + color={!errors.name && touched.name ? '#3CBF61' : null} + > + {errors.name ? errors.name : 'Success name'} + ) : null}
- {errors.email && touched.email || !errors.email && touched.email ? ( + {(errors.email && touched.email) || + (!errors.email && touched.email) ? ( {errors.email ? errors.email : "Success email"} + color={!errors.email && touched.email ? '#3CBF61' : null} + > + {errors.email ? errors.email : 'Success email'} + ) : null}
@@ -119,7 +131,14 @@ const SignUpForm = () => {
{ - {errors.password && touched.password || !errors.password && touched.password ? ( + {(errors.password && touched.password) || + (!errors.password && touched.password) ? ( {errors.password ? errors.password : "Success password"} + color={ + !errors.password && touched.password ? '#3CBF61' : null + } + > + {errors.password ? errors.password : 'Success password'} + ) : null}
diff --git a/src/pages/SignUp.jsx b/src/pages/SignUp.jsx index 5268760..1cd82f9 100644 --- a/src/pages/SignUp.jsx +++ b/src/pages/SignUp.jsx @@ -1,5 +1,5 @@ import { Link } from 'react-router-dom'; -import { ToastContainer } from 'react-toastify'; + import 'react-toastify/dist/ReactToastify.css'; import SectionTemplateNoAuth from '../components/SectionTemplateNoAuth'; import SectionTemplateLeft from '../components/SectionTemplateLeft';