Skip to content

Commit f55db23

Browse files
authored
Merge pull request #93 from AgainIoT/feature/83
Fixed profile image mulfunction
2 parents 8c96ff8 + 4d14dea commit f55db23

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

src/layout/Header.js

Lines changed: 8 additions & 6 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, useSetRecoilState } from "recoil";
20+
import { useRecoilState } from "recoil";
2121
import { avatar, id, name, isLogin } from "../recoil/authorize";
2222
import styled from "styled-components";
2323
const ElevationScroll = (props) => {
@@ -48,11 +48,13 @@ export const Header = (props) => {
4848
const [src, setSrc] = useRecoilState(avatar);
4949
const [userId, setUserId] = useRecoilState(id);
5050
const [userName, setUserName] = useRecoilState(name);
51-
const setIsLogin = useSetRecoilState(isLogin);
51+
const [Login, setLogin] = useRecoilState(isLogin);
5252
React.useEffect(() => {
53-
setSrc(localStorage.avatar);
54-
setUserId(localStorage.id);
55-
setUserName(localStorage.name);
53+
if (Login) {
54+
setSrc(localStorage.avatar);
55+
setUserId(localStorage.id);
56+
setUserName(localStorage.name);
57+
}
5658
}, []);
5759
const handleOpenNavMenu = (event) => {
5860
setAnchorElNav(event.currentTarget);
@@ -76,7 +78,7 @@ export const Header = (props) => {
7678
"",
7779
{ withCredentials: true },
7880
);
79-
setIsLogin(false);
81+
setLogin(false);
8082
localStorage.setItem("id", "guest");
8183
localStorage.setItem("name", "guest");
8284
localStorage.setItem("avatar", "");

src/pages/MainPage.js

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

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

3137
useEffect(() => {

0 commit comments

Comments
 (0)