Skip to content

Commit bf64708

Browse files
authored
Merge pull request #95 from AgainIoT/revert-94-main
Revert "Unexpected bugs fixed"
2 parents d64c309 + 4f34440 commit bf64708

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

src/layout/Header.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import MenuItem from "@mui/material/MenuItem";
1717
import MenuIcon from "@mui/icons-material/Menu";
1818
import LOGO from "../../src/assets/images/Logo.svg";
1919
import axios from "axios";
20-
import { useRecoilState } from "recoil";
20+
import { useRecoilState, useSetRecoilState } from "recoil";
2121
import { avatar, id, name, isLogin } from "../recoil/authorize";
2222
import styled from "styled-components";
2323
const ElevationScroll = (props) => {
@@ -48,13 +48,11 @@ export const Header = (props) => {
4848
const [src, setSrc] = useRecoilState(avatar);
4949
const [userId, setUserId] = useRecoilState(id);
5050
const [userName, setUserName] = useRecoilState(name);
51-
const [Login, setLogin] = useRecoilState(isLogin);
51+
const setIsLogin = useSetRecoilState(isLogin);
5252
React.useEffect(() => {
53-
if (Login) {
54-
setSrc(localStorage.avatar);
55-
setUserId(localStorage.id);
56-
setUserName(localStorage.name);
57-
}
53+
setSrc(localStorage.avatar);
54+
setUserId(localStorage.id);
55+
setUserName(localStorage.name);
5856
}, []);
5957
const handleOpenNavMenu = (event) => {
6058
setAnchorElNav(event.currentTarget);
@@ -78,7 +76,7 @@ export const Header = (props) => {
7876
"",
7977
{ withCredentials: true },
8078
);
81-
setLogin(false);
79+
setIsLogin(false);
8280
localStorage.setItem("id", "guest");
8381
localStorage.setItem("name", "guest");
8482
localStorage.setItem("avatar", "");

src/pages/MainPage.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,7 @@ function MainPage() {
2525
const setIsLogin = useSetRecoilState(isLogin);
2626

2727
const checkIsLogin = async () => {
28-
const loggedIn = await checkTokenValid();
29-
if (!loggedIn) {
30-
localStorage.removeItem("id");
31-
localStorage.removeItem("name");
32-
localStorage.removeItem("avatar");
33-
}
34-
setIsLogin(loggedIn);
28+
setIsLogin(await checkTokenValid());
3529
};
3630

3731
useEffect(() => {

0 commit comments

Comments
 (0)