Merge pull request #282 from GDGoCINHA/develop

Merge Dev

Author: CSE-Shaco

.eslintrc.json

@@ -1,3 +1,6 @@
 {
-  "extends": "next/core-web-vitals"
+  "extends": [
+    "next/core-web-vitals",
+    "prettier"
+  ]
 }

.github/workflows/deploy.yml

@@ -17,16 +17,16 @@ jobs:
     runs-on: ubuntu-latest
     env:
       NEXT_PUBLIC_GOOGLE_REDIRECT_CLIENT_ID: ${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_CLIENT_ID }}
-      NEXT_PUBLIC_GOOGLE_REDIRECT_URI: ${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }}
+      NEXT_PUBLIC_GOOGLE_MAPS_API_KEY: ${{ secrets.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY }}
 
     steps:
       - name: Checkout source code
         uses: actions/checkout@v4
 
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
           cache: 'yarn'
 
       - name: Set env for develop
@@ -35,15 +35,15 @@ jobs:
           echo "TARGET_BUCKET=${{ secrets.AWS_S3_BUCKET_DEV }}" >> $GITHUB_ENV
           echo "NEXT_PUBLIC_APP_ENV=dev" >> $GITHUB_ENV
           echo "NEXT_PUBLIC_BASE_API_URL=${{ secrets.NEXT_PUBLIC_BASE_API_URL_DEV }}" >> $GITHUB_ENV
-          echo "NEXT_PUBLIC_GOOGLE_MAPS_API_KEY=${{ secrets.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY }}" >> $GITHUB_ENV
+          echo "NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI_DEV }}" >> $GITHUB_ENV
 
       - name: Set env for main
         if: github.ref == 'refs/heads/master'
         run: |
           echo "TARGET_BUCKET=${{ secrets.AWS_S3_BUCKET }}" >> $GITHUB_ENV
           echo "NEXT_PUBLIC_APP_ENV=production" >> $GITHUB_ENV
           echo "NEXT_PUBLIC_BASE_API_URL=${{ secrets.NEXT_PUBLIC_BASE_API_URL }}" >> $GITHUB_ENV
-          echo "NEXT_PUBLIC_GOOGLE_MAPS_API_KEY=${{ secrets.NEXT_PUBLIC_GOOGLE_MAPS_API_KEY }}" >> $GITHUB_ENV
+          echo "NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }}" >> $GITHUB_ENV
 
       - name: Install dependencies
         run: yarn install --frozen-lockfile
@@ -60,19 +60,19 @@ jobs:
 
       # (선택) 캐시 헤더 전략: 해시된 자산은 장기 캐시, HTML은 no-cache
       # 프로젝트에 맞게 include/exclude 패턴 조정
-      - name: Upload static assets (long cache)
+      - name: Sync static assets (long cache, delete removed)
         run: |
-          aws s3 cp ./out s3://$TARGET_BUCKET \
-            --recursive \
+          aws s3 sync ./out s3://$TARGET_BUCKET \
+            --delete \
             --exclude "*" \
             --include "_next/**" --include "static/**" --include "assets/**" \
             --cache-control "public, max-age=31536000, immutable" \
             --metadata-directive REPLACE
-      - name: Upload html (no cache)
+      - name: Sync html (no cache, delete removed)
         run: |
-          aws s3 cp ./out s3://$TARGET_BUCKET \
-            --recursive \
-            --exclude "_next/*" --exclude "static/*" --exclude "assets/*" \
+          aws s3 sync ./out s3://$TARGET_BUCKET \
+            --delete \
+            --exclude "_next/**" --exclude "static/**" --exclude "assets/**" \
             --cache-control "no-cache" \
             --metadata-directive REPLACE
       # (단순화 원하면 기존 sync 한 줄 유지 가능)

.gitignore

@@ -40,4 +40,4 @@ yarn-error.log*
 next-env.d.ts
 
 # ide files
-.idea/*
+.idea

.prettierignore

@@ -0,0 +1,6 @@
+node_modules
+.next
+out
+build
+coverage
+dist

.prettierrc.json

@@ -0,0 +1,8 @@
+{
+  "singleQuote": true,
+  "semi": false,
+  "tabWidth": 2,
+  "trailingComma": "none",
+  "printWidth": 100,
+  "endOfLine": "lf"
+}

Dockerfile

@@ -1,5 +1,5 @@
 # 1단계: 빌드 환경
-FROM node:18 AS builder
+FROM node:22 AS builder
 
 WORKDIR /app
 
@@ -26,7 +26,7 @@ RUN ls -la /app/.next || echo ".next 디렉토리가 없습니다"
 RUN ls -la /app/out || echo "out 디렉토리가 없습니다"
 
 # 2단계: 실행 환경
-FROM node:18
+FROM node:22
 
 WORKDIR /app
 
@@ -51,4 +51,4 @@ RUN ls -la /app/.next || echo ".next 디렉토리가 없습니다"
 EXPOSE 3000
 
 # Next.js 서버 시작
-CMD ["npm", "run", "start"]
+CMD ["npm", "run", "start"]