Merge branch 'develop' into feature/#38-selfcare

.github/ISSUE_TEMPLATE/error.yml

@@ -1,18 +1,24 @@
-name: "에러났어요"
-description: "😥 이러이러한 에러가 났어요. 고쳐주세요"
-labels: error
+name: "Error"
+description: "지금 여기서 에러가 발생하고 있습니다. 🩻"
+labels: 에러
 body:
-
+  - type: textarea
+    attributes:
+      label: UI
+      description: |
+        [이미지/영상 추가] 이부분에서 제가 에러를 발견했습니다.📸🎥
+      placeholder: |
+        여기에 파일을 드래그하거나 클릭하여 업로드하세요.
   - type: textarea
     attributes:
       label: 설명
       description: |
-        어디에서 에러가 났나요?
+        에러가 난 부분을 알려주세요
       placeholder: |
-        여기에서 에러가 난 것 같아요
+        여기가 잘못된 것 같아요.
   - type: textarea
     attributes:
-      label: 자세한 내용을 알려주세요
+      label: 추가사항
       description: |
-        다른 문제가 있나요?
+        더 문제가 있을까요?
 

.github/ISSUE_TEMPLATE/explanation.yml

@@ -0,0 +1,17 @@
+name: "feedback"
+description: "이렇게 하는 것이 더 좋을 것 같아요 🙏"
+labels: 피드백
+body:
+
+  - type: textarea
+    attributes:
+      label: 설명
+      description: |
+        [Explain] 어떤 부분을 말씀하시는 것인가요? 😏
+      placeholder: |
+        생성자 패턴을 적용하면 코드가 더 예뻬질 것 같아요!! 😍
+  - type: textarea
+    attributes:
+      label: 추가사항
+      description: |
+        [추가사항] 더 할말 있으신가요? 피드백은 언제나 환영입니다 ^^

.github/ISSUE_TEMPLATE/function.yml

@@ -1,16 +1,23 @@
-name: "새 기능이에요"
-description: "🙃 이 기능을 추가할려고 합니다."
+name: "function"
+description: "이 기능을 추가할려고 합니다. 💪🏿"
+labels: 기능
 body:
-
   - type: textarea
     attributes:
-      label: 새 기능
+      label: UI
       description: |
-        어떤 기능을 추가할 건가요?
+        [이미지/영상 추가] 개발하고자 하는 기능을 더 잘 설명할 수 있도록 이미지나 영상을 첨부해주세요.📸🎥
       placeholder: |
-        이런 기능을 추가할게요!
+        여기에 파일을 드래그하거나 클릭하여 업로드하세요.
   - type: textarea
     attributes:
-      label: 자세한 내용을 알려주세요
+      label: 설명
       description: |
-        어떤 문제가 있나요?
+        [Explain] 어떤 기능을 말씀하시는 건가요? 🥴
+      placeholder: |
+        사용자에 편리성을 위해서 만보기 기능을 추가하겠습니다.
+  - type: textarea
+    attributes:
+      label: 추가사항
+      description: |
+        [추가사항] 조금 더 구체적으로 알려주시겠어요? 🏃🏿‍♂️

.github/ISSUE_TEMPLATE/refactoring.yml

@@ -1,16 +1,24 @@
-name: "리팩토링할게요"
-description: "😀 이 코드 리팩토링 할게요!"
+name: "refactoring"
+description: "코드를 이렇게 수정할려고 합니다 🥊"
+labels: 리펙토링
 body:
-
   - type: textarea
     attributes:
-      label: 리팩토링
+      label: UI
+      description: |
+        [이미지/영상 추가] 지금은 이렇지만 디자인에 맞춰서 이렇게 바꿀게요! 📸🎥
+      placeholder: |
+        여기에 파일을 드래그하거나 클릭하여 업로드하세요.
+  - type: textarea
+    attributes:
+      label: 리펙토링
       description: |
