From a2b27cba453f3ff4b0109873f69b14fe43ffaed1 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 12 May 2025 14:27:24 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[Chore]=20Generation/=20admin=20directory?= =?UTF-8?q?=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/{ => pages/admin}/Admin.jsx | 0 frontend/src/{ => pages/generation}/Assignment.jsx | 10 +++++----- .../src/{ => pages/generation}/Assignment.module.css | 0 frontend/src/{ => pages/generation}/Attendance.jsx | 8 ++++---- .../src/{ => pages/generation}/Attendance.module.css | 0 frontend/src/{ => pages/generation}/Deposit.jsx | 4 ++-- frontend/src/{ => pages/generation}/Deposit.module.css | 0 7 files changed, 11 insertions(+), 11 deletions(-) rename frontend/src/{ => pages/admin}/Admin.jsx (100%) rename frontend/src/{ => pages/generation}/Assignment.jsx (86%) rename frontend/src/{ => pages/generation}/Assignment.module.css (100%) rename frontend/src/{ => pages/generation}/Attendance.jsx (97%) rename frontend/src/{ => pages/generation}/Attendance.module.css (100%) rename frontend/src/{ => pages/generation}/Deposit.jsx (94%) rename frontend/src/{ => pages/generation}/Deposit.module.css (100%) diff --git a/frontend/src/Admin.jsx b/frontend/src/pages/admin/Admin.jsx similarity index 100% rename from frontend/src/Admin.jsx rename to frontend/src/pages/admin/Admin.jsx diff --git a/frontend/src/Assignment.jsx b/frontend/src/pages/generation/Assignment.jsx similarity index 86% rename from frontend/src/Assignment.jsx rename to frontend/src/pages/generation/Assignment.jsx index f24604a..1654cc6 100644 --- a/frontend/src/Assignment.jsx +++ b/frontend/src/pages/generation/Assignment.jsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from "react"; -import WeeklyListBlock from "./components/WeeklyListBlock"; -import Header from "./components/Header"; -import AssignmentInfoBlock from "./components/AssignmentInfoBlock"; +import WeeklyListBlock from "../components/WeeklyListBlock"; +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"; +import { mapStatus } from "../utils/AssignmentStatus.js"; +import { fetchAssignmentsByUser } from "../api/assignment.js"; const Assignment = () => { const [weeks, setWeeks] = useState([]); diff --git a/frontend/src/Assignment.module.css b/frontend/src/pages/generation/Assignment.module.css similarity index 100% rename from frontend/src/Assignment.module.css rename to frontend/src/pages/generation/Assignment.module.css diff --git a/frontend/src/Attendance.jsx b/frontend/src/pages/generation/Attendance.jsx similarity index 97% rename from frontend/src/Attendance.jsx rename to frontend/src/pages/generation/Attendance.jsx index 0e72c16..3d95709 100644 --- a/frontend/src/Attendance.jsx +++ b/frontend/src/pages/generation/Attendance.jsx @@ -1,9 +1,9 @@ import { useEffect, useState } from "react"; -import Header from "./components/Header"; -import InputBlock from "./components/InputBlock"; -import AttendanceWeekInfo from "./components/AttendanceWeekInfo"; +import Header from "../components/Header"; +import InputBlock from "../components/InputBlock"; +import AttendanceWeekInfo from "../components/AttendanceWeekInfo"; import styles from "./Attendance.module.css"; -import api from "./api/api"; +import api from "../api/api"; const Attendance = () => { const [attendanceCode, setAttendanceCode] = useState([""]); diff --git a/frontend/src/Attendance.module.css b/frontend/src/pages/generation/Attendance.module.css similarity index 100% rename from frontend/src/Attendance.module.css rename to frontend/src/pages/generation/Attendance.module.css diff --git a/frontend/src/Deposit.jsx b/frontend/src/pages/generation/Deposit.jsx similarity index 94% rename from frontend/src/Deposit.jsx rename to frontend/src/pages/generation/Deposit.jsx index 3a84615..63d5621 100644 --- a/frontend/src/Deposit.jsx +++ b/frontend/src/pages/generation/Deposit.jsx @@ -1,8 +1,8 @@ -import Header from "./components/Header"; +import Header from "../components/Header"; import styles from "./Deposit.module.css"; import axios from "axios"; import { useEffect, useState } from "react"; -import api from "./api/api"; +import api from "../api/api"; const Deposit = () => { const [deposit, setDeposit] = useState(null); diff --git a/frontend/src/Deposit.module.css b/frontend/src/pages/generation/Deposit.module.css similarity index 100% rename from frontend/src/Deposit.module.css rename to frontend/src/pages/generation/Deposit.module.css From 5ecc609191eacc887016339c33094103f2a0dcae Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 12 May 2025 14:31:13 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Chore]=20Generation/=20admin=20directory?= =?UTF-8?q?=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.jsx | 8 ++++---- frontend/src/pages/generation/Assignment.jsx | 10 +++++----- frontend/src/pages/generation/Attendance.jsx | 8 ++++---- frontend/src/pages/generation/Deposit.jsx | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index db217ff..50530e1 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -2,11 +2,11 @@ import React from "react"; import { BrowserRouter, Routes, Route } from "react-router-dom"; import Login from "./Login"; import Home from "./Home"; -import Assignment from "./Assignment"; -import Deposit from "./Deposit"; +import Assignment from "./pages/generation/Assignment"; +import Deposit from "./pages/generation/Deposit"; import Intro from "./Intro"; -import Admin from "./Admin"; -import Attendance from "./Attendance"; +import Admin from "./pages/admin/Admin"; +import Attendance from "./pages/generation/Attendance"; function App() { return ( diff --git a/frontend/src/pages/generation/Assignment.jsx b/frontend/src/pages/generation/Assignment.jsx index 1654cc6..d1c0115 100644 --- a/frontend/src/pages/generation/Assignment.jsx +++ b/frontend/src/pages/generation/Assignment.jsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from "react"; -import WeeklyListBlock from "../components/WeeklyListBlock"; -import Header from "../components/Header"; -import AssignmentInfoBlock from "../components/AssignmentInfoBlock"; +import WeeklyListBlock from "../../components/WeeklyListBlock"; +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"; +import { mapStatus } from "../../utils/AssignmentStatus.js"; +import { fetchAssignmentsByUser } from "../../api/assignment.js"; const Assignment = () => { const [weeks, setWeeks] = useState([]); diff --git a/frontend/src/pages/generation/Attendance.jsx b/frontend/src/pages/generation/Attendance.jsx index 3d95709..dce08b1 100644 --- a/frontend/src/pages/generation/Attendance.jsx +++ b/frontend/src/pages/generation/Attendance.jsx @@ -1,9 +1,9 @@ import { useEffect, useState } from "react"; -import Header from "../components/Header"; -import InputBlock from "../components/InputBlock"; -import AttendanceWeekInfo from "../components/AttendanceWeekInfo"; +import Header from "../../components/Header"; +import InputBlock from "../../components/InputBlock"; +import AttendanceWeekInfo from "../../components/AttendanceWeekInfo"; import styles from "./Attendance.module.css"; -import api from "../api/api"; +import api from "../../api/api"; const Attendance = () => { const [attendanceCode, setAttendanceCode] = useState([""]); diff --git a/frontend/src/pages/generation/Deposit.jsx b/frontend/src/pages/generation/Deposit.jsx index 63d5621..8b9c17b 100644 --- a/frontend/src/pages/generation/Deposit.jsx +++ b/frontend/src/pages/generation/Deposit.jsx @@ -1,8 +1,8 @@ -import Header from "../components/Header"; +import Header from "../../components/Header"; import styles from "./Deposit.module.css"; import axios from "axios"; import { useEffect, useState } from "react"; -import api from "../api/api"; +import api from "../../api/api"; const Deposit = () => { const [deposit, setDeposit] = useState(null); From 65672e18d619a4bdfb690b1493ad79a5aa3b996d Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Mon, 12 May 2025 14:42:31 +0900 Subject: [PATCH 3/3] [Fix] Allow all headers for CORS --- .../src/main/java/backend/pirocheck/config/WebConfig.java | 1 + frontend/src/api/api.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java index f67ed5b..0d16c22 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java @@ -13,5 +13,6 @@ public void addCorsMappings(CorsRegistry registry) { .allowedOrigins("http://pirocheck.org") // 프론트 배포 URL .allowedMethods("GET", "POST", "PUT", "DELETE") // 허용할 HTTP 메서드 .allowCredentials(true); // 세션 쿠키 주고받기 허용 + .allowedHeaders("*") } } diff --git a/frontend/src/api/api.js b/frontend/src/api/api.js index 9ba4ee2..2cd0305 100644 --- a/frontend/src/api/api.js +++ b/frontend/src/api/api.js @@ -1,7 +1,7 @@ import axios from "axios"; const api = axios.create({ - baseURL: "http://api.pirocheck.org:8080/api", + baseURL: "http://api.:8080/api", withCredentials: true, });