verified that otp is six digits

.env

@@ -7,21 +7,11 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
 #REACT_APP_APPSITE="http://localhost:7012"
 
 
-# REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
+REACT_APP_AUX_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
-# REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
+REACT_APP_USERS_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
-
+# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
-REACT_APP_AUX_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfit"
-REACT_APP_USERS_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfituser"
 
 REACT_APP_SESSION_EXPIRE_MINUTES=15
 
 REACT_APP_TRACKING="Tracking"
 REACT_APP_RESOURCES="Resources"
-REACT_APP_HISTORY="History"
-
-REACT_APP_TRACKING_SHOW=1
-REACT_APP_HISTORY_SHOW=1
-
-REACT_APP_RESOURCES_SHOW=1
-
-REACT_APP_VERSION_NO="DEF-CONFIG"

.env.development

@@ -1,25 +0,0 @@
-SKIP_PREFLIGHT_CHECK=true 
-
-REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
-REACT_APP_TWITTER="https://twitter.com/fluxtra"
-
-REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
-#REACT_APP_APPSITE="http://localhost:7012"
-
-
-REACT_APP_AUX_ENDPOINT="https://devapi.myfit.ai/en/desktop/api/v2/myfit"
-REACT_APP_USERS_ENDPOINT="https://devapi.myfit.ai/en/desktop/api/v2/myfituser"
-# REACT_APP_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
-
-REACT_APP_SESSION_EXPIRE_MINUTES=15
-
-REACT_APP_TRACKING="Tracking"
-REACT_APP_RESOURCES="Resources"
-REACT_APP_HISTORY="History"
-
-REACT_APP_TRACKING_SHOW=1
-REACT_APP_HISTORY_SHOW=1
-
-REACT_APP_RESOURCES_SHOW=1
-
-REACT_APP_VERSION_NO="DEV-CONFIG"

.env.production

@@ -1,25 +0,0 @@
-SKIP_PREFLIGHT_CHECK=true 
-
-REACT_APP_FACEBOOK="https://www.facebook.com/profile.php?id=100066498622246"
-REACT_APP_TWITTER="https://twitter.com/fluxtra"
-
-REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
-#REACT_APP_APPSITE="http://localhost:7012"
-
-REACT_APP_AUX_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfit"
-REACT_APP_USERS_ENDPOINT="https://api.myfit.ai/en/desktop/api/v2/myfituser"
-
-# REACT_APP_PASSWORD_ENDPOINT="https://api.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
-
-REACT_APP_SESSION_EXPIRE_MINUTES=15
-
-REACT_APP_TRACKING="Tracking"
-REACT_APP_RESOURCES="Resources"
-REACT_APP_HISTORY="History"
-
-REACT_APP_TRACKING_SHOW=0
-REACT_APP_HISTORY_SHOW=0
-
-REACT_APP_RESOURCES_SHOW=0
-
-REACT_APP_VERSION_NO="PROD-CONFIG"

.gitlab-ci.yml

@@ -1,23 +0,0 @@
-build-job:
-  stage: build
-  script:
-    - echo "Hello, $GITLAB_USER_LOGIN!"
-
-test-job1:
-  stage: test
-  script:
-    - echo "This job tests something"
-
-test-job2:
-  stage: test
-  script:
-    - echo "This job tests something, but takes more time than test-job1."
-    - echo "After the echo commands complete, it runs the sleep command for 20 seconds"
-    - echo "which simulates a test that runs 20 seconds longer than test-job1"
-    - sleep 20
-
-deploy-prod:
-  stage: deploy
-  script:
-    - echo "This job deploys something from the $CI_COMMIT_BRANCH branch."
-  environment: production

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   users-myfit:
-    image: registry.chiefsoft.net/users-myfit:latest
+    image: registry.myfit.ai/users-myfit:latest
     build:
       context: .
       dockerfile: docker/Dockerfile
@@ -17,10 +17,17 @@ services:
       - ./src/:/usr/src/app/src
       - ./vendors/:/usr/src/app/vendors
     extra_hosts:
-      - api.myfit.ai:10.10.33.15
+      - backend.wrenchboard.api.live:10.10.33.15
-      - devapi.myfit.ai:10.10.33.15
+      - backend.wrenchboard.api.test:10.10.33.15
+      # #- backend.wrenchboard.api.live:172.31.4.27
+      # #- backend.wrenchboard.api.test:10.20.30.27
+      - apigateway.wrenchboard.app.dev.fluxtra.net:10.20.30.19
+      - apigateway.wrenchboard.app.lotus.fluxtra.net:172.31.4.19
     environment:
       - CHOKIDAR_USEPOLLING=true
+   # volumes:
+   #   - ./:/app
+   #   - /app/node_modules
     tty: true
     stdin_open: true
     # working_dir: /app

src/Routers.jsx

@@ -3,7 +3,6 @@ import FourZeroFour from "./components/FourZeroFour";
 import ScrollToTop from "./components/Helpers/ScrollToTop";
 import MyCollection from "./components/MyCollection";
 import Notification from "./components/Notification";
-import ThankYou from "./components/AuthPages/ThankYou";
 import AuthRoute from "./middleware/AuthRoute";
 import AcitveBidsPage from "./views/AcitveBidsPage";
 import AuthProfilePage from "./views/AuthProfilePage";
@@ -32,7 +31,6 @@ import CalendarPage from "./views/CalendarPage";
 import ResourcePage from "./views/ResourcePage";
 import TrackActionPage from "./views/TrackActionPage";
 import SubscriptionPage from "./views/SubscriptionPage";
