Merge pull request #90 from 2022-2-Graduation-Project/feature/86-user…

…-screen [#86] fix: fix GET error
2022-2-Graduation-Project · Mar 15, 2023 · 8990e22 · 8990e22
2 parents 36b7e7e + ce377c8
commit 8990e22
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/bowwowcare/src/context/ThemeProvider.js b/bowwowcare/src/context/ThemeProvider.js
@@ -1,5 +1,6 @@
 import { createContext, useState, useEffect } from "react";
 import userService from "../services/user.service";
+import { isLogin } from "../utils/isLogin";
 
 export const ThemeContext = createContext({});
 
@@ -8,14 +9,17 @@ function ThemeProvider({ children }) {
   const [myTheme, setMyTheme] = useState(0);
   const [ThemeMode, setThemeMode] = useState(theme[0]);
 
+
   useEffect(() => {
-    userService.getUserBoard().then((response) => {
-      if(response.status === 200) {
-        const user = response.data;
-        setMyTheme(user.theme);
+    if(isLogin()){
+      userService.getUserBoard().then((response) => {
+        if(response.status === 200) {
+          const user = response.data;
+          setMyTheme(user.theme);
+        }
       }
+      ).catch((e) => {console.log(e.response.data)})
     }
-    ).catch((e) => {console.log(e.response.data)})
   },[]);
 
   useEffect(() => {

diff --git a/bowwowcare/src/utils/isLogin.js b/bowwowcare/src/utils/isLogin.js
@@ -0,0 +1 @@
+export const isLogin = () => !!localStorage.getItem("user");
diff --git a/bowwowcare/src/views/HomePage/HomePage.js b/bowwowcare/src/views/HomePage/HomePage.js
@@ -3,6 +3,7 @@ import { useNavigate } from "react-router-dom";
 import axios from "axios";
 import { API_URL } from "../../Config";
 import authHeader from "../../services/auth-header";
+import { isLogin } from "../../utils/isLogin";
 
 import Header from "../../components/Header";
 import PetList from "./PetList/PetList";
@@ -39,7 +40,7 @@ function HomePage() {
     };
 
   useEffect(() => {
-    getPetList();
+    isLogin() && getPetList();
   }, []);
 
   return (
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		export const isLogin = () => !!localStorage.getItem("user");