Merge pull request #34 from FinalDoubleTen/dev

main production 테스트

.github/workflows/preview.yaml

@@ -0,0 +1,26 @@
+name: GitHub Actions Vercel Preview Deployment
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+on:
+  push:
+    branches:
+      - dev
+  pull_request:
+    types:
+      - opened
+jobs:
+  Deploy-Preview:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install Vercel CLI
+        run: npm install --global vercel@canary
+      - name: Install pnpm
+        run: npm install -g pnpm
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
+      - name: Build Project Artifacts
+        run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
+      - name: Deploy Project Artifacts to Vercel
+        run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}

.github/workflows/production.yaml

@@ -0,0 +1,23 @@
+name: Vercel Production Deployment
+env:
+  VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+  VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+on:
+  push:
+    branches:
+      - main
+jobs:
+  Deploy-Production:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Vercel CLI
+        run: npm install --global vercel@latest
+      - name: Pull Vercel Environment Information
+        run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
+      - name: Build Project Artifacts
+        run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
+      - name: Deploy Project Artifacts to Vercel
+        run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
+      - name: Set Fixed Domain Alias
+        run: vercel alias set https://weplanplans-dev.vercel.app/ --token=${{ secrets.VERCEL_TOKEN }}

README.md

@@ -1,7 +1,9 @@
 ## 📝 프로젝트 소개
+
 여정공유 여행플랫폼
 
 ## 📖 Commit convention
+
 - Feat : 새로운 기능 추가
 - Fix : 버그 수정
 - Env : 개발 환경 관련 설정
@@ -12,5 +14,5 @@
 - Docs : 내부 문서 추가/수정
 - Test : 테스트 추가/수정
 - Chore : 빌드 관련 코드 수정
-- Rename : 파일 및 폴더명 수정
-- Remove : 파일 삭제
+- Rename : 파일 및 폴더명 수정.
+- Remove : 파일 삭제.

src/index.css

@@ -47,17 +47,38 @@ code {
   .title3,
   .headline1,
   .headline2,
+  .body1,
   .body2,
-  .body4 {
+  .body3,
+  .body4,
+  .body5,
+  .body6,
+  .caption1,
+  .caption2 {
+    font-style: normal;
+    line-height: normal;
+  }
+
+  .title1,
+  .title2,
+  .title3,
+  .headline1,
+  .headline2,
+  .body2 {
     @apply font-bold;
   }
 }
 
-.body5,
-.caption1 {
+.body1,
+.body5 {
   @apply font-medium;
 }
 
+.body3,
+.caption1 {
+  @apply font-semibold;
+}
+
 .title1 {
   font-size: 24px;
 }
@@ -73,24 +94,26 @@ code {
 .headline1 {
   font-size: 16px;
 }
+
 .headline2,
 .body1 {
   font-size: 15px;
 }
 
 .body2,
-.body3 {
+.body3,
+.body4,
+.body5 {
   font-size: 14px;
 }
-.body4,
-.body5,
+
 .body6 {
-  font-size: 12px;
+  font-size: 13px;
 }
 
 .caption1,
 .caption2 {
-  font-size: 11px;
+  font-size: 12px;
 }
 
 .no-scrollbar::-webkit-scrollbar {

tailwind.config.js

@@ -4,14 +4,18 @@ export default {
   theme: {
     extend: {
       colors: {
-        primary: '#29DDF6',
+        main1: '#29DDF6',
+        main2: '#062139',
+        sub1: '#FFEC3E',
+        sub2: 'FF2167',
         gray1: '#f8f8f8',
         gray2: '#ededed',
         gray3: '#d7d7d7',
         gray4: '#888',
         gray5: '#5e5e5e',
         gray6: '#38393C',
         gray7: '#1E1E1E',
+        red: '#F00',
       },
     },
   },