Added visibility toggle

.env

@@ -23,6 +23,8 @@ REACT_APP_SESSION_EXPIRE_CHECKER=60000
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 REACT_APP_SIGNUP_ERROR_TIMEOUT=7000
 
+REACT_APP_FLUTTERWAVE_APIKEY=FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X
+
 # Had to change the error time to 3sec cause it took too long
 REACT_APP_RESET_START_ERROR_TIMEOUT=3000
 

.env.development

@@ -23,6 +23,8 @@ REACT_APP_SESSION_EXPIRE_CHECKER=60000
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 REACT_APP_SIGNUP_ERROR_TIMEOUT=7000
 
+REACT_APP_FLUTTERWAVE_APIKEY=FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X
+
 # Had to change the error time to 3sec cause it took too long
 REACT_APP_RESET_START_ERROR_TIMEOUT=3000
 

.env.poduction

@@ -23,6 +23,8 @@ REACT_APP_SESSION_EXPIRE_CHECKER=60000
 REACT_APP_LOGIN_ERROR_TIMEOUT=7000
 REACT_APP_SIGNUP_ERROR_TIMEOUT=7000
 
+REACT_APP_FLUTTERWAVE_APIKEY=FLWPUBK_TEST-54c90141b028789d671067bd72f781a9-X
+
 # Had to change the error time to 3sec cause it took too long
 REACT_APP_RESET_START_ERROR_TIMEOUT=3000
 

.gitattributes

@@ -0,0 +1,15 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+*.jsx text
+*.js text
+*.css text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.md text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+*.sh binary
+

package.json

@@ -14,16 +14,16 @@
     "cors": "^2.8.5",
     "faker": "^6.6.6",
     "formik": "^2.2.9",
-    "react": "^18.0.0",
     "react-chartjs-2": "^4.1.0",
     "react-countup": "^6.2.0",
-    "react-dom": "^18.0.0",
-    "react-lottie": "^1.2.3",
-    "react-redux": "^8.0.2",
     "react-router-dom": "^6.0.2",
-    "react-scripts": "5.0.0",
     "react-slick": "^0.29.0",
     "react-toastify": "^9.0.1",
+    "flutterwave-react-v3": "^1.3.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-redux": "^8.0.5",
+    "react-scripts": "5.0.1",
     "redux": "^4.2.0",
     "slick-carousel": "^1.8.1",
     "web-vitals": "^1.0.1",
@@ -53,4 +53,4 @@
       "last 1 safari version"
     ]
   }
-}
+}

run.sh

@@ -6,12 +6,15 @@ export NODE_ENV="${NODE_ENV:-development}"
 
 if [ $NODE_ENV == "development" ]; then
   # this runs webpack-dev-server with hot reloading
+  echo "Development build"
   npm install --legacy-peer-deps
   npm start
 else
   # build the app and serve it via nginx
+  echo "Production build"
   npm install --legacy-peer-deps
   npm run build
   nginx -g 'daemon off;' -c /usr/src/app/nginx.conf
   nginx -c /usr/src/app/nginx.conf
-fi
+fi
+

src/Routers.jsx

@@ -22,7 +22,7 @@ import UpdatePasswordPages from "./views/UpdatePasswordPages";
 import UploadProductPage from "./views/UploadProductPage";
 import UserProfilePage from "./views/UserProfilePage";
 import VerifyYouPages from "./views/VerifyYouPages";
-
+import VerifyPasswordPages from "./views/VerifyPasswordPages";
 import RemindersPage from './views/RemindersPage';
 import TrackingPage from "./views/TrackingPage";
 import CalendarPage from "./views/CalendarPage";
