From 403a46d902fe87cfbd16ed22f1304ad60e49c8be Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Wed, 21 May 2025 23:08:35 +0900 Subject: [PATCH 1/3] =?UTF-8?q?pull=20=ED=95=A0=EA=B1=B0=EC=95=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/assignment.js | 4 ++-- frontend/src/pages/admin/AdminStudentAssignment.jsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/api/assignment.js b/frontend/src/api/assignment.js index 2af21aa..f21b348 100644 --- a/frontend/src/api/assignment.js +++ b/frontend/src/api/assignment.js @@ -7,7 +7,7 @@ export const fetchAssignmentsByUser = async (userId) => { */ export const fetchAssignmentsByUser = async (userId) => { try { - const res = await api.get(`/api/assignment/${userId}`); + const res = await api.get(`/assignment/${userId}`); return res.data; // 백엔드가 반환하는 JSON 그대로 } catch (err) { console.error("과제 데이터 불러오기 실패:", err); @@ -17,7 +17,7 @@ export const fetchAssignmentsByUser = async (userId) => { export const submitAssignmentStatus = async (userId, assignmentId, status) => { - return api.post(`/api/admin/users/${userId}/assignments/${assignmentId}/submission`, { + return api.post(`/admin/users/${userId}/assignments/${assignmentId}/submission`, { assignmentId, userId, status, diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index 35d234e..4d509f8 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -5,7 +5,7 @@ import WeeklyOpenBlock from "../../components/WeeklyOpenBlock"; import AssignmentInfoBlock from "../../components/AssignmentInfoBlock"; import api from "../../api/api"; import styles from "./AdminStudentAssignment.module.css"; -import { submitAssignmentStatus, updateAssignmentStatus } from "../../api/assignments"; +import { submitAssignmentStatus, updateAssignmentStatus } from "../../api/assignment"; const AdminStudentAssignment = () => { const { studentId, week } = useParams(); From 4a51aad85cbf7b30b39710b42f9d50a0d94524b3 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Fri, 23 May 2025 16:40:56 +0900 Subject: [PATCH 2/3] [Fix] Assginment page title --- frontend/src/pages/generation/Assignment.jsx | 2 +- frontend/vite.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/generation/Assignment.jsx b/frontend/src/pages/generation/Assignment.jsx index 65f8e45..095d5fc 100644 --- a/frontend/src/pages/generation/Assignment.jsx +++ b/frontend/src/pages/generation/Assignment.jsx @@ -22,7 +22,7 @@ const Assignment = () => { label: `${weekItem.week}주차 ${weekItem.subject}`, details: weekItem.days.map((dayItem) => ({ day: dayItem.day, - subject: weekItem.title, + subject: weekItem.subject, tasks: dayItem.details.map((task) => ({ label: task.assignmentName, status: mapStatus(task.status), diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 6b46dee..26f670c 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -7,7 +7,7 @@ export default defineConfig({ server: { proxy: { "/api": { - target: "http://localhost:8080", + target: "http://api.pirocheck.org:8080/api", changeOrigin: true, }, }, From 78d51e49e36c8966f16cb6f87c78e16e40276f14 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Fri, 23 May 2025 16:59:21 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Fix]=20admin=20assignment=20api=20?= =?UTF-8?q?=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/adminassignment.js | 22 +++++++++++++++++++ .../pages/admin/AdminStudentAssignment.jsx | 6 ++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 frontend/src/api/adminassignment.js diff --git a/frontend/src/api/adminassignment.js b/frontend/src/api/adminassignment.js new file mode 100644 index 0000000..6642f7e --- /dev/null +++ b/frontend/src/api/adminassignment.js @@ -0,0 +1,22 @@ +// src/api/assignmentAdmin.js +import api from "./api"; + +// 학생 정보 불러오기 +export const fetchStudentInfo = (studentId) => + api.get(`/admin/users/${studentId}`); + +// 주차별 과제 데이터 불러오기 +export const fetchStudentAssignments = (userId) => + api.get(`/api/assignment/${userId}`); // ← 수정됨 + +// 과제 상태 수정 (PUT) +export const updateAssignmentStatus = (userId, assignmentId, status) => + api.put(`/api/admin/users/${userId}/assignments/${assignmentId}/submission`, { + status, + }); + +// 과제 상태 등록 (POST) +export const submitAssignmentStatus = (userId, assignmentId, status) => + api.post(`/api/admin/users/${userId}/assignments/${assignmentId}/submission`, { + status, + }); diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index edc9d88..de0ff08 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -24,17 +24,17 @@ const AdminStudentAssignment = () => { }); api - .get(`/admin/managestudent/{studentId}`, { + .get(`/admin/managestudent/${studentId}`, { params: { userId: studentId }, withCredentials: true, }) .then((res) => { const formatted = res.data.data.map((weekItem) => ({ week: weekItem.week, - label: `${weekItem.week}주차 ${weekItem.title}`, + label: `${weekItem.week}주차 ${weekItem.subject}`, days: weekItem.days.map((dayItem) => ({ day: dayItem.day, - subject: weekItem.title, + subject: weekItem.subject, tasks: dayItem.details.map((task) => ({ id: task.id, label: task.assignmentName,