-        어떻게 코드를 바꿀 것인가요?
+        이 코드보다는 이 코드가 좀 더 효율적인 것 같습니다! 🤓
       placeholder: |
-        이렇게 코드를 바꿀게요
+        이 코드는 문제가 발생할 것 같아요.. 😭
   - type: textarea
     attributes:
-      label: 자세한 내용을 알려주세요
+      label: 추가사항
       description: |
-        어떤 문제가 있나요?
+        더 문제가 있을까요? 🤔
+

.github/pull_request_template.md

@@ -0,0 +1,47 @@
+## What kind of this PR?
+
+<!--
+/kind 버그
+/kind 리펙토링
+/kind 문서
+/kind 기능
+-->
+
+<br>
+
+## What is this PR? 🔍
+<!---- 변경 사항 및 관련 이슈에 대해 간단하게 작성해주세요. 어떻게보다 무엇을 왜 수정했는지 설명해주세요! 😎 -->
+
+<!---- Resolves: #(Isuue Number) -->
+
+## Screenshot 📸
+
+-
+
+<br>
+
+## Changes 🗒️
+
+-
+
+<br>
+
+### Summary 😌
+
+-
+
+<br>
+
+### Describe your changes 💉
+
+-
+
+<br>
+
+## PR Checklist ✅
+PR이 다음 요구 사항을 충족하는지 확인하세요.
+
+- [ ] 커밋 메시지 컨벤션에 맞게 작성했습니다.  Commit message convention 참고  (Ctrl + 클릭하세요.) 
+- [ ] 변경 사항에 대한 테스트를 했습니다.(버그 수정/기능에 대한 테스트).
+- [ ] Lint에 맞게 개발하셨나요?
+- [ ] 한명이상의 리뷰가 달렸나요?

.github/workflows/deploy-admin.yml

@@ -34,3 +34,10 @@ jobs:
           config_file_path: service/${{ env.SERVICE_NAME }}/.xquare/config.yaml
           yarn_docker_build: true
           yarn_workspace: "@service/${{ env.SERVICE_NAME }}"
+          buildargs: |
+            NEXT_PUBLIC_BASE_URL=${{ secrets.NEXT_PUBLIC_BASE_URL }}
+            NEXT_PUBLIC_GOOGLE_CLIENT_ID=${{ secrets.NEXT_PUBLIC_GOOGLE_CLIENT_ID }}
+            NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }}
+            NEXT_PUBLIC_GOOGLE_SCOPE=${{ secrets.NEXT_PUBLIC_GOOGLE_SCOPE }}
+            NEXT_PUBLIC_KAKAO_CLIENT_ID=${{ secrets.NEXT_PUBLIC_KAKAO_CLIENT_ID }}
+            NEXT_PUBLIC_KAKAO_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_KAKAO_REDIRECT_URI }}

.github/workflows/deploy-main.yml

@@ -34,3 +34,10 @@ jobs:
           config_file_path: service/${{ env.SERVICE_NAME }}/.xquare/config.yaml
           yarn_docker_build: true
           yarn_workspace: "@service/${{ env.SERVICE_NAME }}"
+          buildargs: |
+            NEXT_PUBLIC_BASE_URL=${{ secrets.NEXT_PUBLIC_BASE_URL }}
+            NEXT_PUBLIC_GOOGLE_CLIENT_ID=${{ secrets.NEXT_PUBLIC_GOOGLE_CLIENT_ID }}
+            NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }}
+            NEXT_PUBLIC_GOOGLE_SCOPE=${{ secrets.NEXT_PUBLIC_GOOGLE_SCOPE }}
+            NEXT_PUBLIC_KAKAO_CLIENT_ID=${{ secrets.NEXT_PUBLIC_KAKAO_CLIENT_ID }}
+            NEXT_PUBLIC_KAKAO_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_KAKAO_REDIRECT_URI }}

.github/workflows/deploy-user.yml

