Merge pull request #51 from mooco-renew/feat/#50

fix: Error Page Space & Comment Delete
mooco-renew · May 7, 2024 · 14de6cd · 14de6cd
2 parents a357ecd + 0f44c4c
commit 14de6cd
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 38 deletions.
diff --git a/src/components/profiletab/DailyBarcodeTab.js b/src/components/profiletab/DailyBarcodeTab.js
@@ -20,6 +20,13 @@ export default function DailyBarcodeTab({ profileData }) {
   const [hasMore, setHasMore] = useState(true);
   const [refreshing, setRefreshing] = useState(false);
 
+  const onServerError = () => {
+    navigation.reset({
+      index: 0,
+      routes: [{ name: "ServerError" }],
+    });
+  };
+
   useEffect(() => {
     fetchData();
   }, []);
@@ -45,8 +52,7 @@ export default function DailyBarcodeTab({ profileData }) {
         console.log("더 이상 데이터가 없습니다.");
       }
     } catch (error) {
-      console.error("API 호출 에러", error);
-      Alert.alert("API 호출 에러", "데이터를 불러오는 중 문제가 발생했습니다.");
+      onServerError();
     } finally {
       setLoading(false);
       setRefreshing(false);

diff --git a/src/screens/profile/DailyBarcodeDetail.js b/src/screens/profile/DailyBarcodeDetail.js
@@ -49,20 +49,27 @@ export default function DailyBarcodeDetail() {
   } = route.params;
   const { setBarcodeId } = useBarcodeContext();
 
+  const onServerError = () => {
+    navigation.reset({
+      index: 0,
+      routes: [{ name: "ServerError" }],
+    });
+  };
+
   useEffect(() => {
     setBarcodeId(barcodeId);
   }, [barcodeId, setBarcodeId]);
 
   useEffect(() => {
-    getToggleStateFromStorage(); // 저장된 토글 상태 불러오기
+    getToggleStateFromStorage();
   }, []);
 
   useEffect(() => {
-    setIsEnabled(isPrivate); // 초기 토글 상태 설정
+    setIsEnabled(isPrivate);
   }, [isPrivate]);
 
   useEffect(() => {
-    loadPhotos(); // 사진 정보 받아오기
+    loadPhotos();
   }, []);
 
   const getToggleStateFromStorage = async () => {
@@ -83,7 +90,7 @@ export default function DailyBarcodeDetail() {
 
     try {
       await patchPublicBarcode(barcodeId, !isEnabled);
-      storeToggleState(!isEnabled); // 토글 상태 저장
+      storeToggleState(!isEnabled);
     } catch (error) {
       console.error("바코드 전환 에러:", error);
     }
@@ -101,7 +108,7 @@ export default function DailyBarcodeDetail() {
         console.error("일상 디테일 사진 조회 에러 ", response.error.message);
       }
     } catch (error) {
-      console.error("일상 디테일 사진 조회 에러 ", error);
+      onServerError();
     }
   };
 
@@ -143,10 +150,10 @@ export default function DailyBarcodeDetail() {
         setPhotos((prevPhotos) => [...prevPhotos, ...nextTenPhotos]);
         setCurrentPage(nextPage);
       } else {
-        console.error("일상 디테일 사진 조회 에러 ", response.error.message);
+        onServerError();
       }
     } catch (error) {
-      console.error("일상 디테일 사진 조회 에러 ", error);
+      onServerError();
     } finally {
       setIsLoadingMore(false);
     }

diff --git a/src/screens/profile/Profile.js b/src/screens/profile/Profile.js
@@ -1,4 +1,3 @@
-import { SERVER_HOST } from "@env";
 import React, { useEffect, useState } from "react";
 import { useNavigation } from "@react-navigation/native";
 import { createMaterialTopTabNavigator } from "@react-navigation/material-top-tabs";
@@ -7,30 +6,27 @@ import SettingSvg from "../../assets/images/setting/setting";
 import DailyBarcodeTab from "../../components/profiletab/DailyBarcodeTab";
 import EventBarcodeTab from "../../components/profiletab/EventBarcodeTab";
 import getProfileData from "../../server/profile/getProfileData";
-// import sendRequest from "../../server/test/makeBarcode";
 
 const Tab = createMaterialTopTabNavigator();
 
 export default function Profile() {
-  // const [loading, setLoading] = useState(false);
-
-  // const handleBarcodeCreation = async () => {
-  //   setLoading(true);
-  //   await sendRequest();
-  //   setLoading(false);
-  // };
-  // 바코드 만들기 테스트
   const navigation = useNavigation();
-
   const [profileData, setProfileData] = useState(null);
 
+  const onServerError = () => {
+    navigation.reset({
+      index: 0,
+      routes: [{ name: "ServerError" }],
+    });
+  };
+
   useEffect(() => {
     const fetchProfileData = async () => {
       try {
         const data = await getProfileData();
         setProfileData(data);
       } catch (error) {
-        console.error("프로필 데이터 에러", error);
+        onServerError();
       }
     };
 
@@ -62,9 +58,6 @@ export default function Profile() {
           <Text style={styles.profileTag}>@{profileData.identifierId}</Text>
         </View>
       </View>
-      {/* <TouchableOpacity onPress={handleBarcodeCreation} style={styles.button}>
-        <Text style={styles.buttonText}>바코드 생성</Text>
-      </TouchableOpacity> */}
       <Tab.Navigator
         initialRouteName="데일리 바코드"
         screenOptions={{
@@ -117,19 +110,6 @@ const styles = StyleSheet.create({
     fontSize: 12,
     fontWeight: "500",
   },
-  // button: {
-  //   backgroundColor: "#FFD700",
-  //   paddingVertical: 10,
-  //   paddingHorizontal: 20,
-  //   borderRadius: 8,
-  //   alignSelf: "center",
-  //   marginVertical: 20,
-  // },
-  // buttonText: {
-  //   color: "#000000",
-  //   fontSize: 16,
-  //   fontWeight: "bold",
-  // },
   disabled: {
     opacity: 0.5,
   },

diff --git a/src/screens/profile/Setting.js b/src/screens/profile/Setting.js
@@ -18,14 +18,21 @@ export default function Setting() {
   const navigation = useNavigation();
   const [profileData, setProfileData] = useState(null);
 
+  const onServerError = () => {
+    navigation.reset({
+      index: 0,
+      routes: [{ name: "ServerError" }],
+    });
+  };
+
   useEffect(() => {
     const fetchProfileData = async () => {
       try {
         const data = await getProfileData();
         console.log(data);
         setProfileData(data);
       } catch (error) {
-        console.error("프로필 데이터 에러", error);
+        onServerError();
       }
     };