Merge pull request #357 from SejongPeer/feature/18

Feature/18
SejongPeer · Jul 22, 2024 · 1a29152 · 1a29152
2 parents 367fe30 + bd94fc9
commit 1a29152
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 12 deletions.
diff --git a/src/App.js b/src/App.js
@@ -99,6 +99,8 @@ const App = () => {
     const timeUntilLogout = expTime - cuurentTime;
 
     setTimeout(() => {
+      console.log('logout');
+      alert('logout!')
       logout();
     }, timeUntilLogout);
   };

diff --git a/src/pages/study/studyModify/studyModify.js b/src/pages/study/studyModify/studyModify.js
@@ -1,12 +1,42 @@
 import { useEffect, useState } from 'react';
 import StudyPostWrite from '../studyPostWrite/StudyPostWrite';
+import usePostStore from '../studyPostWrite/usePostStore';
+import useStudyInfoStore from '../useStudyInfoStore';
 
 const StudyModify = () => {
-  const studyId = 2;
+  const studyId = 1;
   //const {studyId} = useParams();
   //console.log("studyId : ",studyId);
   const [studyData, setStudyData] = useState(null);
 
+  const {
+    title,
+    setTitle,
+    category,
+    setCategory,
+    startDate,
+    setStartDate,
+    endDate,
+    setEndDate,
+    memberNum,
+    setMemberNum,
+    selectedWay,
+    setSelectedWay,
+    selectedFrequency,
+    setSelectedFrequency,
+    questionLink,
+    setQuestionLink,
+    images,
+    addImage,
+    content,
+    setContent,
+    studyLink,
+    setStudyLink,
+    tags,
+    setTags
+  } = usePostStore();
+  const { studyType } = useStudyInfoStore();
+
   useEffect(() => {
     const fetchStudyData = async () => {
       try {
@@ -37,15 +67,37 @@ const StudyModify = () => {
     fetchStudyData();
   }, [studyId]);
 
+  useEffect(() => {
+    if (studyData) {
+      if(studyData.data.studyFrequency === '주 1~2회') {
+        setSelectedFrequency("ONCE_OR_TWICE_A_WEEK");
+      } else if (studyData.data.studyFrequency === '주 3~4회') {
+        setSelectedFrequency('THREE_TO_FOUR_TIMES_A_WEEK');
+      } else {
+        setSelectedFrequency('FIVE_OR_MORE_TIMES_A_WEEK');
+      }
+
+      if(studyData.data.studyMethod === '대면') {
+        setSelectedWay("FACE_TO_FACE");
+      } else if (studyData.data.studyMethod === '비대면') {
+        setSelectedWay('NON_FACE_TO_FACE');
+      } else {
+        setSelectedWay('BOTH');
+      }
+
+      setTitle(studyData.data.title);
+      setCategory(studyData.data.categoryName);
+      setStartDate(studyData.data.recruitmentStart);
+      setEndDate(studyData.data.recruitmentEnd);
+      setMemberNum(studyData.data.totalRecruitmentCount);
+      setContent(studyData.data.content);
+      setQuestionLink(studyData.data.questionKakaoLink);
+    }
+  }, [studyData]);
+
   return studyData ? (
     <StudyPostWrite
-      title={studyData.data.title}
-      categoryName={studyData.data.categoryName}
-      recruitmentStart={studyData.data.recruitmentStart}
-      recruitmentEnd={studyData.data.recruitmentEnd}
-      numberOfApplicants={studyData.data.numberOfApplicants}
-      content={studyData.data.content}
-      imgUrl={studyData.data.imgUrl}
+      studyId={studyId}
     />
   ) : (
     <div>Loading...</div>

diff --git a/src/pages/study/studyPostWrite/StudyPostWrite.js b/src/pages/study/studyPostWrite/StudyPostWrite.js
@@ -184,9 +184,9 @@ const StudyPostWrite = props => {
       togglePopup(errorMessage);
       return;
     }
-    const formStartDate =
-      startDate === format(startDate, 'yyyy-MM-dd HH:mm:ss');
+    const formStartDate = format(startDate, 'yyyy-MM-dd HH:mm:ss');
     const formEndDate = format(endDate, 'yyyy-MM-dd HH:mm:ss');
+    console.log(formStartDate)
     const studyData =
       studyType === 'lecture'
         ? {
@@ -217,7 +217,6 @@ const StudyPostWrite = props => {
             tags: tags,
             images: null,
           };
-
     try {
       const response = await fetch(
         `${process.env.REACT_APP_BACK_SERVER}/study/${studyType}`,
@@ -293,4 +292,4 @@ const StudyPostWrite = props => {
   );
 };
 
-export default StudyPostWrite;
+export default StudyPostWrite;