@@ -34,3 +34,10 @@ jobs:
           config_file_path: service/${{ env.SERVICE_NAME }}/.xquare/config.yaml
           yarn_docker_build: true
           yarn_workspace: "@service/${{ env.SERVICE_NAME }}"
+          buildargs: |
+            NEXT_PUBLIC_BASE_URL=${{ secrets.NEXT_PUBLIC_BASE_URL }}
+            NEXT_PUBLIC_GOOGLE_CLIENT_ID=${{ secrets.NEXT_PUBLIC_GOOGLE_CLIENT_ID }}
+            NEXT_PUBLIC_GOOGLE_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_GOOGLE_REDIRECT_URI }}
+            NEXT_PUBLIC_GOOGLE_SCOPE=${{ secrets.NEXT_PUBLIC_GOOGLE_SCOPE }}
+            NEXT_PUBLIC_KAKAO_CLIENT_ID=${{ secrets.NEXT_PUBLIC_KAKAO_CLIENT_ID }}
+            NEXT_PUBLIC_KAKAO_REDIRECT_URI=${{ secrets.NEXT_PUBLIC_KAKAO_REDIRECT_URI }}

OWNERS

@@ -0,0 +1,13 @@
+reviewers:
+    - eternrust
+    - wjknnn
+    - applely25
+    - kimeojin35
+    - wlalsplus100
+
+approvers:
+    - eternrust
+    - wjknnn
+    - applely25
+    - kimeojin35
+    - wlalsplus100

service/admin/Dockerfile

@@ -9,13 +9,31 @@ RUN yarn install --immutable
 
 COPY packs ./
 
+ARG NEXT_PUBLIC_BASE_URL
+ENV NEXT_PUBLIC_BASE_URL ${NEXT_PUBLIC_BASE_URL}
+
+ARG NEXT_PUBLIC_GOOGLE_CLIENT_ID
+ENV NEXT_PUBLIC_GOOGLE_CLIENT_ID ${NEXT_PUBLIC_GOOGLE_CLIENT_ID}
+
+ARG NEXT_PUBLIC_GOOGLE_REDIRECT_URI
+ENV NEXT_PUBLIC_GOOGLE_REDIRECT_URI ${NEXT_PUBLIC_GOOGLE_REDIRECT_URI}
+
+ARG NEXT_PUBLIC_GOOGLE_SCOPE
+ENV NEXT_PUBLIC_GOOGLE_SCOPE ${NEXT_PUBLIC_GOOGLE_SCOPE}
+
+ARG NEXT_PUBLIC_KAKAO_CLIENT_ID
+ENV NEXT_PUBLIC_KAKAO_CLIENT_ID ${NEXT_PUBLIC_KAKAO_CLIENT_ID}
+
+ARG NEXT_PUBLIC_KAKAO_REDIRECT_URI
+ENV NEXT_PUBLIC_KAKAO_REDIRECT_URI ${NEXT_PUBLIC_KAKAO_REDIRECT_URI}
+
+ENV NODE_ENV production
+
 RUN yarn workspace @service/admin build
 
 FROM node:20.10.0-alpine AS runner
 WORKDIR /app
 
-ENV NODE_ENV production
-
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 

service/admin/src/apis/axios.ts

