From 475949b8b83979050236b62fc4fc0d2e3a824501 Mon Sep 17 00:00:00 2001 From: ChineseChikki Date: Tue, 24 Jan 2023 17:24:06 +0100 Subject: [PATCH 1/7] forgot password page is working now --- src/assets/images/shape/straight-line.svg | 10 ++++++++++ src/assets/images/shape/title-shape-two.svg | 2 +- src/components/AuthPages/ForgotPassword/index.jsx | 14 +++++++++++--- 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/assets/images/shape/straight-line.svg diff --git a/src/assets/images/shape/straight-line.svg b/src/assets/images/shape/straight-line.svg new file mode 100644 index 0000000..296abb3 --- /dev/null +++ b/src/assets/images/shape/straight-line.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/images/shape/title-shape-two.svg b/src/assets/images/shape/title-shape-two.svg index 0374734..4a2ae28 100644 --- a/src/assets/images/shape/title-shape-two.svg +++ b/src/assets/images/shape/title-shape-two.svg @@ -1,4 +1,4 @@ - + diff --git a/src/components/AuthPages/ForgotPassword/index.jsx b/src/components/AuthPages/ForgotPassword/index.jsx index b7e7c07..86f488c 100644 --- a/src/components/AuthPages/ForgotPassword/index.jsx +++ b/src/components/AuthPages/ForgotPassword/index.jsx @@ -1,5 +1,6 @@ import React from "react"; -import titleShape from "../../../assets/images/shape/title-shape-two.svg"; +import { Link } from 'react-router-dom'; +import straightLine from "../../../assets/images/shape/straight-line.svg"; import InputCom from "../../Helpers/Inputs/InputCom"; import AuthLayout from "../AuthLayout"; @@ -15,8 +16,8 @@ export default function ForgotPassword() {

Forget Password

-
- shape +
+ shape
@@ -36,6 +37,13 @@ export default function ForgotPassword() { > Send Code + + + + Back to Home +
From 4457276f08a92b63a22ce108f46c3d2fa0f87916 Mon Sep 17 00:00:00 2001 From: victorAnumudu Date: Wed, 25 Jan 2023 09:40:12 +0100 Subject: [PATCH 2/7] made the curve underline straight --- src/assets/images/shape/login_straight_underline.svg | 10 ++++++++++ src/components/AuthPages/Login/index.jsx | 5 +++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 src/assets/images/shape/login_straight_underline.svg diff --git a/src/assets/images/shape/login_straight_underline.svg b/src/assets/images/shape/login_straight_underline.svg new file mode 100644 index 0000000..d79df8d --- /dev/null +++ b/src/assets/images/shape/login_straight_underline.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 0a9c50c..39a59b7 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -2,7 +2,8 @@ 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"; @@ -51,7 +52,7 @@ export default function Login() {

Log In

-
+
shape
From e3ae8547815053b06a8667911ea3ff18f293a20d Mon Sep 17 00:00:00 2001 From: ChineseChikki Date: Wed, 25 Jan 2023 10:56:11 +0100 Subject: [PATCH 3/7] updated reset password --- src/assets/images/shape/straight-line.svg | 10 ---------- src/assets/images/shape/title-shape-two.svg | 6 +++--- src/components/AuthPages/ForgotPassword/index.jsx | 4 ++-- 3 files changed, 5 insertions(+), 15 deletions(-) delete mode 100644 src/assets/images/shape/straight-line.svg diff --git a/src/assets/images/shape/straight-line.svg b/src/assets/images/shape/straight-line.svg deleted file mode 100644 index 296abb3..0000000 --- a/src/assets/images/shape/straight-line.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/assets/images/shape/title-shape-two.svg b/src/assets/images/shape/title-shape-two.svg index 4a2ae28..2484789 100644 --- a/src/assets/images/shape/title-shape-two.svg +++ b/src/assets/images/shape/title-shape-two.svg @@ -1,7 +1,7 @@ - - + + - + diff --git a/src/components/AuthPages/ForgotPassword/index.jsx b/src/components/AuthPages/ForgotPassword/index.jsx index 86f488c..4745d89 100644 --- a/src/components/AuthPages/ForgotPassword/index.jsx +++ b/src/components/AuthPages/ForgotPassword/index.jsx @@ -1,6 +1,6 @@ import React from "react"; import { Link } from 'react-router-dom'; -import straightLine from "../../../assets/images/shape/straight-line.svg"; +import titleShape from "../../../assets/images/shape/title-shape-two.svg"; import InputCom from "../../Helpers/Inputs/InputCom"; import AuthLayout from "../AuthLayout"; @@ -17,7 +17,7 @@ export default function ForgotPassword() { Forget Password
- shape + shape
From d6eadbb46bc6a101d96411039ae9b0c9d4664474 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QHP1O2H\\MIKE" Date: Wed, 25 Jan 2023 07:02:33 -0500 Subject: [PATCH 4/7] Changed position of the login error message --- src/components/AuthPages/Login/index.jsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 0a9c50c..f6a7b9a 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -9,6 +9,10 @@ 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); }; @@ -35,7 +39,8 @@ export default function Login() { setLoginLoading(false); }, 2000); } else { - toast.error("Invalid Credential"); + // toast.error("Invalid Credential"); + setLoginError(true) } } }; @@ -102,7 +107,7 @@ export default function Login() { Remember Me @@ -127,6 +132,7 @@ export default function Login() { )}
+ {loginError &&

Invalid Credential

} ); -} +} \ No newline at end of file From 72e898cd589e3593b7b4ad5ad435815c151e1599 Mon Sep 17 00:00:00 2001 From: "DESKTOP-BC3NEC6\\chiefsoft" Date: Wed, 25 Jan 2023 12:43:22 -0500 Subject: [PATCH 5/7] logout text --- src/components/Partials/Layout.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Partials/Layout.jsx b/src/components/Partials/Layout.jsx index 414e786..c746909 100644 --- a/src/components/Partials/Layout.jsx +++ b/src/components/Partials/Layout.jsx @@ -143,7 +143,7 @@ export default function Layout({ children }) {

- Are you sure you want to Logout of your myFit account? + Are you sure you want to Logout of your myFit account ?

From fbe9615b034a9bd50eccdbf261e4875690a6037e Mon Sep 17 00:00:00 2001 From: "DESKTOP-BC3NEC6\\chiefsoft" Date: Wed, 25 Jan 2023 12:45:52 -0500 Subject: [PATCH 6/7] Logout msg --- src/components/Partials/Layout.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Partials/Layout.jsx b/src/components/Partials/Layout.jsx index c746909..414e786 100644 --- a/src/components/Partials/Layout.jsx +++ b/src/components/Partials/Layout.jsx @@ -143,7 +143,7 @@ export default function Layout({ children }) {

- Are you sure you want to Logout of your myFit account ? + Are you sure you want to Logout of your myFit account?

From bf2dbb71767ace9eca5df39755849a8362fa63f2 Mon Sep 17 00:00:00 2001 From: "DESKTOP-BC3NEC6\\chiefsoft" Date: Wed, 25 Jan 2023 13:18:39 -0500 Subject: [PATCH 7/7] placeholder text --- src/components/AuthPages/Login/index.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index 12642ea..98c733a 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -19,7 +19,7 @@ export default function Login() { }; // email - const [email, setMail] = useState("example@quomodosoft.com"); + const [email, setMail] = useState("support@chiefsoft.com"); const handleEmail = (e) => { setMail(e.target.value); }; @@ -66,7 +66,7 @@ export default function Login() {

- Dont’t have an aceount ? + Don't have an account ? Sign up free