diff --git a/.github/workflows/deployFront.yml b/.github/workflows/deployFront.yml index 177eaf3..e184f7f 100644 --- a/.github/workflows/deployFront.yml +++ b/.github/workflows/deployFront.yml @@ -24,6 +24,9 @@ jobs: rm -rf node_modules package-lock.json npm install npm install --save-dev vite rollup + + #- name: Clean dist + # run: rm -rf frontend/dist - name: Build frontend run: | diff --git a/.gitignore b/.gitignore index 53d4561..70dccf0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ .env *.pem .idea/ +et --hard HEAD~1 \ No newline at end of file diff --git a/backend/pirocheck/src/main/resources/application.yml b/backend/pirocheck/src/main/resources/application.yml index bdef4aa..8d44732 100644 --- a/backend/pirocheck/src/main/resources/application.yml +++ b/backend/pirocheck/src/main/resources/application.yml @@ -17,7 +17,7 @@ server: session: cookie: http-only: true # 세션 쿠키를 HttpOnly로 설정 (JS에서 접근 불가) - secure: false # HTTPS 전용 전송 (Https -> true로 바꿔야 함) + secure: true # HTTPS 전용 전송 (Https -> true로 바꿔야 함) same-site: Lax # CSRF 방지 timeout: 30m # 세션 타임아웃 30분 (30 minutes) address: 0.0.0.0 diff --git a/frontend/src/api/api.js b/frontend/src/api/api.js index 1950026..c2c9d61 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: "https://api.pirocheck.org/api", // 수정 필요한지 재검 필요함 // "http://api.pirocheck.org:8080/api" withCredentials: true, diff --git a/frontend/src/api/user.js b/frontend/src/api/user.js index 12e057a..3309ca5 100644 --- a/frontend/src/api/user.js +++ b/frontend/src/api/user.js @@ -1,5 +1,5 @@ export const loginUser = async ({ name, password }) => { - const res = await fetch("http://api.pirocheck.org:8080/api/login", { + const res = await fetch("https://api.pirocheck.org/api/login", { method: "POST", headers: { "Content-Type": "application/json", diff --git a/frontend/src/pages/admin/AdminStudentAssignment.jsx b/frontend/src/pages/admin/AdminStudentAssignment.jsx index c29c35e..b02cf21 100644 --- a/frontend/src/pages/admin/AdminStudentAssignment.jsx +++ b/frontend/src/pages/admin/AdminStudentAssignment.jsx @@ -42,7 +42,7 @@ const AdminStudentAssignment = () => { id: task.id, label: task.assignmentName, status: task.status, - //modified: false, + modified: false, })), })), })); diff --git a/frontend/vite.config.js b/frontend/vite.config.js index 26f670c..43d84a4 100644 --- a/frontend/vite.config.js +++ b/frontend/vite.config.js @@ -3,11 +3,12 @@ import react from "@vitejs/plugin-react"; // https://vitejs.dev/config/ export default defineConfig({ + base: './', plugins: [react()], server: { proxy: { "/api": { - target: "http://api.pirocheck.org:8080/api", + target: "https://api.pirocheck.org/api", changeOrigin: true, }, },