Merge pull request #228 from TUK-DP/refactor/218

Refactor/218

package.json

@@ -25,6 +25,7 @@
     "react-scripts": "5.0.1",
     "react-simple-image-slider": "^2.4.1",
     "reacticons": "^0.0.1",
+    "recoil": "^0.7.7",
     "redux": "^5.0.1",
     "web-vitals": "^2.1.4"
   },
@@ -54,5 +55,6 @@
   },
   "devDependencies": {
     "tailwindcss": "^3.4.1"
-  }
+  },
+  "proxy": "https://tukorea-dp.s3.amazonaws.com"
 }

src/App.js

@@ -24,7 +24,7 @@ import Surveyresult from "./pages/Survey/SurveyResult.js";
 import BeforeGame from "./pages/gamePages/BeforeGame";
 import Gymnastics from "./pages/Gym/Gymnastics";
 import GymnasticsVideo from "./pages/Gym/GymnasticsVideo";
-import MyPage from "./pages/MyPage";
+import MyPage from "./pages/MyPages/MyPage";
 import CenterMap from "./pages/CenterPages/CenterMap";
 import PrevSurveyResult from "./pages/Survey/PrevSurveyResult";
 import SurveyError from "./pages/Survey/SurveyError";
@@ -34,11 +34,19 @@ import Login from "./pages/Login";
 import Signup from "./pages/Signup";
 import useAutoLogin from "./hooks/useAutoLogin";
 import Explain from "./pages/Keyword/Explain.js";
-import UserUpdate from "./pages/UserUpdate.js";
-import DiaryManagement from "./pages/DiaryManagement.js";
+import UserUpdate, {
+  USER_UPDATE_PAGE_PATH,
+} from "./pages/MyPages/UserUpdate.js";
+import DiaryManagement, {
+  DIARY_MANAGEMENT_PAGE_PATH,
+} from "./pages/MyPages/DiaryManagement.js";
 import HelpForAi from "./pages/ImageDiary/HelpForAi.js";
 import ShowAiResult from "./pages/ImageDiary/ShowAiResult.js";
 import Keyword from "./pages/Keyword/Keyword.js";
+import {
+  API_KEY_INPUT_PAGE_PATH,
+  APIKeyInput,
+} from "./pages/MyPages/APIKeyInput";
 
 function App() {
   let { loading } = useAutoLogin();
@@ -83,12 +91,17 @@ function App() {
           <Route exact path={"/centermap"} element={<CenterMap />} />
           <Route exact path={"/explain"} element={<Explain />} />
           <Route exact path={"/keyword"} element={<Keyword />} />
-          <Route exact path={"/userupdate"} element={<UserUpdate />} />
+          <Route exact path={USER_UPDATE_PAGE_PATH} element={<UserUpdate />} />
           <Route
             exact
-            path={"/diarymanagement"}
+            path={DIARY_MANAGEMENT_PAGE_PATH}
             element={<DiaryManagement />}
           />
+          <Route
+            exact
+            path={API_KEY_INPUT_PAGE_PATH}
+            element={<APIKeyInput />}
+          />
           <Route
             exact
             path={"/prevsurveyresult"}

src/api/diary.controller.js

@@ -57,5 +57,11 @@ class DiaryController extends Api {
       `/diary/list?userId=${userId}&startDate=${startDate}&finishDate=${finishDate}&sortBy=${sortBy}`
     );
   };
+  //기간별 일기 유무 리스트 가져오기
+  checkDiaryList = async ({ userId, year, month }) => {
+    return await this.get(
+      `/diary/check?userId=${userId}&year=${year}&month=${month}`
+    );
+  };
 }
 export default new DiaryController();

src/component/ImageDiary/AIModal.js

@@ -1,6 +1,5 @@
 import React from "react";
 import BackGroundSkyButton from "../BackGroundSkyButton";
-import { IoClose } from "react-icons/io5";
 import { useNavigate } from "react-router-dom";
 
 const AIModal = ({ onClose, content, keyword }) => {
@@ -11,7 +10,7 @@ const AIModal = ({ onClose, content, keyword }) => {
   return (
     <div
       className={
-        "w-full h-full fixed top-0 left-0 flex justify-center items-center bg-opacity-30 bg-black"
+        "w-full h-full fixed top-0 left-0 flex justify-center items-center bg-opacity-30 bg-black z-10"
       }
     >
       <div className={"absolute bg-white w-4/5 h-fit py-7 px-3 rounded-2xl"}>