-import VerifySignupCompletePage from "./views/VerifySignupCompletePage";
 
 export default function Routers() {
   return (
@@ -51,14 +49,8 @@ export default function Routers() {
           path="/update-password"
           element={<UpdatePasswordPages />}
         />
-        <Route
-          exact
-          path="/confirm-reset"
-          element={<ThankYou />}
-        />
         <Route exact path="/verify-you" element={<VerifyYouPages />} />
         <Route exact path="/verify-signup" element={<VerifySignupPage />} />
-        <Route exact path="/complete-signup" element={<VerifySignupCompletePage />} />
 
         {/* private route */}
         <Route element={<AuthRoute />}>

src/components/AuthPages/AuthLayout.jsx

@@ -1,34 +1,37 @@
 import React from "react";
 import loginThumb from "../../assets/images/auth-thumb.svg";
-import logo from "../../assets/images/light-logo.png";
+import logo from "../../assets/images/light-logo.png"; //logo-1.svg";
 
-/**
- * Renders a login layout with a slogan and child components.
- * The layout adjusts its height based on the screen height.
- * @returns {React.Component} The rendered login layout.
- */
 export default function LoginLayout({ slogan, children }) {
-  const screen = window.screen.height <= 950 ? "h-screen" : "h-screen";
+  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">
       <div className={`main-wrapper w-full ${screen}`}>
         <div className="flex w-full h-full">
           <div className="xl:flex hidden w-1/2 h-full p-[70px]  flex-col justify-between primary-home">
-            {/* <div className="logo">
+          {/*
+           <div className="logo">
               <img src={logo} alt="logo" />
-            </div> */}
+            </div>
+          */} 
             <div className="thumbnail flex justify-center">
-              {/* <img src={loginThumb} alt="login-thumb" /> */}
+             {/*  <img src={loginThumb} alt="login-thumb" />*/}
             </div>
             <div className="article w-[600px]">
-              <p className="text-[60px] font-bold leading-[72px] text-[#a03774]">
+              <p className="text-[60px] font-bold leading-[72px] text-white">
                 {slogan}
               </p>
             </div>
           </div>
           <div className="flex-1 flex justify-center items-center">
-            {children}
+            {children && children}
           </div>
         </div>
       </div>

src/components/AuthPages/ForgotPassword/index.jsx

@@ -3,52 +3,34 @@ import { Link, useNavigate } from 'react-router-dom';
 import titleShape from "../../../assets/images/shape/title-shape-two.svg";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
-import usersService from "../../../services/UsersService";
 
 export default function ForgotPassword() {
+
   const navigate = useNavigate();
   const [validation, setValidation] = useState("")
   const [buttonDisabled, setButtonDisabled] = useState(true)
-  const [loading, setLoading] = useState(false);
-  const user = new usersService()
 
+  // email
   const [email, setEmail] = useState("");
   const handleEmail = (e) => {
     setEmail(e.target.value);
   };
 
+
   function validationChecker(email) {
     const emailCheck = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
     if (email === "") {
-      setValidation("");
+      setValidation("email is required");
+
     } else if (!email.match(emailCheck)) {
       setValidation('Please input a valid email address');
+
     } else {
+      setValidation("");
       setButtonDisabled(false)
     }
   }
 
-  const handleSubmit = async() => {
-    const resetEmail = {
-      username: email,
-      stage: 100
-    }
-    const reset = await user.resetPassword(resetEmail);
-    setLoading(true)
-    
-    const {raw_data, uuid} = reset.data
-    localStorage.setItem('reset_uuid', uuid)
-    localStorage.setItem('reset_raw', JSON.stringify(raw_data))
-    if (reset.status == 200){
-      setTimeout(() => {
-        navigate("/verify-you", {replace : true});
-        setLoading(false)
-      }, 2000);
-    }else{
-      setValidation('An error occurred')
-    }
-  }
-  
   useEffect(() => {
     validationChecker(email)
   }, [email])
@@ -79,21 +61,21 @@ export default function ForgotPassword() {
                   inputHandler={handleEmail}
                   value={email}
                 />
-                {validation && <p className="my-5 text-center font-light italic subpixel-antialiased tracking-wide text-red-500">{validation}</p>}
+                {validation && <p className="my-5 font-bold  text-red-500">{validation}</p>}
               </div>
 
               <div className="signin-area mb-3.5">
 
                 <button
-                  className="w-full rounded-[50px] h-[58px] text-xl text-white font-bold flex justify-center bg-purple items-center"
+                  className="w-full rounded-[50px] mb-5 h-[58px] text-xl text-white font-bold flex justify-center bg-purple items-center"
                   disabled={buttonDisabled}
-                  onClick={handleSubmit}
+                  onClick={() => navigate("/verify-you")}
                 >
-                  {loading ? <div className="signup btn-loader"></div> : <span>Send Code</span>}
+                  Send Code
                 </button>
 
                 <Link to="/"
-                  className="mt-5 cursor-default font-bold flex justify-center subpixel-antialiased tracking-wide text-white items-center h-[58px] rounded-[50px] bg-[#1a3544a2]"
+                  className="my-40 font-bold flex justify-center text-red-500 items-center"
                 >
                   Back to Home
                 </Link>

src/components/AuthPages/Login/index.jsx

@@ -73,7 +73,7 @@ export default function Login() {
         <div className="content-wrapper w-full  flex justify-center items-center xl:bg-white dark:bg-dark-white   2xl:w-[828px] xl:w-[500px] 2xl:h-[818px] xl:h-[600px] rounded-xl 2xl:px-[164px] xl:px-[56px] sm:px-7 px-5 ">
           <div className="w-full">
             <div className="title-area flex flex-col justify-center items-center relative text-center mb-7">
-              <h1 className="text-5xl font-bold leading-[74px] text-dark-gray dark:text-white">
+              <h1 className="text-5xl font-bold leading-[74px]   text-dark-gray dark:text-white">
                 Log In
               </h1>
               <div className="shape mb-[10px]">
@@ -170,9 +170,6 @@ export default function Login() {
                   </a>
                 </p>
               </div>
-              <div>
-              {process.env.REACT_APP_VERSION_NO}
-              </div>
             </div>
           </div>
         </div>

src/components/AuthPages/SignUp/CompleteSignUp/index.jsx

@@ -1,14 +1,7 @@
 import React from "react";
-import AuthLayout from "../../AuthLayout";
 
-
+export default function ThankYou({ className }) {
-export default function CompleteSignUp({ className }) {
   return (
-    <>
-    <AuthLayout
-      slogan="Welcome to myFit"
-    >
-
     <div
       className={`content-wrapper xl:bg-white dark:xl:bg-dark-white   sm:px-[70px] px-5 2xl:px-[100px] 2xl:h-[818px] xl:h-[650px] rounded-xl flex flex-col justify-center ${
         className || ""
@@ -51,7 +44,5 @@ export default function CompleteSignUp({ className }) {
         </a>
       </div>
     </div>
-    </AuthLayout>
-    </>
   );
 }

src/components/AuthPages/SignUp/VerifySignup/index.jsx

@@ -1,4 +1,5 @@
 import React, {useState} from "react";
+// import titleShape from "../../../../assets/images/shape/text-shape-three.svg";
 import titleShape from "../../../../assets/images/shape/title_shape_3.svg";
 import AuthLayout from "../../AuthLayout";
 import Otp from "./Otp";
@@ -9,7 +10,7 @@ export default function VerifyYou() {
 
   const navigate = useNavigate();
 
-  const verifyOTP = new usersService();
+  const verify = new usersService();
 
   const [loading, setLoading] = useState(false) // For loading spinner
 
@@ -44,12 +45,12 @@ export default function VerifyYou() {
     
     setLoading(true) // Sets loading spinner
 
-    let otpCode = '';
+    let code = '';
     for(let values in verificationCode){
-      otpCode+=verificationCode[values]
+      code+=verificationCode[values]
     }
 
-    if(!otpCode){ // checks if code is empty
+    if(!code){ // checks if code is empty
       setLoading(false)
       setErrorMessage({
         success: false,
@@ -57,7 +58,7 @@ export default function VerifyYou() {
       })
       return
     }
-    if(otpCode.length < 6){ // checks if verifiedCode is empty
+    if(code.length < 6){ // checks if verifiedCode is empty
       setLoading(false)
       setErrorMessage({
         success: false,
@@ -66,15 +67,9 @@ export default function VerifyYou() {
       return
     }
 
-    let apiInput = {
-      username: localStorage.getItem('username'),
-      pend_uid: localStorage.getItem('uuid'),
-      random_text: otpCode,
-      mode: 'VERIFY',
-    }
-
     try {
-      const res = await verifyOTP.signupUser(apiInput)
+      const res = await verify.signupOTPVerify(code);
+      console.log(res)
       if(res.status != 200){
         setLoading(false)
         setErrorMessage({
@@ -83,33 +78,15 @@ export default function VerifyYou() {
         })
         return
       }
-
+      // if status code is 200 proceed
-      if(res.status == 200){
+      setErrorMessage({
-        if(res.data.status < 0) { // when resquest is successful but status is not 100
+        success: true,
-          setLoading(false)
+        message: 'verification successfully'
-          setErrorMessage({
+      })
-            success: false,
+      setTimeout(()=>{
-            message: res.data.error_msg
+        setLoading(false)
-          })
+        navigate('/update-password', { replace: true })
-          return
+      }, 1000)
-        }
-
-        // if request is successful and status is 100 proceed
-        setErrorMessage({
-          success: true,
-          message: 'verification successfully'
-        })
-
-        //clears the temporary uuid and email in tge local storage
-        localStorage.removeItem('uuid')
-        localStorage.removeItem('username')
-
-        setTimeout(()=>{
-          setLoading(false)
-          navigate('/complete-signup', { replace: true })
-        }, 1000)
-      }
-      
     } catch (error) {
       setLoading(false)
       setErrorMessage({

src/components/AuthPages/SignUp/index.jsx

@@ -6,12 +6,12 @@ import titleShape from "../../../assets/images/shape/title-shape-two.svg";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import { Link, useNavigate } from 'react-router-dom';
 
-import usersService from "../../../services/UsersService"; // site api services
+import usersService from "../../../services/UsersService";
 
 export default function SignUp() {
   const navigate = useNavigate();
 
-  const userSignup = new usersService();
+  const userSignupAuth = new usersService();
 
   const [loading, setLoading] = useState(false) // For loading spinner
 
@@ -62,16 +62,6 @@ export default function SignUp() {
       })
       return
     }
-    //checks if email is a valid email address
-    let regEx = /^[^0-9][a-zA-Z0-9._%+-]+@[a-zA-Z]+(\.[a-zA-Z]+)+$/;
-    if (regEx.test(email) == false) {
-      setLoading(false)
-      setErrorMessage({
-        success: false,
-        message: 'Please Input a valid email; e.g: text@gmail.com'
-      })
-      return
-    }
 
     if(password != confirm_password){ //checks if password matches confirm password
       setLoading(false)
@@ -82,24 +72,10 @@ export default function SignUp() {
       return
     }
 
-    //checks if password is matches alphanumeric with at least one uppercase letter
-    // let PwdRegEx = /[A-Z]/;
-    if (/[A-Z]/.test(password) == false) {
-      setLoading(false)
-      setErrorMessage({
-        success: false,
-        message: 'Password must contain at least one uppercase character; e.g: Text123'
-      })
-      return
-    }
-
-    userInfo.username = email // assigns email as username also
-    userInfo.mode = 'START' // assigns mode as START
-
     delete userInfo.confirm_password // deletes confrim password before making API call
 
     try {
-      const res = await userSignup.signupUser(userInfo);
+      const res = await userSignupAuth.signupAuth(userInfo);
       if(res.status != 200){
         setLoading(false)
         setErrorMessage({
@@ -108,31 +84,15 @@ export default function SignUp() {
         })
         return
       }
-
+      // if status code is 200 proceed
-      if(res.status == 200){
+      setErrorMessage({
-        if(res.data.status < 0) { // when resquest is successful but status is not 1
+        success: true,
-          setLoading(false)
+        message: 'Account created successfully'
-          setErrorMessage({
+      })
-            success: false,
+      setTimeout(()=>{
-            message: 'unable to create account'
+        setLoading(false)
-          })
+        navigate("/verify-signup", { replace: true })
-          return
+      }, 1000)
-        }
-
-        // if request is successful and status is 1 proceed
-        setErrorMessage({
-          success: true,
-          message: 'Account created successfully'
-        })
-  
-        localStorage.setItem('uuid', res.data.uuid) // Stores the user UUID to localstorage
-        localStorage.setItem('username', email) // Stores the user UUID to localstorage
-  
-        setTimeout(()=>{
-          setLoading(false)
-          navigate("/verify-signup", { replace: true })
-        }, 1000)
-      }
     } catch (error) {
       setLoading(false)
       setErrorMessage({
@@ -141,7 +101,6 @@ export default function SignUp() {
       })
     }
   }
-
   return (
     <>
       <div className="layout-wrapper">
@@ -182,7 +141,7 @@ export default function SignUp() {
                           name="firstname"
                           type="text"
                           iconName="people"
-                          value={userDetails.first_name}
+                          value={userDetails.firstname}
                           inputHandler={handleInputChange}
                         />
                       </div>
@@ -193,7 +152,7 @@ export default function SignUp() {
                           name="lastname"
                           type="text"
                           iconName="people"
-                          value={userDetails.Last_name}
+                          value={userDetails.lastname}
                           inputHandler={handleInputChange}
                         />
                       </div>
@@ -269,9 +228,7 @@ export default function SignUp() {
                       </div>
                     </div>
                     <div className="signin-area mb-1">
-
+                   {errorMessage.message != '' &&  <p className={`text-center p-3 ${errorMessage.success ? 'text-green-600' : 'text-red-600'}`}>{errorMessage.message}</p>}
-                    {errorMessage.message != '' &&  <p className={`text-center p-3 ${errorMessage.success ? 'text-green-600' : 'text-red-600'}`}>{errorMessage.message}</p>}
-
                       <button
                   className="w-full rounded-[50px] mb-5 h-[58px] text-xl text-white font-bold flex justify-center bg-purple items-center"
                   // onClick={() => navigate("/verify-signup")}

src/components/AuthPages/ThankYou/index.jsx

@@ -1,11 +1,8 @@
 import React from "react";
-import AuthLayout from "../../AuthPages/AuthLayout";
 
 export default function ThankYou({ className }) {
   return (
-    <>
+    <div
-      <AuthLayout slogan='Welcome to myFit'>
-      <div
       className={`content-wrapper xl:bg-white dark:xl:bg-dark-white   sm:px-[70px] px-5 2xl:px-[100px] 2xl:h-[818px] xl:h-[650px] rounded-xl flex flex-col justify-center ${
         className || ""
       }`}
@@ -47,7 +44,5 @@ export default function ThankYou({ className }) {
         </a>
       </div>
     </div>
-      </AuthLayout>
-    </>
   );
 }

src/components/AuthPages/UpdatePassword/index.jsx

@@ -1,87 +1,17 @@
 import React, { useState } from "react";
-import { useNavigate } from "react-router-dom";
 import titleShape from "../../../assets/images/shape/title-shape-two.svg";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 import ThankYou from "../ThankYou";
-import usersService from "../../../services/UsersService";
 
 export default function UpdatePassword() {
-  const [values, setValues] = useState({
+  const [updated, setValue] = useState(false);
-    password: '',
-    confirmPassword: '',
-  })
   const [message, setMessage] = useState(false);
-  const [validation, setValidation] = useState("");
+  const updatePassword = () => {
-  const [loading, setLoading] = useState(false);
+    setValue(!updated);
-  const updatePass = new usersService()
+    setTimeout(() => {
-  const navigate = useNavigate()
+      setMessage(!message);
-  
+    }, 100);
-  const onChange = (e) => {
-    setValues((prev) => ({ ...prev, [e.target.name]: e.target.value }));
-  };
-
-  const updatePassword = async (e) => {
-    const {username} = JSON.parse(localStorage.getItem('reset_raw'))
-    const otpCode = localStorage.getItem('otp')
-
-    setLoading(true)
-
-    if(!values.password || !values.confirmPassword){
-      setLoading(false)
-      setValidation("Please Fill empty inputs")
-      return
-    }
-
-    const regex = /^[A-Za-z]\w{7,14}$/
-    if(regex.test(values.password) == false) {
-      setLoading(false)
-      setValidation("it must be a least 7 alphanumeric characters")
-      return
-    }
-
-    if (values.password != values.confirmPassword){
-      setLoading(false)
-      setValidation("Password does not match")
-      return
-    }
-
-    const newPassword = {
-      username: username,
-      reset_uuid: localStorage.getItem('reset_uuid'),
-      random_text: otpCode,
-      member_uid: localStorage.getItem('member_uid'),
-      new_password: values.password,
-      stage: 300
-    }
-
-    delete values.confirmPassword
-
-    try {
-      const confirm = await updatePass.resetPassword(newPassword)
-      console.log(confirm)
-
-      if(confirm.status != 200){
-      setLoading(false)  
-      setValidation("Sorry, could not verify code")
-      return
-      }
-      
-      localStorage.removeItem('reset_uuid')
-      localStorage.removeItem('reset_raw')
-      localStorage.removeItem('otp')
-
-      if(confirm.status == 200){
-        setValidation("Password updated")
-        setTimeout(() => {
-          setLoading(false)
-          navigate("/confirm-reset", {replace : true});
-      }, 2000);
-      }
-    } catch (error) {
-      setLoading(false)
-      setValidation("An error occurred")
-    }
   };
 
   return (
@@ -89,6 +19,7 @@ export default function UpdatePassword() {
       <AuthLayout
         slogan="Welcome to  myFit"
       >
+        {updated === false ? (
           <div className="content-wrapper update-password-section xl:bg-white dark:bg-dark-white   w-full 2xl:h-[818px] xl:h-[600px] sm:w-auto sm:px-[70px] px-5 2xl:px-[100px] rounded-xl flex flex-col justify-center">
             <div>
               <div className="title-area relative flex flex-col justify-center items-center mb-7">
@@ -101,7 +32,7 @@ export default function UpdatePassword() {
                 </div>
               </div>
               <div className="input-area">
-                {/* <div className="input-item mb-5">
+                <div className="input-item mb-5">
                   <InputCom
                     placeholder="*********"
                     label="Old Password"
@@ -109,7 +40,7 @@ export default function UpdatePassword() {
                     type="password"
                     iconName="password"
                   />
-                </div> */}
+                </div>
                 <div className="input-item mb-5">
                   <InputCom
                     placeholder="*********"
@@ -117,35 +48,32 @@ export default function UpdatePassword() {
                     name="password"
                     type="password"
                     iconName="password"
-                    inputHandler={onChange}
                   />
                 </div>
                 <div className="input-item mb-5">
                   <InputCom
                     placeholder="*********"
                     label="Re-enter Password"
-                    name="confirmPassword"
+                    name="password"
                     type="password"
                     iconName="password"
-                    inputHandler={onChange}
                   />
                 </div>
-                {validation && <p className={`my-5 text-center font-light italic text-sm subpixel-antialiased tracking-wide ${validation == 'Password updated' ? 'text-green-600' : 'text-red-500'} `}>{validation}</p>}
                 <div className="signin-area mb-3.5">
                   <button
                     onClick={updatePassword}
                     type="button"
                     className="w-full rounded-[50px] mb-5 h-[58px] text-xl text-white font-bold flex justify-center bg-purple items-center"
                   >
-                    {loading ? <div className="signup btn-loader"></div> : <span>Continue</span>}
+                    Continue
                   </button>
                 </div>
               </div>
             </div>
           </div>
-        {/* // : (
+        ) : (
-        //   <ThankYou className={`thankyou-section ${message ? "active" : ""}`} />
+          <ThankYou className={`thankyou-section ${message ? "active" : ""}`} />
-        // )} */}
+        )}
       </AuthLayout>
     </>
   );

src/components/AuthPages/VerifyYou/Otp.jsx

@@ -1,26 +1,18 @@
 import React, { useEffect } from "react";
 
-export default function Otp({handleChange, value}) {
+export default function Otp() {
   useEffect(() => {
     const otp = document.querySelector("#otp-inputs");
     // eslint-disable-next-line no-restricted-syntax
     for (const pin of otp.children) {
       // eslint-disable-next-line no-loop-func
-      pin.onkeyup = (value) => {
+      pin.onkeyup = () => {
-        if(pin.children){
+        if (pin.nextSibling) {
-          if(value.key === '' || value.key === ' ' || value.key === 'ArrowRight' || value.key === 'ArrowLeft' || value.key === 'ArrowUp' || value.key === 'ArrowDown' || value.key === 'Tab') return;
+          pin.nextSibling.children.otp.focus();
-          if(value.key === 'Backspace'){
-            if(pin.previousSibling){
-              pin.previousSibling.children.otp.focus();
-            } else {return;}
-          } else {
-            pin.nextSibling.children.otp.focus();
-          }
         }
       };
     }
-  }, []);
+  });
-  
   return (
     <>
       <div
@@ -33,9 +25,6 @@ export default function Otp({handleChange, value}) {
             type="text"
             maxLength={1}
             id="otp"
-            name='value_one'
-            value={value.value_one}
-            onChange={handleChange}
           />
         </div>
         <div className="input-wrapper border border-light-purple dark:border-[#5356fb29]  sm:w-14 sm:h-14 w-12 h-12 rounded-[50px] overflow-hidden relative ">
@@ -44,9 +33,6 @@ export default function Otp({handleChange, value}) {
             type="text"
             maxLength={1}
             id="otp"
-            name='value_two'
-            value={value.value_two}
-            onChange={handleChange}
           />
         </div>
         <div className="input-wrapper border border-light-purple dark:border-[#5356fb29]  sm:w-14 sm:h-14 w-12 h-12 rounded-[50px] overflow-hidden relative ">
@@ -55,9 +41,6 @@ export default function Otp({handleChange, value}) {
             type="text"
             maxLength={1}
             id="otp"
-            name='value_three'
-            value={value.value_three}
-            onChange={handleChange}
           />
         </div>
         <div className="input-wrapper border border-light-purple dark:border-[#5356fb29]  sm:w-14 sm:h-14 w-12 h-12 rounded-[50px]  overflow-hidden relative ">
@@ -66,9 +49,6 @@ export default function Otp({handleChange, value}) {
             type="text"
             maxLength={1}
             id="otp"
-            name='value_four'
-            value={value.value_four}
-            onChange={handleChange}
           />
         </div>
         <div className="input-wrapper border border-light-purple dark:border-[#5356fb29]  sm:w-14 sm:h-14 w-12 h-12 rounded-[50px]  overflow-hidden relative ">
@@ -77,9 +57,6 @@ export default function Otp({handleChange, value}) {
             type="text"
             maxLength={1}
             id="otp"
-            name='value_five'
-            value={value.value_five}
-            onChange={handleChange}
           />
         </div>
         <div className="input-wrapper border border-light-purple dark:border-[#5356fb29]  sm:w-14 sm:h-14 w-12 h-12 rounded-[50px] overflow-hidden relative ">
@@ -88,9 +65,6 @@ export default function Otp({handleChange, value}) {
             type="text"
             maxLength={1}
             id="otp"
-            name='value_six'
-            value={value.value_six}
-            onChange={handleChange}
           />
         </div>
       </div>

src/components/AuthPages/VerifyYou/index.jsx

@@ -1,90 +1,9 @@
-import React,{useState} from "react";
+import React from "react";
-import {useNavigate} from "react-router-dom"
 import titleShape from "../../../assets/images/shape/text-shape-three.svg";
 import AuthLayout from "../AuthLayout";
 import Otp from "./Otp";
-import usersService from "../../../services/UsersService";
 
 export default function VerifyYou() {
-  const [loading, setLoading] = useState(false);
-  const [validation, setValidation] = useState("");
-  const verifyOTP = new usersService()
-  const navigate = useNavigate()
-
-  const [verificationCode, setVerificationCode] = useState({
-    value_one: '',
-    value_two: ''
-  })
-
-  const handleVerificationInput = ({target:{name, value}}) => { 
-    setVerificationCode(prev => {
-      return {...prev, [name]:value}
-    })
-  }
-
-  const handleSubmit = async() => {
-    setValidation("")
-    setLoading(true)
-    
-    let otpCode = '';
-    for(let values in verificationCode){
-      otpCode+=verificationCode[values]
-    }
-    
-    // Validating otp code
-    if(!otpCode) {
-      setLoading(false)
-      setValidation("Please enter your otp code")
-      return
-    }
-    if(otpCode.length < 6) {
-      setLoading(false)
-      setValidation("OTP code incomplete")
-      return
-    }
-    
-    const {username} = JSON.parse(localStorage.getItem('reset_raw'))
-    const verifyEmail = {
-      username: username,
-      stage: 200,
-      reset_uuid: localStorage.getItem('reset_uuid'),
-      random_text: otpCode
-    }
-
-    localStorage.setItem('otp', otpCode)
-
-    try {
-    const verify = await verifyOTP.resetPassword(verifyEmail);
-    console.log(verify)
-    localStorage.setItem('member_uid', verify.data.member_uid);
-    if (verify.status != 200){
-      setValidation("Sorry, could not verify code")
-      setLoading(false)
-      return
-    }
-      
-    if (verify.status == 200){
-
-      if(verify?.data.error_msg == "Unable to continue"){
-        setLoading(false)
-        setValidation("Incorrect otp code")
-        return
-      }
-
-      setValidation("verified successfully")
-
-      setTimeout(() => {
-        setLoading(false)
-        navigate("/update-password", {replace : true});
-    }, 2000);
-        return
-      }
-    } catch (error) {
-      setLoading(false)
-      setValidation('An error occurred')
-    }
-  }
-  
   return (
     <>
       <AuthLayout
@@ -101,22 +20,20 @@ export default function VerifyYou() {
               </div>
             </div>
             <div className="input-area">
-              <Otp handleChange={handleVerificationInput} value={verificationCode} />
+              <Otp />
-              {validation && <p className={`my-5 text-center font-light italic text-sm subpixel-antialiased tracking-wide ${validation == 'verified successfully' ? 'text-green-600' : 'text-red-500'} `}>{validation}</p>}
               <div className="signin-area mb-3.5">
                 <a
-                  // href="/update-password"
+                  href="/update-password"
                   className="w-full rounded-[50px] h-[58px] mb-6 text-xl text-white font-bold flex justify-center bg-purple items-center"
-                  onClick={handleSubmit}
                 >
-                  {loading ? <div className="signup btn-loader"></div> : <span>Continue</span>}
+                  Continue
                 </a>
               </div>
               <div className="resend-code flex justify-center">
                 <p className="text-lg text-thin-light-gray font-normal">
                   Dont’t have an aceount ?
-                  <a href="/signup" className="ml-2 text-dark-gray dark:text-white font-bold">
+                  <a href="#" className="ml-2 text-dark-gray dark:text-white font-bold">
-                    Sign Up
+                    Please resend
                   </a>
                 </p>
               </div>

src/components/Calendar/CalendarTable.jsx

@@ -1,45 +1,16 @@
-import React, { useState, useEffect } from "react";
+import React, { useState } from "react";
 import dataImage1 from "../../assets/images/data-table-user-1.png";
 import dataImage2 from "../../assets/images/data-table-user-2.png";
 import dataImage3 from "../../assets/images/data-table-user-3.png";
 import dataImage4 from "../../assets/images/data-table-user-4.png";
 import SelectBox from "../Helpers/SelectBox";
-
-import usersService from "../../services/UsersService"; // API SERVICE
-import localImgLoad from "../../lib/localImgLoad"; // img loader
-
-
 import Calendar from 'react-calendar';
 import 'react-calendar/dist/Calendar.css';
 
 export default function CalendarTable({ className }) {
-  const [isLoading, setIsLoading] = useState(true) // for determining when a page is awating request call
-
   const filterCategories = ["All Categories", "Explore", "Featured"];
   const [selectedCategory, setCategory] = useState(filterCategories[0]);
-
+  const [value, onChange] = useState(new Date());
-  const [value, onChange] = useState(new Date()); // value of calendar date and onchange handler for calendar
-  const [remDate, setRemDate] = useState([]) // for holding dates on reminders to display on calendar
-
-  const calenderApi = new usersService(); // instantiating the API SERVICE
-
-  const getUserReminders = async () => {
-    try {
-      const res = await calenderApi.getUserReminders();
-      if(res.status == 200 && res.data.status > 0){
-        setRemDate(res.data.reminders)
-        setIsLoading(false)
-        return
-      }
-      setIsLoading(false)
-    }catch(error) {
-      setIsLoading(false)
-    }
-  };
-  
-  useEffect(() => {
-    getUserReminders();
-  }, []);
 
   return (
     <div
@@ -63,52 +34,7 @@ export default function CalendarTable({ className }) {
 
 
       <div>
-
+      <Calendar onChange={onChange} value={value} calendarType="US" />
-        {
-          isLoading ?  
-            <div role="status" className="flex justify-center">
-              <svg aria-hidden="true" className="w-32 h-32 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-blue-600" 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>
-              <span className="sr-only">Loading...</span>
-            </div>
-          :
-          <Calendar 
-            onChange={onChange} 
-            value={value} 
-            calendarType="US" 
-           
-            tileContent={({ date, view }) => {
-              const reminder = []
-              remDate.map((x) => {
-                // console.log(new Date(date).toDateString() == new Date(x.start_date).toDateString())
-                if(date.toDateString() == new Date(x.start_date.split(' ')[0]).toDateString()){
-                  if(reminder.length < 1) {
-                    reminder.push([x])
-                  }else{
-                    for(let i=0; i<reminder.length; i++){
-                      if(reminder[i][0].start_date.split(' ')[0] == x.start_date.split(' ')[0]){
-                      reminder[i].push(x)
-                      break
-                      }else if(reminder[i][0].start_date != x.start_date && i==reminder.length-1){
-                        reminder.push([x])
-                        break
-                      }
-                    }
-                  }
-                }
-              });
-              return reminder ? reminder.map((rem, index) => {
-                if(rem){
-                  return <ReminderThumbnail key={index} reminders={rem} />
-                }
-              }) : "";
-            }}
-
-          />
-        }
-      
     </div>
 
 
@@ -116,47 +42,3 @@ export default function CalendarTable({ className }) {
     </div>
   );
 }
-
-/**
- * Renders a list of reminder thumbnails.
- * Each thumbnail displays the reminder's category image, description, and start date.
- 
- * Each object should have the following properties:
- * - category (string): The category of the reminder.
- * - description (string): The description of the reminder.
- * - start_date (string): The start date of the reminder.
- */
-const ReminderThumbnail = ({ reminders }) => {
-  const getThumbnailImage = (category) => {
-    if (!category) {
-      return dataImage1;
-    }
-    return localImgLoad(`images/${category}.png`);
-  };
-
-  return (
-    <div className="w-full h-full overflow-y-auto overflow-x-hidden pb-1">
-      {reminders.map((reminder, index) => (
-        <div key={index} className="flex space-x-2 items-center bg-slate-300 hover:bg-white mb-1 p-1 transition-all duration-500">
-          <div className="w-[30px] h-[30px] rounded-full overflow-hidden flex justify-center items-center">
-            <img
-              src={getThumbnailImage(reminder.category)}
-              alt="data"
-              className="w-full h-full"
-            />
-          </div>
-          <div className="flex flex-col justify-start items-start">
-            <h1 className="font-bold text-[10px] text-dark-gray dark:text-white whitespace-nowrap">
-              {reminder.description?.substring(0, 20) + ' ...'}
-            </h1>
-            <span className="text-[8px] text-thin-light-gray">
-              Added <span className="text-purple">
-                {reminder.start_date.split(' ')[0]}
-              </span>
-            </span>
-          </div>
-        </div>
-      ))}
-    </div>
-  );
-};

src/components/Cards/TrackItemCard.jsx

@@ -76,7 +76,8 @@ export default function TrackItemCard({ datas, hidden = false }) {
           </div>
         </div>
         {/* user */}
-        <div className="user w-full text-center mt-[14px]">
+        <div className="user w-full text-center">
+
           <p className="text-sm text-thin-light-gray dark:text-white">
             <Link
             to={`/track-action/${datas.widget}`}

src/components/Partials/MobileSideBar.jsx

@@ -1,6 +1,7 @@
 import React, { useContext } from "react";
 import { NavLink } from "react-router-dom";
-import { default as logo, default as logo3 } from "../../assets/images/myfit-logo-2.png"; //logo-2.svg";
+import logo from "../../assets/images/myfit-logo-2.png"; //logo-2.svg";
+import logo3 from "../../assets/images/myfit-logo-2.png"; //logo-3.svg";
 import DarkModeContext from "../Contexts/DarkModeContext";
 import Icons from "../Helpers/Icons";
 
@@ -101,8 +102,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              {(process.env.REACT_APP_TRACKING_SHOW == true) ? 
+              <li className="item group">
-              (<li className="item group">
                 <NavLink
                   to="/tracking"
                   className="nav-item flex items-center justify-start space-x-3.5"
@@ -114,8 +114,7 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                     {process.env.REACT_APP_TRACKING}
                   </span>
                 </NavLink>
-              </li>)
+              </li>
-              : ''}
               <li className="item group">
                 <NavLink
                   to="/calendar"
@@ -129,9 +128,20 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              
+              <li className="item group">
-              {(process.env.REACT_APP_HISTORY_SHOW == true) ? 
+                <NavLink
-              (<li className="item group">
+                  to="/resources"
+                  className="nav-item flex items-center justify-start space-x-3.5"
+                >
+                  <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">
+                    <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 active flex-1">
+                    {process.env.REACT_APP_RESOURCES}
+                  </span>
+                </NavLink>
+              </li>
+              <li className="item group">
                 <NavLink
                   to="/history"
                   className="nav-item flex items-center justify-start space-x-3.5"
@@ -140,11 +150,10 @@ export default function MobileSidebar({ sidebar, action, logoutModalHandler }) {
                     <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 active flex-1">
-                  {process.env.REACT_APP_HISTORY}
+                    History
                   </span>
                 </NavLink>
-              </li>)
+              </li>
-              : ''}
             </ul>
           </div>
         </div>

src/components/Partials/Sidebar.jsx

@@ -151,8 +151,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-              {(process.env.REACT_APP_TRACKING_SHOW == true) ? 
+              <li className="item group">
-              (<li className="item group">
                 <NavLink
                   to="/tracking"
                   className={`nav-item flex items-center  ${
@@ -171,8 +170,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                    {process.env.REACT_APP_TRACKING}
                   </span>
                 </NavLink>
-              </li>)
+              </li>
-              : ''}
               <li className="item group">
                 <NavLink
                   to="/calendar"
@@ -193,31 +191,26 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                   </span>
                 </NavLink>
               </li>
-
+              <li className="item group">
-               {process.env.REACT_APP_RESOURCES_SHOW == true ?
+                <NavLink
-                <li className="item group">
+                  to="/resources"
-                  <NavLink
+                  className={`nav-item flex items-center ${
-                    to="/resources"
+                    ((navData) => (navData.isActive ? "active" : ""),
-                    className={`nav-item flex items-center ${
+                    sidebar ? "justify-start space-x-3.5" : "justify-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">
+                    <Icons name="resources" />
+                  </span>
+                  <span
+                    className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
+                      sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
-                    <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">
+                    {process.env.REACT_APP_RESOURCES}
-                      <Icons name="resources" />
+                  </span>
-                    </span>
+                </NavLink>
-                    <span
+              </li>
-                      className={`item-content group-hover:text-purple text-[18px] dark:hover:text-white transition-all duration-300 ease-in-out text-lighter-gray relative font-medium ${
-                        sidebar ? "active flex-1" : "w-0"
-                      }`}
-                    >
-                      {process.env.REACT_APP_RESOURCES}
-                    </span>
-                  </NavLink>
-                </li>
-               :
-               <></>
-               }
           
               <li className="item group">
                 <NavLink
@@ -235,7 +228,7 @@ export default function Sidebar({ sidebar, action, logoutModalHandler }) {
                       sidebar ? "active flex-1" : "w-0"
                     }`}
                   >
-                    {process.env.REACT_APP_HISTORY}
+                    History
                   </span>
                 </NavLink>
               </li>

src/components/Reminders/AddEditReminder.jsx

@@ -76,7 +76,7 @@ export default function AddEditReminder({ className }) {
     setMessage({status: true, message: ''})
     let {description, notes, category, mode} = infoDetail
     //CHECKING IF AN EMPTY FIELD WAS PASSED
-    if(!description || !category || !mode){
+    if(!description || !notes || !category || !mode){
       setSuccess(false)
       setMessage({status: false, message: 'All fields must be filled'})
       return

src/components/Reminders/ReminderTable.jsx

@@ -82,138 +82,127 @@ export default function ReminderTable({ className }) {
         <div className="relative w-full overflow-x-auto sm:rounded-lg">
         <table className="w-full text-sm text-left text-gray-500 dark:text-gray-400">
           <tbody>
-            <>
+            <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-bottom ">
-              <tr className="text-base text-thin-light-gray whitespace-nowrap border-b dark:border-[#5356fb29]  default-border-bottom">
+              <td className="py-4">Item</td>
-                <td className="py-4">Item</td>
+              <td className="py-4 text-center">Start</td>
-                <td className="py-4 text-center">Start</td>
+              <td className="py-4 text-center">End</td>
-                <td className="py-4 text-center">End</td>
+              <td className="py-4 text-center">Reminder</td>
-                <td className="py-4 text-center">Reminder</td>
+              <td className="py-4 text-right">.</td>
-                <td className="py-4 text-right">.</td>
+            </tr>
-              </tr>
-              <tr className="spacer"></tr>
-            </>
           
                 {
                   userReminders[0].reminders.length > 0 && (
                     selectedCategory == "All category" ? (
                       userReminders[0].reminders.map((reminder, index) => (
-                      <>
+                      <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                        {/* <tr key={index} className="bg-white dark:bg-dark-white border border-light-purple dark:border-[#5356fb29]  hover:bg-gray-50"> */}
+                    <td className=" py-4">
-                        <tr key={index} className="bg-light-purple dark:bg-black hover:bg-gray-50 transition-all duration-500">
+                      <div className="flex space-x-2 items-center">
-                            <td className="py-4 px-2 rounded-l-full">
+                        <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                              <div className="flex space-x-2 items-center">
+                          <img
-                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                            src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
-                                  <img
+                            alt="data"
-                                    src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
+                            className="w-full h-full"
-                                    alt="data"
+                          />
-                                    className="w-full h-full"
+                        </div>
-                                  />
+                        <div className="flex flex-col">
-                                </div>
+                          <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                                <div className="flex flex-col">
+                          {reminder.description.substring(0, 30)+ ' ...'}
-                                  <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                          </h1>
-                                  {reminder.description.substring(0, 30)+ ' ...'}
+                          <span className="text-sm text-thin-light-gray">
-                                  </h1>
-                                  <span className="text-sm text-thin-light-gray dark:text-white"> 
                           
-                                    Added <span className="text-purple dark:text-white">
+                            Added <span className="text-purple">
-                                      {/* {new Date(reminder.added).toLocaleString().replace(/-/g, '/')} */}
+                              {/* {new Date(reminder.added).toLocaleString().replace(/-/g, '/')} */}
-                                      {reminder.added.split(' ')[0]}
+                              {reminder.added.split(' ')[0]}
-                                      </span>
-                                  </span>
-                                </div>
-                              </div>
-                            </td>
-                            <td className="text-center py-4 px-2">
-                              <div className="flex space-x-1 items-center justify-center">
-                    
-                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                                {/* {new Date(reminder.start_date).toLocaleString().replace(/-/g, '/')} */}
-                                {reminder.start_date.split(' ')[0]}
-                                </span>
-                              </div>
-                            </td>
-                            <td className="text-center py-4 px-2">
-                              <div className="flex space-x-1 items-center justify-center">
-                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                                {/* {new Date(reminder.end_date).toLocaleString().replace(/-/g, '/')} */}
-                                {reminder.end_date.split(' ')[0]}
-                                </span>
-                              </div>
-                            </td>
-                            <td className="text-right py-4 px-2">
-                              <span className="text-base text-thin-light-gray whitespace-nowrap">
-                              {reminder.reminder}
                               </span>
-                            </td>
+                          </span>
-                            <td className="text-right py-4 px-2 rounded-r-full">
+                        </div>
-                            <Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
+                      </div>
-                            </td>
+                    </td>
-                        </tr>
+                    <td className="text-center py-4 px-2">
-                        <tr className="spacer"></tr>
+                      <div className="flex space-x-1 items-center justify-center">
-                      </>
+             
+                        <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                        {/* {new Date(reminder.start_date).toLocaleString().replace(/-/g, '/')} */}
+                        {reminder.start_date.split(' ')[0]}
+                        </span>
+                      </div>
+                    </td>
+                    <td className="text-center py-4 px-2">
+                      <div className="flex space-x-1 items-center justify-center">
+                        <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                        {/* {new Date(reminder.end_date).toLocaleString().replace(/-/g, '/')} */}
+                        {reminder.end_date.split(' ')[0]}
+                        </span>
+                      </div>
+                    </td>
+                    <td className="text-right py-4 px-2">
+                      <span className="text-base text-thin-light-gray whitespace-nowrap">
+                       {reminder.reminder}
+                      </span>
+                    </td>
+                    <td className="text-right py-4 px-2">
+                    <Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
+                    </td>
+                      </tr>
                       ))
                     )
                     :
                     userReminders[0].reminders.map((reminder, index) => {
                       if(reminder.category == selectedCategory){
                         return (
-                          <>
+                          <tr key={index} className="bg-white dark:bg-dark-white   border-b dark:border-[#5356fb29]  hover:bg-gray-50">
-                          {/* <tr key={index} className="bg-white dark:bg-dark-white border border-light-purple dark:border-[#5356fb29]  hover:bg-gray-50"> */}
+                    <td className=" py-4">
-                          <tr key={index} className="bg-light-purple dark:bg-black hover:bg-gray-50 transition-all duration-500">
+                      <div className="flex space-x-2 items-center">
-                            <td className="py-4 px-2 rounded-l-full">
+                        <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
-                              <div className="flex space-x-2 items-center">
+                        <img
-                                <div className="w-[60px] h-[60px] rounded-full overflow-hidden flex justify-center items-center">
+                            src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
-                                <img
+                            alt="data"
-                                    src={(reminder.category == null || reminder.category == '')? dataImage1: localImgLoad(`images/${reminder.category}.png`)}
+                            className="w-full h-full"
-                                    alt="data"
+                          />
-                                    className="w-full h-full"
+                        </div>
-                                  />
+                        <div className="flex flex-col">
-                                </div>
+                          <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
-                                <div className="flex flex-col">
+                          {reminder.description.substring(0, 30)+ ' ...'}
-                                  <h1 className="font-bold text-xl text-dark-gray dark:text-white whitespace-nowrap">
+                          </h1>
-                                  {reminder.description.substring(0, 30)+ ' ...'}
+                          <span className="text-sm text-thin-light-gray">
-                                  </h1>
-                                  <span className="text-sm text-thin-light-gray dark:text-white">
                           
-                                    Added <span className="text-purple dark:text-white">
+                            Added <span className="text-purple">
-                                    {new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
+                            {new Date(reminder.added).toLocaleString().replace(/-/g, '/')}
-                                      </span>
-                                  </span>
-                                </div>
-                              </div>
-                            </td>
-                            <td className="text-center py-4 px-2">
-                              <div className="flex space-x-1 items-center justify-center">
-                    
-                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                                {new Date(reminder.start_date).toLocaleString().replace(/-/g, '/')}
-                                </span>
-                              </div>
-                            </td>
-                            <td className="text-center py-4 px-2">
-                              <div className="flex space-x-1 items-center justify-center">
-                                <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                                {new Date(reminder.end_date).toLocaleString().replace(/-/g, '/')}
-                                </span>
-                              </div>
-                            </td>
-                            <td className="text-right py-4 px-2">
-                              <span className="text-base text-thin-light-gray whitespace-nowrap">
-                              {reminder.reminder}
                               </span>
-                            </td>
+                          </span>
-                            <td className="text-right py-4 px-2 rounded-r-full">
+                        </div>
-                              {/* <button
+                      </div>
-                                type="button"
+                    </td>
-                                className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
+                    <td className="text-center py-4 px-2">
-                              >
+                      <div className="flex space-x-1 items-center justify-center">
-                                Edit
+             
-                              </button> */}
+                        <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
-                              <Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
+                        {new Date(reminder.start_date).toLocaleString().replace(/-/g, '/')}
-                            </td>
+                        </span>
+                      </div>
+                    </td>
+                    <td className="text-center py-4 px-2">
+                      <div className="flex space-x-1 items-center justify-center">
+                        <span className="text-base text-dark-gray dark:text-white font-medium whitespace-nowrap">
+                        {new Date(reminder.end_date).toLocaleString().replace(/-/g, '/')}
+                        </span>
+                      </div>
+                    </td>
+                    <td className="text-right py-4 px-2">
+                      <span className="text-base text-thin-light-gray whitespace-nowrap">
+                       {reminder.reminder}
+                      </span>
+                    </td>
+                    <td className="text-right py-4 px-2">
+                      {/* <button
+                        type="button"
+                        className="text-sm text-white bg-purple px-2.5 py-1.5 rounded-full"
+                      >
+                        Edit
+                      </button> */}
+                      <Link to={`/add-reminder/${reminder.uuid}`} state={{reminder}} className="text-sm text-white btn-gradient px-2.5 py-1.5 rounded-full">Edit</Link>
+                    </td>
                           </tr>
-                          <tr className="spacer"></tr>
-                          </>
                         )
                       }
                     })

src/components/Settings/Tabs/ChangePasswordTab.jsx

@@ -3,8 +3,6 @@
 import React, { useState } from "react";
 import Icons from "../../Helpers/Icons";
 import PasswordSvg from "../PasswordSvg";
-import { toast } from "react-toastify";
-import usersService from "../../../services/UsersService";
 
 export default function ChangePasswordTab() {
   const [oldPass, setOldPass] = useState("hide-password");
@@ -40,95 +38,6 @@ export default function ChangePasswordTab() {
       }
     }
   };
-
-  // Reset Password
-  const reset_profilePass = new usersService()
-  const [loading, setLoading] = useState(false) 
-  const [validation, setValidation] = useState("")
-  // state for password values
-  const [passwordDetails, setPasswordDetails] = useState({
-    prev_pass: '',
-    new_pass: '',
-    confirm_pass: ''
-  })
-  // tracks password changes
-  const handlePasswordChange = ({target:{name, value}}) => {
-    setPasswordDetails(prev => ({...prev, [name]:value}))
-  }
-
-  const handleResetPassword = async(e) => {
-    setValidation("")
-    setLoading(true)
-
-    let resetPassword = {...passwordDetails}
-    let {prev_pass, new_pass, confirm_pass} = resetPassword
-
-    // Check empty fields
-    if(!prev_pass || !new_pass || !confirm_pass) {
-      setLoading(false)
-      setValidation("Please fill the empty fields")
-      return
-    }
-
-    // Checking to see the password has 
-    if(!/^[A-Za-z]\w{6,14}$/.test(new_pass)) {
-      setLoading(false)
-      setValidation("it must be a more 7 alphanumeric characters")
-      return
-    }
-
-    // matching new passwords with confirm_password
-    if(new_pass != confirm_pass){
-      setLoading(false)
-      setValidation("new password does not match")
-      return
-    }
-
-    // matching new passwords with old passwords
-    if(prev_pass === new_pass){
-      setLoading(false)
-      setValidation("you can't use old passwords")
-      return
-    }
-
-    // assigning new values to resetPassword
-    resetPassword.member_id = localStorage.getItem("member_id")
-    resetPassword.session_token = localStorage.getItem("session_token")
-    resetPassword.member_uuid = localStorage.getItem("member_uuid")
-
-    // removed confirm password from the payload
-    delete resetPassword.confirm_pass
-
-    try {
-      const res = await reset_profilePass.resetProfilePassword(resetPassword)
-      console.log(res)
-      
-      if(res.status != 200){
-        setLoading(false)
-        setValidation("An error occurred")
-        return
-      }
-      
-      if(res.status == 200){
-        // if status is okay but can't success not granted
-        if(res.data.status < 0 ) {
-          setLoading(false)
-          setValidation("sorry, error updating password")
-        } else {
-          setLoading(false)
-          // setValidation("password updated successfully")
-          toast.success("password updated successfully")
-  
-          // setPasswordDetails(prev => ({...prev, e.target.name: ''}))
-        }
-      }
-    } catch (error) {
-      setLoading(false)
-      setValidation("something went wrong, try again later")
-    }
-
-  }
-
   return (
     <div className="changePasswordTab w-full">
       <div className="w-full flex xl:flex-row flex-col-reverse space-x-5 xl:items-center">
@@ -149,9 +58,6 @@ export default function ChangePasswordTab() {
                 className="input-field placeholder:text-base text-bese px-12 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
                 type="password"
                 id="old_password"
-                name='prev_pass'
-                value={passwordDetails.prev_pass}
-                onChange={handlePasswordChange}
               />
               <div
                 className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
@@ -177,9 +83,6 @@ export default function ChangePasswordTab() {
                 className="input-field placeholder:text-base text-bese px-12 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
                 type="password"
                 id="new_password"
-                name="new_pass"
-                value={passwordDetails.new_pass}
-                onChange={handlePasswordChange}
               />
               <div
                 className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
@@ -205,9 +108,6 @@ export default function ChangePasswordTab() {
                 className="input-field placeholder:text-base text-bese px-12 text-dark-gray dark:text-white w-full h-full bg-[#FAFAFA] dark:bg-[#11131F]  focus:ring-0 focus:outline-none"
                 type="password"
                 id="confirm_password"
-                name="confirm_pass"
-                value={passwordDetails.confirm_pass}
-                onChange={handlePasswordChange}
               />
               <div
                 className="absolute right-6 bottom-[17px] z-10 cursor-pointer"
@@ -217,7 +117,6 @@ export default function ChangePasswordTab() {
               </div>
             </div>
           </div>
-          {validation && <p className={`my-5 text-center font-light italic text-sm subpixel-antialiased tracking-wide ${validation == 'Password updated' ? 'text-green-600' : 'text-red-500'} `}>{validation}</p>}
           <div className="flex justify-center space-x-4 items-center">
             <button
               type="button"
@@ -228,10 +127,9 @@ export default function ChangePasswordTab() {
             <button
               type="button"
               className="btn-gradient tracking-wide rounded-full w-[173px] h-[46px] flex justify-center items-center"
-              onClick={handleResetPassword}
             >
               <span className="font-thin text-18 tracking-wide antialiased text-white">
-              {loading ? <div className="signup btn-loader"></div> : <span>Change Password</span>}
+                Change Password
               </span>
             </button>
           </div>

src/index.css

@@ -15,13 +15,11 @@
   font-family: "Product Sans";
   src: url("./assets/fonts/Product Sans Italic.ttf");
 }
-
 /* regular Weight */
 @font-face {
   font-family: "Product Sans";
   src: url("./assets/fonts/Product Sans Regular.ttf");
 }
-
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
@@ -30,7 +28,6 @@
   min-height: 0;
   min-width: 0;
 }
-
 :root {
   --toastify-color-success: #f539f8;
 }
@@ -41,20 +38,18 @@ body {
   background-repeat: no-repeat;
   background-size: cover;
 }
-
 html {
   font-family: "Product Sans";
 }
-
 .primary-gradient {
   background: linear-gradient(134.38deg, #f539f8 0%, #284f64 43.55%, #1a3544 104.51%);
-  /* background-image: url("./assets/images/left-myft.jpg");
+ /* background-image: url("./assets/images/left-myft.jpg");
   background-repeat: no-repeat;
   background-size: cover; */
 }
 
 .dark .dark-primary-gradient {
-  background: linear-gradient(90deg, rgba(255, 255, 255, 1) 0%, rgba(188, 73, 190, 1) 100%);
+  background: linear-gradient(90deg, rgba(255,255,255,1) 0%, rgba(188,73,190,1) 100%);
 }
 
 .primary-home {
@@ -62,25 +57,12 @@ html {
   background-image: url("./assets/images/left-myft.jpg");
   background-repeat: no-repeat;
   background-size: cover;
-  position: relative;
-}
-
-.primary-home::before {
-  content: "";
-  position: absolute;
-  width: 55px;
-  height: 100%;
-  top: 0;
-  right: -30px;
-  -webkit-backdrop-filter: blur(10px);
-  backdrop-filter: blur(10px);
 }
 
 .btn-shine {
   position: relative;
   overflow: hidden;
 }
-
 .btn-shine:after {
   content: "";
   z-index: 1;
@@ -96,7 +78,6 @@ html {
   transition: transform 0.45s ease-in-out;
   transform: translate3d(500%, 0, 0) rotate(35deg);
 }
-
 .secondary-gradient::before {
   content: "";
   display: block;
@@ -108,52 +89,40 @@ html {
   background: linear-gradient(134.38deg, #5356fb 0%, #c342f9 43.55%, #f539f8 104.51%);
   opacity: 30%;
 }
-
 /* Chrome, Safari, Edge, Opera */
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
   -webkit-appearance: none;
   margin: 0;
 }
-
 /* Firefox */
 input[type="number"] {
   -moz-appearance: textfield;
 }
-
 .default-border-bottom {
   border-bottom: 1px solid #d3d2fe;
 }
-
 .overflow-style-none::-webkit-scrollbar {
   display: none;
 }
-
 /* Hide scrollbar for IE, Edge and Firefox */
 .overflow-style-none {
-  -ms-overflow-style: none;
+  -ms-overflow-style: none; /* IE and Edge */
-  /* IE and Edge */
+  scrollbar-width: none; /* Firefox */
-  scrollbar-width: none;
-  /* Firefox */
 }
-
 .btn-gradient {
   background: linear-gradient(134.38deg, #f539f8 0%, #c342f9 43.55%, #5356fb 104.51%);
 }
-
 .btn-gradient:hover {
   background: linear-gradient(134.38deg, #5356fb 0%, #c342f9 43.55%, #f539f8 104.51%);
 }
-
 .text-26 {
   font-size: 26px;
   line-height: 31.54px;
 }
-
 .text-18 {
   font-size: 18px;
 }
-
 .section-shadow {
   box-shadow: 0px 9px 95px 0px #0000000d;
 }
@@ -163,7 +132,6 @@ input[type="number"] {
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;
 }
-
 .border-gradient {
   border: 1px solid transparent;
   background: linear-gradient(to right, white, white),
@@ -171,7 +139,6 @@ input[type="number"] {
   background-clip: padding-box, border-box;
   background-origin: padding-box, border-box;
 }
-
 .signup.btn-loader {
   border: 3px solid hsla(180, 4%, 82%, 0.2);
   border-top-color: #ffffff;
@@ -186,7 +153,6 @@ input[type="number"] {
     transform: rotate(360deg);
   }
 }
-
 /* TODO: =================================default end================================ */
 /* TODO: =================================update password================================ */
 .content-wrapper.thankyou-section {
@@ -196,13 +162,11 @@ input[type="number"] {
   transform: scale(0);
   visibility: hidden;
 }
-
 .content-wrapper.thankyou-section.active {
   transition: all 0.5s ease-in-out;
   transform: scale(1);
   visibility: visible;
 }
-
 /* #otp {
   caret-color: transparent;
 }
@@ -223,13 +187,11 @@ input[type="number"] {
   transform: scale(1);
   width: 100%;
 }
-
 .sidebar-logo {
   transform: scale(0);
   width: 0;
   transition: all 0.5s cubic-bezier(0.48, 0.3, 0.37, 0.79);
 }
-
 .menu-setting-items .items .item .item-content {
   transform: scale(0);
   transition: all 0.5s cubic-bezier(0.48, 0.3, 0.37, 0.79);
@@ -239,35 +201,30 @@ input[type="number"] {
   transform: scale(1);
   transition: all 0.5s cubic-bezier(0.48, 0.3, 0.37, 0.79);
 }
-
 .menu-setting-items .heading.active {
   opacity: 100;
   transform: scale(1);
   width: 100%;
   transition: all 0.5s cubic-bezier(0.48, 0.3, 0.37, 0.79);
 }
-
 .menu-setting-items .heading {
   opacity: 0;
   transform: scale(0);
   width: 0;
   transition: all 0.5s cubic-bezier(0.48, 0.3, 0.37, 0.79);
 }
-
 .signout-btn .signout-btn-content.active {
   opacity: 100;
   transform: scale(1);
   width: 100%;
   transition: all 0.5s cubic-bezier(0.48, 0.3, 0.37, 0.79);
 }
-
 .signout-btn .signout-btn-content {
   opacity: 0;
   transform: scale(0);
   width: 0;
   transition: all 0.5s cubic-bezier(0.48, 0.3, 0.37, 0.79);
 }
-
 .balance-dropdown::before {
   content: "";
   display: block;
@@ -280,7 +237,6 @@ input[type="number"] {
   top: -28px;
   left: 50%;
 }
-
 .notification-dropdown::before {
   content: "";
   display: block;
@@ -293,7 +249,6 @@ input[type="number"] {
   top: -28px;
   left: 74%;
 }
-
 .profile-dropdown::before {
   content: "";
   display: block;
@@ -306,7 +261,6 @@ input[type="number"] {
   top: -28px;
   left: 57%;
 }
-
 .dark .profile-dropdown::before,
 .dark .notification-dropdown::before,
 .dark .balance-dropdown::before {
@@ -319,71 +273,58 @@ input[type="number"] {
   visibility: hidden;
   transition: all 0.5s cubic-bezier(0.34, 1.56, 0.64, 1) 0s;
 }
-
 .balance-dropdown.active {
   top: 6rem;
   opacity: 100;
   visibility: visible;
 }
-
 .notification-dropdown {
   top: 16rem;
   opacity: 0;
   visibility: hidden;
   transition: all 0.5s cubic-bezier(0.34, 1.56, 0.64, 1) 0s;
 }
-
 .notification-dropdown.active {
   top: 6rem;
   opacity: 100;
   visibility: visible;
 }
-
 .profile-dropdown {
   top: 16rem;
   opacity: 0;
   visibility: hidden;
   transition: all 0.5s cubic-bezier(0.34, 1.56, 0.64, 1) 0s;
 }
-
 .profile-dropdown.active {
   top: 6rem;
   opacity: 100;
   visibility: visible;
 }
-
 .profile-dropdown,
 .notification-dropdown,
 .balance-dropdown {
   box-shadow: 19px 11px 127px 0px #00000030;
 }
-
 .miniLineChart canvas {
   height: 122px;
 }
-
 .menu-setting-items .nav-item.active span.item-icon {
   @apply bg-purple text-white;
 }
-
 .menu-setting-items .nav-item.active span.item-content {
   @apply text-purple;
 }
-
 .dark .menu-setting-items .nav-item.active span.item-content {
   @apply text-white
 }
-
 /* TODO: =================================layout end================================ */
 /* TODO: =================================HomePage ================================ */
 .home-page-wrapper .hero-slider .slick-slider .slick-dots li {
   margin: 0;
 }
-
 .home-page-wrapper .hero-slider .slick-slider .slick-dots li.slick-active button {
   background: white;
 }
-
 .home-page-wrapper .hero-slider .slick-slider .slick-dots li button {
   background: none;
   border: 1px solid white;
@@ -391,13 +332,11 @@ input[type="number"] {
   width: 8px;
   height: 8px;
 }
-
 .home-page-wrapper .hero-slider .slick-slider .slick-dots li button:before {
   content: "";
   width: 100%;
   height: 100%;
 }
-
 .trending-slider-left-btn::before {
   content: "";
   display: block;
@@ -410,17 +349,15 @@ input[type="number"] {
   z-index: -1;
   opacity: 30%;
 }
-
 .card-style-one .content .thumbnail {
   background-repeat: no-repeat;
   background-size: cover;
 }
-
 .card-style-one {
   box-shadow: 0px 9px 95px 0px #0000000d;
 }
 
-.trending-products .slick-slide>div {
+.trending-products .slick-slide > div {
   margin: 0 16px;
 }
 
@@ -428,15 +365,9 @@ input[type="number"] {
 .trending-products .slick-list {
   margin: 0 -16px;
 }
-
+.update-table table tr:last-child {
-/* .update-table table tr:last-child {
   border-bottom: none;
-} */
-
-.update-table table tr.spacer {
-  height: 10px;
 }
-
 /* TODO: =================================HomePage end================================ */
 /* TODO: =================================my wallet end================================ */
 .circle-count {
@@ -486,7 +417,6 @@ input[type="number"] {
 .circle-count:nth-child(2) svg circle:last-of-type {
   stroke: rgba(242, 153, 74, 1);
 }
-
 .circle-count:nth-child(3) svg circle:last-of-type {
   stroke: rgba(235, 87, 87, 1);
 }
@@ -495,11 +425,9 @@ input[type="number"] {
   stroke-dasharray: 156px;
   stroke-dashoffset: calc(156px - (156px * var(--percent)) / 100);
 }
-
 .recent-transaction-widget .content ul li:last-child {
   border-bottom: none;
 }
-
 /* TODO: =================================my wallet end================================ */
 /* TODO: =================================upload product end================================ */
 .drop-product-upload {
@@ -510,29 +438,23 @@ input[type="number"] {
 .drop-product-upload.highlight {
   border: 2px dashed #5356fb;
 }
-
 .field-title {
   @apply text-xl font-bold tracking-wide text-dark-gray dark:text-white;
 }
-
 .switch-btn {
   transition: all 0.5s ease-in-out;
   background-color: #878f9a;
 }
-
 .switch-btn.active {
   background-color: #27ae60;
 }
-
 .switch-btn .inner-circle {
   transition: all 0.5s ease-in-out;
   transform: translate(1.5px, 1.5px);
 }
-
 .switch-btn.active .inner-circle {
   transform: translate(24.5px, 1.5px);
 }
-
 .preview-upload-product {
   background-image: url("./assets/images/background-2.svg");
   background-repeat: no-repeat;
@@ -544,23 +466,18 @@ input[type="number"] {
 .notification-page .content-item .notifications {
   @apply flex space-x-4 items-center;
 }
-
 .notification-page .content-item .notifications .notification-page .content-item .notifications {
   @apply mb-0;
 }
-
 .notification-setting-tab .notification-settings-items li:last-child {
   border-bottom: none;
 }
-
 .faq-tab .accordion-items .accordion-item:first-child .accordion-title-bar {
   padding-top: 0;
 }
-
 .faq-tab .accordion-items .accordion-item:last-child .accordion-body .accordion-body-content {
   padding-bottom: 20px;
 }
-
 .faq-tab .accordion-title-bar {
   background: #ffffff;
   position: relative;
@@ -572,13 +489,11 @@ input[type="number"] {
   transform: rotate(0deg);
   visibility: hidden;
 }
-
 .faq-tab .accordion-title-bar .accordion-title-icon .vertical.active {
   transition: all 0.5s ease-in-out;
   transform: rotate(90deg);
   visibility: visible;
 }
-
 .faq-tab .accordion-body {
   transition: all 0.2s ease-in-out;
   max-height: 0;
@@ -586,14 +501,12 @@ input[type="number"] {
   transform: translateY(-220px);
   overflow: hidden;
 }
-
 .faq-tab .accordion-body.active {
   transition: all 0.5s ease-in-out;
   max-height: 1444px;
   transform: translateY(0);
   opacity: 100;
 }
-
 /* TODO: =================================setting end================================= */
 /* TODO: =================================modal================================= */
 .children-element {
@@ -601,11 +514,9 @@ input[type="number"] {
   top: 175px;
   transform: translate(-50%, 0px);
 }
-
 .modal-com {
   transition: all 0.1s ease-in-out;
 }
-
 /* TODO: =================================modal end================================= */
 /* TODO: =================================login ================================= */
 .btn-login {
@@ -613,7 +524,6 @@ input[type="number"] {
   height: 58px;
   @apply bg-purple;
 }
-
 .btn-login.active {
   transition: all 0.5s ease-in-out;
   width: 58px;
@@ -642,13 +552,11 @@ TODO: components ===========================
   visibility: hidden;
   top: 150px;
 }
-
 .drop-down-com .drop-down-content.active {
   opacity: 100;
   visibility: visible;
   top: 100%;
 }
-
 .product-options .drop-down-content {
   transition: all 0.5s ease-in-out;
   opacity: 0;
@@ -656,13 +564,11 @@ TODO: components ===========================
   top: 150px;
   right: 40px;
 }
-
 .product-options .drop-down-content.active {
   opacity: 100;
   visibility: visible;
   top: 0;
 }
-
 .product-two-options .drop-down-content {
   transition: all 0.5s ease-in-out;
   opacity: 0;
@@ -670,13 +576,11 @@ TODO: components ===========================
   top: 150px;
   right: 0;
 }
-
 .product-two-options .drop-down-content.active {
   opacity: 100;
   visibility: visible;
   top: calc(100% + 10px);
 }
-
 .rate-statics-dropdown {
   transition: all 0.5s ease-in-out;
   opacity: 0;
@@ -684,13 +588,11 @@ TODO: components ===========================
   top: 150px;
   left: 0;
 }
-
 .rate-statics-dropdown.active {
   opacity: 100;
   visibility: visible;
   top: calc(100% + 10px);
 }
-
 .Update-table-dropdown :is(.text-sm) {
   @apply text-base;
 }
@@ -699,57 +601,47 @@ TODO: components ===========================
 .dark .drop-product-upload {
   background-color: #1d1f2f;
 }
-
 html.dark body {
   background-image: url("./assets/images/background-dark.svg");
   background-repeat: no-repeat;
   background-size: cover;
 }
-
 .dark .preview-upload-product {
   background: none;
 }
-
 .dark .faq-tab .accordion-title-bar {
   background: none;
 }
-
 .dark .content-wrapper.thankyou-section {
   background-image: none;
 }
-
 /*
 TODO: Responsive ===========================
 */
 
 @media (prefers-color-scheme: dark) {
-
   /* defaults to dark theme */
   html.dark body {
     background-image: url("./assets/images/background-dark.svg");
   }
 }
-
 @media (max-width: 1536px) {
-  .trending-products .slick-slide>div {
+  .trending-products .slick-slide > div {
     margin: 0 10px;
   }
 }
-
+@media (max-width: 1280px) {
-@media (max-width: 1280px) {}
+}
-
 @media (max-width: 1024px) {
   .content-wrapper.thankyou-section {
     background-image: none;
   }
-
   .children-element {
     left: 50%;
     top: 65px;
     transform: translate(-50%, 0px);
   }
 }
-
 @media (max-width: 768px) {
   .profile-dropdown::before {
     content: "";
@@ -763,7 +655,6 @@ TODO: Responsive ===========================
     top: -28px;
     left: 78%;
   }
-
   .children-element {
     left: 0;
     top: 0;
@@ -771,87 +662,70 @@ TODO: Responsive ===========================
     transform: none;
   }
 }
-
+@media (max-width: 640px) {
-@media (max-width: 640px) {}
+}
-
 @media (max-width: 426px) {
-
   .nft-authprofile-wrapper .content-wrapper-profile-only .auth,
   .nft-userprofile-wrapper .content-wrapper-profile-only .auth {
     margin-top: -70px;
   }
-
-  .react-date-picker__calendar {
-    width: 290px;
-  }
 }
-
 @media (max-width: 376px) {
   .notification-page .content-item .notifications {
     @apply block space-x-0;
   }
-
   .notification-page .content-item .notifications .icon {
     @apply mb-2;
   }
-
 }
 
 /* Calendar */
-.react-calendar {
+.react-calendar{
   width: 100%;
   min-height: 23.2rem;
   border-radius: 7px !important;
   @apply border border-pink !important;
 }
 
-.dark .react-calendar {
+.dark .react-calendar{
   background: #11131F;
   color: #7B818D;
   border: 1px solid #25284F;  
 }
-
 .dark .react-calendar__navigation button:enabled:hover, 
 .dark .react-calendar__navigation button:enabled:focus,
 .dark .react-calendar__tile:disabled,
-.dark .react-calendar__navigation button:disabled {
+.dark .react-calendar__navigation button:disabled{background: #1D1F2F;}
-  background: #1D1F2F;
-}
 
-.react-calendar__navigation {
+.react-calendar__navigation{
   margin-top: 2px;
   margin-inline: 2px;
   @apply text-pink !important;
 }
 
-.react-calendar__tile--active {
+.react-calendar__tile--active{color: #fff; font-weight: bold;
-  color: #fff;
-  font-weight: bold;
   /* background-color: #006edc; */
   @apply bg-pink;
 }
-
+.dark .react-calendar__tile--active{color: #fff;}
-.dark .react-calendar__tile--active {
-  color: #fff;
-}
 
 .react-calendar__navigation button:enabled:hover,
-.react-calendar__navigation button:enabled:focus {
+.react-calendar__navigation button:enabled:focus{
   @apply rounded-full transition duration-500
 }
 
-.react-calendar__month-view__days {
+.react-calendar__month-view__days{
   display: grid !important;
   grid-template-columns: repeat(7, 1fr);
 }
 
-.react-calendar__month-view__weekdays__weekday abbr:where([title]) {
+.react-calendar__month-view__weekdays__weekday abbr:where([title]){
   text-decoration: none !important;
   cursor: default;
   @apply text-pink !important;
 }
 
-.react-calendar__tile {
+.react-calendar__tile{
   border: 1px solid #cfd7e3 !important;
   border-left: 0;
   text-align: right;
@@ -860,11 +734,9 @@ TODO: Responsive ===========================
   /* @apply border border-pink !important; */
 }
 
-.dark .react-calendar__tile {
+.dark .react-calendar__tile{background: #11131F;}
-  background: #11131F;
-}
 
-.reminder-select select {
+.reminder-select select{
   -webkit-appearance: none;
   -moz-appearance: none;
   appearance: none;
@@ -878,29 +750,23 @@ TODO: Responsive ===========================
 }
 
 .reminder-select select::-ms-expand {
-  display: none;
+  display: none; /* Remove default arrow in Internet Explorer 10 and 11 */
-  /* Remove default arrow in Internet Explorer 10 and 11 */
 }
 
-.reminder-select select option {
+.reminder-select select option{
   color: inherit;
 }
 
 /* Target Internet Explorer 9 to undo the custom arrow */
 @media screen and (min-width:0\0) {
   .reminder-select select {
-    background: none\9;
+      background: none\9;
-    padding: 5px\9;
+      padding: 5px\9;
   }
 }
 
 /* Date Picker */
-.react-date-picker {
+.react-date-picker__wrapper{
-  display: flex !important;
-  flex: 1;
-}
-
-.react-date-picker__wrapper {
   border: 0.5px solid #E3E4FE;
   padding: 1.25rem;
   background: #fafafa;
@@ -908,38 +774,28 @@ TODO: Responsive ===========================
   @apply border border-pink;
 }
 
-.dark .react-date-picker__wrapper {
+.dark .react-date-picker__wrapper {border: 0.5px solid #25284F;}
-  border: 0.5px solid #25284F;
-}
 
-.dark .react-date-picker__wrapper {
+.dark .react-date-picker__wrapper{
   background: #11131F;
   color: #7B818D;
 }
 
-.dark .react-date-picker__button svg {
+.dark .react-date-picker__button svg{stroke: #7B818D;}
-  stroke: #7B818D;
-}
 
-.react-date-picker__calendar {
+.react-date-picker__calendar .react-calendar{
-  inset: 100% 25px auto auto !important;
-}
-
-.react-date-picker__calendar .react-calendar {
   min-height: 18.4rem;
 }
 
-.react-date-picker__calendar .react-calendar__tile {
+.react-date-picker__calendar .react-calendar__tile{
   height: 40px !important;
 }
 
 .react-date-picker__inputGroup__input,
 .react-date-picker__inputGroup__divider, 
-.react-date-picker__inputGroup__leadingZero {
+.react-date-picker__inputGroup__leadingZero{
   cursor: pointer;
   color: #374151;
 }
 
-.animate-fadeIn {
+.animate-fadeIn {@apply transition duration-300}
-  @apply transition duration-300
-}

src/services/UsersService.js

@@ -5,15 +5,6 @@ class usersService {
         console.log("Er are here anyway");
     }
 
-    // Reset Password
-    resetPassword(reqData) {
-        return this.postAuxEnd('/resetpass', reqData);
-    }
-
-    resetProfilePassword(reqData){
-        return this.postAuxEnd('/resetpass-profile', reqData);
-    }
-
     logInUser(reqData) {
         localStorage.setItem("session_token", ``);
         return this.postAuxEnd("/login", reqData);
@@ -25,10 +16,15 @@ class usersService {
     }
 
     //SIGNUP AUTH
-    signupUser(reqData){
+    signupAuth(reqData){
         return this.postAuxEnd("/account", reqData);
     }
 
+    //SIGNUP OTP VERIFICATION AUTH
+    signupOTPVerify(reqData){
+    return this.postAuxEnd("/signup-code", reqData);
+    }
+
     getUserReminders(){
         var reqData = {
             member_id: localStorage.getItem("member_id")
@@ -36,13 +32,6 @@ class usersService {
         return this.getAuxEnd("/reminders", reqData);
     }
 
-    getUserHomeStats(){
-        var reqData = {
-            member_id: localStorage.getItem("member_id")
-        };
-        return this.getAuxEnd("/home-stats", reqData);
-    }
-
     getUserLoginHistory(){
         var reqData = {
             member_id: localStorage.getItem("member_id")
@@ -144,7 +133,7 @@ class usersService {
                 if (error.response) {
                     //response status is an error code
                     console.log("ERROR-------------------------------------------------------");
-                    console.log(error.response.status, 'err');
+                    console.log(error.response.status);
                     console.log("ERROR-------------------------------------------------------");
                 } else if (error.request) {
                     //response not received though the request was sent

src/views/CalendarPage.jsx

@@ -2,9 +2,9 @@ import React from "react";
 import Calendar from "../components/Calendar";
 
 export default function CalendarPage() {
-  return (
+    return (
-    <>
+        <>
-      <Calendar />
+            <Calendar />
-    </>
+        </>
-  );
+    );
 }

src/views/VerifySignupCompletePage.jsx

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