Merge branch 'develop' into Feat/131/DesignGatheringsFix

Author: HaeJungg

package-lock.json

@@ -27,13 +27,15 @@
     "@storybook/test": "^8.3.5",
     "@tanstack/react-query": "^5.59.16",
     "@tanstack/react-query-next-experimental": "^5.59.19",
+    "@vercel/speed-insights": "^1.1.0",
     "dayjs": "^1.11.13",
     "embla-carousel-react": "^7.1.0",
     "framer-motion": "^11.11.9",
     "next": "14.2.15",
     "react": "^18",
     "react-dom": "^18",
     "react-hook-form": "^7.53.1",
+    "react-hook-form-persist": "^3.0.0",
     "react-intersection-observer": "^9.13.1",
     "react-toastify": "^10.0.6",
     "zustand": "^5.0.1"

package.json

@@ -1,11 +1,52 @@
 import { fetchApi } from '@/src/utils/api';
 import { User } from '@/src/types/auth';
 
-export function getUser(): Promise<{ data: User }> {
+export function getUser(): Promise<User> {
   return fetchApi<{ data: User }>('/auths/user', {
     method: 'GET',
     headers: {
       'Content-Type': 'application/json',
     },
+  }).then((response) => response.data);
+}
+
+// 회원정보 수정
+export async function updateUserProfile(file: File): Promise<void> {
+  const url = `/auths/user`;
+
+  const formData = new FormData();
+  formData.append('file', file);
+
+  await fetchApi(url, {
+    method: 'PUT',
+    body: formData,
+  });
+}
+
+export async function fetchUpdatedUser() {
+  return fetchApi<{ data: User }>('/auths/user', {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json',
+      'Cache-Control': 'no-cache',
+    },
+  })
+    .then((response) => {
+      return response.data;
+    })
+    .catch((error) => {
+      throw error;
+    });
+}
+
+// 유저 프로필 이미지 초기화
+export async function resetUserProfileImage(): Promise<void> {
+  const url = `/auths/profile-image/reset`;
+
+  await fetchApi(url, {
+    method: 'PUT',
+    headers: {
+      'Content-Type': 'application/json',
+    },
   });
 }

public/assets/icons/ic-captain-check.svg

@@ -1,6 +1,7 @@
 import { fetchApi } from '@/src/utils/api';
 import { CrewDetail } from '@/src/types/crew-card';
 
+// 크루 디테일 보기
 export async function getCrewDetail(id: number): Promise<CrewDetail> {
   const url = `/api/crews/${id}`;
 
@@ -12,3 +13,39 @@ export async function getCrewDetail(id: number): Promise<CrewDetail> {
   });
   return response.data;
 }
+
+// 크루 참여
+export async function joinCrew(crewId: number): Promise<void> {
+  const url = `/api/crews/${crewId}/join`;
+
+  await fetchApi<void>(url, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+}
+
+// 사용자 크루 탈퇴
+export async function leaveCrew(crewId: number): Promise<void> {
+  const url = `/api/crews/${crewId}/leave`;
+
+  await fetchApi<void>(url, {
+    method: 'DELETE',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+}
+
+// 주최자 크루 취소
+export async function cancelCrew(crewId: number): Promise<void> {
+  const url = `/api/crews/${crewId}`;
+
+  await fetchApi<void>(url, {
+    method: 'DELETE',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+}

public/assets/icons/ic-edit.svg

@@ -1,19 +1,21 @@
 import { fetchApi } from '@/src/utils/api';
-import { CreateCrewRequestTypes, CreateCrewResponseTypes } from '@/src/types/create-crew';
+import {
+  CreateCrewRequestTypes,
+  CreateCrewResponseTypes,
+  EditCrewRequestTypes,
+  EditCrewResponseTypes,
+} from '@/src/types/create-crew';
 
 export async function createCrew(data: CreateCrewRequestTypes) {
   try {
-    const response: { data: CreateCrewResponseTypes; status: number } = await fetchApi(
-      `/api/crews`,
-      {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        credentials: 'include', // Include authentication credentials
-        body: JSON.stringify(data),
+    const response: { data: CreateCrewResponseTypes } = await fetchApi(`/api/crews`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
       },
-    );
+      credentials: 'include', // Include authentication credentials
+      body: JSON.stringify(data),
+    });
     if (!response.data) {
       throw new Error('Failed to create crew: No data received');
     }
@@ -23,3 +25,18 @@ export async function createCrew(data: CreateCrewRequestTypes) {
     throw error;
   }
 }
+
+export async function editCrew(id: number, data: EditCrewRequestTypes) {
+  try {
+    await fetchApi(`/api/crews/${id}`, {
+      method: 'PUT',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      credentials: 'include', // Include authentication credentials
+      body: JSON.stringify(data),
+    });
+  } catch (error) {
+    throw error;
+  }
+}