From 7a28b54274de2cc9591c0442fc3087c48346fe25 Mon Sep 17 00:00:00 2001 From: l-wanderer01 Date: Mon, 12 May 2025 13:56:26 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[fix]=20WebConfig.java=203000=EB=B2=88=20?= =?UTF-8?q?=ED=8F=AC=ED=8A=B8=20=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=EA=B3=BC?= =?UTF-8?q?=EC=A0=9C=20api=20=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pirocheck/assignment/controller/AssignmentController.java | 2 +- .../src/main/java/backend/pirocheck/config/WebConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a6ae980..f67ed5b 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java @@ -10,7 +10,7 @@ public class WebConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/api/**") // 백엔드 API 요청에만 CORS 허용 - .allowedOrigins("http://pirocheck.org:3000") // 프론트 배포 URL + .allowedOrigins("http://pirocheck.org") // 프론트 배포 URL .allowedMethods("GET", "POST", "PUT", "DELETE") // 허용할 HTTP 메서드 .allowCredentials(true); // 세션 쿠키 주고받기 허용 } From 0907577aa4d9ca9b5d35f4c73183197b75fb70c5 Mon Sep 17 00:00:00 2001 From: Suhjung Park <145967352+Imggaggu@users.noreply.github.com> Date: Mon, 12 May 2025 14:47:40 +0900 Subject: [PATCH 2/7] Update WebConfig.java --- .../src/main/java/backend/pirocheck/config/WebConfig.java | 2 +- 1 file changed, 1 insertion(+), 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 0d16c22..910877b 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java @@ -13,6 +13,6 @@ public void addCorsMappings(CorsRegistry registry) { .allowedOrigins("http://pirocheck.org") // 프론트 배포 URL .allowedMethods("GET", "POST", "PUT", "DELETE") // 허용할 HTTP 메서드 .allowCredentials(true); // 세션 쿠키 주고받기 허용 - .allowedHeaders("*") + .allowedHeaders("*"); } } From 390252f18a04f44d57c1b36dd4789dfb863cc93a Mon Sep 17 00:00:00 2001 From: Suhjung Park <145967352+Imggaggu@users.noreply.github.com> Date: Mon, 12 May 2025 14:50:23 +0900 Subject: [PATCH 3/7] Update WebConfig.java --- .../src/main/java/backend/pirocheck/config/WebConfig.java | 3 ++- 1 file 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 910877b..d75bc55 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java @@ -12,7 +12,8 @@ public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/api/**") // 백엔드 API 요청에만 CORS 허용 .allowedOrigins("http://pirocheck.org") // 프론트 배포 URL .allowedMethods("GET", "POST", "PUT", "DELETE") // 허용할 HTTP 메서드 - .allowCredentials(true); // 세션 쿠키 주고받기 허용 .allowedHeaders("*"); + .allowCredentials(true); // 세션 쿠키 주고받기 허용 + } } From 24099efd9f5136f391e7bd8d9d2fb5cc67fdb725 Mon Sep 17 00:00:00 2001 From: Suhjung Park <145967352+Imggaggu@users.noreply.github.com> Date: Mon, 12 May 2025 14:54:27 +0900 Subject: [PATCH 4/7] Update WebConfig.java --- .../src/main/java/backend/pirocheck/config/WebConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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..c9c63bf 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java @@ -12,7 +12,7 @@ public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/api/**") // 백엔드 API 요청에만 CORS 허용 .allowedOrigins("http://pirocheck.org") // 프론트 배포 URL .allowedMethods("GET", "POST", "PUT", "DELETE") // 허용할 HTTP 메서드 - .allowCredentials(true); // 세션 쿠키 주고받기 허용 - .allowedHeaders("*") + .allowCredentials(true) // 세션 쿠키 주고받기 허용 + .allowedHeaders("*"); } } From 67dfc6c802aead3a50f51c677bfaf8c5e660a8d6 Mon Sep 17 00:00:00 2001 From: Suhjung Park <145967352+Imggaggu@users.noreply.github.com> Date: Mon, 12 May 2025 14:55:46 +0900 Subject: [PATCH 5/7] Update WebConfig.java --- .../src/main/java/backend/pirocheck/config/WebConfig.java | 2 +- 1 file changed, 1 insertion(+), 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 d75bc55..e8bff61 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java @@ -12,7 +12,7 @@ public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/api/**") // 백엔드 API 요청에만 CORS 허용 .allowedOrigins("http://pirocheck.org") // 프론트 배포 URL .allowedMethods("GET", "POST", "PUT", "DELETE") // 허용할 HTTP 메서드 - .allowedHeaders("*"); + .allowedHeaders("*") .allowCredentials(true); // 세션 쿠키 주고받기 허용 } From c4c2d97e0350dc95f7828f6ae429c85c99565dd2 Mon Sep 17 00:00:00 2001 From: l-wanderer01 Date: Mon, 12 May 2025 16:12:26 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[fix]=20WebConfig.java=20Origin=20url=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/backend/pirocheck/config/WebConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c9c63bf..f729c5c 100644 --- a/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java +++ b/backend/pirocheck/src/main/java/backend/pirocheck/config/WebConfig.java @@ -10,8 +10,8 @@ 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 메서드 + .allowedOrigins("http://www.pirocheck.org") // 프론트 배포 URL + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") // 허용할 HTTP 메서드 .allowCredentials(true) // 세션 쿠키 주고받기 허용 .allowedHeaders("*"); } From d2d37c9ad25837b50298c138df3f8604fe378d99 Mon Sep 17 00:00:00 2001 From: qkrxogmla Date: Tue, 13 May 2025 12:17:49 +0900 Subject: [PATCH 7/7] =?UTF-8?q?admin=EC=99=84=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.jsx | 6 ++++ frontend/src/pages/admin/Admin.jsx | 31 +++++++++++++++++-- frontend/src/pages/admin/AttendanceCode.jsx | 4 +++ frontend/src/pages/admin/ManageStudent.jsx | 4 +++ frontend/src/pages/admin/ManageTask.jsx | 4 +++ frontend/src/{ => pages/generation}/Home.jsx | 1 - .../{ => pages/generation}/Home.module.css | 0 7 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 frontend/src/pages/admin/AttendanceCode.jsx create mode 100644 frontend/src/pages/admin/ManageStudent.jsx create mode 100644 frontend/src/pages/admin/ManageTask.jsx rename frontend/src/{ => pages/generation}/Home.jsx (96%) rename frontend/src/{ => pages/generation}/Home.module.css (100%) 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