Merge pull request #47 from capstone-maru/feat/shared-api

feat: Shared API 일부 적용
capstone-maru · Apr 4, 2024 · 4aef317 · 4aef317
2 parents a9d6626 + 720588b
commit 4aef317
Show file tree

Hide file tree

Showing 44 changed files with 452 additions and 227 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -50,6 +50,7 @@
         "tsx": "never"
       }
     ],
+    "no-empty-pattern": ["warn", { "allowObjectPatternsAsParameters": true }],
     "@typescript-eslint/no-unused-vars": "error",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/no-empty-function": ["warn", {}],

diff --git a/next.config.mjs b/next.config.mjs
@@ -1,5 +1,7 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
+  // reactStrictMode: false,
+  reactStrictMode: true,
   compiler: {
     styledComponents: true,
   },

diff --git a/src/app/pages/main-page.tsx b/src/app/pages/main-page.tsx
@@ -1,14 +1,13 @@
 'use client';
 
-import { useQuery } from '@tanstack/react-query';
 import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import { useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
 
 import { CircularButton } from '@/components';
 import { UserCard } from '@/components/main-page';
-import { getUserData, useAuthActions, useAuthValue } from '@/features/auth';
+import { useAuthActions, useAuthValue, useUserData } from '@/features/auth';
 
 const styles = {
   container: styled.div`
@@ -67,11 +66,7 @@ export function MainPage() {
   const auth = useAuthValue();
   const { setAuthUserData } = useAuthActions();
 
-  const { data } = useQuery({
-    queryKey: ['/api/auth/initial/info'],
-    queryFn: getUserData,
-    enabled: auth?.refreshToken !== null,
-  });
+  const { data } = useUserData(auth?.accessToken !== undefined);
 
   const [, setMap] = useState<naver.maps.Map | null>(null);
 
@@ -102,10 +97,8 @@ export function MainPage() {
 
   useEffect(() => {
     if (data !== undefined) {
-      const userData = data.data;
-
-      setAuthUserData(userData);
-      if (userData.initialized) {
+      setAuthUserData(data);
+      if (data.initialized) {
         // router.replace('/profile');
       }
     }

diff --git a/src/app/pages/shared-post-page.tsx b/src/app/pages/shared-post-page.tsx
@@ -13,7 +13,6 @@ import {
   ImageGrid,
   MiniCircularProfileImage,
 } from '@/components/shared-post-page';
-import { type SharedPost } from '@/entities/shared-post';
 
 const styles = {
   container: styled.div`
@@ -350,7 +349,7 @@ const dummyParticipants = [
 ];
 
 interface Props {
-  post: SharedPost;
+  post: { title: string; content: string };
 }
 
 function Item({ label, data }: { label: string; data: string }) {

diff --git a/src/app/pages/shared-posts.tsx b/src/app/pages/shared-posts.tsx
@@ -1,6 +1,5 @@
 'use client';
 
-import { useQuery } from '@tanstack/react-query';
 import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import { useEffect, useState } from 'react';
@@ -14,8 +13,8 @@ import {
   PostCard,
 } from '@/components/shared-posts';
 import { type SharedPostsType } from '@/entities/shared-posts-filter';
-import { getUserData, useAuthActions, useAuthValue } from '@/features/auth';
-import { usePaging } from '@/features/shared';
+import { useAuthActions, useAuthValue, useUserData } from '@/features/auth';
+import { usePaging, useSharedPosts } from '@/features/shared';
 
 const styles = {
   container: styled.div`
@@ -114,44 +113,43 @@ export function SharedPostsPage() {
 
   const auth = useAuthValue();
   const [selected, setSelected] = useState<SharedPostsType>('hasRoom');
+  const [totalPageCount, setTotalPageCount] = useState(0);
   const { setAuthUserData } = useAuthActions();
 
-  const { data } = useQuery({
-    queryKey: ['/api/auth/initial/info'],
-    queryFn: getUserData,
-    enabled: auth?.refreshToken !== null,
-  });
+  const { data: userData } = useUserData(auth?.accessToken !== undefined);
 
   const {
     page,
-    maxPostPage,
     sliceSize,
     currentSlice,
     isFirstPage,
     isLastPage,
     handleNextPage,
     handlePrevPage,
   } = usePaging({
-    maxPostPage: 12,
+    totalPages: totalPageCount,
     sliceSize: 10,
   });
 
+  const { data: sharedPosts } = useSharedPosts({
+    enabled: auth?.accessToken !== undefined && selected === 'hasRoom',
+    page: page - 1,
+  });
+
   useEffect(() => {
-    if (data !== undefined) {
-      const userData = data.data;
+    if (sharedPosts !== undefined) {
+      setTotalPageCount(sharedPosts.data.totalPages);
+    }
+  }, [sharedPosts]);
 
+  useEffect(() => {
+    if (userData !== undefined) {
       setAuthUserData(userData);
       if (userData.initialized) {
         // router.replace('/profile');
       }
     }
-  }, [data, router, setAuthUserData]);
-
-  useEffect(() => {
-    if (data?.data.initialized === true) {
-      // router.replace('/profile');
-    }
-  }, [data, router]);
+  }, [userData, router, setAuthUserData]);
 
   return (
     <styles.container>
@@ -165,24 +163,11 @@ export function SharedPostsPage() {
             </Link>
           </styles.createButtonRow>
           <styles.posts>
-            <Link href="/shared/1">
-              <PostCard />
-            </Link>
-            <Link href="/shared/1">
-              <PostCard />
-            </Link>
-            <Link href="/shared/1">
-              <PostCard />
-            </Link>
-            <Link href="/shared/1">
-              <PostCard />
-            </Link>
-            <Link href="/shared/1">
-              <PostCard />
-            </Link>
-            <Link href="/shared/1">
-              <PostCard />
-            </Link>
+            {sharedPosts?.data.content.map(post => (
+              <Link key={post.id} href={`/shared/${post.id}`}>
+                <PostCard />
+              </Link>
+            ))}
           </styles.posts>
           <styles.pagingRow>
             <styles.CircularButton
@@ -193,7 +178,7 @@ export function SharedPostsPage() {
             <styles.paging>
               {Array.from({
                 length: Math.min(
-                  maxPostPage - currentSlice * sliceSize,
+                  totalPageCount - currentSlice * sliceSize,
                   sliceSize,
                 ),
               }).map((_, index) => (

diff --git a/src/components/NavigationBar.tsx b/src/components/NavigationBar.tsx
@@ -1,6 +1,5 @@
 'use client';
 
-import { useQuery } from '@tanstack/react-query';
 import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import styled from 'styled-components';
@@ -9,10 +8,10 @@ import { SearchBox } from './SearchBox';
 
 import {
   getAuthLogout,
-  getUserData,
   useAuthActions,
   useAuthIsLogin,
   useAuthValue,
+  useUserData,
 } from '@/features/auth';
 import { load } from '@/shared/storage';
 
@@ -76,11 +75,7 @@ export function NavigationBar() {
   const auth = useAuthValue();
   const { logout } = useAuthActions();
 
-  const { data } = useQuery({
-    queryKey: ['/api/auth/initial/info'],
-    queryFn: getUserData,
-    enabled: auth?.refreshToken !== null,
-  });
+  const { data } = useUserData(auth?.accessToken !== undefined);
 
   const handleLogout = () => {
     const refreshToken = load<string>({ type: 'local', key: 'refreshToken' });
@@ -107,7 +102,7 @@ export function NavigationBar() {
       <styles.links>
         <Link href="/shared">메이트찾기</Link>
         <Link href="/community">커뮤니티</Link>
-        <Link href={`/profile/${data?.data.memberId}`}>마이페이지</Link>
+        <Link href={`/profile/${data?.memberId}`}>마이페이지</Link>
         {isLogin && (
           <styles.logout
             onClick={() => {

diff --git a/src/entities/address/address.model.ts b/src/entities/address/address.model.ts
diff --git a/src/entities/address/index.ts b/src/entities/address/index.ts
diff --git a/src/entities/follow/follow.model.ts b/src/entities/follow/follow.model.ts
diff --git a/src/entities/follow/index.ts b/src/entities/follow/index.ts
diff --git a/src/entities/member-account/index.ts b/src/entities/member-account/index.ts
diff --git a/src/entities/member-account/member-account.model.ts b/src/entities/member-account/member-account.model.ts
diff --git a/src/entities/member-card/index.ts b/src/entities/member-card/index.ts
diff --git a/src/entities/member-card/member-card.model.ts b/src/entities/member-card/member-card.model.ts
diff --git a/src/entities/room-image/index.ts b/src/entities/room-image/index.ts
diff --git a/src/entities/room-image/room-image.model.ts b/src/entities/room-image/room-image.model.ts
diff --git a/src/entities/room-info/index.ts b/src/entities/room-info/index.ts
diff --git a/src/entities/room-info/room-info.model.ts b/src/entities/room-info/room-info.model.ts
diff --git a/src/entities/shared-post/index.ts b/src/entities/shared-post/index.ts
diff --git a/src/entities/shared-post/shared-post.model.ts b/src/entities/shared-post/shared-post.model.ts
diff --git a/src/entities/shared-posts-filter/index.ts b/src/entities/shared-posts-filter/index.ts
@@ -1,2 +1,2 @@
-export * from './shared-posts-filter.model';
+export * from './shared-posts-filter.type';
 export * from './shared-posts-filter.hook';
diff --git a/...posts-filter/shared-posts-filter.model.ts → ...-posts-filter/shared-posts-filter.type.ts b/...posts-filter/shared-posts-filter.model.ts → ...-posts-filter/shared-posts-filter.type.ts
diff --git a/src/entities/shared-room-post/index.ts b/src/entities/shared-room-post/index.ts
diff --git a/src/entities/shared-room-post/shared-room-post.model.ts b/src/entities/shared-room-post/shared-room-post.model.ts
diff --git a/src/entities/studio-room-post/index.ts b/src/entities/studio-room-post/index.ts
diff --git a/src/entities/studio-room-post/studio-room-post.model.ts b/src/entities/studio-room-post/studio-room-post.model.ts
diff --git a/src/entities/user/index.ts b/src/entities/user/index.ts
@@ -1 +1 @@
-export type { User } from './user.model';
+export type { User } from './user.type';
diff --git a/src/entities/user/user.model.ts → src/entities/user/user.type.ts b/src/entities/user/user.model.ts → src/entities/user/user.type.ts
diff --git a/src/features/auth/auth.action.ts b/src/features/auth/auth.action.ts
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export type { User } from './user.model';
		export type { User } from './user.type';