CodeitFESI4-Team1 · HaeJungg · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024 · Nov 11, 2024
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -61,7 +61,7 @@
       ]
     }
   },
-  "cSpell.words": ["crewcrew", "mantine", "tailwindcss", "tanstack"],
+  "cSpell.words": ["CODEIT", "crewcrew", "mantine", "pretendard", "tailwindcss", "tanstack"],
   // Prettier를 기본 포맷터로 설정하고 저장 시 자동 포맷팅
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,

diff --git a/next.config.mjs b/next.config.mjs
@@ -17,8 +17,8 @@ const nextConfig = {
           {
             key: 'Access-Control-Allow-Origin',
             value:
-              process.env.NEXT_PUBLIC_API_BASE_URL || 'https://foggy-sideways-saltasaurus.glitch.me/',
-
+              process.env.NEXT_PUBLIC_API_BASE_URL ||
+              'https://foggy-sideways-saltasaurus.glitch.me/',
           },
           { key: 'Access-Control-Allow-Methods', value: 'GET,OPTIONS,PATCH,DELETE,POST,PUT' },
           {

diff --git a/public/assets/images/crew-sample/index.tsx b/public/assets/images/crew-sample/index.tsx
@@ -2,10 +2,6 @@ import ImgCrewSample01 from './crew-sample-1.jpg';
 import ImgCrewSample02 from './crew-sample-2.jpg';
 import ImgCrewSample03 from './crew-sample-3.jpg';
 
-const ImgCrewSamples = [
-  ImgCrewSample01,
-  ImgCrewSample02,
-  ImgCrewSample03,
-];
+const ImgCrewSamples = [ImgCrewSample01, ImgCrewSample02, ImgCrewSample03];
 
-export default ImgCrewSamples;
+export default ImgCrewSamples;
diff --git a/public/assets/images/gathering-sample/index.tsx b/public/assets/images/gathering-sample/index.tsx
@@ -2,10 +2,6 @@ import ImgGatheringSample01 from './gathering-sample-1.jpg';
 import ImgGatheringSample02 from './gathering-sample-2.jpg';
 import ImgGatheringSample03 from './gathering-sample-3.jpg';
 
-const ImgGatheringSamples = [
-  ImgGatheringSample01,
-  ImgGatheringSample02,
-  ImgGatheringSample03,
-];
+const ImgGatheringSamples = [ImgGatheringSample01, ImgGatheringSample02, ImgGatheringSample03];
 
-export default ImgGatheringSamples;
+export default ImgGatheringSamples;
diff --git a/src/_apis/crew/get-crew-list.ts b/src/_apis/crew/get-crew-list.ts
@@ -1,9 +1,9 @@
 import { fetchApi } from '@/src/utils/api';
-import { CrewCardInform, CrewCardInformResponse } from '@/src/types/crew-card';
+import { MainCrewList, MainCrewListResponse } from '@/src/types/crew-card';
 
-export async function getCrewList(page: number, limit: number): Promise<CrewCardInformResponse> {
+export async function getCrewList(page: number, limit: number): Promise<MainCrewListResponse> {
   try {
-    const response = await fetchApi<CrewCardInformResponse>(
+    const response = await fetchApi<MainCrewListResponse>(
       `/crews?_page=${page + 1}&_limit=${limit}`,
       {
         method: 'GET',
@@ -15,10 +15,10 @@ export async function getCrewList(page: number, limit: number): Promise<CrewCard
     if (!Array.isArray(response)) {
       throw new Error('서버 응답이 올바른 형식이 아닙니다.');
     }
-    const data = response as CrewCardInform[];
-    const hasNextPage = data.length === limit;
+    const data = response as MainCrewList[];
+    const hasNext = data.length === limit;
 
-    return { data, hasNextPage };
+    return { data, hasNext };
   } catch (error) {
     throw new Error('크루 리스트를 불러오는데 실패했습니다.');
   }

diff --git a/src/_apis/detail/get-crew-detail.ts b/src/_apis/detail/get-crew-detail.ts
@@ -1,25 +1,5 @@
 import { fetchApi } from '@/src/utils/api';
-
-type CrewMember = {
-  id: number;
-  nickname: string;
-  profileImageUrl?: string;
-};
-
-export type CrewDetail = {
-  id: number;
-  title: string;
-  mainLocation: string;
-  subLocation: string;
-  participantCount: number;
-  totalCount: number;
-  isConfirmed: boolean;
-  imageUrl: string;
-  totalGatheringCount: number;
-  CrewMembers: CrewMember[];
-  isCaptain: boolean;
-  isCrew: boolean;
-};
+import { CrewDetail } from '@/src/types/crew-card';
 
 export async function getCrewDetail(): Promise<{ data: CrewDetail }> {
   const response = await fetchApi<CrewDetail[]>('/crewDetail', {

diff --git a/src/_apis/detail/get-gathering-list.ts b/src/_apis/detail/get-gathering-list.ts
@@ -1,18 +1,8 @@
 import { fetchApi } from '@/src/utils/api';
+import { GatheringType } from '@/src/types/gathering-data';
 
-export type GatheringList = {
-  id: number;
-  title: string;
-  dateTime: string;
-  location: string;
-  currentCount: number;
-  totalCount: number;
-  imageUrl: string;
-  isLiked: boolean;
-};
-
-export async function getGatheringList(): Promise<GatheringList[]> {
-  return fetchApi<GatheringList[]>('/gatherings', {
+export async function getGatheringList(): Promise<GatheringType[]> {
+  return fetchApi<GatheringType[]>('/gatherings', {
     method: 'GET',
     headers: {
       'Content-Type': 'application/json',

diff --git a/src/_apis/getUser.ts b/src/_apis/getUser.ts
diff --git a/src/_queries/crew-queries.tsx b/src/_queries/crew-queries.tsx
@@ -1,39 +1,20 @@
-import { CrewCardInform } from '@/src/types/crew-card';
+import { MainCrewList } from '@/src/types/crew-card';
 import { getCrewList } from '../_apis/crew/get-crew-list';
 
-// Crew data 변환 로직을 간소화한 helper 함수
-const mapCrewData = (crew: CrewCardInform) => ({
-  crewId: crew.crewId,
-  type: crew.type,
-  subType: crew.subType,
-  name: crew.name,
-  location: crew.location,
-  detailedLocation: crew.detailedLocation,
-  participantCount: crew.participantCount,
-  capacity: crew.capacity,
-  images: crew.images,
-  createdBy: crew.createdBy,
-  createdDate: crew.createdDate,
-  updatedDate: crew.updatedDate,
-  isConfirmed: crew.isConfirmed,
-  gatheringCount: crew.gatheringCount,
-  crewMember: crew.crewMember,
-});
-
 export function useGetCrewQuery() {
   interface QueryParams {
     pageParam?: number;
   }
 
   interface Page {
-    hasNextPage: boolean;
+    hasNext: boolean;
   }
 
   return {
     queryKey: ['crew'],
     queryFn: ({ pageParam = 0 }: QueryParams) => getCrewList(pageParam, 3),
     getNextPageParam: (lastPage: Page, allPages: Page[]) =>
-      lastPage.hasNextPage ? allPages.length + 1 : undefined,
-    select: (data: CrewCardInform[]) => data.map(mapCrewData),
+      lastPage.hasNext ? allPages.length + 1 : undefined,
+    select: (data: MainCrewList[]) => data, // 그대로 반환
   };
 }
diff --git a/src/_queries/useGetUserQuery.ts b/src/_queries/useGetUserQuery.ts
diff --git a/src/app/(crew)/api-test/page.tsx b/src/app/(crew)/api-test/page.tsx
diff --git a/src/app/(crew)/crew/_components/gathering-detail-modal/gathering-detail-modal.stories.tsx b/src/app/(crew)/crew/_components/gathering-detail-modal/gathering-detail-modal.stories.tsx
@@ -64,9 +64,9 @@ ModalWithUser.args = {
     totalCount: 10,
     imageUrl:
       'https://www.dabur.com/Blogs/Doshas/Importance%20and%20Benefits%20of%20Yoga%201020x450.jpg',
-    isLiked: false,
-    isGatherCaptain: false,
-    isParticipant: false,
+    liked: false,
+    gatheringCaptain: false,
+    participant: false,
     participants: [
       {
         id: 1,
@@ -106,9 +106,9 @@ ModalWithCaptain.args = {
     totalCount: 10,
     imageUrl:
       'https://www.dabur.com/Blogs/Doshas/Importance%20and%20Benefits%20of%20Yoga%201020x450.jpg',
-    isLiked: false,
-    isGatherCaptain: true,
-    isParticipant: true,
+    liked: false,
+    gatheringCaptain: true,
+    participant: true,
     participants: [
       {
         id: 1,
@@ -148,9 +148,9 @@ ModalWithCrew.args = {
     totalCount: 10,
     imageUrl:
       'https://www.dabur.com/Blogs/Doshas/Importance%20and%20Benefits%20of%20Yoga%201020x450.jpg',
-    isLiked: false,
-    isGatherCaptain: false,
-    isParticipant: true,
+    liked: false,
+    gatheringCaptain: false,
+    participant: true,
     participants: [
       {
         id: 1,

diff --git a/src/app/(crew)/crew/_components/gathering-detail-modal/presenter.tsx b/src/app/(crew)/crew/_components/gathering-detail-modal/presenter.tsx
@@ -120,7 +120,7 @@ export default function GatheringDetailModalPresenter({
             >
               닫기
             </Button>
-            {!data?.isParticipant && (
+            {!data?.participant && (
               <Button
                 type="button"
                 onClick={onJoin}
@@ -129,7 +129,7 @@ export default function GatheringDetailModalPresenter({
                 참여하기
               </Button>
             )}
-            {data?.isParticipant && !data?.isGatherCaptain && (
+            {data?.participant && !data?.gatheringCaptain && (
               <Button
                 type="button"
                 onClick={onExit}
@@ -138,7 +138,7 @@ export default function GatheringDetailModalPresenter({
                 탈퇴하기
               </Button>
             )}
-            {data?.isGatherCaptain && (
+            {data?.gatheringCaptain && (
               <Button
                 type="button"
                 onClick={onDelete}

diff --git a/src/app/(crew)/crew/detail/[id]/page.tsx b/src/app/(crew)/crew/detail/[id]/page.tsx
@@ -14,7 +14,8 @@ export default async function CrewDetailPage() {
       <div className="mx-3 my-7 space-y-10 md:mx-7 md:my-11 lg:mx-11 lg:my-16">
         <section className="w-full">
           <article>
-            <DetailCrewCard {...crewDetail} />
+            {/* //TODO: 추후 confirmed부분 수정 */}
+            <DetailCrewCard isConfirmed={false} {...crewDetail} />
           </article>
         </section>
         <section className="w-full space-y-6">

diff --git a/src/app/(crew)/my-crew/page.tsx b/src/app/(crew)/my-crew/page.tsx
@@ -2,10 +2,10 @@
 
 import { useState } from 'react';
 import { useGetCrewQuery } from '@/src/_queries/crew-queries';
-import { useInfiniteScroll } from '@/src/hooks/useInfiniteScroll';
+import { useInfiniteScroll } from '@/src/hooks/use-infinite-scroll';
 import CrewCardList from '@/src/components/common/crew-list/crew-card-list';
 import Tabs from '@/src/components/common/tab';
-import { CrewCardInformResponse } from '@/src/types/crew-card';
+import { MyCrewListResponse } from '@/src/types/crew-card';
 
 export default function MyCrewPage() {
   const myPageTabs = [
@@ -15,8 +15,9 @@ export default function MyCrewPage() {
   const [currentTab, setCurrentTab] = useState(myPageTabs[0].id);
 
   // TODO: fetchCrewData 함수를 사용하여 데이터를 불러오기 : 파라미터 수정 필요
-  const { data, ref, isFetchingNextPage } =
-    useInfiniteScroll<CrewCardInformResponse>(useGetCrewQuery());
+  // TODO: 리스트와는 다른 데이터를 사용해야해서 우선 주석처리 했습니다.
+  // const { data, ref, isFetchingNextPage } =
+  //   useInfiniteScroll<MyCrewListResponse>(useGetCrewQuery());
 
   return (
     <div className="py-8 md:py-12.5">
@@ -31,12 +32,12 @@ export default function MyCrewPage() {
         />
       </div>
       <div className="mt-8 px-3 md:px-8 lg:px-11.5">
-        <CrewCardList
+        {/* <CrewCardList
           inWhere="my-crew"
           data={data}
           ref={ref}
           isFetchingNextPage={isFetchingNextPage}
-        />
+        /> */}
       </div>
     </div>
   );