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
24 changes: 12 additions & 12 deletions frontend/src/Assignment.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Header from "./components/Header";
import AssignmentInfoBlock from "./components/AssignmentInfoBlock";
import styles from "./Assignment.module.css";
import { mapStatus } from "./utils/AssignmentStatus.js";
import { fetchAssignmentsByUser } from "./api/assignment.js";

const Assignment = () => {
const [weeks, setWeeks] = useState([]);
Expand All @@ -16,18 +17,18 @@ const Assignment = () => {
if (!userId) return;

fetchAssignmentsByUser(userId)
.then((weekData) => {
const formatted = weekData.map((weekItem) => ({
label: `${weekItem.week}주차 ${weekItem.title}`,
details: weekItem.days.map((dayItem) => ({
day: dayItem.day,
subject: weekItem.title,
tasks: dayItem.details.map((task) => ({
label: task.assignmentName,
status: mapStatus(task.status),
.then((weekData) => {
const formatted = weekData.map((weekItem) => ({
label: `${weekItem.week}주차 ${weekItem.title}`,
details: weekItem.days.map((dayItem) => ({
day: dayItem.day,
subject: weekItem.title,
tasks: dayItem.details.map((task) => ({
label: task.assignmentName,
status: mapStatus(task.status),
})),
})),
})),
}));
}));

setWeeks(formatted);

Expand Down Expand Up @@ -63,4 +64,3 @@ const Assignment = () => {
};

export default Assignment;

2 changes: 1 addition & 1 deletion frontend/src/api/api.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import axios from "axios";

const api = axios.create({
baseURL: "/api",
baseURL: "http://www.pirocheck.org/api",
withCredentials: true,
});

Expand Down
6 changes: 2 additions & 4 deletions frontend/src/api/assignment.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import axios from "axios";
import api from "./api";

export const fetchAssignmentsByUser = async (userId) => {
const res = await axios.get(`/api/assignment/grouped/${userId}`, {
withCredentials: true
});
const res = await api.get(`/assignment/grouped/${userId}`);
return res.data;
};