@@ -50,6 +50,7 @@ export default function Routers() {
           element={<UpdatePasswordPages />}
         />
         <Route path="/vemail" element={<VerifyLinkPages />} />
+        <Route path="/complereset" element={<VerifyPasswordPages />} />
         <Route exact path="/outmessage" element={<VerifyYouPages />} />
 
         {/* private route */}
@@ -72,6 +73,7 @@ export default function Routers() {
           <Route exact path="/notification" element={<Notification />} />
           <Route exact path="/mytask" element={<MyTaskPage />} />
           <Route exact path="/myjobs" element={<MyJobsPage />} />
+          <Route exact path="/my-active-jobs"  element={<MyJobsPage />} />
           <Route
             exact
             path="/my-collection/collection-item"

src/components/AuthPages/AuthLayout.jsx

@@ -1,24 +1,35 @@
 import React from "react";
-import loginThumb from "../../assets/images/auth-thumb.svg";
-import logo from "../../assets/images/wrenchboard.png"; //logo-1.svg";
+import { Link } from "react-router-dom";
 
 export default function LoginLayout({ slogan, children }) {
-  const checkScreenHeight = window.screen.height;
-  let screen = "";
-  if (checkScreenHeight <= 950) {
-    screen = "h-screen";
-    // screen = "h-[950px]";
-  } else {
-    screen = "h-screen";
-  }
   return (
-    <div className="layout-wrapper login">
-      <div className={`main-wrapper login-wrapper w-full ${screen}`}>
-        <div className="flex w-full h-full">
-
+    <div className={`layout-wrapper login`}>
+      <div className={`main-wrapper login-wrapper w-full h-screen overflow-y-auto sm:p-20 p-10`}>
+        <div className="w-full h-full">
           <div className="flex-1 flex justify-center items-center">
             {children && children}
           </div>
+          <div className="flex-1 flex justify-center items-center p-10">
+            <div className="flex items-center">
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                About
+              </Link>
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                Services
+              </Link>
+              <Link to="#" className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]">
+                Contact Us
+              </Link>
+            </div>
+          </div>
+          <div className="flex-1 flex justify-center items-center p-10">
+            <p className="text-black text-[15px] px-2 font-medium flex items-center">
+             <span className="text-3xl mt-2 mr-1">©</span>  2023 - {" "}
+              <Link to="/" className="text-[#009ef7] ml-1">
+                WrenchBoard
+              </Link>{" "}
+            </p>
+          </div>
         </div>
       </div>
     </div>

src/components/AuthPages/Login/index.jsx

@@ -4,19 +4,24 @@ import { toast } from "react-toastify";
 import googleLogo from "../../../assets/images/google-logo.svg";
 import appleLogo from "../../../assets/images/apple-black.svg";
 import facebookLogo from "../../../assets/images/facebook-4.svg";
-import WrenchBoard from "../../../assets/images/wrenchboard.png"
+import WrenchBoard from "../../../assets/images/wrenchboard.png";
 import usersService from "../../../services/UsersService";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 
+import { useDispatch, useSelector } from "react-redux";
+import { updateUserDetails } from "../../../store/UserDetails";
+
 export default function Login() {
+  const dispatch = useDispatch();
+
   const [checked, setValue] = useState(false);
   const [loginLoading, setLoginLoading] = useState(false);
 
   //login error state
   const [loginError, setLoginError] = useState(false);
   // for the catch error
-  const [msgError, setMsgError] = useState('');
+  const [msgError, setMsgError] = useState("");
 
   const rememberMe = () => {
     setValue(!checked);
@@ -35,65 +40,62 @@ export default function Login() {
   const navigate = useNavigate();
   const userApi = new usersService();
 
-
   const doLogin = async () => {
-    if (email == '' && password == '') {
-      setMsgError('Please fill in fields')
-    }
     try {
       if (email !== "" && password !== "") {
         var postData = {
           username: email,
           password: password,
-          sessionid: 'STARTING'
+          sessionid: "STARTING",
         };
-        const loginResult = await userApi.logInUser(postData);  // just for a test
+        const loginResult = await userApi.logInUser(postData); // just for a test
         //debugger;
         // if (email === "support@mermsemr.com") {
-        if (loginResult.data.status > 0 && loginResult.data.internal_return == 100 && loginResult.data.session != '') { // just for a start
-          localStorage.setItem("email", `${loginResult.data.email}`);
+        if (
+          loginResult.data.status > 0 &&
+          loginResult.data.internal_return == 100 &&
+          loginResult.data.session != ""
+        ) {
+          // just for a start
           localStorage.setItem("member_id", `${loginResult.data.member_id}`);
           localStorage.setItem("uid", `${loginResult.data.uid}`);
           localStorage.setItem("session_token", `${loginResult.data.session}`);
-          localStorage.setItem("added", `${loginResult.data.added}`);
-          localStorage.setItem("city", `${loginResult.data.city}`);
-          localStorage.setItem("country", `${loginResult.data.country}`);
-          localStorage.setItem("firstname", `${loginResult.data.firstname}`);
-          localStorage.setItem("last_login", `${loginResult.data.last_login}`);
-          localStorage.setItem("lastname", `${loginResult.data.lastname}`);
-          localStorage.setItem("state", `${loginResult.data.state}`);
-          localStorage.setItem("zip_code", `${loginResult.data.zip_code}`);
           localStorage.setItem("session", `${loginResult.data.session}`);
           setLoginLoading(true);
           // userApi.getUserReminders(); //testing
+          dispatch(updateUserDetails(loginResult.data));
           setTimeout(() => {
             navigate("/", { replace: true });
             setLoginLoading(false);
           }, 2000);
         } else {
           // toast.error("Invalid Credential");
-          setLoginError(true)
+          setLoginError(true);
         }
+      } else {
+        setMsgError("Please fill in fields");
       }
     } catch (error) {
-      setMsgError('An error occurred')
+      setMsgError("An error occurred");
     } finally {
       setTimeout(() => {
-        setLoginError(false)
-        setMsgError(null)
-      }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT))
+        setLoginError(false);
+        setMsgError(null);
+      }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT));
     }
   };
 
   return (
     <>
-      <AuthLayout
-        slogan="Welcome to WrenchBoard"
-      >
+      <AuthLayout slogan="Welcome to WrenchBoard">
         <div className="w-full">
-          <div className='mb-12'>
-            <Link to='#'>
-              <img src={WrenchBoard} alt="wrenchboard" className="h-10 mx-auto" />
+          <div className="mb-12">
+            <Link to="#">
+              <img
+                src={WrenchBoard}
+                alt="wrenchboard"
+                className="h-10 mx-auto"
+              />
             </Link>
           </div>
           <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center xl:bg-white dark:bg-dark-white 2xl:w-[828px]  rounded-[0.475rem] sm:p-7 p-5">
@@ -102,7 +104,15 @@ export default function Login() {
                 <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                   Sign In to WrenchBoard
                 </h1>
-                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">New Here? <Link to='/signup' className='font-semibold text-[#4687ba] hover:text-[#009ef7] transition'>Create an Account</Link></span>
+                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                  New Here?{" "}
+                  <Link
+                    to="/signup"
+                    className="font-semibold text-[#4687ba] hover:text-[#009ef7] transition"
+                  >
+                    Create an Account
+                  </Link>
+                </span>
               </div>
               <div className="input-area">
                 <div className="input-item mb-5">
@@ -162,8 +172,23 @@ export default function Login() {
                   Forgot Password
                 </a>
               </div> */}
-                {loginError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-thin leading-[19.5px] text-[13px]">Invalid username or password- Please <Link to='/#' className='text-[#009ef7]'>reset your password</Link> or <Link to='/signup' className='text-[#009ef7]'>create a new account</Link></div>}
-                {msgError && <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">{msgError}</div>}
+                {loginError && (
+                  <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-thin leading-[19.5px] text-[13px]">
+                    Invalid username or password- Please{" "}
+                    <Link to="/#" className="text-[#009ef7]">
+                      reset your password
+                    </Link>{" "}
+                    or{" "}
+                    <Link to="/signup" className="text-[#009ef7]">
+                      create a new account
+                    </Link>
+                  </div>
+                )}
+                {msgError && (
+                  <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
+                    {msgError}
+                  </div>
+                )}
                 <div className="signin-area mb-3.5">
                   <div className="flex justify-center">
                     <button
@@ -178,9 +203,9 @@ export default function Login() {
                       )}
                     </button>
                   </div>
-                  <BrandBtn link='#' imgSrc={googleLogo} brand='Google' />
-                  <BrandBtn link='#' imgSrc={facebookLogo} brand='Facebook' />
-                  <BrandBtn link='#' imgSrc={appleLogo} brand='Apple' />
+                  <BrandBtn link="#" imgSrc={googleLogo} brand="Google" />
+                  <BrandBtn link="#" imgSrc={facebookLogo} brand="Facebook" />
+                  <BrandBtn link="#" imgSrc={appleLogo} brand="Apple" />
                 </div>
                 {/* <div className="signup-area flex justify-center">
                 <p className="sm:text-lg text-sm text-thin-light-gray font-normal">
@@ -190,7 +215,10 @@ export default function Login() {
                   </a>
                 </p>
               </div> */}
-                <div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">This site is protected by hCaptcha and the our Privacy Policy and Terms of Service apply.</div>
+                <div className="pt-5 text-[#181c32] text-center font-semibold text-[13.975px] leading-[20.9625px]">
+                  This site is protected by hCaptcha and the our Privacy Policy
+                  and Terms of Service apply.
+                </div>
               </div>
             </div>
           </div>
@@ -200,11 +228,7 @@ export default function Login() {
   );
 }
 
-const BrandBtn = ({
-  link,
-  imgSrc,
-  brand
-}) => {
+const BrandBtn = ({ link, imgSrc, brand }) => {
   return (
     <div className="flex justify-center bottomMargin">
       <a
@@ -217,5 +241,5 @@ const BrandBtn = ({
         </span>
       </a>
     </div>
-  )
-}
+  );
+};

src/components/AuthPages/SignUp/index.jsx

@@ -56,17 +56,13 @@ export default function SignUp() {
 
   const handleSignUp = async () => {
     let { country, first_name, last_name, email, password } = formData;
-
-    if (email === "" && password === "" && first_name === "") {
-      setMsgError("Please fill in fields");
-    }
-
     try {
       if (
         email !== "" &&
         password !== "" &&
         first_name !== "" &&
-        last_name !== ""
+        last_name !== "" &&
+        country !== ""
       ) {
         setSignUpLoading(true);
         const reqData = {
@@ -98,6 +94,8 @@ export default function SignUp() {
           setSignUpLoading(false);
           setMsgError("An error occurred");
         }
+      } else {
+        setMsgError("Please fill in fields");
       }
     } catch (error) {
       throw new Error(error);
@@ -262,7 +260,7 @@ export default function SignUp() {
                           <button
                             type="button"
                             onClick={handleSignUp}
-                            className={`rounded-[0.475rem] mb-6 text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px]`}
+                            className={`rounded-[0.475rem] mb-6 text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center h-[42px] py-[0.8875rem] px-[1.81rem] text-[14.95px] btn-login`}
                           >
                             {signUpLoading ? (
                               <div className="signup btn-loader"></div>
@@ -277,6 +275,36 @@ export default function SignUp() {
                 </div>
               </div>
             </div>
+            <div className="flex-1 flex justify-center items-center p-10">
+              <div className="flex items-center">
+                <Link
+                  to="#"
+                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                >
+                  About
+                </Link>
+                <Link
+                  to="#"
+                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                >
+                  Services
+                </Link>
+                <Link
+                  to="#"
+                  className="text-[#a1a5b7] text-[15px] px-2 font-medium hover:text-[#009ef7]"
+                >
+                  Contact Us
+                </Link>
+              </div>
+            </div>
+            <div className="flex-1 flex justify-center items-center p-10">
+              <p className="text-black text-[15px] px-2 font-medium flex items-center">
+                <span className="text-3xl mt-2 mr-1">©</span> 2023 -{" "}
+                <Link to="/" className="text-[#009ef7] ml-1">
+                  WrenchBoard
+                </Link>{" "}
+              </p>
+            </div>
           </div>
         </div>
       </div>

src/components/AuthPages/VerifyLink/index.jsx

@@ -1,4 +1,4 @@
-import { useState, useLayoutEffect, useCallback } from "react";
+import { useState, useEffect, useCallback } from "react";
 import { useLocation, Link, useNavigate } from "react-router-dom";
 import AuthLayout from "../AuthLayout";
 import InputCom from "../../Helpers/Inputs/InputCom";
@@ -28,6 +28,58 @@ export default function VerifyLink() {
     setPassword(e.target.value);
   };
 
+  // if verification is okay. set a complete signup form
+  const completeSignup = async () => {
+    try {
+      if (email !== "" && password !== "") {
+        setLinkLoader(true);
+        var postData = {
+          username: email,
+          password: password,
+          login_mode: 100,
+          sessionid: "STARTER-NOTREAL",
+          verify_link: token,
+          action: 11012,
+        };
+        const res = await userApi?.CompleteSignUp(postData);
+
+        if (res.status === 200) {
+          const { data } = res;
+          if (
+            data?.status > 0 &&
+            data?.internal_return == 100 &&
+            data?.session != ""
+          ) {
+            localStorage.setItem("email", `${data?.email}`);
+            localStorage.setItem("member_id", `${data?.member_id}`);
+            localStorage.setItem("session_token", `${data?.session}`);
+            localStorage.setItem("session", `${data?.session}`);
+
+            navigate("/", { replace: true });
+            setLinkLoader(false);
+          } else {
+            setLinkLoader(false);
+            setMsgError("Invalid Link or Password Combination");
+          }
+        } else {
+          setLinkLoader(false);
+          setLinkSuccess(false);
+          setMsgError("An error occurred");
+        }
+      } else {
+        setMsgError("Please fill in fields");
+      }
+    } catch (error) {
+      setLinkLoader(false);
+      setLinkSuccess(false);
+      throw new Error(error);
+    } finally {
+      setTimeout(() => {
+        setMsgError(null);
+      }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT);
+    }
+  };
+
   // for verifying the incoming verification link and render the correct component
   const verifyEmail = useCallback(async (code) => {
     try {
@@ -56,71 +108,9 @@ export default function VerifyLink() {
   // delay verify requests by 10000ms
   const debouncedEmail = debounce(verifyEmail, 1000);
 
-  // if verification is okay. set a complete signup form
-  const completeSignup = async () => {
-    if (email === "" && password === "") {
-      setMsgError("Please fill in fields");
-    }
-
-    try {
-      if (email !== "" && password !== "") {
-        setLinkLoader(true);
-        var postData = {
-          username: email,
-          password: password,
-          login_mode: 100,
-          sessionid: "STARTER-NOTREAL",
-          verify_link: token,
-          action: 11012,
-        };
-        const res = await userApi.CompleteSignUp(postData);
-
-        if (res.status === 200) {
-          const { data } = res;
-          if (
-            data?.status > 0 &&
-            data?.internal_return == 100 &&
-            data?.session != ""
-          ) {
-            localStorage.setItem("email", `${data?.email}`);
-            localStorage.setItem("member_id", `${data?.member_id}`);
-            localStorage.setItem("session_token", `${data?.session}`);
-            localStorage.setItem("added", `${data?.added}`);
-            localStorage.setItem("city", `${data?.city}`);
-            localStorage.setItem("country", `${data?.country}`);
-            localStorage.setItem("firstname", `${data?.firstname}`);
-            localStorage.setItem("last_login", `${data?.last_login}`);
-            localStorage.setItem("lastname", `${data?.lastname}`);
-            localStorage.setItem("state", `${data?.state}`);
-            localStorage.setItem("zip_code", `${data?.zip_code}`);
-            localStorage.setItem("session", `${data?.session}`);
-
-            navigate("/", { replace: true });
-            setLinkLoader(false);
-          } else {
-            setLinkLoader(false);
-            setMsgError("Invalid Link or Password Combination");
-          }
-        } else {
-          setLinkLoader(false);
-          setLinkSuccess(false)
-          setMsgError("An error occurred");
-        }
-      }
-    } catch (error) {
-      setLinkLoader(false);
-      setLinkSuccess(false)
-      throw new Error(error);
-    } finally {
-      setTimeout(() => {
-        setMsgError(null);
-      }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT);
-    }
-  };
-
-  useLayoutEffect(() => {
+  useEffect(() => {
     debouncedEmail(token);
-  });
+  }, []);
 
   return (
     <>

src/components/AuthPages/VerifyPassword/index.jsx

@@ -0,0 +1,233 @@
+import { useState, useEffect, useCallback } from "react";
+import { useLocation, Link, useNavigate } from "react-router-dom";
+import AuthLayout from "../AuthLayout";
+import InputCom from "../../Helpers/Inputs/InputCom";
+import usersService from "../../../services/UsersService";
+import WrenchBoard from "../../../assets/images/wrenchboard.png";
+
+const VerifyPassword = () => {
+  const [password, setPassword] = useState("");
+  const [confirmPassword, setConfirmPassword] = useState("");
+  const [msgError, setMsgError] = useState("");
+  const [linkLoader, setLinkLoader] = useState(false);
+  const [linkSuccess, setLinkSuccess] = useState(true);
+  const [showPassword, setShowPassword] = useState(false);
+  const navigate = useNavigate();
+  const location = useLocation();
+  const queryParams = new URLSearchParams(location?.search);
+  const token = queryParams.get("passlink");
+  const userApi = new usersService();
+
+  // To Show and Hide Password
+  const togglePasswordVisibility = () => {
+    setShowPassword(!showPassword);
+  };
+
+  // little checker for the validity of the token
+  if (token?.length != 64) {
+    setLinkSuccess(false);
+  }
+
+  // Password
+  const handlePassword = (e) => {
+    let { name, value } = e?.target;
+    if (name == "password") setPassword(value);
+    if (name == "confirm_password") setConfirmPassword(value);
+  };
+
+  const completeReset = async () => {
+    try {
+      if (password !== "" && confirmPassword !== "") {
+        if (password === confirmPassword) {
+          setLinkLoader(true);
+          var reqData = {
+            sessionid: "DUMMY-CANNOT_BE_EMPTY",
+            reset_link: token,
+            newpass: password,
+            step: 300,
+            action: 730,
+          };
+
+          const res = await userApi?.CompleteResetPassword(reqData);
+
+          if (res.status === 200) {
+            const { data } = res;
+
+            if (data?.status > 0 && data?.email) {
+              setTimeout(() => {
+                navigate("/login", { replace: true });
+                setLinkLoader(false);
+              }, 2000);
+            } else if (data && data?.status == "Invalid Request") {
+              setLinkLoader(false);
+              setLinkSuccess(false);
+            } else {
+              setLinkLoader(false);
+              setMsgError("An error occurred");
+            }
+          } else {
+            setLinkLoader(false);
+            setLinkSuccess(false);
+          }
+        } else {
+          setLinkLoader(false);
+          setMsgError("Passwords does not match");
+        }
+      } else {
+        setMsgError("Please fill in fields");
+      }
+    } catch (error) {
+      setLinkLoader(false);
+      setLinkSuccess(false);
+      throw new Error(error);
+    } finally {
+      setTimeout(() => {
+        setMsgError(null);
+      }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT);
+    }
+  };
+
+  return (
+    <>
+      <AuthLayout slogan="Welcome to WrenchBoard">
+        <div className="w-full">
+          <div className="mb-12">
+            <Link to="#">
+              <img
+                src={WrenchBoard}
+                alt="wrenchboard"
+                className="h-10 mx-auto"
+              />
+            </Link>
+          </div>
+          <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center dark:bg-dark-white 2xl:w-[828px] rounded-[0.475rem] sm:p-7 p-5">
+            <div className="w-full">
+              <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
+                <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
+                  {linkSuccess ? "Password Reset" : "Invalid verification link"}
+                </h1>
+                {linkSuccess && (
+                  <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                    Enter a new password to reset
+                  </span>
+                )}
+                {linkSuccess && (
+                  <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                    We'll send an email to confirm reset
+                  </span>
+                )}
+              </div>
+              {/* If the verification was a success */}
+              {linkSuccess ? (
+                <SuccessfulComponent
+                  password={password}
+                  confirmPassword={confirmPassword}
+                  handlePassword={handlePassword}
+                  onSubmit={completeReset}
+                  msgErr={msgError}
+                  loader={linkLoader}
+                  showPassword={showPassword}
+                  onClick={togglePasswordVisibility}
+                  navigateHandler={() => navigate("/login")}
+                />
+              ) : (
+                <ErrorComponent onClick={() => navigate("/login")} />
+              )}
+            </div>
+          </div>
+        </div>
+      </AuthLayout>
+    </>
+  );
+};
+
+export default VerifyPassword;
+
+const SuccessfulComponent = ({
+  onSubmit,
+  navigateHandler,
+  showPassword,
+  onClick,
+  password,
+  confirmPassword,
+  handlePassword,
+  msgErr,
+  loader,
+}) => (
+  <div className="input-area">
+    {/* INPUT */}
+    <div className="mb-5">
+      <InputCom
+        value={password}
+        inputHandler={handlePassword}
+        placeholder="● ● ● ● ● ●"
+        label="Password"
+        name="password"
+        type={showPassword ? "text" : "password"}
+        onClick={onClick}
+        passIcon={
+          showPassword ? "show-password" : "hide-password"
+        }
+      />
+    </div>
+    <div className="mb-5">
+      <InputCom
+        value={confirmPassword}
+        inputHandler={handlePassword}
+        placeholder="● ● ● ● ● ●"
+        label="Confirm Password"
+        name="confirm_password"
+        type="password"
+      />
+    </div>
+    {msgErr && (
+      <div className="relative p-4 text-[#912741] bg-[#fcd9e2] border-[#fbc6d3] mb-4 rounded-[0.475rem] text-md font-light leading-[19.5px] text-[13px]">
+        {msgErr}
+      </div>
+    )}
+    <div className="signin-area mb-3.5">
+      <button
+        onClick={onSubmit}
+        type="button"
+        className={`btn-login  rounded-[0.475rem] mb-6 text-xl text-white flex justify-center bg-[#4687ba] hover:bg-[#009ef7] transition-all duration-300 items-center text-[15px]`}
+      >
+        {loader ? (
+          <div className="signup btn-loader"></div>
+        ) : (
+          <span>Continue</span>
+        )}
+      </button>
+    </div>
+    <div className="signin-area mb-3.5">
+      <button
+        onClick={navigateHandler}
+        type="button"
+        className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem] btn-login`}
+      >
+        <span>Return Home</span>
+      </button>
+    </div>
+  </div>
+);
+
+const ErrorComponent = ({ onClick }) => (
+  <div className="input-area">
+    <div className="my-5">
+      <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
+        This error occurs because you have already used this link or the link
+        has broken/expired. Start with the reset process again. If it doesn't
+        work, try to create the account from the start.
+      </p>
+    </div>
+
+    <div className="signin-area flex justify-center mb-3.5">
+      <button
+        onClick={onClick}
+        type="button"
+        className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
+      >
+        <span>Return Home</span>
+      </button>
+    </div>
+  </div>
+);

src/components/AuthPages/VerifyYou/index.jsx

@@ -1,18 +1,20 @@
 import { useNavigate, Link } from "react-router-dom";
 import AuthLayout from "../AuthLayout";
-import WrenchBoard from "../../../assets/images/wrenchboard.png"
+import WrenchBoard from "../../../assets/images/wrenchboard.png";
 
 export default function VerifyYou() {
-  const navigate = useNavigate()
+  const navigate = useNavigate();
   return (
     <>
-      <AuthLayout
-        slogan="Welcome to WrenchBoard"
-      >
+      <AuthLayout slogan="Welcome to WrenchBoard">
         <div className="w-full">
-          <div className='mb-12'>
-            <Link to='#'>
-              <img src={WrenchBoard} alt="wrenchboard" className="h-10 mx-auto" />
+          <div className="mb-12">
+            <Link to="#">
+              <img
+                src={WrenchBoard}
+                alt="wrenchboard"
+                className="h-10 mx-auto"
+              />
             </Link>
           </div>
           <div className="content-wrapper login shadow-md w-full lg:max-w-[500px] mx-auto flex justify-center items-center dark:bg-dark-white 2xl:w-[828px] rounded-[0.475rem] sm:p-7 p-5">
@@ -21,29 +23,38 @@ export default function VerifyYou() {
                 <h1 className="text-[#181c32] font-semibold dark:text-white mb-3 leading-[27.3px] text-[22.75px]">
                   Let's verify your email now
                 </h1>
-                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">Check your email.</span>
+                <span className="text-gray-400 font-medium text-[16.25px] leading-[24.375px]">
+                  Check your email.
+                </span>
               </div>
               <div className="input-area">
                 <div className="mb-5">
                   <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
-                    <b>Verify Email.</b> Help us secure your WrenchBoard account by verifying your email registration address. Verification will let you access all of WrenchBoard's features.
+                    <b>Verify Email.</b> Help us secure your WrenchBoard account
+                    by verifying your email registration address. Verification
+                    will let you access all of WrenchBoard's features.
                   </p>
                 </div>
                 <div className="mb-5">
                   <p className="text-[14px] leading-[19px] text-center text-[#181c32]">
-                    If you do not receive the confirmation message within a few minutes of signing up, please check your Junk E-mail folder just in case the confirmation email got delivered there instead of your inbox. If so, select the confirmation message and click Not Junk, which will allow future messages to get through.
+                    If you do not receive the confirmation message within a few
+                    minutes of signing up, please check your Junk E-mail folder
+                    just in case the confirmation email got delivered there
+                    instead of your inbox. If so, select the confirmation
+                    message and click Not Junk, which will allow future messages
+                    to get through.
                   </p>
                 </div>
               </div>
-            <div className="signin-area flex justify-center mb-3.5">
-              <button
-                onClick={() => navigate("/")}
-                type="button"
-                className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
-              >
-                <span>Return Home</span>
-              </button>
-            </div>
+              <div className="signin-area flex justify-center mb-3.5">
+                <button
+                  onClick={() => navigate("/")}
+                  type="button"
+                  className={`rounded-[0.475rem] mb-6 text-[15px] font-semibold text-[#009ef7] hover:text-white flex justify-center bg-[#f1faff] hover:bg-[#009ef7] transition-all duration-300 items-center py-[0.8875rem] px-[1.81rem]`}
+                >
+                  <span>Return Home</span>
+                </button>
+              </div>
             </div>
           </div>
         </div>

src/components/FourZeroFour/index.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Lottie from "react-lottie";
+// import Lottie from "react-lottie";
 import { useNavigate } from "react-router-dom";
 import * as animationData from "../../assets/images/Lotties/77618-website-404-error-animation.json";
 
@@ -16,7 +16,7 @@ export default function FourZeroFour() {
   return (
     <div className="flex justify-center items-center w-full h-screen bg-[#232247]">
       <div>
-        <Lottie options={defaultOptions} width={600} height={600} />
+        {/* <Lottie options={defaultOptions} width={600} height={600} /> */}
         <div className="flex justify-center">
           <button
             onClick={() => navigate(-1)}

src/components/Home/Hero.jsx

@@ -9,6 +9,7 @@ import slider3 from "../../assets/images/slider-3.jpg";
 import CountDown from "../Helpers/CountDown";
 import SliderCom from "../Helpers/SliderCom";
 import HomeSliders from "./HomeSliders";
+import { useSelector } from "react-redux";
 
 export default function Hero({ className }) {
   const settings = {
@@ -20,6 +21,8 @@ export default function Hero({ className }) {
   };
   const sildeData =null;
   const [addFavorite, setValue] = useState(false);
+
+  const {userDetails} = useSelector((state) => state?.userDetails)
   const favoriteHandler = () => {
     if (!addFavorite) {
       setValue(true);
@@ -29,6 +32,11 @@ export default function Hero({ className }) {
       toast.warn("Remove to Favorite List");
     }
   };
+
+  let loginDate = userDetails?.last_login.split(' ')[0]
+  let {firstname, lastname, email, profile_pic} = userDetails
+  let userEmail = email.split('@')[0]
+
   return (
     <div
       className={`w-full lg:h-[444px] h-full lg:flex lg:p-8 p-4 justify-between items-center lg:space-x-28 rounded-2xl overflow-hidden ${
@@ -47,19 +55,19 @@ export default function Hero({ className }) {
             Welcome
           </h1>
           <span className="text-[18px] font-thin tracking-wide text-white">
-            Last Login :  10-10-2026
+            Last Login :  {loginDate}
           </span>
         </div>
         {/* user */}
         <div className="flex items-center space-x-3">
           <div className="w-14 h-14 flex justify-center items-center rounded-full overflow-hidden">
-            <img src={heroUser} alt="" />
+            <img src={profile_pic != '' ? profile_pic : heroUser} alt="" />
           </div>
           <div>
             <p className="text-xl tracking-wide font-bold antise text-white">
-              Brokln Simons
+              {`${firstname} ${lastname}`}
             </p>
-            <p className="text-sm tracking-wide text-white">@broklinslam_75</p>
+            <p className="text-sm tracking-wide text-white">@{userEmail}</p>
           </div>
         </div>
         {/* countdown */}

src/components/Home/index.jsx

@@ -10,6 +10,8 @@ import UpdateTable from "./UpdateTable";
 import HomeTaskDisplay from "./HomeTaskDisplay";
 import UsersService from "../../services/UsersService";
 import usersService from "../../services/UsersService";
+import { useSelector } from "react-redux";
+
 
 export default function Home() {
     const trending = datas.datas;
@@ -18,10 +20,12 @@ export default function Home() {
     const userApi = new usersService();
     const homeData = userApi.getHomeDate();
 
+    const {userDetails} = useSelector((state) => state?.userDetails)
+
     return (
         <Layout>
             <div className="home-page-wrapper">
-                <Hero className="mb-10" />
+                <Hero className="mb-10" data={userDetails} />
                 {/* <CreateNft />
         <TrendingSection trending={trending} className="mb-10" />*/}
                 <HomeTaskDisplay

src/components/MyJobs/MyJobTable.jsx

@@ -57,6 +57,7 @@ export default function MyJobTable({MyJobList, className }) {
                                                        </h1>
                                                        <span className="text-sm text-thin-light-gray">
                           Price <span className="text-purple">{value.price*0.01}</span>
+                                                           {value.timeline_days} day(s)
                         </span>
                                                    </div>
                                                </div>

src/components/MyWallet/AddFund.jsx

@@ -1,24 +1,39 @@
 import React, {useState} from 'react'
 import RecentActivityTable from './WalletComponent/RecentActivityTable'
 import LoadingSpinner from '../Spinners/LoadingSpinner'
+import { useNavigate } from 'react-router-dom'
 
 function AddFund({payment}) {
    
-    //STATE FOR CONTROLLED INPUTS
-    let [inputs, setInputs] = useState('0')
+    const navigate = useNavigate()
+
+    //STATE FOR CONTROLLED INPUT
+    let [input, setInput] = useState('0')
+
+    let [inputError, setInputError] = useState('')
 
     // FUNCTION TO HANDLE INPUT CHANGE
     const handleChange = ({target:{name, value}}) => {
-        setInputs(value)
+        setInput(value)
     }
 
     //FUNCTION TO HANDLE SUBMIT
-    const handleSubmit = (e) => {
-        e.preventDefault();
+    const handleSubmit = () => {
+        setInputError('')
+        if(!input || input == '0'){
+            setInputError('Please Enter Amount')
+            return
+        }
 
-        //valid inputs before submitting. Just for texting remove later
+        if(isNaN(input)){
+            setInputError('Amount must be a Number')
+            return
+        }
+
+        const stateData = {amount: Number(input)}
+        navigate('confirm-add-fund', {state: stateData})
      
-        setInputs('')
+        setInput('')
     }
     return (
         <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
@@ -30,7 +45,7 @@ function AddFund({payment}) {
                         <div className='md:flex items-center'>
                             <label className='w-full md:w-2/4 text-slate-600 text-lg'>Amount(Naira) <span className='text-red-500'>*</span></label>
                             <input className='w-full md:w-2/4 p-3 text-lg text-right bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                                value={inputs} 
+                                value={input} 
                                 name='amount' 
                                 type="text" 
                                 placeholder='Amount' 
@@ -38,6 +53,7 @@ function AddFund({payment}) {
                                 onChange={handleChange}
                                 />
                         </div>
+                        {inputError && <p className='text-base text-red-500'>{inputError}</p>}
                    </form>
                         <hr />
                         <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>

src/components/MyWallet/AddRecipient.jsx

@@ -108,7 +108,7 @@ function AddRecipient() {
             }
             // setRequestStatus({message: 'Recipient Added Successfully!', loading: false, status: true})
             toast.success("Recipient Added Successfully!");
-            setTimeout(()=>{navigate('../transfer-fund',{replace:true})},1000)
+            setTimeout(()=>{navigate('/my-wallet/transfer-fund',{replace:true})},1000)
         }).catch((error)=>{
             setRequestStatus({message: 'Opps! an error occured! Try again later', loading: false, status: false})
         })    

src/components/MyWallet/ConfirmAddFund.jsx

@@ -0,0 +1,132 @@
+import React, {useState, useEffect} from 'react'
+import RecentActivityTable from './WalletComponent/RecentActivityTable'
+import LoadingSpinner from '../Spinners/LoadingSpinner'
+import InputCom from '../Helpers/Inputs/InputCom'
+import {toast} from 'react-toastify'
+import { useLocation, useNavigate } from 'react-router-dom'
+import { useSelector } from 'react-redux'
+
+import usersService from '../../services/UsersService'
+
+import { FlutterWaveButton, closePaymentModal } from 'flutterwave-react-v3'
+
+
+function ConfirmAddFund({payment}) {
+
+    let {userDetails} = useSelector(state => state.userDetails) // TO GET LOGGEDIN USER DETAILS
+    
+    let [pageLoading, setPageLoading] = useState(true)
+
+    let [requestStatus, setRequestStatus] = useState({message: '', loading: false, status: false}) // STATE FOR API REQUEST
+
+    const apiURL = new usersService()
+    const navigate = useNavigate()
+
+    let {state} = useLocation()
+    
+
+    //FUNCTION TO HANDLE SUBMIT
+    const onSuccessPayment = () => {
+        setRequestStatus({message: '', loading: true, status: false})
+        let reqData = {amount: state?.account, currency: 'NGN'}
+        apiURL.startTopUp(reqData).then((res)=>{
+            if(res.data.internal_return < 0){
+                setRequestStatus({message: 'Could not finish transaction', loading: false, status: false})
+                toast.success('Opps! something went wrong')
+            }
+             // do something
+             setRequestStatus({message: 'Topup successful', loading: false, status: true})
+             toast.success('Account Topup was sucessful')
+            setTimeout(()=>{
+                navigate('/my-wallet', {replace: true})
+                window.location.reload(true)
+            }, 1000)
+        }).catch(err => {
+            // do something
+            setRequestStatus({message: 'Opps! An Error Occured', loading: false, status: false})
+            toast.success('Opps! something went wrong')
+        })
+    }
+
+    const config = {
+        public_key: process.env.REACT_APP_FLUTTERWAVE_APIKEY,
+        tx_ref: Date.now(),
+        amount: state?.amount,
+        currency: 'NGN',
+        payment_options: 'card,mobilemoney,ussd',
+        customer: {
+          email: `${userDetails.email}`,
+          phone_number: userDetails.phone,
+          name: `${userDetails.lastname} ${userDetails.firstname}`
+        },
+        customizations: {
+          title: 'WrenchBoard',
+          description: 'Topup Payment',
+          logo: 'https://st2.depositphotos.com/4403291/7418/v/450/depositphotos_74189661-stock-illustration-online-shop-log.jpg',
+        },
+      };
+
+    const fwConfig = {
+        ...config,
+        text: 'Proceed',
+        callback: (response) => {
+          onSuccessPayment()
+          closePaymentModal() // this will close the modal programmatically
+        },
+        onClose: () => {},
+      };
+
+    useEffect(()=>{
+        // what happens if not state redirect user
+        if(!state){
+            navigate('/my-wallet/add-fund',{replace: true})
+        }else{
+            setPageLoading(false)
+        }
+    },[])
+
+    return (
+        <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">
+            {pageLoading ?
+            <LoadingSpinner size='8' color='sky-blue' />
+            :
+            <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                <div className="add-fund w-full bg-white dark:bg-dark-white rounded-2xl shadow">
+                    <h2 className='md:p-8 p-4 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Confirm Add Fund To Account</h2>
+                    <hr />
+                   <div className='px-4 md:px-8 py-4 add-fund-info'>
+                        <div className="field w-full mb-3">
+                            <InputCom
+                                label="Amount (Naira):"
+                                type="text"
+                                name="amount"
+                                value={state.amount || ''}
+                                disable={true}
+                            />
+                        </div>
+                    </div>
+
+                    <hr />
+                    <div className='md:p-8 p-4 add-fund-btn flex justify-end items-center py-4'>
+                        <FlutterWaveButton {...fwConfig} className='text-lg text-white bg-sky-blue px-4 py-2 hover:opacity-90 rounded-md' />
+                    </div>
+                </div>
+            </div>
+            }
+    
+            <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
+                <div className="wallet w-full  md:p-8 p-4 h-full max-h-[600px] bg-white dark:bg-dark-white overflow-y-auto rounded-2xl shadow">
+                    <h2 className='text-gray-900 dark:text-white text-xl lg:text-2xl font-medium'>Recent Activity</h2>
+                    <p className='text-base text-gray-600 dark:text-white'>Activity Report</p>
+                    {payment.loading ?
+                    <LoadingSpinner size='16' color='sky-blue' />
+                    :
+                    <RecentActivityTable  payment={payment}/>
+                    }
+                </div>
+            </div>
+        </div>
+      )
+}
+
+export default ConfirmAddFund

src/components/MyWallet/ConfirmTransfer.jsx

@@ -13,10 +13,7 @@ function ConfirmTransfer({payment, wallet}) {
     const navigate = useNavigate()
     
     let {state} = useLocation()
-    // what happens if not state redirect user
-    if(!state){
-        navigate('../transfer-fund',{replace: true})
-    }
+    
 
     let [requestStatus, setRequestStatus] = useState({message: '', loading: false, status: false})
     let [pageLoading, setPageLoading] = useState(true)
@@ -37,7 +34,8 @@ function ConfirmTransfer({payment, wallet}) {
             setRequestStatus({message: 'transfer successful', loading: false, status: true})
             toast.success('Transfer sucessful')
             setTimeout(()=>{
-                navigate('/', {replace: true})
+                navigate('/my-wallet', {replace: true})
+                window.location.reload(true)
             }, 1000)
         }).catch(error=>{
             setRequestStatus({message: 'Opps! something went wrong! Try Again', loading: false, status: false})
@@ -45,7 +43,12 @@ function ConfirmTransfer({payment, wallet}) {
     }
 
     useEffect(()=>{
-        setPageLoading(false)
+        // what happens if not state redirect user
+        if(!state){
+            navigate('/my-wallet/transfer-fund',{replace: true})
+        }else{
+            setPageLoading(false)
+        }
     },[])
     return (
         <div className="content-wrapper w-full lg:flex xl:space-x-8 lg:space-x-4 bottomMargin">

src/components/MyWallet/TransferFund.jsx

@@ -125,8 +125,8 @@ function TransferFund({payment, wallet}) {
                                                 inputHandler={props.handleChange}
                                                 blurHandler={(e)=>{
                                                     getSendMoneyFee(e)
-                                                    props.handleBlur
                                                 }}
+                                                // props.handleBlur
                                                 // onMouseLeave={(e)=>{getSendMoneyFee(e)}}
                                             />
                                             {(props.errors.amount && props.touched.amount) && <p className="text-sm text-red-500">{props.errors.amount}</p>}

src/components/MyWallet/Wallet.jsx

@@ -9,6 +9,7 @@ import TransferFund from './TransferFund'
 import AddFund from './AddFund'
 import AddRecipient from './AddRecipient'
 import ConfirmTransfer from './ConfirmTransfer'
+import ConfirmAddFund from './ConfirmAddFund'
 
 function Wallet() {
   return (
@@ -112,6 +113,7 @@ const WalletRoutes = () => {
         <Routes>
             <Route element={<Wallet />}>
                 <Route path='add-fund' element={<AddFund payment={paymentHistory} />} />
+                <Route path='add-fund/confirm-add-fund' element={<ConfirmAddFund payment={paymentHistory} />} />
                 <Route path='transfer-fund' element={<TransferFund payment={paymentHistory} wallet={walletList} />} />
                 <Route index element={<Balance payment={paymentHistory} purchase={purchaseHistory} coupon={couponHistory} wallet={walletList} />} />
                 <Route path='transfer-fund/add-recipient' element={<AddRecipient />} />

src/components/Partials/Header.jsx

@@ -15,6 +15,7 @@ import usersService from "../../services/UsersService";
 
 import siteLogo from '../../assets/images/wrenchboard.png'
 import Flag from '../../assets/images/united-states.svg'
+import { useSelector } from "react-redux";
 
 
 export default function Header({ logoutModalHandler, sidebarHandler }) {
@@ -24,6 +25,8 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
   const [moneyPopup, setPopup] = useToggle(false);
   const [toggleNotification, setToggleNotification] = useToggle(false)
   const darkMode = useContext(DarkModeContext);
+  const {userDetails} = useSelector((state) => state?.userDetails)
+
 
   const [myWalletList, setMyWalletList] = useState([]);
   const api = new usersService();
@@ -87,6 +90,11 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
   const setNotification = ()=> {
     setToggleNotification.toggle()
   }
+
+  // User Profile
+  let {firstname, lastname, email, profile_pic} = userDetails
+  let userEmail = email.split('@')[0]
+
   return (
     <>
       <div className="header-wrapper backdrop-blur-sm bg-[#efedfe5e]/60 dark:bg-transparent w-full h-full flex items-center xl:px-0 md:px-10 px-5">
@@ -463,17 +471,17 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
                 {/* profile-image */}
                 <div className="lg:w-[62px] lg:h-[62px] w-[50px] h-[50px] rounded-full overflow-hidden">
                   <img
-                    src={profileImg}
+                    src={profile_pic != '' ? profile_pic : profileImg}
                     alt="profile"
                     className="w-full h-full"
                   />
                 </div>
                 <div className="lg:block hidden">
                   <h1 className="text-xl font-bold   text-dark-gray dark:text-white">
-                    Brokln Simons
+                  {`${firstname} ${lastname}`}
                   </h1>
                   <p className="text-sm text-thin-light-gray">
-                    @broklinslam_75
+                    @{userEmail}
                   </p>
                 </div>
               </div>

src/components/Partials/Layout.jsx

@@ -22,9 +22,9 @@ export default function Layout({ children }) {
   const logOut = () => {
     localStorage.removeItem("email");
     localStorage.clear();
-    toast.success("Come Back Soon", {
-      icon: `🙂`,
-    });
+    // toast.success("Come Back Soon", {
+    //   icon: `🙂`,
+    // });
 
     navigate("/login", { replace: true });
   };

src/components/Partials/RightSideBar.jsx

@@ -12,6 +12,7 @@ import EthIco from "../Helpers/Icons/EthIco";
 import LtcIco from "../Helpers/Icons/LtcIco";
 import Usdt from "../Helpers/Icons/Usdt";
 import SelectBox from "../Helpers/SelectBox";
+import { NavLink } from "react-router-dom";
 
 export default function RightSideBar() {
   const filterDatas = ["Last 15 days", "Last Month", "Last 6 month"];
@@ -108,7 +109,10 @@ export default function RightSideBar() {
               {/* name */}
               <div>
                 <p className="text-thin-light-gray text-base font-medium">
-                  Rarible
+                  <NavLink
+                      to="/history">
+                    History
+                  </NavLink>
                 </p>
               </div>
               {/* action */}
@@ -152,7 +156,8 @@ export default function RightSideBar() {
               {/* name */}
               <div>
                 <p className="text-thin-light-gray text-base font-medium">
-                  Myth Market
+                  <NavLink
+                      to="/referral">Refer a Friend</NavLink>
                 </p>
               </div>
             </div>
@@ -186,7 +191,10 @@ export default function RightSideBar() {
               {/* name */}
               <div>
                 <p className="text-thin-light-gray text-base font-medium">
-                  KnownOrigin
+                  <NavLink
+                      to="/resources">
+                    Resources
+                  </NavLink>
                 </p>
               </div>
             </div>

src/components/Partials/Sidebar.jsx

@@ -156,108 +156,108 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              <li className="item group">
-                <NavLink
-                  to="/notification"
-                  className={`nav-item flex items-center  ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="notification-setting" />
-                  </span>
-                  <span
-                    className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                   Messages
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/my-wallet"
-                  className={`nav-item flex items-center  ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="wallet-two" />
-                  </span>
-                  <span
-                    className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                   My Wallet
-                  </span>
-                </NavLink>
-              </li>
-              <li className="item group">
-                <NavLink
-                  to="/resources"
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="star" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    Resources
-                  </span>
-                </NavLink>
-              </li>
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/notification"*/}
+              {/*    className={`nav-item flex items-center  ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="notification-setting" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*     Messages*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/my-wallet"*/}
+              {/*    className={`nav-item flex items-center  ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="wallet-two" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content relative group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*     My Wallet*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/resources"*/}
+              {/*    className={`nav-item flex items-center ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="star" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*      Resources*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
           
-              <li className="item group">
-                <NavLink
-                  to="/history"
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="history" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    History
-                  </span>
-                </NavLink>
-              </li>
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/history"*/}
+              {/*    className={`nav-item flex items-center ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="history" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*      History*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
 
-              <li className="item group">
-                <NavLink
-                  to="/referral"
-                  className={`nav-item flex items-center ${
-                    ((navData) => (navData.isActive ? "active" : ""),
-                    sidebar ? "justify-start space-x-3.5" : "justify-center")
-                  }`}
-                >
-                  <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">
-                    <Icons name="history" />
-                  </span>
-                  <span
-                    className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                      sidebar ? "active flex-1" : "w-0"
-                    }`}
-                  >
-                    Refer a Friend
-                  </span>
-                </NavLink>
-              </li>
+              {/*<li className="item group">*/}
+              {/*  <NavLink*/}
+              {/*    to="/referral"*/}
+              {/*    className={`nav-item flex items-center ${*/}
+              {/*      ((navData) => (navData.isActive ? "active" : ""),*/}
+              {/*      sidebar ? "justify-start space-x-3.5" : "justify-center")*/}
+              {/*    }`}*/}
+              {/*  >*/}
+              {/*    <span className="item-icon group-hover:bg-purple group-hover:text-white w-8 h-8 flex justify-center items-center transition-all duration-300 ease-in-out  bg-light-purple dark:bg-dark-light-purple  rounded-full text-dark-gray dark:text-white dark:text-lighter-gray">*/}
+              {/*      <Icons name="history" />*/}
+              {/*    </span>*/}
+              {/*    <span*/}
+              {/*      className={`item-content group-hover:text-purple text-[18px] transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${*/}
+              {/*        sidebar ? "active flex-1" : "w-0"*/}
+              {/*      }`}*/}
+              {/*    >*/}
+              {/*      Refer a Friend*/}
+              {/*    </span>*/}
+              {/*  </NavLink>*/}
+              {/*</li>*/}
             </ul>
           </div>
         </div>
@@ -290,7 +290,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
               </li>
               <li className="item group">
                 <NavLink
-                    to="/market"
+                    to="/my-active-jobs"
                     className={`nav-item flex items-center ${
                         ((navData) => (navData.isActive ? "active" : ""),
                             sidebar ? "justify-start space-x-3.5" : "justify-center")

src/components/Referral/ReferralDisplay.jsx

@@ -2,6 +2,33 @@ import React, { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { toast } from "react-toastify";
 import usersService from '../../services/UsersService';
+import InputCom from '../Helpers/Inputs/InputCom';
+import LoadingSpinner from '../Spinners/LoadingSpinner';
+
+import {Formik, Form} from 'formik'
+import * as Yup from 'yup'
+
+const validationSchema = Yup.object().shape({
+    email: Yup.string()
+      .email('Wrong email format')
+      .min(3, 'Minimum 3 characters')
+      .max(50, 'Maximum 50 characters')
+      .required('Email is required'),
+    firstname: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Firstname is required'),
+    lastname: Yup.string()
+      .min(3, 'Minimum 3 characters')
+      .max(25, 'Maximum 25 characters')
+      .required('Lastname is required'),
+  })
+  
+  const initialValues = {
+    firstname: '',
+    lastname: '',
+    email: ''
+  }
 
 function ReferralDisplay() {
     const apiCall = new usersService() // GET API CALL
@@ -16,7 +43,7 @@ function ReferralDisplay() {
         data: []
     }) 
 
-    let [error, setError] = useState({message: '', loading: false}) // for displaying error message on the page
+    let [error, setError] = useState({message: '', loading: false, status: false}) // for displaying error message on the page
 
     //function to call referral history API
     const allReferrals = () => {
@@ -38,49 +65,28 @@ function ReferralDisplay() {
     const sendReferralMsg = (postData) => {
         apiCall.sendReferralMsg(postData).then((res)=>{
             if(res.data.internal_return < 0){
-                setError({message:'Email already referred', loading: false})
+                setError({message:'Email already referred', loading: false, status: false})
                 return
             }else{
-                setInputs({ firstname: '', lastname: '', email: '',})
                 toast.success("Message Sent");
-                setError({message:'', loading: false})
+                setError({message:'', loading: false, status: true})
                 setRefHistoryReload(prev => !prev)
             }
         }).catch((error)=>{
-            setError({message:'Opps! an error occured, try again later', loading: false})
+            setError({message:'Opps! an error occured, try again later', loading: false, status: false})
         })
     }
 
-    //STATE FOR CONTROLLED INPUTS
-    let [inputs, setInputs] = useState({
-        firstname: '',
-        lastname: '',
-        email: ''
-    })
-
-    // FUNCTION TO HANDLE INPUT CHANGE
-    const handleChange = ({target:{name, value}}) => {
-        setInputs(prev => ({...prev, [name]:value}))
-    }
-
     //FUNCTION TO HANDLE SUBMIT
-    const handleSubmit = (e) => {
-        e.preventDefault();
-        setError({message: '', loading: true})
-        let {firstname, lastname, email} = inputs
-        if(!firstname || !lastname || !email){
-            setError({message: 'Please fill all fields', loading: false})
-            return
-        }
+    const handleSubmit = (values, helpers) => {
+        setError({message: '', loading: true, status: false})
 
         var postData = {
             uid: localStorage.getItem("uid"),
             member_id: localStorage.getItem("member_id"),
             sessionid: localStorage.getItem("session_token"),
             action: 11032,
-            ref_firstname: firstname,
-            ref_lastname: lastname,
-            ref_email: email
+            ...values
             };
 
         sendReferralMsg(postData) // FUNCTION TO SEND REFERRAL MESSAGE
@@ -95,56 +101,62 @@ function ReferralDisplay() {
         <div className="lg:w-1/2 w-full mb-10 lg:mb-0">
             <div className="referral w-full  md:p-8 p-4 h-full bg-white dark:bg-dark-white rounded-2xl shadow">
                 <h2 className='text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Send Referral</h2>
-               <form className='referral-info' onSubmit={handleSubmit}>
-                    <div className='md:flex items-center my-4'>
-                        <label className='w-full md:w-1/4 text-slate-900 text-lg'>Firstname <span className='text-red-500'>*</span></label>
-                        <input className='w-full md:w-3/4 p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                            value={inputs.firstname} 
-                            name='firstname' 
-                            type="text" 
-                            placeholder='Firstname' 
-                            onChange={handleChange}
+                <Formik initialValues={initialValues} validationSchema={validationSchema} onSubmit={handleSubmit}>
+                    {(props)=>(
+                        <Form className='referral-info'>
+                            {/* Firstname */}
+                            <div className="field w-full mb-6">
+                            <InputCom
+                                label="Firstname"
+                                type="text"
+                                name="firstname"
+                                placeholder="Firstname"
+                                value={props.values.firstname}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
                             />
-                    </div>
-
-                    <div className='md:flex items-center my-4'>
-                        <label className='w-full md:w-1/4 text-slate-900 text-lg'>Lastname <span className='text-red-500'>*</span></label>
-                        <input className='w-full md:w-3/4 p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                            value={inputs.lastname} 
-                            name='lastname' 
-                            type="text" 
-                            placeholder='Lastname' 
-                            onChange={handleChange}
-                            />
-                    </div>
-
-                    <div className='md:flex items-center my-4'>
-                        <label className='w-full md:w-1/4 text-slate-900 text-lg'>Email <span className='text-red-500'>*</span></label>
-                        <input className='w-full md:w-3/4 p-3 text-lg bg-slate-100 rounded-md outline-0 placeholder:text-slate-500 placeholder:text-lg' 
-                            value={inputs.email} 
-                            name='email' 
-                            type="email" 
-                            placeholder='Email' 
-                            onChange={handleChange}
-                            />
-                    </div>
-                    <hr />
-                    {error.message != '' && <p className='text-base text-red-500 py-2'>{error.message}</p>}
-                    <div className='referral-btn flex justify-end items-center py-4 border-b-4'>
-                        {error.loading ?
-                        <div className='flex items-center justify-center'>
-                            <div role="status">
-                                <svg aria-hidden="true" class="w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-sky-blue" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                                    <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-                                    <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-                                </svg>
+                            {(props.errors.firstname && props.touched.firstname) && <p className="text-sm text-red-500">{props.errors.firstname}</p>}
                             </div>
-                        </div>
-                        :
-                        <button type='submit' className='text-lg text-white bg-sky-blue p-2 hover:opacity-90 rounded-md'>Send Message</button>
-                        }
-                    </div>
-               </form>
+
+                            {/* Lastname */}
+                            <div className="field w-full mb-6">
+                            <InputCom
+                                label="Lastname"
+                                type="text"
+                                name="lastname"
+                                placeholder="Lastname"
+                                value={props.values.lastname}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
+                            />
+                            {(props.errors.lastname && props.touched.lastname) && <p className="text-sm text-red-500">{props.errors.lastname}</p>}
+                            </div>
+
+                            <div className="field w-full mb-6">
+                            <InputCom
+                                label="Email"
+                                type="text"
+                                name="email"
+                                placeholder="Email"
+                                value={props.values.email}
+                                inputHandler={props.handleChange}
+                                blurHandler={props.handleBlur}
+                            />
+                            {(props.errors.email && props.touched.email) && <p className="text-sm text-red-500">{props.errors.email}</p>}
+                            </div>
+
+                            <hr />
+                            {error.message != '' && <p className='text-base text-red-500 py-2'>{error.message}</p>}
+                            <div className='referral-btn flex justify-end items-center py-4 border-b-4'>
+                                {error.loading ?
+                                <LoadingSpinner size='6' color='sky-blue' />
+                                :
+                                <button type='submit' className='text-lg text-white bg-sky-blue p-2 hover:opacity-90 rounded-md'>Send Message</button>
+                                }
+                            </div>
+                        </Form>
+                    )}
+               </Formik>
             </div>
         </div>
 
@@ -153,14 +165,7 @@ function ReferralDisplay() {
                 <h2 className='mb-2 text-slate-900 dark:text-white text-xl lg:text-2xl font-medium'>Referral List</h2>
                 {referralList.loading ? 
                 (
-                <div className='flex items-center justify-center'>
-                    <div role="status">
-                        <svg aria-hidden="true" class="w-32 h-32 text-gray-200 animate-spin dark:text-gray-600 fill-sky-blue" viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-                            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-                        </svg>
-                    </div>
-                </div>
+                <LoadingSpinner size='32' color='sky-blue' />
                 )
                 :
                 (

src/components/Settings/Tabs/PersonalInfoTab.jsx

@@ -4,6 +4,7 @@ import InputCom from "../../Helpers/Inputs/InputCom";
 import {Link, useNavigate} from 'react-router-dom'
 import usersService from "../../../services/UsersService";
 import LoadingSpinner from "../../Spinners/LoadingSpinner";
+import { useSelector } from "react-redux";
 
 import {toast} from 'react-toastify'
 
@@ -34,14 +35,6 @@ const validationSchema = Yup.object().shape({
     .required('State is required'),
 })
 
-const initialValues = {
-  firstname: '',
-  lastname: '',
-  state: '',
-  city: '',
-  email: ''
-}
-
 export default function PersonalInfoTab({
   datas,
   frstNmeHndlr,
@@ -57,13 +50,23 @@ export default function PersonalInfoTab({
   coverImgChangHandler,
 }) {
 
+  let {userDetails} = useSelector((state) => state.userDetails)
+  
   const apiCall = new usersService()
+
   let navigate = useNavigate()
 
   let [togglePromotion, setTogglePromotion] = useState(false)
 
+  const initialValues = {
+    firstname: userDetails?.firstname,
+    lastname: userDetails?.lastname,
+    state: userDetails?.state,
+    city: userDetails?.city,
+    email: userDetails?.email
+  }
+
   let [profile, setProfile] = useState({ // state for requesting from load profile API
-    data: [],
     loading: true,
     status: false
   })
@@ -74,55 +77,27 @@ export default function PersonalInfoTab({
     status: false
   })
 
-  let [inputs, setInputs] = useState({ // State for input fields
-    firstname: '',
-    lastname: '',
-    state: '',
-    city: '',
-    email: ''
-  })
-
-  // const handleChange = ({target:{name, value}}) => {
-  //   setInputs(prev => ({...prev, [name]:value}))
-  // }
-
   const handleUpdateUser = (values, helpers)=> {
     setRequestState({message: '', loading: true, status: false})
     
-    apiCall.updateProfile(values).then((res)=>{
+    apiCall.updateProfile(values).then((res)=>{ // API CALL TO UPDATE USER DETAILS
       if(res.data.internal_return < 0){
         setRequestState({message: 'Profile Was unable to update', loading: false, status: false})
         return
       }
       // setRequestState({message: 'Profile update successfully', loading: false, status: true})
       toast.success("Update Successful");
-      setTimeout(()=>{navigate('/',{replace:true})},1000)
+      setTimeout(()=>{
+        navigate('/',{replace:true})
+        window.location.reload(true)
+      },1000)
     }).catch(error => {
       setRequestState({message: 'Opps! an error occurred. Try Agian', loading: false, status: false})
     })
   }
 
-  const loadProfile = ()=>{ // function to load user profile
-    apiCall.loadProfile().then((res)=>{
-      if(res.data.internal_return < 0){
-        setProfile(prev => ({...prev, loading: false, status: true}))
-        return
-      }
-      setProfile(prev => ({...prev, data: [res.data], loading: false, status: true}))
-      setInputs({
-        firstname: res.data.firstname,
-        lastname: res.data.lastname,
-        state: res.data.state,
-        city: res.data.city,
-        email: res.data.email
-      })
-    }).catch(error =>{
-      setProfile(prev => ({...prev, loading: false, status: false}))
-    })
-  }
-
   useEffect(()=>{
-    loadProfile() // loads user profile unto the page
+    setProfile({loading: false, status: true})
   },[])
 
   return (
@@ -135,14 +110,12 @@ export default function PersonalInfoTab({
       </div>
     :
       <div className="personal-info-tab w-full flex flex-col justify-between">
-        <Formik initialValues={inputs} validationSchema={validationSchema} onSubmit={handleUpdateUser}>
+        <Formik initialValues={initialValues} validationSchema={validationSchema} onSubmit={handleUpdateUser}>
           {(props => {
             return (
             <Form>
-            {
-            profile.data.length ? 
-            profile.data.map((item, index) => (
-              <div key={index} className="flex flex-col-reverse sm:flex-row">
+
+              <div className="flex flex-col-reverse sm:flex-row">
                 <div className="flex-1 sm:mr-10">
                   <div className="fields w-full">
                     {/* inputs starts here */}
@@ -153,7 +126,7 @@ export default function PersonalInfoTab({
                         type="text"
                         name="username"
                         placeholder=""
-                        value={item.username}
+                        value={userDetails.username}
                         disable={true}
                       />
                     </div>
@@ -205,7 +178,7 @@ export default function PersonalInfoTab({
                         label="Country"
                         type="text"
                         name="country"
-                        value={item.country}
+                        value={userDetails.country}
                         disable={true}
                       />
                     </div>
@@ -324,41 +297,35 @@ export default function PersonalInfoTab({
                     </div>
                   </div>
                 </div>
-            </div>
-            ))
-            :
-            profile.status ?
-            <div className="py-3 text-slate-500">No User Information Found!</div>
-            :
-            <div className="py-3 text-slate-500">Opps! something went wrong. Try Again Later!</div>
-            }
-            <div className="content-footer w-full">
-              {requestStatus.message != '' && <p className={`text-center text-base ${requestStatus.status ? 'text-green-800' : 'text-red-600'}`}>{requestStatus.message}</p>}
-              <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
-                <div className="flex items-center space-x-4 mr-9">
-                  <Link
-                    to='/'
-                    className="text-18 text-light-red tracking-wide "
-                  >
-                    <span className="border-b dark:border-[#5356fb29]  border-light-red">
-                      {" "}
-                      Cancel
-                    </span>
-                  </Link>
+              </div>
 
-                  {requestStatus.loading ? 
-                  <LoadingSpinner size='8' color='sky-blue' />
-                  :
-                  <button
-                  type="submit"
-                  className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
-                  >
-                    Update Profile
-                  </button>
-                  }
+              <div className="content-footer w-full">
+                {requestStatus.message != '' && <p className={`text-center text-base ${requestStatus.status ? 'text-green-800' : 'text-red-600'}`}>{requestStatus.message}</p>}
+                <div className="w-full h-[120px] border-t border-light-purple dark:border-[#5356fb29]  flex justify-end items-center">
+                  <div className="flex items-center space-x-4 mr-9">
+                    <Link
+                      to='/'
+                      className="text-18 text-light-red tracking-wide "
+                    >
+                      <span className="border-b dark:border-[#5356fb29]  border-light-red">
+                        {" "}
+                        Cancel
+                      </span>
+                    </Link>
+
+                    {requestStatus.loading ? 
+                    <LoadingSpinner size='8' color='sky-blue' />
+                    :
+                    <button
+                    type="submit"
+                    className="w-[152px] h-[46px] flex justify-center items-center btn-gradient text-base rounded-full text-white"
+                    >
+                      Update Profile
+                    </button>
+                    }
+                  </div>
                 </div>
               </div>
-            </div>
             </Form>
           )
         })}

src/components/Settings/index.jsx

@@ -40,6 +40,10 @@ export default function Settings() {
     },
     {
       id: 7,
+      name: "privacy",
+    },
+    {
+      id: 8,
       name: "terms",
     },
   ];
@@ -191,6 +195,23 @@ export default function Settings() {
                         <p className="text-18 tracking-wide">FAQ</p>
                       </div>
                     </li>
+                    <li
+                        onClick={() => tabHandler("terms")}
+                        className={`flex lg:space-x-4 space-x-2 hover:text-purple transition-all duration-300 ease-in-out items-center cursor-pointer lg:mb-11 mb-2 mr-6 lg:mr-0 float-left lg:float-none overflow-hidden ${
+                            tab === "privacy"
+                                ? "text-purple"
+                                : " text-thin-light-gray"
+                        }`}
+                    >
+                      <div>
+                        <Icons name="page-right" />
+                      </div>
+                      <div>
+                        <p className="text-18 tracking-wide">
+                          Privacy Policy
+                        </p>
+                      </div>
+                    </li>
                     <li
                       onClick={() => tabHandler("terms")}
                       className={`flex lg:space-x-4 space-x-2 hover:text-purple transition-all duration-300 ease-in-out items-center cursor-pointer lg:mb-11 mb-2 mr-6 lg:mr-0 float-left lg:float-none overflow-hidden ${

src/components/Spinners/LoadingSpinner.jsx

@@ -1,8 +1,8 @@
 import React from 'react'
 
-function LoadingSpinner({size, color}) {
+function LoadingSpinner({size, color, height}) {
   return (
-    <div className='flex items-center justify-center'>
+    <div className={`flex items-center justify-center ${height ? height : ''}`}>
         <div role="status">
             <svg aria-hidden="true" className={`w-${size} h-${size} text-gray-200 animate-spin dark:text-gray-600 fill-${color}`} viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>

src/middleware/AuthRoute.jsx

@@ -1,38 +1,31 @@
-import { useEffect, useState } from "react";
+import { useEffect, useState, useCallback } from "react";
 import { Navigate, Outlet, useLocation, useNavigate } from "react-router-dom";
+import usersService from '../services/UsersService'
+import LoadingSpinner from '../components/Spinners/LoadingSpinner'
+import WrenchBoard from "../assets/images/wrenchboard.png"
+import { useDispatch, useSelector } from "react-redux";
+import {updateUserDetails} from '../store/UserDetails'
+
 
 const AuthRoute = ({ redirectPath = "/login", children }) => {
+  const apiCall = new usersService()
+
+  const dispatch = useDispatch()
+
   const [lastActivityTime, setLastActivityTime] = useState(Date.now());
-  const isLogin = localStorage.getItem("email");
+  let [isLogin, setIsLogin] = useState({loading: true, status: false})
 
   const navigate = useNavigate();
-  const { pathname } = useLocation();
 
   //Removing Data stored at localStorage after session expires
   const expireSession = () => {
-    localStorage.removeItem("email");
     localStorage.removeItem('session_token');
-    localStorage.removeItem('firstname');
     localStorage.removeItem('member_id');
-    localStorage.removeItem('lastname');
-    localStorage.removeItem('state');
-    localStorage.removeItem('last_login');
     localStorage.removeItem('uid');
     localStorage.removeItem('session');
-    localStorage.removeItem('city');
-    localStorage.removeItem('country');
-    localStorage.removeItem('loglevel');
-    localStorage.removeItem('zip_code');
-    localStorage.removeItem('added');
     navigate("/login", { replace: true }); // redirects user to login page after session expires
   };
 
-  const checkInactivity = setInterval(() => {
-    if (Date.now() - lastActivityTime > process.env.REACT_APP_SESSION_EXPIRE_MINUTES) {
-      expireSession()
-    }
-  }, process.env.REACT_APP_SESSION_EXPIRE_CHECKER) // Checks for inactivity every minute
-
   // Reset last activity time on user input
   const resetTime = () => {
     setLastActivityTime(Date.now());
@@ -40,19 +33,52 @@ const AuthRoute = ({ redirectPath = "/login", children }) => {
   window.addEventListener('mousemove', resetTime)
   window.addEventListener('keydown', resetTime)
 
+  const loadProfile = ()=>{ // function to load user profile
+    setIsLogin({loading: true, status: false})
+    apiCall.loadProfile().then((res)=>{
+      if(res.data.internal_return < 0){
+        setIsLogin({loading: false, status: false})
+        return
+      }
+      dispatch(updateUserDetails(res.data))
+      setIsLogin({loading: false, status: true})
+    }).catch(error =>{
+      setIsLogin({loading: false, status: false})
+    })
+  }
+  
   useEffect(() => {
+    if(!isLogin.status){
+      loadProfile() // LOADS USER PROFILE DETAILS AND CALLS DISPATCH UPDATEUSERDETAILS TO UPDATE USERDETAILS SLICE IN STORE
+    }
+
+    const checkInactivity = setInterval(() => {
+      if (Date.now() - lastActivityTime > process.env.REACT_APP_SESSION_EXPIRE_MINUTES) {
+        expireSession()
+      }
+    }, process.env.REACT_APP_SESSION_EXPIRE_CHECKER) // Checks for inactivity every minute
+
     // cleaning up listeners
     return () => {
       clearInterval(checkInactivity)
       window.removeEventListener('mousemove', resetTime)
       window.removeEventListener('keydown', resetTime)
     }
-  }, [pathname, lastActivityTime])
+  }, [lastActivityTime])
 
-  if (!isLogin) {
-    return <Navigate to={redirectPath} replace />;
-  }
-  return children || <Outlet />;
+  return (
+    isLogin.loading ?
+      <LoadingSpinner size='32' color='sky-blue' height='h-screen' />
+      // Stills needs fixing
+      // <div className="h-screen m-auto">
+      //   <img src={WrenchBoard} alt="wrenchboard" className="h-10" />
+      // </div>
+      :
+      !isLogin.status ?
+      <Navigate to={redirectPath} replace />
+      :
+      (children || <Outlet />)
+  )
 };
 
-export default AuthRoute;
+export default AuthRoute;

src/services/UsersService.js

@@ -279,6 +279,18 @@ class usersService {
         return this.postAuxEnd("/loadprofile", postData);
     }
 
+     //END POINT CALL FOR ACCOUNT TOP
+     startTopUp(post){
+        var postData = {
+        uid: localStorage.getItem("uid"),
+        member_id: localStorage.getItem("member_id"),
+        sessionid: localStorage.getItem("session_token"),
+        action: 11062,
+        ...post
+        };
+        return this.postAuxEnd("/starttopup", postData);
+    }
+
     //END POINT CALL FOR SENDING REFERRAL MESSAGE
     sendReferralMsg(postData){
         return this.postAuxEnd("/sendreferral", postData);
@@ -288,6 +300,10 @@ class usersService {
         return this.postAuxEnd("/startresetpasword", reqData)
     }
 
+    CompleteResetPassword(reqData){
+        return this.postAuxEnd("/stepresetpass", reqData)
+    }
+
     getCouponRedeem(){
     var postData = {
         uuid: localStorage.getItem("uid"),

src/store/UserDetails.js

@@ -0,0 +1,20 @@
+import { createSlice } from "@reduxjs/toolkit";
+
+const initialState = {
+  userDetails: {}
+};
+
+export const userSlice = createSlice({
+  name: "userDetails",
+  initialState,
+  reducers: {
+    updateUserDetails: (state,payload) => {
+      state.userDetails = {...payload.payload}
+    },
+  },
+});
+
+// Action creators are generated for each case reducer function
+export const { updateUserDetails } = userSlice.actions;
+
+export default userSlice.reducer;

src/store/store.js

@@ -1,8 +1,11 @@
 import { configureStore } from "@reduxjs/toolkit";
 import drawerReducer from "./drawer";
 
+import userDetailReducer from "./UserDetails";
+
 export default configureStore({
   reducer: {
     drawer: drawerReducer,
+    userDetails: userDetailReducer,
   },
-});
+});

src/views/VerifyPasswordPages.jsx

@@ -0,0 +1,6 @@
+import React from "react";
+import VerifyPassword from "../components/AuthPages/VerifyPassword";
+
+export default function VerifyPasswordPages() {
+  return <VerifyPassword />;
+}