Merge branch 'main' into 457-refactor-메인페이지-리팩토링-및-레이아웃-수정

prgrms-web-devcourse-final-project · Jan 4, 2025 · 06090bf · 06090bf
2 parents c58c6de + 04f8986
commit 06090bf
Show file tree

Hide file tree

Showing 65 changed files with 5,405 additions and 794 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,3 +3,4 @@
 .pnp.loader.mjs linguist-vendored
 vite_cache/* linguist-vendored
 .yarn/* linguist-vendored
+stats.html linguist-vendored
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -3,7 +3,7 @@ name: PR Build Check
 on:
     pull_request:
         branches:
-            - develope
+            - main
 
 jobs:
     build:

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,7 +3,7 @@ name: deploy aws
 on:
     push:
         branches:
-            - develope
+            - main
 
 jobs:
     deploy:

diff --git a/.github/workflows/lighthouse.yml b/.github/workflows/lighthouse.yml
@@ -2,9 +2,9 @@ name: Run lighthouse
 
 on:
     pull_request:
-        branches: develope
+        branches: main
     push:
-        branches: develope
+        branches: main
 
 jobs:
     lighthouse:

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
@@ -3,7 +3,7 @@ name: 'Chromatic Deployment'
 
 on:
     pull_request:
-        branches: develope
+        branches: main
         paths:
             - '**.stories.tsx'
     push:
@@ -39,3 +39,5 @@ jobs:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
               with:
                   message: '🚀 **storybook**: ${{ steps.publish_chromatic.outputs.storybookUrl }}'
+                  comment_tag: storybook
+                  mode: upsert
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![image](https://github.com/user-attachments/assets/618e1553-ed54-41d3-ad09-889741eea17a)
 
-# 🫙Bottler(보틀러)
+# Bottler(보틀러)
 
 - 보틀러는 **유리병에 담긴 익명 편지**를 주고받으며 자신의 이야기를 공유할 수 있는 서비스입니다.
 - **아날로그 편지의 설렘을 온라인으로 재해석**해서 사용자가 자신의 감정을 담아 특별한 순간을 공유할 수 있는 경험을 제공하는 서비스입니다.

diff --git a/index.html b/index.html
@@ -3,6 +3,8 @@
     <head>
         <meta charset="UTF-8" />
         <link rel="icon" type="image/svg+xml" href="/sample_icon.svg" />
+        <link rel="preconnect" href="https://www.bottler.store" />
+        <link rel="dns-prefetch" href="https://www.bottler.store" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <link rel="manifest" href="/manifest.json" />
         <title>Bottler</title>

diff --git a/package.json b/package.json
@@ -89,6 +89,7 @@
         "lint-staged": "^15.2.10",
         "postcss": "^8.4.49",
         "prettier": "^3.3.3",
+        "rollup-plugin-visualizer": "^5.13.1",
         "storybook": "8.4.4",
         "tailwindcss": "^3.4.15",
         "typescript": "^5.7.2",

diff --git a/public/fonts/BagelFatOne-Regular.ttf b/public/fonts/BagelFatOne-Regular.ttf
diff --git a/public/fonts/BagelFatOne-Regular.woff b/public/fonts/BagelFatOne-Regular.woff
diff --git a/public/fonts/CookieRun Regular.ttf b/public/fonts/CookieRun Regular.ttf
diff --git a/public/fonts/CookieRun-Regular.woff b/public/fonts/CookieRun-Regular.woff
diff --git a/public/fonts/Inter-VariableFont_opsz,wght.ttf b/public/fonts/Inter-VariableFont_opsz,wght.ttf
diff --git a/public/fonts/Inter-VariableFont_opsz_wght.woff b/public/fonts/Inter-VariableFont_opsz_wght.woff
diff --git a/public/fonts/Pretendard-Regular.subset.woff2 b/public/fonts/Pretendard-Regular.subset.woff2
diff --git a/public/fonts/PyeongChangPeace-Light.ttf b/public/fonts/PyeongChangPeace-Light.ttf
diff --git a/public/fonts/PyeongChangPeace-Light.woff b/public/fonts/PyeongChangPeace-Light.woff
diff --git a/public/fonts/Sagak-sagak.ttf b/public/fonts/Sagak-sagak.ttf
diff --git a/public/fonts/Sagak-sagak.woff b/public/fonts/Sagak-sagak.woff
diff --git a/public/letter1/letter1.svg b/public/letter1/letter1.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: PR Build Check @@
     on:
         pull_request:
             branches:
-                - develope
+                - main
     jobs:
         build:
@@ Expand Down @@