diff --git a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/controller/AssignmentController.java b/backend/pirocheck/src/main/java/backend/pirocheck/assignment/controller/AssignmentController.java index 3552b44..0c1379f 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/assignment/controller/AssignmentController.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/assignment/controller/AssignmentController.java @@ -10,7 +10,7 @@ import java.util.List; @RestController -@RequestMapping("/assignment") +@RequestMapping("/api/assignment") @RequiredArgsConstructor public class AssignmentController { 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 0d16c22..1dcff3e 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java @@ -10,9 +10,9 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/api/**") // 백엔드 API 요청에만 CORS 허용 - .allowedOrigins("http://pirocheck.org") // 프론트 배포 URL - .allowedMethods("GET", "POST", "PUT", "DELETE") // 허용할 HTTP 메서드 - .allowCredentials(true); // 세션 쿠키 주고받기 허용 + .allowedOrigins("http://www.pirocheck.org") // 프론트 배포 URL + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") // 허용할 HTTP 메서드 .allowedHeaders("*") + .allowCredentials(true); // 세션 쿠키 주고받기 허용 } } diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 50530e1..2d7135e 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -6,6 +6,9 @@ import Assignment from "./pages/generation/Assignment"; import Deposit from "./pages/generation/Deposit"; import Intro from "./Intro"; import Admin from "./pages/admin/Admin"; +import MagageStudent from "./pages/admin/MagageStudent"; +import MagageTask from "./pages/admin/MagageTask"; +import AttendanceCode from "./pages/admin/AttendanceCode"; import Attendance from "./pages/generation/Attendance"; function App() { @@ -19,6 +22,9 @@ function App() { } /> } /> } /> + } /> + } /> + } /> ); diff --git a/frontend/src/pages/admin/Admin.jsx b/frontend/src/pages/admin/Admin.jsx index 1eb01d0..2223673 100644 --- a/frontend/src/pages/admin/Admin.jsx +++ b/frontend/src/pages/admin/Admin.jsx @@ -1,9 +1,34 @@ +import { useNavigate } from "react-router-dom"; +import styles from "../generation/Home.module.css"; + const Admin = () => { + const navigate = useNavigate(); return ( -
-

Admin Page

-

This is the admin page.

+
+
+

PIROCHECK

+ + + + 로고 +
); }; + export default Admin; diff --git a/frontend/src/pages/admin/AttendanceCode.jsx b/frontend/src/pages/admin/AttendanceCode.jsx new file mode 100644 index 0000000..bd0987b --- /dev/null +++ b/frontend/src/pages/admin/AttendanceCode.jsx @@ -0,0 +1,4 @@ +const AttendanceCode = () => { + return

수강생 관리

; +}; +export default AttendanceCode; diff --git a/frontend/src/pages/admin/ManageStudent.jsx b/frontend/src/pages/admin/ManageStudent.jsx new file mode 100644 index 0000000..41f63e8 --- /dev/null +++ b/frontend/src/pages/admin/ManageStudent.jsx @@ -0,0 +1,4 @@ +const MagageStudent = () => { + return

수강생 관리

; +}; +export default MagageStudent; diff --git a/frontend/src/pages/admin/ManageTask.jsx b/frontend/src/pages/admin/ManageTask.jsx new file mode 100644 index 0000000..f0f4924 --- /dev/null +++ b/frontend/src/pages/admin/ManageTask.jsx @@ -0,0 +1,4 @@ +const MagageTask = () => { + return

수강생 관리

; +}; +export default MagageTask; diff --git a/frontend/src/Home.jsx b/frontend/src/pages/generation/Home.jsx similarity index 96% rename from frontend/src/Home.jsx rename to frontend/src/pages/generation/Home.jsx index f1fe4fa..df86a12 100644 --- a/frontend/src/Home.jsx +++ b/frontend/src/pages/generation/Home.jsx @@ -1,4 +1,3 @@ -import React from "react"; import { useNavigate } from "react-router-dom"; import styles from "./Home.module.css"; diff --git a/frontend/src/Home.module.css b/frontend/src/pages/generation/Home.module.css similarity index 100% rename from frontend/src/Home.module.css rename to frontend/src/pages/generation/Home.module.css