diff --git a/src/Routers.jsx b/src/Routers.jsx index 79abf42..1e8ac9c 100644 --- a/src/Routers.jsx +++ b/src/Routers.jsx @@ -22,7 +22,7 @@ import UpdatePasswordPages from "./views/UpdatePasswordPages"; import UploadProductPage from "./views/UploadProductPage"; import UserProfilePage from "./views/UserProfilePage"; import VerifyYouPages from "./views/VerifyYouPages"; - +import VerifyPasswordPages from "./views/VerifyPasswordPages"; import RemindersPage from './views/RemindersPage'; import TrackingPage from "./views/TrackingPage"; import CalendarPage from "./views/CalendarPage"; @@ -50,6 +50,7 @@ export default function Routers() { element={} /> } /> + } /> } /> {/* private route */} diff --git a/src/components/AuthPages/Login/index.jsx b/src/components/AuthPages/Login/index.jsx index bcb294c..3907df8 100644 --- a/src/components/AuthPages/Login/index.jsx +++ b/src/components/AuthPages/Login/index.jsx @@ -4,17 +4,16 @@ import { toast } from "react-toastify"; import googleLogo from "../../../assets/images/google-logo.svg"; import appleLogo from "../../../assets/images/apple-black.svg"; import facebookLogo from "../../../assets/images/facebook-4.svg"; -import WrenchBoard from "../../../assets/images/wrenchboard.png" +import WrenchBoard from "../../../assets/images/wrenchboard.png"; import usersService from "../../../services/UsersService"; import InputCom from "../../Helpers/Inputs/InputCom"; import AuthLayout from "../AuthLayout"; import { useDispatch, useSelector } from "react-redux"; -import {updateUserDetails} from '../../../store/UserDetails' +import { updateUserDetails } from "../../../store/UserDetails"; export default function Login() { - - const dispatch = useDispatch() + const dispatch = useDispatch(); const [checked, setValue] = useState(false); const [loginLoading, setLoginLoading] = useState(false); @@ -22,7 +21,7 @@ export default function Login() { //login error state const [loginError, setLoginError] = useState(false); // for the catch error - const [msgError, setMsgError] = useState(''); + const [msgError, setMsgError] = useState(""); const rememberMe = () => { setValue(!checked); @@ -41,57 +40,62 @@ export default function Login() { const navigate = useNavigate(); const userApi = new usersService(); - const doLogin = async () => { - if (email == '' && password == '') { - setMsgError('Please fill in fields') - } try { if (email !== "" && password !== "") { var postData = { username: email, password: password, - sessionid: 'STARTING' + sessionid: "STARTING", }; - const loginResult = await userApi.logInUser(postData); // just for a test + const loginResult = await userApi.logInUser(postData); // just for a test //debugger; // if (email === "support@mermsemr.com") { - if (loginResult.data.status > 0 && loginResult.data.internal_return == 100 && loginResult.data.session != '') { // just for a start + if ( + loginResult.data.status > 0 && + loginResult.data.internal_return == 100 && + loginResult.data.session != "" + ) { + // just for a start localStorage.setItem("member_id", `${loginResult.data.member_id}`); localStorage.setItem("uid", `${loginResult.data.uid}`); localStorage.setItem("session_token", `${loginResult.data.session}`); localStorage.setItem("session", `${loginResult.data.session}`); setLoginLoading(true); // userApi.getUserReminders(); //testing - dispatch(updateUserDetails(loginResult.data)) + dispatch(updateUserDetails(loginResult.data)); setTimeout(() => { navigate("/", { replace: true }); setLoginLoading(false); }, 2000); } else { // toast.error("Invalid Credential"); - setLoginError(true) + setLoginError(true); } + } else { + setMsgError("Please fill in fields"); } } catch (error) { - setMsgError('An error occurred') + setMsgError("An error occurred"); } finally { setTimeout(() => { - setLoginError(false) - setMsgError(null) - }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT)) + setLoginError(false); + setMsgError(null); + }, Number(process.env.REACT_APP_LOGIN_ERROR_TIMEOUT)); } }; return ( <> - +
-
- - wrenchboard +
+ + wrenchboard
@@ -100,7 +104,15 @@ export default function Login() {

Sign In to WrenchBoard

- New Here? Create an Account + + New Here?{" "} + + Create an Account + +
@@ -160,8 +172,23 @@ export default function Login() { Forgot Password
*/} - {loginError &&
Invalid username or password- Please reset your password or create a new account
} - {msgError &&
{msgError}
} + {loginError && ( +
+ Invalid username or password- Please{" "} + + reset your password + {" "} + or{" "} + + create a new account + +
+ )} + {msgError && ( +
+ {msgError} +
+ )}
- - - + + +
{/*

@@ -188,7 +215,10 @@ export default function Login() {

*/} -
This site is protected by hCaptcha and the our Privacy Policy and Terms of Service apply.
+
+ This site is protected by hCaptcha and the our Privacy Policy + and Terms of Service apply. +
@@ -198,11 +228,7 @@ export default function Login() { ); } -const BrandBtn = ({ - link, - imgSrc, - brand -}) => { +const BrandBtn = ({ link, imgSrc, brand }) => { return ( - ) -} \ No newline at end of file + ); +}; diff --git a/src/components/AuthPages/SignUp/index.jsx b/src/components/AuthPages/SignUp/index.jsx index bfcdec9..2cdc99e 100644 --- a/src/components/AuthPages/SignUp/index.jsx +++ b/src/components/AuthPages/SignUp/index.jsx @@ -56,17 +56,13 @@ export default function SignUp() { const handleSignUp = async () => { let { country, first_name, last_name, email, password } = formData; - - if (email === "" && password === "" && first_name === "") { - setMsgError("Please fill in fields"); - } - try { if ( email !== "" && password !== "" && first_name !== "" && - last_name !== "" + last_name !== "" && + country !== "" ) { setSignUpLoading(true); const reqData = { @@ -98,6 +94,8 @@ export default function SignUp() { setSignUpLoading(false); setMsgError("An error occurred"); } + } else { + setMsgError("Please fill in fields"); } } catch (error) { throw new Error(error); @@ -106,7 +104,7 @@ export default function SignUp() { setMsgError(null); }, process.env.REACT_APP_SIGNUP_ERROR_TIMEOUT); } - }; + }; useEffect(() => { getCountryList(); @@ -262,7 +260,7 @@ export default function SignUp() { + +
+ +
+ +); + +const ErrorComponent = ({ onClick }) => ( +
+
+

+ This error occurs because you have already used this link or the link + has broken/expired. Start with the reset process again. If it doesn't + work, try to create the account from the start. +

+
+ +
+ +
+
+); diff --git a/src/components/AuthPages/VerifyYou/index.jsx b/src/components/AuthPages/VerifyYou/index.jsx index c8d8831..3f3ddb6 100644 --- a/src/components/AuthPages/VerifyYou/index.jsx +++ b/src/components/AuthPages/VerifyYou/index.jsx @@ -1,18 +1,20 @@ import { useNavigate, Link } from "react-router-dom"; import AuthLayout from "../AuthLayout"; -import WrenchBoard from "../../../assets/images/wrenchboard.png" +import WrenchBoard from "../../../assets/images/wrenchboard.png"; export default function VerifyYou() { - const navigate = useNavigate() + const navigate = useNavigate(); return ( <> - +
-
- - wrenchboard +
+ + wrenchboard
@@ -21,29 +23,38 @@ export default function VerifyYou() {

Let's verify your email now

- Check your email. + + Check your email. +

- Verify Email. Help us secure your WrenchBoard account by verifying your email registration address. Verification will let you access all of WrenchBoard's features. + Verify Email. Help us secure your WrenchBoard account + by verifying your email registration address. Verification + will let you access all of WrenchBoard's features.

- If you do not receive the confirmation message within a few minutes of signing up, please check your Junk E-mail folder just in case the confirmation email got delivered there instead of your inbox. If so, select the confirmation message and click Not Junk, which will allow future messages to get through. + If you do not receive the confirmation message within a few + minutes of signing up, please check your Junk E-mail folder + just in case the confirmation email got delivered there + instead of your inbox. If so, select the confirmation + message and click Not Junk, which will allow future messages + to get through.

-
- -
+
+ +
diff --git a/src/services/UsersService.js b/src/services/UsersService.js index fb28d26..c1fbf16 100644 --- a/src/services/UsersService.js +++ b/src/services/UsersService.js @@ -300,6 +300,10 @@ class usersService { return this.postAuxEnd("/startresetpasword", reqData) } + CompleteResetPassword(reqData){ + return this.postAuxEnd("/stepresetpass", reqData) + } + getCouponRedeem(){ var postData = { uuid: localStorage.getItem("uid"), diff --git a/src/views/VerifyPasswordPages.jsx b/src/views/VerifyPasswordPages.jsx new file mode 100644 index 0000000..2bcba53 --- /dev/null +++ b/src/views/VerifyPasswordPages.jsx @@ -0,0 +1,6 @@ +import React from "react"; +import VerifyPassword from "../components/AuthPages/VerifyPassword"; + +export default function VerifyPasswordPages() { + return ; +}