Merge branch 'main' into develop

Author: yulrang

.github/workflows/ci.yml

@@ -42,7 +42,6 @@ jobs:
         with:
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           token: ${{ secrets.GITHUB_TOKEN }}
-
       - name: comment PR
         uses: thollander/actions-comment-pull-request@v1
         env:

.github/workflows/deploy_develop.yml

@@ -0,0 +1,23 @@
+name: Trigger Sync - develop
+
+on:
+  repository_dispatch:
+    types: [develop_updated]
+
+jobs:
+  trigger-sync-develop:
+    if: github.repository == 'yulrang/Team-1-Codeit-youl'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Git user
+        run: |
+          git config --global user.email "[email protected]"
+          git config --global user.name "yulrang"
+      - name: Sync fork
+        run: |
+          git remote add upstream https://github.com/CodeitFESI4-Team1/Team-1-Codeit.git
+          git fetch upstream
+          git checkout develop
+          git merge -X theirs upstream/develop --allow-unrelated-histories || echo "Merge conflicts occurred"
+          git push origin develop

.github/workflows/dispatch_develop.yml

@@ -0,0 +1,17 @@
+name: Trigger Fork Repo Action - develop
+on:
+  push:
+    branches:
+      - develop
+jobs:
+  trigger-fork-develop:
+    if: github.repository_owner == 'CodeitFESI4-Team1'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger repository_dispatch - develop
+        run: |
+          curl -X POST \
+          -H "Authorization: token ${{ secrets.PAT }}" \
+          -H "Accept: application/vnd.github.everest-preview+json" \
+          "https://api.github.com/repos/yulrang/Team-1-Codeit-youl/dispatches" \
+          -d '{"event_type": "develop_updated"}'

.storybook/main.ts

@@ -18,5 +18,4 @@ const config: StorybookConfig = {
     },
   },
 };
-
 export default config;

README.md

@@ -67,4 +67,4 @@
 | ![팀원5 사진](https://via.placeholder.com/100) | 이 율 | Front |
 | ![팀원6 사진](https://via.placeholder.com/100) | 최수형 | Front |
 | ![팀원7 사진](https://via.placeholder.com/100) | 이우현 | Back |
-| ![팀원8 사진](https://via.placeholder.com/100) | 이정우 | Back |
+| ![팀원8 사진](https://via.placeholder.com/100) | 이정우 | Back |

Team-1-Codeit

@@ -0,0 +1 @@
+Subproject commit 0097cf6918586adcc47641699c49fcbfea029ec0