Merge branch 'dev' into feature-임수혁

package.json

@@ -13,7 +13,9 @@
   "dependencies": {
     "axios": "^1.7.2",
     "classnames": "^2.5.1",
+    "date-fns": "^3.6.0",
     "react": "^18.2.0",
+    "react-datepicker": "^6.9.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.51.5",
     "react-router-dom": "^6.23.1",
@@ -22,6 +24,7 @@
   "devDependencies": {
     "@types/axios": "^0.14.0",
     "@types/react": "^18.2.66",
+    "@types/react-datepicker": "^6.2.0",
     "@types/react-dom": "^18.2.22",
     "@typescript-eslint/eslint-plugin": "^7.11.0",
     "@typescript-eslint/parser": "^7.11.0",

src/App.tsx

@@ -8,6 +8,7 @@ import DashboardForId from './pages/dashboard.{dashboardid}';
 import Login from './pages/login-signup/login/Login';
 import SignUp from './pages/login-signup/signup/SignUp';
 import MyPage from './pages/mypage/MyPage';
+import { DashboardProvider } from './contexts/DashboardContext';
 
 /*
 페이지 라우팅 분리,
@@ -16,15 +17,17 @@ import MyPage from './pages/mypage/MyPage';
 function App() {
   return (
     <BrowserRouter>
-      <Routes>
-        <Route index element={<Home />} />
-        <Route path="/mydashboard" element={<MyDashboard />} />
-        <Route path="/dashboard/1/edit" element={<DashboardEdit />} />
-        <Route path="/dashboard/1" element={<DashboardForId />} />
-        <Route path="/login" element={<Login />} />
-        <Route path="/signup" element={<SignUp />} />
-        <Route path="/mypage" element={<MyPage />} />
-      </Routes>
+      <DashboardProvider>
+        <Routes>
+          <Route index element={<Home />} />
+          <Route path="/mydashboard" element={<MyDashboard />} />
+          <Route path="/dashboard/1/edit" element={<DashboardEdit />} />
+          <Route path="/dashboard/:id" element={<DashboardForId />} />
+          <Route path="/login" element={<Login />} />
+          <Route path="/signup" element={<SignUp />} />
+          <Route path="/mypage" element={<MyPage />} />
+        </Routes>
+      </DashboardProvider>
     </BrowserRouter>
   );
 }

src/api/apiModule.tsx

@@ -1,5 +1,7 @@
 export * from './authorization/apiAuth';
 export * from './cards/apiCards';
+export * from './columns/apiColumns';
+export * from './comments/apiComments';
 export * from './dashboards/apiDashboards';
 export * from './invitations/apiInvitations';
 export * from './members/apiMembers';

src/api/authorization/apiAuth.tsx

@@ -1,50 +1,41 @@
 import instance from '../axiosInstance';
 import { handleResponse } from '../errorHandler';
 
-interface LoginBody {
+export interface LoginBody {
   email: string;
   password: string;
 }
 
-interface ChangePasswordBody {
+export interface ChangePasswordBody {
   password: string;
   newPassword: string;
 }
 
-interface LoginResponse {
-  status: number;
-  message?: string;
-  user?: {
+export interface LoginResponse {
+  user: {
     id: number;
     email: string;
     nickname: string;
     profileImageUrl?: string;
     createdAt: string;
     updatedAt: string;
   };
-  accessToken?: string;
-}
-
-interface ChangePasswordResponse {
-  status: number;
-  message?: string;
+  accessToken: string;
 }
 
 // 로그인 요청 api
 export async function apiLoginRequest(body: LoginBody): Promise<LoginResponse> {
   const res = await instance.post<LoginResponse>('/auth/login', body);
   const responseData = await handleResponse(res);
-  localStorage.setItem('Token', responseData.accessToken);
-  return handleResponse(res);
+  const token = responseData.accessToken;
+  if (token) {
+    localStorage.setItem('Token', token);
+  }
+  return responseData;
 }
 
 // 비밀번호 변경 요청 api
-export async function apiChangePassword(
-  body: ChangePasswordBody,
-): Promise<string | ChangePasswordResponse> {
-  const res = await instance.put<ChangePasswordResponse>(
-    '/auth/password',
-    body,
-  );
+export async function apiChangePassword(body: ChangePasswordBody) {
+  const res = await instance.put('/auth/password', body);
   return handleResponse(res);
 }