Merge pull request #59 from MoDeep11/develop

feat: 전체적인 기능 추가

Author: kangsea09

src/App.jsx

@@ -9,20 +9,49 @@ import Mypage from "./pages/MyPage.jsx";
 import Statics from "./pages/Statics.jsx";
 import Home from "./pages/Home.jsx";
 import EditDiary from "./pages/EditDiary.jsx";
+import { useEffect } from "react";
+import { useNavigate } from "react-router-dom";
 
 function App() {
+
+  const navigate = useNavigate();
+useEffect(() => {
+  const checkTokenExpiry = () => {
+    const token = localStorage.getItem("accessToken"); 
+    const expiry = localStorage.getItem("tokenExpiry");
+
+    if (!token) {
+      return;
+    }
+
+    const expiryMs = Number(expiry);
+    const now = Date.now();
+    
+    if (!expiry || !Number.isFinite(expiryMs) || now > expiryMs) {
+      alert("세션이 만료되었습니다. 다시 로그인해주세요.");
+      localStorage.clear();
+      navigate("/");
+    }
+  };
+
+  checkTokenExpiry();
+  const interval = setInterval(checkTokenExpiry, 60000);
+
+  return () => clearInterval(interval);
+}, [navigate]);
+
   return (
     <Routes>
       <Route path="/" element={<Main />} />
       <Route path="/login" element={<Login />} />
       <Route path="/signup" element={<Signup />} />
       <Route path="/ai/chats" element={<AiChat />} />
-      <Route path="/diary" element={<Diary />} />
+      <Route path="/diary/:id" element={<Diary />} />
       <Route path="/mypage" element={<Mypage />} />
       <Route path="/statics" element={<Statics />} />
       <Route path="/home" element={<Home />} />
       <Route path="/photobook" element={<Photo_book />} />
-      <Route path="/editDiary" element={<EditDiary />} />
+      <Route path="/editDiary/:id" element={<EditDiary />} />
     </Routes>
   );
 }

src/apis/auth.js

@@ -20,7 +20,6 @@ export const login = async (userData) => {
   return response.data; 
 };
 
