From 11cc9c55eacbebba005f3ca8b2d2dd95e4180eca Mon Sep 17 00:00:00 2001
From: minwucho <mauercho@gmail.com>
Date: Fri, 9 Aug 2024 14:46:22 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20listPage=EC=97=90=EC=84=9C=20=EB=82=98?=
 =?UTF-8?q?=EC=98=A4=EB=8A=94=20=EC=8B=9C=EA=B0=84=20=ED=98=95=EC=8B=9D=20?=
 =?UTF-8?q?=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/FreeboardListPage/FreeboardListPage.jsx |  3 +--
 frontend/src/pages/NoticeListPage/NoticeListPage.jsx  |  4 +---
 .../TeacherReportsetDetailPage.jsx                    | 11 +----------
 .../TeacherReportsetPage/TeacherReportsetPage.jsx     | 11 +----------
 4 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/frontend/src/pages/FreeboardListPage/FreeboardListPage.jsx b/frontend/src/pages/FreeboardListPage/FreeboardListPage.jsx
index 3b4f876..b82e64a 100644
--- a/frontend/src/pages/FreeboardListPage/FreeboardListPage.jsx
+++ b/frontend/src/pages/FreeboardListPage/FreeboardListPage.jsx
@@ -8,7 +8,6 @@ export default function NoticeListPage() {
   const { data } = useFreeboards(lectureId);
   const notices = data?.data;
 
-  console.log(notices);
   return (
     <ArticleBoard
       title="자유게시판"
@@ -18,7 +17,7 @@ export default function NoticeListPage() {
         <ArticleLink
           key={`${notice.id}`}
           title={notice.title}
-          sub={`${notice.createdAt[0]}. ${notice.createdAt[1]}. ${notice.createdAt[2]}. ${notice.createdAt[3]}:${notice.createdAt[4]}`}
+          sub={`${new Date(notice.createdAt).toLocaleDateString()} ${new Date(notice.createdAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}`}
           to={`${notice.id}`}
         />
       ))}
diff --git a/frontend/src/pages/NoticeListPage/NoticeListPage.jsx b/frontend/src/pages/NoticeListPage/NoticeListPage.jsx
index 816f281..3aaad61 100644
--- a/frontend/src/pages/NoticeListPage/NoticeListPage.jsx
+++ b/frontend/src/pages/NoticeListPage/NoticeListPage.jsx
@@ -20,9 +20,7 @@ export default function NoticeListPage() {
           <ArticleLink
             key={`${notice.id}`}
             title={notice.title}
-            //Todo: createdAt을 이용하여 날짜 표시했는데 Q&A에서 나오는 날짜 형식이랑 공지사항에서 나오는 날짜 형식이랑 달라서 수정해야함.
-            // + Q&A 글쓰기 버튼이 너무 커서 글 밀어내는 느낌 있음.
-            sub={`${notice.createdAt[0]}. ${notice.createdAt[1]}. ${notice.createdAt[2]}. ${notice.createdAt[3]}:${notice.createdAt[4]}`}
+            sub={`${new Date(notice.createdAt).toLocaleDateString()} ${new Date(notice.createdAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}`}
             to={`${notice.id}`}
           />
         ))}
diff --git a/frontend/src/pages/TeacherReportsetDetailPage/TeacherReportsetDetailPage.jsx b/frontend/src/pages/TeacherReportsetDetailPage/TeacherReportsetDetailPage.jsx
index 3b45208..9a12808 100644
--- a/frontend/src/pages/TeacherReportsetDetailPage/TeacherReportsetDetailPage.jsx
+++ b/frontend/src/pages/TeacherReportsetDetailPage/TeacherReportsetDetailPage.jsx
@@ -8,14 +8,6 @@ export default function TeacherReportsetDetailPage() {
   const { data } = useReportSetDetail(reportsetId);
   const reports = data?.data;
 
-  const formatDate = (dateArray) => {
-    const date = new Date(...dateArray.slice(0, 6));
-    return date.toLocaleString('ko-KR', {
-      hour12: true,
-      timeZone: 'Asia/Seoul',
-    });
-  };
-
   return (
     <ArticleBoard
       title="퀴즈 조회"
@@ -23,7 +15,6 @@ export default function TeacherReportsetDetailPage() {
     >
       {reports.length &&
         reports.map?.((report) => {
-          const formattedDate = formatDate(report.date);
           return (
             <ArticleLink
               key={`${report.reportId}`}
@@ -32,7 +23,7 @@ export default function TeacherReportsetDetailPage() {
                   ? `${report.name} - 미응시`
                   : `${report.name} - ${report.title} 점수: ${report.correctCount}/${report.allCount}`
               }
-              sub={`${formattedDate}`}
+              sub={`${new Date(report.testAt).toLocaleDateString()} ${new Date(report.testAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}`}
               to={`../report/${report.reportId}`}
             />
           );
diff --git a/frontend/src/pages/TeacherReportsetPage/TeacherReportsetPage.jsx b/frontend/src/pages/TeacherReportsetPage/TeacherReportsetPage.jsx
index ecd7170..deddf20 100644
--- a/frontend/src/pages/TeacherReportsetPage/TeacherReportsetPage.jsx
+++ b/frontend/src/pages/TeacherReportsetPage/TeacherReportsetPage.jsx
@@ -8,26 +8,17 @@ export default function TeacherReportsetPage() {
   const { data } = useReportSets(lectureId);
   const reports = data?.data;
 
-  const formatDate = (dateArray) => {
-    const date = new Date(...dateArray.slice(0, 6));
-    return date.toLocaleString('ko-KR', {
-      hour12: true,
-      timeZone: 'Asia/Seoul',
-    });
-  };
-
   return (
     <ArticleBoard
       title="퀴즈 성적 목록"
       canCreate={false}
     >
       {reports.map?.((report) => {
-        const formattedDate = formatDate(report.testAt);
         return (
           <ArticleLink
             key={`${report.reportSetId}`}
             title={`${report.quizSetTitle}`}
-            sub={formattedDate}
+            sub={`${new Date(report.testAt).toLocaleDateString()} ${new Date(report.testAt).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })}`}
             to={`${report.reportSetId}`}
           />
         );