sdp-tech#509 feat : add curation update

youngsikkk · Oct 2, 2023 · da495ba · da495ba
1 parent b96c8ec
commit da495ba
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 43 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -84,6 +84,7 @@ const App = () => {
               <Route path="/admin/story" element={<StoryAdmin />} />
               <Route path="/admin/story/:id" element={<StoryAdmin />} />
               <Route path="/admin/curation" element={<CurationAdmin/>} />
+              {/* <Route path="/admin/curation/:id" element={<CurationAdmin/>} /> */}
               <Route path="/community/" element={<SpotCommunity />} />
               <Route path="/community/:board" element={<SpotCommunity />} />
               <Route path="/community/:board/:id/*" element={<SpotCommunity />} />

diff --git a/src/components/Admin/CurationFormPage.jsx b/src/components/Admin/CurationFormPage.jsx
@@ -160,10 +160,9 @@ const StoryWrapper = styled.div`
 
 const charCount = (editor) => editor.getContent({ format: "text" }).length;
 
-export default function CurationForm() {
+export default function CurationForm({id}) {
   const [imageUrl, setImageUrl] = useState(null);
   const sizeLimit = 200;
-  const [data, setData] = useState("");
   const [count, setCount] = useState(0);
   const [item, setItem] = useState([]);
   const [pageCount, setPageCount] = useState(1);
@@ -178,7 +177,7 @@ export default function CurationForm() {
   const [search, setSearch] = useState('');
   const [searchToggle, setSearchToggle] = useState(false);
   const [selectedStory, setSelectedStory] = useState([]);
-  const [rep_pic, setRep_pic] = useState([])
+  const [rep_pic, setRep_pic] = useState([]);
   const [curation, setCuration] = useState({title: '', contents: '', uri:'', width: 1, height: 1, fileName: ''})
   const [open, setOpen] = useState(false);
   const [size, setSize] = useState("");
@@ -198,7 +197,7 @@ export default function CurationForm() {
 
     formData.append('rep_pic', rep_pic)
     for (let i of selectedStory) {
-      formData.append('stories', i.id);
+      formData.append('stories', i.story_id);
       formData.append('short_curations', '.');
     }
     if (form.title.length == 0 || count == 0) {
@@ -213,9 +212,20 @@ export default function CurationForm() {
       alert('최소 3개의 스토리를 선택해주세요.')
       return;
     }
-    const response = await request.post('/curations/curation_create/', formData, { "Content-Type": "multipart/form-data" });
-    console.log(response, 'siuuu');
-    navigate("/curation");
+    try {
+      let newId
+      if (!id) {
+        const response = await request.post('/curations/curation_create/', formData, { "Content-Type": "multipart/form-data" });
+        newId = response.data.data.id
+      }
+      else {
+        const response = await request.put(`/curations/curation_update/${id}/`, formData, { "Content-Type": "multipart/form-data"});
+      }
+     id ? navigate(`/curation/${id}`) : navigate(`/curation/${newId}`);
+    }
+    catch (e) {
+      alert(`큐레이션 생성 실패 => ${e.response.data.detail}`);
+    }
   }
 
     const onChangeImage = (e) => {
@@ -229,6 +239,16 @@ export default function CurationForm() {
           setRep_pic(file);
       }
   };
+
+  const loadCuration = async() => {
+    if (!id) return;
+    const response = await request.get(`/curations/curation_detail/${id}/`);
+    const reponse_story_detail = await request.get(`/curations/curated_story_detail/${id}/`);
+    const { contents, rep_pic, title } = response.data.data;
+    setImageUrl(rep_pic);
+    setForm({title : title, contents : contents});
+    setSelectedStory(reponse_story_detail.data.data);
+  }
 
   useEffect(() =>{
     queryString.page = 1;
@@ -238,6 +258,10 @@ export default function CurationForm() {
     handleSearchToggle();
   }, [open, queryString.page]);
 
+  useEffect(async() => {
+    await loadCuration();
+  }, [])
+
   const handleOpen = value => {
     setOpen(true);
     setSize(value);
@@ -285,17 +309,16 @@ export default function CurationForm() {
   };
 
   const handleInit = (value, editor) => {
+    setForm({...form, contents: editor.getContent({format: "html"})});
     setCount(charCount(editor));
-    setForm({...form, contents: editor.getContent({format: "text"})});
   };
 
   const handleUpdate = (value, editor) => {
     const cCount = charCount(editor);
     if (cCount <= sizeLimit) {
-      setData(value);
+      setForm({...form, contents: editor.getContent({format: "html"})});
       setCount(cCount);
     }
-    setForm({...form, contents: editor.getContent({format: "text"})})
   };
 
   const handleBeforeAddUndo = (evt, editor) => {
@@ -306,8 +329,8 @@ export default function CurationForm() {
     }
   };
   const handleSelectedStory = (id, rep_pic) => {
-    if (selectedStory.filter(el => el.id == id).length > 0) {
-      setSelectedStory(selectedStory.filter(el => el.id != id));
+    if (selectedStory.filter(el => el.story_id === id).length > 0) {
+      setSelectedStory(selectedStory.filter(el => el.story_id !== id));
       if (window.confirm("목록에서 삭제하시겠습니까?")) {
         alert("삭제되었습니다.");
         }
@@ -317,7 +340,7 @@ export default function CurationForm() {
   return (
     <InfoBox>
       <ValueBox>
-          <InputTitle placeholder='제목을 입력해주세요 *' placeholderTextColor={'#000000'} onChange={(e) => { setForm({ ...form, title: e.target.value });
+          <InputTitle placeholder='제목을 입력해주세요 *' defaultValue={form.title} placeholderTextColor={'#000000'} onChange={(e) => { setForm({ ...form, title: e.target.value });
         }} maxLength={45} />
           <CountCharacters>{form.title.length}/45</CountCharacters>
       </ValueBox>
@@ -331,14 +354,7 @@ export default function CurationForm() {
                 alt="rep_pic"
                 style ={{height:"400px",
                 width:"400px"}}
-            ></img> : <>
-                {curation.rep_pic ?
-                    <img src={curation.rep_pic}
-                        alt="rep_pic"
-                        style ={{height:"400px",
-                        width:"400px"}}></img>
-                    : <></>}
-            </>}
+            ></img> : <></>}
             <input
                 type="file"
                 id="ex_file"
@@ -382,10 +398,10 @@ export default function CurationForm() {
             selectedStory.map((data, index) =>
               <ValueBox>
                 <StoryWrapper>
-                  <DelX onClick={() => {handleSelectedStory(data.id, data.rep_pic)}}>X</DelX>
+                  <DelX onClick={() => {handleSelectedStory(data.story_id, data.rep_photos)}}>X</DelX>
                   <StoryImage
                   //  style={index == 0 && { borderColor: '#209DF5', borderWidth: 2 }}
-                  src={ data.rep_pic } />
+                  src={ data.rep_photos } />
                   {index == 0 && <p style={{padding:"0px", margin:"0px"}}>대표</p>}
                 </StoryWrapper>
               </ValueBox>
@@ -395,7 +411,7 @@ export default function CurationForm() {
         <View>
           <Label>본문</Label>
           <Editor
-            value={data}
+            value={form.contents ? form.contents : ""}
             onInit={handleInit}
             onEditorChange={handleUpdate}
             onBeforeAddUndo={handleBeforeAddUndo}

diff --git a/src/components/Admin/FormModals/StoryListModal.jsx b/src/components/Admin/FormModals/StoryListModal.jsx
@@ -166,14 +166,14 @@ export default function StoryListModal({ selectedStory, setSelectedStory, item,
 
 
   const handleSelectedStory = (id, rep_pic) => {
-    if (selectedStory.filter(el => el.id == id).length > 0) {
-      setSelectedStory(selectedStory.filter(el => el.id != id));
+    if (selectedStory.filter(el => el.story_id === id).length > 0) {
+      setSelectedStory(selectedStory.filter(el => el.story_id != id));
       if (window.confirm("목록에서 삭제하시겠습니까?")) {
         alert("삭제되었습니다.");
         }
       }
     else {
-      setSelectedStory([...selectedStory, { id: id, rep_pic: rep_pic }]);
+      setSelectedStory([...selectedStory, { story_id: id, rep_photos: rep_pic }]);
       setMessage(true); 
     }
   }

diff --git a/src/components/Admin/StoryFormPage.jsx b/src/components/Admin/StoryFormPage.jsx
@@ -87,16 +87,16 @@ const StoryFormPage = (props) => {
         // }
 
         try {
+            let newId
             if (!id) {
                 const response = await request.post("/stories/create/", formData, { "Content-Type": "multipart/form-data" });
-                console.log(response);
+                newId = response.data.data.id
             }
             else {
                 const response = await request.put(`/stories/${id}/update/`, formData, { "Content-Type": "multipart/form-data" });
-                console.log(response)
             }
             alert('스토리 생성 완료');
-            navigate("/story?page=1");
+            id ? navigate(`/story/${id}`) : navigate(`/story/${newId}`);
         } catch (err) {
             alert(`스토리 생성 실패 => ${err.response.data.detail}`);
         }
@@ -146,7 +146,6 @@ const StoryFormPage = (props) => {
                                         place: event.target.value,
                                     });
                                 }}
-                                disabled={id}
                             >
                                 <option value="0" selected>Select Place</option>
                                 {places.map((place, index) => {

diff --git a/src/components/Curation/components/CurationDetailBox.jsx b/src/components/Curation/components/CurationDetailBox.jsx
@@ -172,10 +172,10 @@ const BackToList = styled.div`
   // margin: 20px auto;
 `;
 const DeleteButton = styled.div`
-  position: absolute;
+  text-align: right;
   color: black;
   cursor : pointer;
-  right: 0;
+  margin-top: 5px;
   font-size: 1rem;
   &:hover {
     text-decoration: underline;
@@ -185,6 +185,8 @@ const DeleteButton = styled.div`
   }
   // margin: 20px auto;
 `;
+const UpdateButton = styled(DeleteButton)`
+`
 const ButtonDiv = styled.div`
   box-sizing: border-box;
   margin-top: 20px;
@@ -227,6 +229,8 @@ const Writer = styled.p`
     color: #00AFFF;
    }
 `
+const ButtonWrapper = styled.div`
+`
 export default function CurationDetailBox() {
   const navigate = useNavigate();
   const params = useParams();
@@ -272,15 +276,13 @@ export default function CurationDetailBox() {
         alert("로그인이 필요합니다.");
       } else {
         const response = await request.post(`/curations/curation_like/${params.id}/`);
-        console.log("response", response);
         rerender();
       }
     };
 
   const getCurationDetail = async () => {
     const response_detail = await request.get(`/curations/curation_detail/${params.id}/`);
     setCurationDetail(response_detail.data.data);
-    console.log(response_detail.data.data);
   }
   const getCurationStoryDetail = async () => {
     const reponse_story_detail = await request.get(`/curations/curated_story_detail/${params.id}/`);
@@ -316,6 +318,10 @@ export default function CurationDetailBox() {
     setOpen(false);
   }
 
+  const markup = () => {
+    return { __html: `${curationDetail.contents}` };
+  };
+
   return (
     <>
       <Wrapper>
@@ -341,15 +347,19 @@ export default function CurationDetailBox() {
                 <View>
                   <Writer style={{textAlign: "right"}} onClick={() => {otherUserData(curationDetail.writer_email)}}>{curationDetail.nickname}</Writer>
                   <p style={{textAlign: "right"}}>{curationDetail.created.slice(0, 10).replace(/-/gi, '.')} 작성</p>
-                  {myEmail === curationDetail.writer_email ? <DeleteButton onClick={delCuration}>삭제하기</DeleteButton> : <></>}
+                  <ButtonWrapper>
+                    {myEmail === curationDetail.writer_email ? <DeleteButton onClick={delCuration}>삭제하기</DeleteButton> : <></>}
+                    {/* 활성화 예정 */}
+                    {/* {myEmail === curationDetail.writer_email ? <UpdateButton onClick={() => {navigate(`/admin/curation/${params.id}`)}}>수정하기</UpdateButton> : <></>} */}
+                  </ButtonWrapper>
                   {myEmail !== curationDetail.writer_email ? <Button onClick={()=>{following(curationDetail.writer_email)}}>{curationDetail.writer_is_followed ? 
                   <Text >팔로우 취소</Text>:
                   <Text >+ 팔로잉</Text>}</Button> : <></>}
                 </View>
               </InfoBox>
             </TitleBox>
             <ButtonDiv>
-              <BackToList onClick={() => { navigate('/curation') }}>&#60; Back To List</BackToList>
+              <BackToList onClick={() => { navigate(-1) }}>&#60; Back To List</BackToList>
               <GotoMap onClick={() => {
                  navigate('/map?page=1');
                  }}>
@@ -358,8 +368,7 @@ export default function CurationDetailBox() {
             </ButtonDiv>
 
           </View>
-          <ContentBox>
-            <p>{curationDetail.contents}</p>
+          <ContentBox dangerouslySetInnerHTML={markup()}>
           </ContentBox>
           <ImgBox>
             <Image src={curationDetail.map_image} 
@@ -416,10 +425,10 @@ export const Storys = ({
     const response = await request.post('/mypage/follow/',
       {
         targetEmail: email
-      })
-      if(writer_is_followed) {
-        writer_is_followed = !writer_is_followed;
-      }
+      });
+    if(writer_is_followed) {
+      writer_is_followed = !writer_is_followed;
+    }
     if(response.data.status == 'fail') alert(response.data.message);
     setRefresh(!refresh);
   }