From b76a204e7de7c4f977126ef26ac73b3c1765d784 Mon Sep 17 00:00:00 2001 From: Suhjung Park <145967352+Imggaggu@users.noreply.github.com> Date: Fri, 23 May 2025 21:37:23 +0900 Subject: [PATCH 1/3] Update and rename deploy.yml to deployBack.yml --- .../workflows/{deploy.yml => deployBack.yml} | 36 +------------------ 1 file changed, 1 insertion(+), 35 deletions(-) rename .github/workflows/{deploy.yml => deployBack.yml} (72%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deployBack.yml similarity index 72% rename from .github/workflows/deploy.yml rename to .github/workflows/deployBack.yml index e969afb..c4237cb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deployBack.yml @@ -1,4 +1,4 @@ -name: Deploy Frontend & Backend +name: Deploy Backend on: push: @@ -73,38 +73,4 @@ jobs: }] }' ${{ secrets.DISCORD_WEBHOOK }} - frontend: - name: Deploy Frontend to S3 - needs: backend - runs-on: ubuntu-22.04 - - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up Node.js - uses: actions/setup-node@v3 - with: - node-version: '22' - - - name: Install dependencies - run: | - cd frontend - rm -rf node_modules package-lock.json - npm install - npm install --save-dev vite rollup - - name: Build frontend - run: | - cd frontend - npm run build - - - name: Deploy to S3 - uses: jakejarvis/s3-sync-action@master - with: - args: --delete - env: - AWS_S3_BUCKET: www.pirocheck.org - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - SOURCE_DIR: frontend/dist From 6ae513f0a702b7f55ec52062a6627d0474a503e9 Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Sat, 24 May 2025 14:52:45 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[Fix]=20navigate=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 10300fe..382ea9e 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -74,7 +74,7 @@ function App() { path="/managestudent/detail/:studentId" element={ - + {studentId && } } /> From 26660f29f2e780b5e92fc899f7c87bad3030958d Mon Sep 17 00:00:00 2001 From: Imggaggu Date: Sat, 24 May 2025 14:53:06 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[Fix]=20navigate=20=EC=88=98=EC=A0=95=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.jsx | 4 ++-- frontend/src/pages/admin/DetailManageStudent.jsx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 382ea9e..ea35122 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -74,7 +74,7 @@ function App() { path="/managestudent/detail/:studentId" element={ - {studentId && } + } /> @@ -103,7 +103,7 @@ function App() { } /> diff --git a/frontend/src/pages/admin/DetailManageStudent.jsx b/frontend/src/pages/admin/DetailManageStudent.jsx index 632aa59..dc5a7d5 100644 --- a/frontend/src/pages/admin/DetailManageStudent.jsx +++ b/frontend/src/pages/admin/DetailManageStudent.jsx @@ -59,13 +59,13 @@ const DetailManageStudent = () => { 출석 관리 > )} - {student && ( + {student && student.id && (
{weekData.map((week, index) => (