@@ -2,7 +2,7 @@ import axios, { AxiosError } from 'axios'
 
 export const instance = axios.create({
   baseURL: process.env.NEXT_PUBLIC_BASE_URL,
-  timeout: 10000,
+  timeout: 30000,
 })
 
 instance.interceptors.request.use(

service/main/Dockerfile

@@ -9,12 +9,31 @@ RUN yarn install --immutable
 
 COPY packs ./
 
+ARG NEXT_PUBLIC_BASE_URL
+ENV NEXT_PUBLIC_BASE_URL ${NEXT_PUBLIC_BASE_URL}
+
+ARG NEXT_PUBLIC_GOOGLE_CLIENT_ID
+ENV NEXT_PUBLIC_GOOGLE_CLIENT_ID ${NEXT_PUBLIC_GOOGLE_CLIENT_ID}
+
+ARG NEXT_PUBLIC_GOOGLE_REDIRECT_URI
+ENV NEXT_PUBLIC_GOOGLE_REDIRECT_URI ${NEXT_PUBLIC_GOOGLE_REDIRECT_URI}
+
+ARG NEXT_PUBLIC_GOOGLE_SCOPE
+ENV NEXT_PUBLIC_GOOGLE_SCOPE ${NEXT_PUBLIC_GOOGLE_SCOPE}
+
+ARG NEXT_PUBLIC_KAKAO_CLIENT_ID
+ENV NEXT_PUBLIC_KAKAO_CLIENT_ID ${NEXT_PUBLIC_KAKAO_CLIENT_ID}
+
+ARG NEXT_PUBLIC_KAKAO_REDIRECT_URI
+ENV NEXT_PUBLIC_KAKAO_REDIRECT_URI ${NEXT_PUBLIC_KAKAO_REDIRECT_URI}
+
+ENV NODE_ENV production
+
 RUN yarn workspace @service/main build
 
 FROM node:20.10.0-alpine AS runner
 WORKDIR /app
 
-ENV NODE_ENV production
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs

service/main/next.config.js

@@ -8,14 +8,6 @@ const nextConfig = {
   // experimental: {
   //   outputFileTracingRoot: path.join(__dirname, '../../'),
   // }
-  async rewrites() {
-    return [
-      {
-        source: '/:path*',
-        destination: 'https://stag-server.xquare.app/:path*',
-      },
-    ]
-  },
 }
 
 module.exports = nextConfig

service/main/src/apis/axios.ts

@@ -1,7 +1,7 @@
 import axios, { AxiosError } from 'axios'
 
 export const instance = axios.create({
-  baseURL: '/maeumgagym',
+  baseURL: process.env.NEXT_PUBLIC_BASE_URL,
   timeout: 30000,
   withCredentials: true,
 })

service/user/Dockerfile

@@ -9,13 +9,31 @@ RUN yarn install --immutable
 
 COPY packs ./
 
+ARG NEXT_PUBLIC_BASE_URL
+ENV NEXT_PUBLIC_BASE_URL ${NEXT_PUBLIC_BASE_URL}
+
+ARG NEXT_PUBLIC_GOOGLE_CLIENT_ID
+ENV NEXT_PUBLIC_GOOGLE_CLIENT_ID ${NEXT_PUBLIC_GOOGLE_CLIENT_ID}
+
+ARG NEXT_PUBLIC_GOOGLE_REDIRECT_URI
+ENV NEXT_PUBLIC_GOOGLE_REDIRECT_URI ${NEXT_PUBLIC_GOOGLE_REDIRECT_URI}
+
+ARG NEXT_PUBLIC_GOOGLE_SCOPE
+ENV NEXT_PUBLIC_GOOGLE_SCOPE ${NEXT_PUBLIC_GOOGLE_SCOPE}
+
+ARG NEXT_PUBLIC_KAKAO_CLIENT_ID
+ENV NEXT_PUBLIC_KAKAO_CLIENT_ID ${NEXT_PUBLIC_KAKAO_CLIENT_ID}
+
+ARG NEXT_PUBLIC_KAKAO_REDIRECT_URI
+ENV NEXT_PUBLIC_KAKAO_REDIRECT_URI ${NEXT_PUBLIC_KAKAO_REDIRECT_URI}
+
+ENV NODE_ENV production
+
 RUN yarn workspace @service/user build
 
 FROM node:20.10.0-alpine AS runner
 WORKDIR /app
 
-ENV NODE_ENV production
-
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 

service/user/src/apis/axios.ts

@@ -2,7 +2,7 @@ import axios, { AxiosError } from 'axios'
 
 export const instance = axios.create({
   baseURL: process.env.NEXT_PUBLIC_BASE_URL,
-  timeout: 10000,
+  timeout: 30000,
 })
 
 instance.interceptors.request.use(