MyFit/users-myfit
2
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'removing-toasts-ebube' of MyFit/users-myfit into master

Browse Source
This commit is contained in:
Toks Law
2023-01-31 15:48:26 +00:00
committed by Gogs
parent 190ec5eff4 730491dba5
commit 1f8a6d0d30
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/AuthPages/Login/index.jsx
+1 -3
View File
@@ -1,6 +1,6 @@
import React, { useState } from "react"; import React, { useState } from "react";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { toast } from "react-toastify"; // import { toast } from "react-toastify";
import googleLogo from "../../../assets/images/google-logo.svg"; 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 titleShape from "../../../assets/images/shape/login_straight_underline.svg";
@@ -50,13 +50,11 @@ export default function Login() {
setLoginLoading(true); setLoginLoading(true);
// userApi.getUserReminders(); //testing // userApi.getUserReminders(); //testing
setTimeout(() => { setTimeout(() => {
toast.success("Login Successfully");
navigate("/", { replace: true }); navigate("/", { replace: true });
setLoginLoading(false); setLoginLoading(false);
dispatch(updateUserInfo(loginResult.data.profile)) dispatch(updateUserInfo(loginResult.data.profile))
}, 2000); }, 2000);
} else { } else {
// toast.error("Invalid Credential");
setLoginError(true) setLoginError(true)
} }
} }
src/views/HomePages.jsx
+1 -4
View File
@@ -2,7 +2,7 @@ import React, {useEffect} from "react";
import Home from "../components/Home"; import Home from "../components/Home";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";
import { toast } from "react-toastify"; // import { toast } from "react-toastify";
export default function HomePages() { export default function HomePages() {
@@ -12,9 +12,6 @@ export default function HomePages() {
const logOut = () => { const logOut = () => {
localStorage.removeItem("email"); localStorage.removeItem("email");
localStorage.removeItem('session_token'); localStorage.removeItem('session_token');
toast.success("Come Back Soon", {
icon: `🙂`,
});
navigate("/login", { replace: true }); navigate("/login", { replace: true });
}; };