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 ( + } /> } /> } /> { 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}`, + label: `${weekItem.week}주차 ${weekItem.title}`, days: weekItem.days.map((dayItem) => ({ day: dayItem.day, tasks: dayItem.details.map((task) => ({ @@ -122,7 +122,7 @@ const AdminStudentAssignment = () => { {weekItem.days.map((dayItem, dayIdx) => (

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

{dayItem.tasks.map((task, taskIdx) => ( 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/admin/ManageTask.jsx b/frontend/src/pages/admin/ManageTask.jsx index 82075dc..00345d9 100644 --- a/frontend/src/pages/admin/ManageTask.jsx +++ b/frontend/src/pages/admin/ManageTask.jsx @@ -23,22 +23,25 @@ const ManageTask = () => { const closeModal = () => setShowModal(false); return ( -
-
-
- {weekData.map((week, index) => ( -
- - edit handleEditClick(index)} - /> -
- ))} +
+
+
+
+ {weekData.map((week, index) => ( +
+ + edit handleEditClick(index)} + /> +
+ ))} +
+
{showModal && ( { 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,