Merge pull request #178 from VasylievYurii/colorAndnav

Color andnav
VasylievYurii · Nov 22, 2023 · 5719c91 · 5719c91
2 parents 6ceca14 + 4652d77
commit 5719c91
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/src/components/Header/Header.jsx b/src/components/Header/Header.jsx
@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import MediaQuery from 'react-responsive';
 import { Link } from 'react-router-dom';
 import sprite from '../../assets/sprite.svg';
@@ -26,6 +26,8 @@ const Header = () => {
     setIsMenuOpen((prevState) => !prevState);
   };
 
+  const { targetBmr } = useSelector((state) => state.indicators.indicators);
+
   const handleLogOut = () => {
     dispatch(logOutUser());
   };
@@ -38,11 +40,16 @@ const Header = () => {
         </Link>
         <SecondNavWrapper>
           <MediaQuery minWidth={1440}>
-            <NavWrapper>
-              <StyledLink to="/diary">Diary</StyledLink>
-              <StyledLink to="/products">Products</StyledLink>
-              <StyledLink to="/exercises">Exercises</StyledLink>
-            </NavWrapper>
+            {targetBmr === 0 ? (
+              (console.log('NavWrapper not rendered: NaN'), null)
+            ) : (
+              <NavWrapper>
+                <StyledLink to="/diary">Diary</StyledLink>
+                <StyledLink to="/products">Products</StyledLink>
+                <StyledLink to="/exercises">Exercises</StyledLink>
+                {console.log('NavWrapper rendered')}
+              </NavWrapper>
+            )}
           </MediaQuery>
           <StyledLinkSettings to="/profile">
             <UserBar />

diff --git a/src/components/SignInForm/SignInForm.jsx b/src/components/SignInForm/SignInForm.jsx
@@ -54,16 +54,13 @@ const SignInForm = () => {
           ? errors.email
             ? '1px solid #D80027'
             : '1px solid #3CBF61'
-          : '1px solid #efede8';
-          // (errors.email && touched.email && '1px solid #D80027') ||
-          // (!errors.email && touched.email && '1px solid #3CBF61');
+          : '1px solid #EFEDE84D';
+
         const borderPasswordColor = touched.password
           ? errors.password
             ? '1px solid #D80027'
             : '1px solid #3CBF61'
-          : '1px solid #efede8';
-          // (errors.password && touched.password && '1px solid #D80027') ||
-          // (!errors.password && touched.password && '1px solid #3CBF61');
+          : '1px solid #EFEDE84D';
 
         return (
           <Form autoComplete="off">

diff --git a/src/components/SignUpForm/SignUpForm.jsx b/src/components/SignUpForm/SignUpForm.jsx
@@ -41,7 +41,6 @@ const initialValues = {
 const SignUpForm = () => {
   const [toggleIcon, setToggleIcon] = useState(`${sprite}#icon-eye-off`);
   const [type, setType] = useState('password');
-  // const [validColor, setValidColor] = useState('red');
 
   const dispatch = useDispatch();
 
@@ -110,7 +109,7 @@ const SignUpForm = () => {
                     ? errors.email
                       ? '1px solid #D80027'
                       : '1px solid #3CBF61'
-                    : '1px solid #efede8'
+                    : '1px solid #EFEDE84D'
                 }
                 type="text"
                 name="email"
@@ -142,7 +141,7 @@ const SignUpForm = () => {
                       ? errors.password
                         ? '1px solid #D80027'
                         : '1px solid #3CBF61'
-                      : '1px solid #efede8'
+                      : '1px solid #EFEDE84D'
                   }
                   type={type}
                   name="password"

diff --git a/src/components/UserForm/UserForm.jsx b/src/components/UserForm/UserForm.jsx
@@ -9,7 +9,7 @@ import {
 import userSchema from '../../schema/userProfileSchema';
 import RadioUseForm from './RadioUseForm/RadioUseForm';
 import InputUseForm from './InputUseForm/InputUseForm';
-import { SubmitBtn, SuccessText } from './UserForm.styled';
+import { SubmitBtn } from './UserForm.styled';
 import { toast } from 'react-toastify';
 
 const toastInfo = (text) => {
@@ -26,7 +26,6 @@ const toastInfo = (text) => {
   });
 };
 
-
 const initialValues = {
   name: '',
   email: '',
@@ -103,8 +102,9 @@ const UserForm = ({ onClick }) => {
           />
           <RadioUseForm />
 
-          <SubmitBtn type="submit" onClick={onClick}>Save</SubmitBtn>
-
+          <SubmitBtn type="submit" onClick={onClick}>
+            Save
+          </SubmitBtn>
         </Form>
       )}
     </Formik>