Merge branch 'develop' of https://github.com/modern-agile-team/8term-…

…main-front into setting/#37/Styled-components_theme
modern-agile-team · Nov 5, 2024 · d42fe16 · d42fe16
2 parents af97472 + 7555211
commit d42fe16
Show file tree

Hide file tree

Showing 46 changed files with 1,352 additions and 23 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @bluetree7878 @rhehfl @dmsdnWkd1234 @chamjin @zzzRYT @dg1418
+* @bluetree7878 @rhehfl @dmsdnWkd1234 @chamjin @zzzRYT @dg1418 @ssi02014
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -18,13 +18,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # github repository에서 checkout
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       # docker build 수행
       - name: Set up docker buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       - name: Cache docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ env.VERSION }}
@@ -36,7 +36,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_TOKEN }}
+          password: ${{ github.actor == 'bluetree7878' && secrets.bluetree7878_GHCR_TOKEN || secrets.rhehfl_ghcr_token }}
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v2
@@ -56,7 +56,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.actor  }}
-          password: ${{ secrets.GHCR_TOKEN }}
+          password: ${{ github.actor == 'bluetree7878' && secrets.bluetree7878_GHCR_TOKEN || secrets.rhehfl_ghcr_token }}
       # 3000 -> 80 포트로 수행하도록 지정
       - name: Docker run
         run: |

diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,7 @@ yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 lerna-debug.log*
-
+.env
 node_modules
 dist
 dist-ssr

diff --git a/index.html b/index.html
@@ -9,6 +9,7 @@
   </head>
   <body>
     <div id="root"></div>
+    <div id="modal-root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		* @bluetree7878 @rhehfl @dmsdnWkd1234 @chamjin @zzzRYT @dg1418
		* @bluetree7878 @rhehfl @dmsdnWkd1234 @chamjin @zzzRYT @dg1418 @ssi02014