Compare commits

..

1 Commits

Author SHA1 Message Date
Chukwumdiebube 293559c02b Toasts removed! 2023-01-30 23:21:07 +01:00
6 changed files with 9 additions and 48 deletions
+2 -10
View File
@@ -1,6 +1,6 @@
import React, { useState } from "react";
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 titleShape from "../../../assets/images/shape/title-shape.svg";
import titleShape from "../../../assets/images/shape/login_straight_underline.svg";
@@ -8,11 +8,7 @@ import usersService from "../../../services/UsersService";
import InputCom from "../../Helpers/Inputs/InputCom";
import AuthLayout from "../AuthLayout";
import { useDispatch, useSelector } from "react-redux";
import { updateUserInfo } from "../../../store/userInfo";
export default function Login() {
const dispatch = useDispatch()
const [checked, setValue] = useState(false);
const [loginLoading, setLoginLoading] = useState(false);
@@ -46,17 +42,13 @@ export default function Login() {
if (loginResult.data.status > 0 && loginResult.data.session_token !='') { // just for a start
localStorage.setItem("email", `${email}`);
localStorage.setItem("session_token", `${loginResult.data.session_token}`);
localStorage.setItem("profile", `${JSON.stringify(loginResult.data.profile)}`);
setLoginLoading(true);
// userApi.getUserReminders(); //testing
setTimeout(() => {
toast.success("Login Successfully");
setTimeout(() => {
navigate("/", { replace: true });
setLoginLoading(false);
dispatch(updateUserInfo(loginResult.data.profile))
}, 2000);
} else {
// toast.error("Invalid Credential");
setLoginError(true)
}
}
+3 -6
View File
@@ -1,5 +1,4 @@
import React, { useContext } from "react";
import { useSelector } from "react-redux";
import { Link } from "react-router-dom";
import bank1 from "../../assets/images/bank-1.png";
import bank2 from "../../assets/images/bank-2.png";
@@ -12,9 +11,7 @@ import Icons from "../Helpers/Icons";
import ModalCom from "../Helpers/ModalCom";
import SearchCom from "../Helpers/SearchCom";
export default function Header({ logoutModalHandler, sidebarHandler }) {
const { userInfo } = useSelector((state) => state.userInfo);
const [balanceDropdown, setbalanceValue] = useToggle(false);
const [notificationDropdown, setNotificationValue] = useToggle(false);
const [userProfileDropdown, setProfileDropdown] = useToggle(false);
@@ -439,11 +436,11 @@ export default function Header({ logoutModalHandler, sidebarHandler }) {
</div>
<div className="lg:block hidden">
<h1 className="text-xl font-bold text-dark-gray dark:text-white">
{userInfo.firstname + ' ' + userInfo.lastname}
Brokln Simons
</h1>
{/* <p className="text-sm text-thin-light-gray">
<p className="text-sm text-thin-light-gray">
@broklinslam_75
</p> */}
</p>
</div>
</div>
<div
+2 -4
View File
@@ -2,12 +2,10 @@ import { Navigate, Outlet } from "react-router-dom";
const AuthRoute = ({ redirectPath = "/login", children }) => {
const isLogin = localStorage.getItem("email");
const profile = localStorage.getItem("profile")
if (!isLogin || !profile || (typeof JSON.parse(profile) == 'object' && JSON.parse(profile).firstname == undefined)) {
if (!isLogin) {
return <Navigate to={redirectPath} replace />;
}
return children || <Outlet />;
};
export default AuthRoute;
export default AuthRoute;
+1 -3
View File
@@ -1,10 +1,8 @@
import { configureStore } from "@reduxjs/toolkit";
import drawerReducer from "./drawer";
import userReducer from "./userInfo";
export default configureStore({
reducer: {
drawer: drawerReducer,
userInfo: userReducer,
},
});
});
-21
View File
@@ -1,21 +0,0 @@
import { createSlice } from "@reduxjs/toolkit";
const initialState = {
userInfo: JSON.parse(localStorage.getItem("profile"))
};
export const userSlice = createSlice({
name: "user",
initialState,
reducers: {
updateUserInfo: (state,payload) => {
// eslint-disable-next-line no-param-reassign
state.userInfo = payload.payload
},
},
});
// Action creators are generated for each case reducer function
export const { updateUserInfo } = userSlice.actions;
export default userSlice.reducer;
+1 -4
View File
@@ -2,7 +2,7 @@ import React, {useEffect} from "react";
import Home from "../components/Home";
import { useNavigate } from "react-router-dom";
import { useDispatch, useSelector } from "react-redux";
import { toast } from "react-toastify";
// import { toast } from "react-toastify";
export default function HomePages() {
@@ -12,9 +12,6 @@ export default function HomePages() {
const logOut = () => {
localStorage.removeItem("email");
localStorage.removeItem('session_token');
toast.success("Come Back Soon", {
icon: `🙂`,
});
navigate("/login", { replace: true });
};