fix mistakes

PoApper · Dec 10, 2023 · d76b27f · d76b27f
1 parent 814b198
commit d76b27f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/components/board/notice/notice.table.jsx b/components/board/notice/notice.table.jsx
@@ -4,8 +4,6 @@ import { Image, Table } from 'semantic-ui-react'
 
 const NoticeTable
  = ({notices}) => {
-  const duration = moment(end_datetime).diff(moment(start_datetime), 'hours');
-
   return (
     <Table
       celled selectable
@@ -23,30 +21,33 @@ const NoticeTable
       </Table.Header>
       <Table.Body>
         {
-          notices.map((notice, idx) =>
-            <Link href={`benefit/notice/update/${notice.id}`} key={notice.id}>
-              <Table.Row key={notice.id}>
-                <Table.Cell>{idx + 1}</Table.Cell>
-                <Table.Cell>
-                  <a href={notice.link} target={'_blank'} rel={"noreferrer"}>
-                    {notice.title}
-                  </a>
-                </Table.Cell>
-                <Table.Cell>
-                  {notice.content}
-                </Table.Cell>
-                <Table.Cell>
-                  <Image href={notice.link}/>
-                </Table.Cell>
-                <Table.Cell>
-                  {notice.start_datetime} ~ {notice.end_datetime} ({Number(duration/24).toFixed(0)}일 {duration%24}시간)
-                </Table.Cell>
-                <Table.Cell>
-                  {notice.click_count}
-                </Table.Cell>
-              </Table.Row>
-            </Link>
-          )
+          notices.map((notice, idx) => {
+            const duration = moment(notice.end_datetime).diff(moment(notice.start_datetime), 'hours');
+            return (
+              <Link href={`/board/notice/update/${notice.id}`} key={notice.id}>
+                <Table.Row key={notice.id}>
+                  <Table.Cell>{idx + 1}</Table.Cell>
+                  <Table.Cell>
+                    <a href={notice.link} target={'_blank'} rel={"noreferrer"}>
+                      {notice.title}
+                    </a>
+                  </Table.Cell>
+                  <Table.Cell>
+                    {notice.content}
+                  </Table.Cell>
+                  <Table.Cell>
+                    <Image href={notice.link}/>
+                  </Table.Cell>
+                  <Table.Cell>
+                    {moment(notice.start_datetime).format('YYYY-MM-DD HH:mm')} ~ {moment(notice.end_datetime).format('YYYY-MM-DD HH:mm')} ({Number(duration/24).toFixed(0)}일 {duration%24}시간)
+                  </Table.Cell>
+                  <Table.Cell>
+                    {notice.click_count}
+                  </Table.Cell>
+                </Table.Row>
+              </Link>
+            )
+          })
         }
       </Table.Body>
     </Table>

diff --git a/pages/board/notice/update/[id].jsx b/pages/board/notice/update/[id].jsx
@@ -15,6 +15,7 @@ const NoticeUpdatePage = ({ noticeInfo }) => {
 
   const [deleteModalOpen, setDeleteModalOpen] = useState(false)
 
+  const id = noticeInfo.id;
   const [title, setTitle] = useState(noticeInfo.title)
   const [content, setContent] = useState(noticeInfo.content)
   const [link, setLink] = useState(noticeInfo.link)
@@ -62,7 +63,7 @@ const NoticeUpdatePage = ({ noticeInfo }) => {
         />
 
         <Message>
-          공지사항은 이미지 업로드는 공지사항 생성 후, 수정 페이지에서 가능합니다.
+          공지사항 이미지 업로드는 공지사항 생성 후, 수정 페이지에서 가능합니다.
         </Message>
 
         <Form.TextArea
@@ -84,8 +85,8 @@ const NoticeUpdatePage = ({ noticeInfo }) => {
 
         <ImageUploadForm
           type={'공지사항'}
-          uploadApiUri={`notice/image/${notice.id}`}
-          originalImageUrl={notice.image_url}
+          uploadApiUri={`notice/image/${id}`}
+          originalImageUrl={noticeInfo.image_url}
         />
         <Message>
           권장 이미지 사이즈(가로 x 세로): 540 x 200