diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml new file mode 100644 index 00000000..fc9420ca --- /dev/null +++ b/.github/workflows/preview.yaml @@ -0,0 +1,31 @@ +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 + id: deploy + run: | + DEPLOY_URL=$(vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} | grep -o 'https://[^ ]*') + echo "::set-output name=url::$DEPLOY_URL" + - name: Alias Deployment to Fixed Domain + run: vercel alias ${{ steps.deploy.outputs.url }} weplanplans-dev.vercel.app --token=${{ secrets.VERCEL_TOKEN }} diff --git a/.github/workflows/production.yaml b/.github/workflows/production.yaml new file mode 100644 index 00000000..fff08a6c --- /dev/null +++ b/.github/workflows/production.yaml @@ -0,0 +1,22 @@ +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 }} diff --git a/README.md b/README.md index 5166a8dc..52cde81a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ ## πŸ“ ν”„λ‘œμ νŠΈ μ†Œκ°œ + μ—¬μ •κ³΅μœ  μ—¬ν–‰ν”Œλž«νΌ ## πŸ“– Commit convention + - Feat : μƒˆλ‘œμš΄ κΈ°λŠ₯ μΆ”κ°€ - Fix : 버그 μˆ˜μ • - Env : 개발 ν™˜κ²½ κ΄€λ ¨ μ„€μ • @@ -12,5 +14,5 @@ - Docs : λ‚΄λΆ€ λ¬Έμ„œ μΆ”κ°€/μˆ˜μ • - Test : ν…ŒμŠ€νŠΈ μΆ”κ°€/μˆ˜μ • - Chore : λΉŒλ“œ κ΄€λ ¨ μ½”λ“œ μˆ˜μ • -- Rename : 파일 및 폴더λͺ… μˆ˜μ • -- Remove : 파일 μ‚­μ œ +- Rename : 파일 및 폴더λͺ… μˆ˜μ •. +- Remove : 파일 μ‚­μ œ. diff --git a/src/index.css b/src/index.css index 54a7589e..22095935 100644 --- a/src/index.css +++ b/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 { diff --git a/tailwind.config.js b/tailwind.config.js index 40df3e50..52c00582 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -4,7 +4,10 @@ export default { theme: { extend: { colors: { - primary: '#29DDF6', + main1: '#29DDF6', + main2: '#062139', + sub1: '#FFEC3E', + sub2: 'FF2167', gray1: '#f8f8f8', gray2: '#ededed', gray3: '#d7d7d7', @@ -12,6 +15,7 @@ export default { gray5: '#5e5e5e', gray6: '#38393C', gray7: '#1E1E1E', + red: '#F00', }, }, },