Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions frontend/public/assets/img/plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ function App() {
return (
<BrowserRouter>
<Routes>
<Route path="/" element={<ManageTask />} />
<Route path="/" element={<Intro />} />
<Route path="/login" element={<Login />} />
<Route
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/pages/admin/AdminStudentAssignment.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => ({
Expand Down Expand Up @@ -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) => (
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/admin/DetailManageStudent.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
35 changes: 19 additions & 16 deletions frontend/src/pages/admin/ManageTask.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions frontend/src/pages/admin/ManageTask.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
flex-direction: column;
align-items: center;
width: 100%;
margin-top: 70px;
margin-bottom: 80px;
}
.week_block {
display: flex;
Expand Down Expand Up @@ -104,3 +106,9 @@
color: white;
cursor: not-allowed;
}
.manage_task_container {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
4 changes: 2 additions & 2 deletions frontend/src/pages/generation/Assignment.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down