Merge pull request #218 from pirogramming/frontend_th

Frontend th

Author: qkrxogmla

frontend/public/assets/img/plus.svg

@@ -20,6 +20,7 @@ function App() {
   return (
     <BrowserRouter>
       <Routes>
+        <Route path="/" element={<ManageTask />} />
         <Route path="/" element={<Intro />} />
         <Route path="/login" element={<Login />} />
         <Route

frontend/src/App.jsx

@@ -33,9 +33,9 @@ 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}`,
+        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) => (
               <div key={dayIdx} className={styles.dayCard}>
                 <p className={styles.dayLabel}>
-                  {dayItem.day} &nbsp; {dayItem.subject}
+                  {dayItem.day} &nbsp; {dayItem.subtitle}
                 </p>
                 <div className={styles.taskList}>
                   {dayItem.tasks.map((task, taskIdx) => (

frontend/src/pages/admin/AdminStudentAssignment.jsx

@@ -73,7 +73,7 @@ const DetailManageStudent = () => {
               <button
                 key={index}
                 className={style.assignment_button}
-                onClick={() => navigate(`/admin/assignment/${student.id}/${week.week}`)}
+                onClick={() => navigate(`/admin/assignment/${student.id}/${index + 1}`)}
               >
                 {week.week} {week.title && `  ${week.title}`}
               </button>

frontend/src/pages/admin/DetailManageStudent.jsx

@@ -23,22 +23,25 @@ const ManageTask = () => {
   const closeModal = () => setShowModal(false);
 
   return (
-    <div className={style.managetask_wrapper}>
-      <Header />
-      <div className={style.week_container}>
-        {weekData.map((week, index) => (
-          <div key={index} className={style.week_block}>
-            <button className={style.week_button}>
-              {week.week} {week.title && `  ${week.title}`}
-            </button>
-            <img
-              src="/assets/img/edit.png"
-              alt="edit"
-              className={style.edit_icon}
-              onClick={() => handleEditClick(index)}
-            />
-          </div>
-        ))}
+    <div className={style.manage_task_container}>
+      <div className={style.managetask_wrapper}>
+        <Header />
+        <div className={style.week_container}>
+          {weekData.map((week, index) => (
+            <div key={index} className={style.week_block}>
+              <button className={style.week_button}>
+                {week.week} {week.title && `  ${week.title}`}
+              </button>
+              <img
+                src="/assets/img/edit.png"
+                alt="edit"
+                className={style.edit_icon}
+                onClick={() => handleEditClick(index)}
+              />
+            </div>
+          ))}
+        </div>
+        <img src="assets/img/plus.svg"></img>
       </div>
       {showModal && (
         <TaskModal

frontend/src/pages/admin/ManageTask.jsx

@@ -9,6 +9,8 @@
   flex-direction: column;
   align-items: center;
   width: 100%;
+  margin-top: 70px;
+  margin-bottom: 80px;
 }
 .week_block {
   display: flex;
@@ -104,3 +106,9 @@
   color: white;
   cursor: not-allowed;
 }
+.manage_task_container {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}

frontend/src/pages/admin/ManageTask.module.css

@@ -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,