Merge pull request #55 from 2022-2-Graduation-Project/feature/37-logi…

…n-signup [#37] fix: add json parse to user object
2022-2-Graduation-Project · Feb 21, 2023 · 71035c7 · 71035c7
2 parents 35ea398 + 4892495
commit 71035c7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bowwowcare/src/App.js b/bowwowcare/src/App.js
@@ -26,7 +26,7 @@ import EventBus from "./common/EventBus";
 function App() {
 	const { user: currentUser } = useSelector((state) => state.auth);
 	const dispatch = useDispatch();
-	const token = window.localStorage.getItem("user")
+	const token = JSON.parse(localStorage.getItem("user"))?.token
 
 	const logOut = useCallback(() => {
 		dispatch(logout());

diff --git a/bowwowcare/src/components/Header.js b/bowwowcare/src/components/Header.js
@@ -28,7 +28,7 @@ function Header() {
 			{window.location.pathname==="/login" ? (
 				null
 			) : (
-				window.localStorage.getItem("user") ? (
+				JSON.parse(localStorage.getItem("user")) ? (
 					<button className="text-right" onClick={() => dispatch(logout())}>로그아웃</button>
 				) : (
 					<button className="text-right" onClick={handleLogin}>로그인</button>

diff --git a/bowwowcare/src/views/HomePage/PetList/PetList.js b/bowwowcare/src/views/HomePage/PetList/PetList.js
@@ -4,7 +4,7 @@ import { Link, useNavigate } from "react-router-dom";
 import PetInfo from "./Sections/PetInfo";
 
 function PetList(props) {
-  const user = window.localStorage.getItem("user");
+  const user = JSON.parse(localStorage.getItem("user"));
   const navigate = useNavigate();
   return user ? (
     <div className="flex overflow-x-scroll">