From ab1d2f1ae3d7b36818613e4563b988932fcb8702 Mon Sep 17 00:00:00 2001 From: Suhjung Park <145967352+Imggaggu@users.noreply.github.com> Date: Mon, 26 May 2025 01:35:08 +0900 Subject: [PATCH 1/6] Update AdminStudentAssignment.jsx --- frontend/src/pages/admin/AdminStudentAssignment.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index 180c8d5..16faf42 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -33,7 +33,7 @@ const AdminStudentAssignment = () => { fetchStudentAssignments(studentId).then((res) => { - const formatted = res.data.data.map((weekItem) => ({ + const formatted = res.data.map((weekItem) => ({ week: weekItem.week, label: `${weekItem.week}주차 ${weekItem.subject}`, days: weekItem.days.map((dayItem) => ({ From bc0b3fe10b29f9db6635c187d91f6add352e9cd5 Mon Sep 17 00:00:00 2001 From: Suhjung Park <145967352+Imggaggu@users.noreply.github.com> Date: Mon, 26 May 2025 01:38:22 +0900 Subject: [PATCH 2/6] Update DetailManageStudent.jsx --- frontend/src/pages/admin/DetailManageStudent.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/admin/DetailManageStudent.jsx b/frontend/src/pages/admin/DetailManageStudent.jsx index 9fbefcb..36cfbb1 100644 --- a/frontend/src/pages/admin/DetailManageStudent.jsx +++ b/frontend/src/pages/admin/DetailManageStudent.jsx @@ -73,7 +73,7 @@ const DetailManageStudent = () => { From 652370e11918b15af4c8cf5abf8997d9250f0957 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 26 May 2025 02:00:44 +0900 Subject: [PATCH 3/6] =?UTF-8?q?[Fix]=20=EC=88=98=EC=A0=95=EB=90=9C=20?= =?UTF-8?q?=EA=B3=BC=EC=A0=9C=EA=B4=80=EB=A6=AC=20api=20=EB=A7=9E=EC=B6=94?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/admin/AdminStudentAssignment.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index 180c8d5..16faf42 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -33,7 +33,7 @@ const AdminStudentAssignment = () => { fetchStudentAssignments(studentId).then((res) => { - const formatted = res.data.data.map((weekItem) => ({ + const formatted = res.data.map((weekItem) => ({ week: weekItem.week, label: `${weekItem.week}주차 ${weekItem.subject}`, days: weekItem.days.map((dayItem) => ({ From 3c8df21cb27cf01eee8640029a0cef0e1a62cb95 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 26 May 2025 02:01:21 +0900 Subject: [PATCH 4/6] =?UTF-8?q?[Fix]=20=EC=88=98=EC=A0=95=EB=90=9C=20?= =?UTF-8?q?=EA=B3=BC=EC=A0=9C=EA=B4=80=EB=A6=AC=20api=20=EB=A7=9E=EC=B6=94?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/admin/AdminStudentAssignment.jsx | 2 +- frontend/src/pages/admin/DetailManageStudent.jsx | 2 +- frontend/src/pages/generation/Assignment.jsx | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index 16faf42..17a44a1 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -35,7 +35,7 @@ const AdminStudentAssignment = () => { fetchStudentAssignments(studentId).then((res) => { const formatted = res.data.map((weekItem) => ({ week: weekItem.week, - label: `${weekItem.week}주차 ${weekItem.subject}`, + label: `${weekItem.week}주차 ${weekItem.title}`, days: weekItem.days.map((dayItem) => ({ day: dayItem.day, tasks: dayItem.details.map((task) => ({ diff --git a/frontend/src/pages/admin/DetailManageStudent.jsx b/frontend/src/pages/admin/DetailManageStudent.jsx index 9fbefcb..36cfbb1 100644 --- a/frontend/src/pages/admin/DetailManageStudent.jsx +++ b/frontend/src/pages/admin/DetailManageStudent.jsx @@ -73,7 +73,7 @@ const DetailManageStudent = () => { diff --git a/frontend/src/pages/generation/Assignment.jsx b/frontend/src/pages/generation/Assignment.jsx index 3f5edc2..b253839 100644 --- a/frontend/src/pages/generation/Assignment.jsx +++ b/frontend/src/pages/generation/Assignment.jsx @@ -19,11 +19,11 @@ const Assignment = () => { fetchAssignmentsByUser(userId) .then((weekData) => { const formatted = weekData.map((weekItem) => ({ - label: `${weekItem.week}주차 ${weekItem.subtitle}`, + label: `${weekItem.week}주차 ${weekItem.title}`, //label: `${weekItem.week}주차 ${weekItem.subject}`, details: weekItem.days.map((dayItem) => ({ day: dayItem.day, - subject: dayItem.subject, + subject: dayItem.subtitle, //subject: weekItem.subject, tasks: dayItem.details.map((task) => ({ label: task.assignmentName, From 6d0b5db62d9edf9fad30cc2b7140475faa4673ea Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 26 May 2025 02:04:47 +0900 Subject: [PATCH 5/6] =?UTF-8?q?[Fix]=20=EC=A0=9C=EB=AA=A9=20=EB=B6=80?= =?UTF-8?q?=EC=A0=9C=EB=AA=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/pages/admin/AdminStudentAssignment.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index 17a44a1..8c718c7 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -122,7 +122,7 @@ const AdminStudentAssignment = () => { {weekItem.days.map((dayItem, dayIdx) => (

- {dayItem.day}   {dayItem.subject} + {dayItem.day}   {dayItem.subtitle}

{dayItem.tasks.map((task, taskIdx) => ( From 2b78ee9d6e858f726745a34b13c422a5ae386dfb Mon Sep 17 00:00:00 2001 From: qkrxogmla Date: Thu, 29 May 2025 00:36:54 +0900 Subject: [PATCH 6/6] =?UTF-8?q?header=20=EB=B0=8F=20=EA=B3=BC=EC=A0=9C?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20+=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/public/assets/img/plus.svg | 3 ++ frontend/src/App.jsx | 1 + frontend/src/pages/admin/ManageTask.jsx | 35 ++++++++++--------- .../src/pages/admin/ManageTask.module.css | 8 +++++ 4 files changed, 31 insertions(+), 16 deletions(-) create mode 100644 frontend/public/assets/img/plus.svg diff --git a/frontend/public/assets/img/plus.svg b/frontend/public/assets/img/plus.svg new file mode 100644 index 0000000..cd05806 --- /dev/null +++ b/frontend/public/assets/img/plus.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index ea35122..ba191cc 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -20,6 +20,7 @@ function App() { return ( + } /> } /> } /> { const closeModal = () => setShowModal(false); return ( -
-
-
- {weekData.map((week, index) => ( -
- - edit handleEditClick(index)} - /> -
- ))} +
+
+
+
+ {weekData.map((week, index) => ( +
+ + edit handleEditClick(index)} + /> +
+ ))} +
+
{showModal && (