Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit

src/assets/images/shape/login_straight_underline.svg

@@ -0,0 +1,10 @@
+<svg width="174" height="31" viewBox="0 0 174 31" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0,2 173,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/assets/images/shape/title-shape-two.svg

@@ -1,7 +1,7 @@
 <svg width="379" height="31" viewBox="0 0 379 31" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1 29.5C18.8333 21 68.4183 8.72179 121.5 18.5C178.5 29 365.5 43.5 378 1.5" stroke="url(#paint0_linear_7_3645)" stroke-width="2" stroke-linecap="round"/>
+<path d="M0,0 379,0" stroke="url(#paint0_linear_4_1797)" stroke-width="4" stroke-linecap="round"/>
 <defs>
-<linearGradient id="paint0_linear_7_3645" x1="1" y1="1.5" x2="5.52687" y2="60.7337" gradientUnits="userSpaceOnUse">
+<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"/>

src/components/AuthPages/ForgotPassword/index.jsx

@@ -1,4 +1,5 @@
 import React from "react";
+import { Link } from 'react-router-dom';
 import titleShape from "../../../assets/images/shape/title-shape-two.svg";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
@@ -15,7 +16,7 @@ export default function ForgotPassword() {
               <h1 className="sm:text-5xl text-4xl font-bold sm:leading-[74px]   text-dark-gray dark:text-white">
                 Forget Password
               </h1>
-              <div className="shape sm:w-[377px] w-[270px] -mt-1 ml-5">
+              <div className="shape sm:w-[377px] w-[270px] -mt-1 ml-0">
                 <img src={titleShape} alt="shape" />
               </div>
             </div>
@@ -36,6 +37,13 @@ export default function ForgotPassword() {
                 >
                   Send Code
                 </a>
+
+
+                <Link to="/"
+                  className=" my-40 font-bold flex justify-center text-red-500 items-center"
+                >
+                  Back to Home
+                </Link>
               </div>
             </div>
           </div>

src/components/AuthPages/Login/index.jsx

@@ -2,19 +2,24 @@ import React, { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { toast } from "react-toastify";
 import googleLogo from "../../../assets/images/google-logo.svg";
-import titleShape from "../../../assets/images/shape/title-shape.svg";
+// import titleShape from "../../../assets/images/shape/title-shape.svg";
+import titleShape from "../../../assets/images/shape/login_straight_underline.svg";
 import InputCom from "../../Helpers/Inputs/InputCom";
 import AuthLayout from "../AuthLayout";
 
 export default function Login() {
   const [checked, setValue] = useState(false);
   const [loginLoading, setLoginLoading] = useState(false);
+
+  //login error state
+  const [loginError, setLoginError] = useState(false);
+
   const rememberMe = () => {
     setValue(!checked);
   };
 
   // email
-  const [email, setMail] = useState("example@quomodosoft.com");
+  const [email, setMail] = useState("support@chiefsoft.com");
   const handleEmail = (e) => {
     setMail(e.target.value);
   };
@@ -35,7 +40,8 @@ export default function Login() {
           setLoginLoading(false);
         }, 2000);
       } else {
-        toast.error("Invalid Credential");
+        // toast.error("Invalid Credential");
+        setLoginError(true)
       }
     }
   };
@@ -51,7 +57,7 @@ export default function Login() {
               <h1 className="text-5xl font-bold leading-[74px]   text-dark-gray dark:text-white">
                 Log In
               </h1>
-              <div className="shape -mt-5">
+              <div className="shape -mt-2">
                 <img src={titleShape} alt="shape" />
               </div>
             </div>
@@ -60,7 +66,7 @@ export default function Login() {
                 <InputCom
                   value={email}
                   inputHandler={handleEmail}
-                  placeholder="example@quomodosoft.com"
+                  placeholder="support@chiefsoft.com"
                   label="Email Address"
                   name="email"
                   type="email"
@@ -102,7 +108,7 @@ export default function Login() {
                   </button>
                   <span
                     onClick={rememberMe}
-                    className="text-base   text-dark-gray dark:text-white"
+                    className="text-base text-dark-gray dark:text-white"
                   >
                     Remember Me
                   </span>
@@ -127,6 +133,7 @@ export default function Login() {
                     )}
                   </button>
                 </div>
+                {loginError && <p class="text-center text-red-600 pb-4">Invalid Credential</p>}
                 <a
                   href="#"
                   className="w-full border border-light-purple dark:border-[#5356fb29]  rounded-[50px] h-[58px] flex justify-center bg-[#FAFAFA] dark:bg-[#11131F]  items-center"
@@ -139,7 +146,7 @@ export default function Login() {
               </div>
               <div className="signup-area flex justify-center">
                 <p className="sm:text-lg text-sm text-thin-light-gray font-normal">
-                  Dont’t have an aceount ?
+                  Don't have an account ?
                   <a href="/signup" className="ml-2   text-dark-gray dark:text-white">
                     Sign up free
                   </a>
@@ -151,4 +158,4 @@ export default function Login() {
       </AuthLayout>
     </>
   );
-}
+}