Merge pull request #114 from sm-cloud-system/dev

[MERGE] 마이페이지 버그 수정
sm-cloud-system · Dec 18, 2024 · f38fbaa · f38fbaa
2 parents caf9e0e + c31368b
commit f38fbaa
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 49 deletions.
diff --git a/src/pages/MyPage/components/BookmarkedPosts/index.jsx b/src/pages/MyPage/components/BookmarkedPosts/index.jsx
@@ -3,26 +3,19 @@ import { useSuspenseQuery } from '@tanstack/react-query';
 import { getBookmarkedPosts } from '@apis';
 
 import { Post } from '@components';
-import { Group } from '@pages/MyPage/components';
-import Path from '@utils/Path';
+
 import { PATH, QUERY_KEY } from '@constants';
 
 export default function BookmarkedPosts() {
   const { data } = useSuspenseQuery({
     queryKey: [QUERY_KEY.bookmarkedPosts],
-    queryFn: async () => await getBookmarkedPosts(),
+    queryFn: getBookmarkedPosts,
   });
 
-  const posts = data.length > 5 ? data.slice(0, 5) : data;
+  const posts = data.slice(0, 5);
 
   return (
-    <Group
-      title='즐겨찾기한 글'
-      to={{
-        path: PATH.bookmark,
-        label: '전체보기',
-      }}
-    >
+    <>
       {posts.map((post) => (
         <Post
           key={post.postId}
@@ -33,6 +26,6 @@ export default function BookmarkedPosts() {
           })}
         />
       ))}
-    </Group>
+    </>
   );
 }
diff --git a/src/pages/MyPage/components/MyPosts/index.jsx b/src/pages/MyPage/components/MyPosts/index.jsx
@@ -3,26 +3,19 @@ import { useSuspenseQuery } from '@tanstack/react-query';
 import { getMyPosts } from '@apis';
 
 import { Post } from '@components';
-import { Group } from '@pages/MyPage/components';
-import Path from '@utils/Path';
+
 import { PATH, QUERY_KEY } from '@constants';
 
 export default function MyPosts() {
   const { data } = useSuspenseQuery({
     queryKey: [QUERY_KEY.myPosts],
-    queryFn: async () => await getMyPosts(),
+    queryFn: getMyPosts,
   });
 
-  const posts = data.length > 5 ? data.slice(0, 5) : data;
+  const posts = data.slice(0, 5);
 
   return (
-    <Group
-      title='내가 쓴 글'
-      to={{
-        path: PATH.myPost,
-        label: '전체보기',
-      }}
-    >
+    <>
       {posts.map((post) => (
         <Post
           key={post.postId}
@@ -33,6 +26,6 @@ export default function MyPosts() {
           })}
         />
       ))}
-    </Group>
+    </>
   );
 }
diff --git a/src/pages/MyPage/components/Profile/index.jsx b/src/pages/MyPage/components/Profile/index.jsx
@@ -26,7 +26,7 @@ export default function Profile() {
       <div className={styles.bottom}>
         <div className={styles.wrapper}>
           <div className={styles.meta}>
-            <span className={styles.nickname}>{USER.nickname}</span>
+            <span className={styles.nickname}>{nickname}</span>
           </div>
           <div className={styles.logout}>
             <button

diff --git a/src/pages/MyPage/index.jsx b/src/pages/MyPage/index.jsx
@@ -38,30 +38,46 @@ export default function MyPage() {
 
       <article className={styles.article}>
         <div className={styles.groups}>
-          <QueryErrorResetBoundary>
-            {({ reset }) => (
-              <ErrorBoundary
-                onReset={reset}
-                FallbackComponent={MyPostsErrorFallback}
-              >
-                <Suspense fallback={<Loading />}>
-                  <MyPosts />
-                </Suspense>
-              </ErrorBoundary>
-            )}
-          </QueryErrorResetBoundary>
-          <QueryErrorResetBoundary>
-            {({ reset }) => (
-              <ErrorBoundary
-                onReset={reset}
-                FallbackComponent={BookmarkedPostsErrorFallback}
-              >
-                <Suspense fallback={<Loading />}>
-                  <BookmarkedPosts />
-                </Suspense>
-              </ErrorBoundary>
-            )}
-          </QueryErrorResetBoundary>
+          <Group
+            title='내가 쓴 글'
+            to={{
+              path: PATH.myPost,
+              label: '전체보기',
+            }}
+          >
+            <QueryErrorResetBoundary>
+              {({ reset }) => (
+                <ErrorBoundary
+                  onReset={reset}
+                  FallbackComponent={MyPostsErrorFallback}
+                >
+                  <Suspense fallback={<Loading />}>
+                    <MyPosts />
+                  </Suspense>
+                </ErrorBoundary>
+              )}
+            </QueryErrorResetBoundary>
+          </Group>
+          <Group
+            title='즐겨찾기한 글'
+            to={{
+              path: PATH.bookmark,
+              label: '전체보기',
+            }}
+          >
+            <QueryErrorResetBoundary>
+              {({ reset }) => (
+                <ErrorBoundary
+                  onReset={reset}
+                  FallbackComponent={BookmarkedPostsErrorFallback}
+                >
+                  <Suspense fallback={<Loading />}>
+                    <BookmarkedPosts />
+                  </Suspense>
+                </ErrorBoundary>
+              )}
+            </QueryErrorResetBoundary>
+          </Group>
         </div>
       </article>
     </section>