Merge pull request #221 from The-Fellowship-of-the-matzip/hotfix/issu…

…e219 Issue219 alert가 3번 발생하는 이슈가 해결되지 않은 것 해결
The-Fellowship-of-the-matzip · Jul 13, 2024 · 27267c5 · 27267c5
2 parents 75ed2c1 + 0038a38
commit 27267c5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 13 deletions.
diff --git a/src/components/pages/MyPage/BookmarkListPage/BookmarkListPage.tsx b/src/components/pages/MyPage/BookmarkListPage/BookmarkListPage.tsx
@@ -19,6 +19,7 @@ import Spinner from "components/common/Spinner/Spinner";
 import StoreList from "components/common/StoreList/StoreList";
 import StoreListItemWithoutHeart from "components/common/StoreListItem/\bStoreListItemWithoutHeart";
 import Text from "components/common/Text/Text";
+import { useToastContext } from "components/common/Toast/provider/ToastProvider";
 
 function BookmarkListPage() {
   const navigate = useNavigate();
@@ -34,9 +35,11 @@ function BookmarkListPage() {
 
   const bookmarkedStoreData = data ?? [];
 
+  const showToast = useToastContext();
+
   useEffect(() => {
-    if (error instanceof Error && error.message === MESSAGES.LOGIN_RETRY) {
-      alert(error.message);
+    if (error instanceof Error && error.message === MESSAGES.LOGIN_REQUIRED) {
+      showToast(error.message);
       navigate(PATHNAME.HOME);
     }
   }, [error]);

diff --git a/src/components/pages/MyPage/BookmarkMapPage/BookmarkMapPage.tsx b/src/components/pages/MyPage/BookmarkMapPage/BookmarkMapPage.tsx
@@ -26,6 +26,7 @@ import SlideCarousel from "components/common/SlideCarousel/SlideCarousel";
 import Spinner from "components/common/Spinner/Spinner";
 import StoreListItemWithoutHeart from "components/common/StoreListItem/\bStoreListItemWithoutHeart";
 import Text from "components/common/Text/Text";
+import { useToastContext } from "components/common/Toast/provider/ToastProvider";
 
 function BookmarkMapPage() {
   const campusName = useContext(campusContext);
@@ -41,9 +42,11 @@ function BookmarkMapPage() {
 
   const navigate = useNavigate();
 
+  const showToast = useToastContext();
+
   useEffect(() => {
-    if (error instanceof Error && error.message === MESSAGES.LOGIN_RETRY) {
-      alert(error.message);
+    if (error instanceof Error && error.message === MESSAGES.LOGIN_REQUIRED) {
+      showToast(error.message);
       navigate(PATHNAME.HOME);
     }
   }, [error]);

diff --git a/src/components/pages/MyPage/MyPage.tsx b/src/components/pages/MyPage/MyPage.tsx
@@ -27,6 +27,7 @@ import Spinner from "components/common/Spinner/Spinner";
 import StoreList from "components/common/StoreList/StoreList";
 import StoreListItemWithoutHeart from "components/common/StoreListItem/\bStoreListItemWithoutHeart";
 import Text from "components/common/Text/Text";
+import { useToastContext } from "components/common/Toast/provider/ToastProvider";
 
 function MyPage() {
   const navigate = useNavigate();
@@ -57,32 +58,34 @@ function MyPage() {
     }
   );
 
+  const showToast = useToastContext();
+
   useEffect(() => {
     if (
       userProfileError instanceof Error &&
-      userProfileError.message === MESSAGES.LOGIN_RETRY
+      userProfileError.message === MESSAGES.LOGIN_REQUIRED
     ) {
-      alert(userProfileError.message);
-      navigate(PATHNAME.HOME);
+      showToast(userProfileError.message);
       logout();
+      navigate(PATHNAME.HOME);
       return;
     }
 
     if (
       bookmarkedStoreError instanceof Error &&
-      bookmarkedStoreError.message === MESSAGES.LOGIN_RETRY
+      bookmarkedStoreError.message === MESSAGES.LOGIN_REQUIRED
     ) {
-      alert(bookmarkedStoreError.message);
+      showToast(bookmarkedStoreError.message);
       logout();
       navigate(PATHNAME.HOME);
       return;
     }
 
     if (
       userReviewError instanceof Error &&
-      userReviewError.message === MESSAGES.LOGIN_RETRY
+      userReviewError.message === MESSAGES.LOGIN_REQUIRED
     ) {
-      alert(userReviewError.message);
+      showToast(userReviewError.message);
       logout();
       navigate(PATHNAME.HOME);
     }

diff --git a/src/components/pages/MyPage/MyReviewItem/MyReviewItem.tsx b/src/components/pages/MyPage/MyReviewItem/MyReviewItem.tsx
@@ -58,6 +58,7 @@ function MyReviewItem({
     {
       onSuccess,
       onError: (error) => {
+        console.log(error.message);
         if (error.message === MESSAGES.LOGIN_REQUIRED) {
           showToast(error.message);
           logout();

diff --git a/src/components/pages/MyPage/MyReviewListPage/MyReviewListPage.tsx b/src/components/pages/MyPage/MyReviewListPage/MyReviewListPage.tsx
@@ -20,6 +20,7 @@ import ErrorText from "components/common/ErrorText/ErrorText";
 import InfiniteScroll from "components/common/InfiniteScroll/InfiniteScroll";
 import Spinner from "components/common/Spinner/Spinner";
 import Text from "components/common/Text/Text";
+import { useToastContext } from "components/common/Toast/provider/ToastProvider";
 
 function MyReviewListPage() {
   const { data, error, isLoading, isError, fetchNextPage, isFetching } =
@@ -45,9 +46,11 @@ function MyReviewListPage() {
 
   const navigate = useNavigate();
 
+  const showToast = useToastContext();
+
   useEffect(() => {
-    if (error instanceof Error && error.message === MESSAGES.LOGIN_RETRY) {
-      alert(error.message);
+    if (error instanceof Error && error.message === MESSAGES.LOGIN_REQUIRED) {
+      showToast(error.message);
       navigate(PATHNAME.HOME);
     }
   }, [error]);