-// apis/auth.js
 
 export const logout = async (refreshToken) => {
   const response = await instance.post('/api/v1/auth/logout', {

src/apis/chat.js

@@ -0,0 +1,83 @@
+import instance from "./instance";
+
+const logApiError = (label, error) => {
+  const status = error?.response?.status;
+  const message = error?.response?.data?.message ?? error?.message;
+  console.error(label, { status, message });
+};
+
+// 채팅 생성
+export const createChat = async (chatData) => {
+  try {
+    const res = await instance.post(`/api/v1/chats`, chatData);
+    return res.data;
+  } catch (error) {
+    // 상세 에러 로깅
+    logApiError("채팅 생성 실패:", error);
+    throw error;
+  }
+};
+
+// 채팅 음성 생성
+export const createChatVoice = async (chatId, voiceData) => {
+  try {
+    const res = await instance.post(`/api/v1/chats/${chatId}/voice`, voiceData);
+    return res.data;
+  } catch (error) {
+   logApiError("음성 생성 실패:", error); 
+    throw error;
+  }
+};
+
+// 채팅 메시지 전송
+export const createChatMessage = async (chatId, messageData) => {
+  try {
+    const res = await instance.post(
+      `/api/v1/chats/${chatId}/messages`,
+      messageData,
+    );
+    return res.data;
+  } catch (error) {
+    logApiError("메시지 전송 실패:", error);
+    throw error;
+  }
+};
+
+// 채팅 수정
+export const updateChat = async (chatId) => {
+  try {
+    const res = await instance.patch(`/api/v1/chats/${chatId}`);
+    return res.data;
+  } catch (error) {
+    logApiError("채팅 수정 실패:", error);
+    throw error;
+  }
+};
+
+// 대화 중 사진 추가
+export const createChatImage = async (chatId, imageData) => {
+  try {
+    const res = await instance.post(
+      `/api/v1/chats/${chatId}/images`,
+      imageData,
+    );
+    return res.data;
+  } catch (error) {
+    logApiError("이미지 생성 실패:", error);
+    throw error;
+  }
+};
+
+// AI 이미지 생성 요청
+export const createChatImageGeneration = async (chatId, generationData) => {
+  try {
+    const res = await instance.post(
+      `/api/v1/chats/${chatId}/images/generations`,
+      generationData,
+    );
+    return res.data;
+  } catch (error) {
+    logApiError("이미지 생성 실패:", error);
+    throw error;
+  }
+};

src/apis/diaries.js

@@ -1,16 +1,27 @@
-import instance from "./axios";
+import instance from "./instance";
 
-// 일기 조회
+// 일기 단건 조회
 export const getDiaries = async (id) => {
   try {
     const res = await instance.get(`/api/v1/diaries/${id}`);
-    return res.data;
+    return res.data.data;
   } catch (error) {
     console.error("일기 조회 실패:", error);
     throw error;
   }
 };
 
+// 일기 목록 조회
+export const getDiariesList = async (params) => {
+  try {
+    const res = await instance.get(`/api/v1/diaries`, { params });
+    return res.data;
+  } catch (error) {
+    console.error("일기 목록 조회 실패:", error);
+    throw error;
+  }
+};
+
 // 일기 내용 수정
 export const updateDiaries = async (id, updateData) => {
   try {
@@ -26,15 +37,11 @@ export const updateDiaries = async (id, updateData) => {
 };
 
 // 일기 이미지 수정
-export const updateDiariesImg = async (diary_id, imageFile) => {
+export const updateDiariesImg = async (diaryId, imageList) => {
   try {
-    const formData = new FormData();
-    formData.append("file", imageFile);
-
     const res = await instance.patch(
-      `/api/v1/diaries/${diary_id}/images`,
-      formData,
-      { headers: { "Content-Type": "multipart/form-data" } },
+      `/api/v1/diaries/${diaryId}/images`,
+      imageList,
     );
     return res.data;
   } catch (error) {
@@ -44,13 +51,24 @@ export const updateDiariesImg = async (diary_id, imageFile) => {
 };
 
 // 일기 삭제
-export const deleteDiaries = async (diary_id) => {
+export const deleteDiaries = async (diaryId) => {
   try {
-    const res = await instance.delete(`/api/v1/diaries/${diary_id}`);
+    const res = await instance.delete(`/api/v1/diaries/${diaryId}`);
     return res.data;
   } catch (error) {
     console.error("일기 삭제 실패:", error);
     throw error;
   }
 };
 
+// 다이어리 추천 조회
+export const getDiaryRecommendation = async () => {
+  try {
+    const res = await instance.get(`/api/v1/diaries/recommendation`);
+    return res.data;
+  } catch (error) {
+    console.error("상태 코드:", error.response?.status);
+    console.error("에러 메시지:", error.response?.data);
+    throw error;
+  }
+};

src/apis/instance.js

@@ -2,7 +2,7 @@ import axios from "axios";
 
 const instance = axios.create({
   baseURL: import.meta.env.VITE_BASE_URL,
-  timeout: 5000,
+  timeout: 30000,
   headers: { "Content-Type": "application/json" },
 });
 
@@ -22,13 +22,13 @@ const processQueue = (error, token = null) => {
 
 instance.interceptors.request.use(
   (config) => {
-    const accessToken = localStorage.getItem("accessToken");
-    if (accessToken) {
-      config.headers.Authorization = `Bearer ${accessToken}`;
+    const token = localStorage.getItem("accessToken");
+    if (token) {
+      config.headers.Authorization = `Bearer ${token}`;
     }
     return config;
   },
-  (error) => Promise.reject(error)
+  (error) => Promise.reject(error),
 );
 
 instance.interceptors.response.use(
@@ -53,43 +53,64 @@ instance.interceptors.response.use(
 
       try {
         const refreshToken = localStorage.getItem("refreshToken");
+        const accessToken = localStorage.getItem("accessToken");
+        if (!refreshToken) {
+          throw Object.assign(new Error("Missing refresh token"), {
+            response: { status: 401 },
+          });
+        }
+
+        const refreshHeaders = accessToken
+          ? { Authorization: `Bearer ${accessToken}` }
+          : {};
+
         const res = await axios.post(
           `${import.meta.env.VITE_BASE_URL}/api/v1/auth/reissue`,
-          { refreshToken: refreshToken }
+          { refreshToken },
+          {
+            headers: refreshHeaders,
+            timeout: instance.defaults.timeout,
+          },
         );
 
         if (res.data.status === "success") {
-          const { accessToken, refreshToken: newRefreshToken } = res.data.data;
+          const tokenPayload = res.data.data ?? res.data;
+          const { accessToken: newAccessToken, refreshToken: newRefreshToken } =
+            tokenPayload ?? {};
+          if (!newAccessToken) {
+            throw new Error("Token refresh response missing access token");
+          }
+
+          localStorage.setItem("accessToken", newAccessToken);
+          if (newRefreshToken) {
+            localStorage.setItem("refreshToken", newRefreshToken);
+          }
+          localStorage.setItem("tokenExpiry", Date.now() + 60 * 60 * 1000);
 
-          localStorage.setItem("accessToken", accessToken);
-          localStorage.setItem("refreshToken", newRefreshToken);
+          originalRequest.headers.Authorization = `Bearer ${newAccessToken}`;
+          processQueue(null, newAccessToken);
 
-          originalRequest.headers.Authorization = `Bearer ${accessToken}`;
-          processQueue(null, accessToken);
-          
           return instance(originalRequest);
         } else {
-          const failError = new Error("토큰 리프레시가 실패했어요");
-          processQueue(failError, null);
-          return Promise.reject(failError);
+          throw new Error("Token refresh failed");
         }
       } catch (refreshError) {
         processQueue(refreshError, null);
-        
+
         const status = refreshError.response?.status;
         if (status === 401 || status === 403) {
-          console.warn("세션이 만료되었습니다. 다시 로그인해주세요.");
+          console.warn("세션이 만료되어 로그아웃됩니다.");
           localStorage.clear();
           window.location.href = "/login";
         }
-
         return Promise.reject(refreshError);
       } finally {
         isRefreshing = false;
       }
     }
+
     return Promise.reject(error);
-  }
+  },
 );
 
-export default instance;
+export default instance;

src/apis/mypages.api.js

@@ -0,0 +1,48 @@
+import instance from "./instance";
+
+export const getMyInfo = async () => {
+  const response = await instance.get("/api/v1/users/me");
+  return response.data;
+};
+
+export const withdrawAccount = async () => {
+  const response = await instance.delete("/api/v1/auth/me");
+  return response.data;
+};
+
+export const updateProfile = async (formData) => {
+  const response = await instance.patch('/api/v1/users/me/profile', formData, {
+    headers: {
+      "Content-Type": undefined, 
+    },
+  });
+  return response.data;
+};
+
+export const changePassword = async (passwordData) => {
+  const response = await instance.patch('/api/v1/users/me/password', passwordData);
+  return response.data;
+};
+
+export const deleteUser = async () => {
+  const refreshToken = localStorage.getItem("refreshToken");
+  const response = await instance.delete('/api/v1/users/me', {
+    data: {
+      refreshToken: refreshToken
+    }
+  });
+  return response.data;
+};
+
+export const logout = async () => {
+  const refreshToken = localStorage.getItem("refreshToken");
+  const response = await instance.post('/api/v1/auth/logout', {
+    refreshToken: refreshToken
+  });
+  return response.data;
+};
+
+export const getRandomProfile = async () => {
+  const response = await instance.patch('/api/v1/users/me/profile-images/random');
+  return response.data;
+};

src/apis/photo.api.js

@@ -0,0 +1,15 @@
+import instance from "./instance";
+
+export const getMyGallery = async (yearMonth, tag = "") => {
+  const response = await instance.get('/api/v1/diaries', {
+    params: {
+      imageType: 'MANUAL',
+      hasPhoto: true,
+      yearMonth: yearMonth, 
+      limit: 32, 
+      tag: tag || null,
+      sort: 'createdAt,desc'
+    }
+  });
+  return response.data;
+};