verified that otp is six digits

src/Routers.jsx

@@ -31,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 (
@@ -52,7 +51,6 @@ export default function Routers() {
         />
         <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/assets/images/shape/title_shape_3.svg

@@ -0,0 +1,10 @@
+<svg width="420" height="31" viewBox="0 0 420 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0,2 420,2" stroke="url(#paint0_linear_4_1797)" stroke-width="4" stroke-linecap="round"/>
+<defs>
+<linearGradient id="paint0_linear_4_1797" x1="1" y1="1" x2="11.0515" y2="59.9411" gradientUnits="userSpaceOnUse">
+<stop stop-color="#F539F8"/>
+<stop offset="0.416763" stop-color="#C342F9"/>
+<stop offset="1" stop-color="#5356FB"/>
+</linearGradient>
+</defs>
+</svg>

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

@@ -1,14 +1,7 @@
 import React from "react";
-import AuthLayout from "../../AuthLayout";
 
-
-export default function CompleteSignUp({ className }) {
+export default function ThankYou({ 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/Otp.jsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from "react";
 
-export default function Otp() {
+export default function Otp({handleChange, value}) {
   useEffect(() => {
     const otp = document.querySelector("#otp-inputs");
     // eslint-disable-next-line no-restricted-syntax
@@ -25,6 +25,9 @@ export default function Otp() {
             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 ">
@@ -33,6 +36,9 @@ export default function Otp() {
             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 ">
@@ -41,6 +47,9 @@ export default function Otp() {
             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 ">
@@ -49,6 +58,9 @@ export default function Otp() {
             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 ">
@@ -57,6 +69,9 @@ export default function Otp() {
             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 ">
@@ -65,6 +80,9 @@ export default function Otp() {
             type="text"
             maxLength={1}
             id="otp"
+            name='value_six'
+            value={value.value_six}
+            onChange={handleChange}
           />
         </div>
       </div>

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

@@ -1,9 +1,101 @@
-import React from "react";
-import titleShape from "../../../../assets/images/shape/text-shape-three.svg";
+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";
+import { useNavigate } from 'react-router-dom';
+import usersService from "../../../../services/UsersService";
+
+export default function VerifyYou() {
+
+  const navigate = useNavigate();
+
+  const verify = new usersService();
+
+  const [loading, setLoading] = useState(false) // For loading spinner
+
+  const [errorMessage, setErrorMessage] = useState({ // For Displaying success or error message
+    success: false,
+    message: ''
+  })
+
+
+  // state for user inputed values
+  const [verificationCode, setVerificationCode] = useState({
+    value_one: '',
+    value_two: '',
+    value_three: '',
+    value_four: '',
+    value_five: '',
+    value_six: '',
+  })
+
+  const handleVerificationInput = ({target:{name, value}}) => { // function that listens to input change
+    setVerificationCode(prev => {
+      return {...prev, [name]:value}
+    })
+  }
+
+  const handleUserOTPVerify = async () => { // handles input validation and submits to api call
+
+    setErrorMessage({ // resets the error message to empty string
+      success: false,
+      message: ''
+    }) 
+    
+    setLoading(true) // Sets loading spinner
+
+    let code = '';
+    for(let values in verificationCode){
+      code+=verificationCode[values]
+    }
+
+    if(!code){ // checks if code is empty
+      setLoading(false)
+      setErrorMessage({
+        success: false,
+        message: 'Please input the code sent to you'
+      })
+      return
+    }
+    if(code.length < 6){ // checks if verifiedCode is empty
+      setLoading(false)
+      setErrorMessage({
+        success: false,
+        message: 'Code must be 6 characters'
+      })
+      return
+    }
+
+    try {
+      const res = await verify.signupOTPVerify(code);
+      console.log(res)
+      if(res.status != 200){
+        setLoading(false)
+        setErrorMessage({
+          success: false,
+          message: 'Could not verify code'
+        })
+        return
+      }
+      // if status code is 200 proceed
+      setErrorMessage({
+        success: true,
+        message: 'verification successfully'
+      })
+      setTimeout(()=>{
+        setLoading(false)
+        navigate('/update-password', { replace: true })
+      }, 1000)
+    } catch (error) {
+      setLoading(false)
+      setErrorMessage({
+        success: false,
+        message: 'Opps! something went wrong, Try agian later'
+      })
+    }
+  }
 
-export default function VerifySignup() {
   return (
     <>
       <AuthLayout
@@ -12,22 +104,33 @@ export default function VerifySignup() {
         <div className="content-wrapper xl:bg-white dark:bg-dark-white   w-full sm:w-auto px-5 xl:px-[70px] 2xl:px-[100px] h-[818px] rounded-xl flex flex-col justify-center">
           <div>
             <div className="title-area flex flex-col justify-center items-center relative text-center mb-8">
-              <h1 className="sm:text-5xl text-4xl font-bold leading-[74px]   text-dark-gray dark:text-white">
+              <h1 className="mb-4 sm:text-5xl text-4xl font-bold leading-[74px]   text-dark-gray dark:text-white">
                SignUp Verification 
               </h1>
-              <div className="shape sm:w-[377px] w-[270px] -mt-5 ml-5">
+              <div className="shape">
                 <img src={titleShape} alt="shape" />
               </div>
             </div>
             <div className="input-area">
-              <Otp />
+              <Otp handleChange={handleVerificationInput} value={verificationCode}/>
+              {errorMessage.message != '' &&  <p className={`text-center p-3 ${errorMessage.success ? 'text-green-600' : 'text-red-600'}`}>{errorMessage.message}</p>}
               <div className="signin-area mb-3.5">
-                <a
-                  href="/complete-signup"
+                <button
+                  // href="/update-password"
+                  onClick={handleUserOTPVerify}
                   className="w-full rounded-[50px] h-[58px] mb-6 text-xl text-white font-bold flex justify-center bg-purple items-center"
                 >
+                  {loading && (
+                  <div role="status" className="px-3">
+                      <svg aria-hidden="true" className="w-8 h-8 mr-2 text-gray-200 animate-spin dark:text-gray-600 fill-purple" 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>
+                  )}
                   Continue
-                </a>
+                </button>
               </div>
               <div className="resend-code flex justify-center">
                 <p className="text-lg text-thin-light-gray font-normal">

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
 
@@ -63,18 +63,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)
       setErrorMessage({
@@ -84,25 +72,11 @@ 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);
-      if(res.status != 200 || res.data.status < 1){
+      const res = await userSignupAuth.signupAuth(userInfo);
+      if(res.status != 200){
         setLoading(false)
         setErrorMessage({
           success: false,
@@ -127,7 +101,6 @@ export default function SignUp() {
       })
     }
   }
-
   return (
     <>
       <div className="layout-wrapper">
@@ -168,7 +141,7 @@ export default function SignUp() {
                           name="firstname"
                           type="text"
                           iconName="people"
-                          value={userDetails.first_name}
+                          value={userDetails.firstname}
                           inputHandler={handleInputChange}
                         />
                       </div>
@@ -179,7 +152,7 @@ export default function SignUp() {
                           name="lastname"
                           type="text"
                           iconName="people"
-                          value={userDetails.Last_name}
+                          value={userDetails.lastname}
                           inputHandler={handleInputChange}
                         />
                       </div>
@@ -255,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/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/services/UsersService.js

@@ -16,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")

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 />;
-}