From 2d6d624fad1522db2ef78a34a1a1e97153bcec40 Mon Sep 17 00:00:00 2001 From: jisu Seo Date: Wed, 3 Jan 2024 14:16:25 +0900 Subject: [PATCH 1/7] =?UTF-8?q?Design:=20=EC=83=89=EC=83=81,=20=ED=83=80?= =?UTF-8?q?=EC=9D=B4=ED=8F=AC=EA=B7=B8=EB=9E=98=ED=94=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.css | 39 +++++++++++++++++++++++++++++++-------- tailwind.config.js | 6 +++++- 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/index.css b/src/index.css index 1d63d1d4..f35dbd15 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,22 +94,24 @@ 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; } 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', }, }, }, From 185079cb1ad244b0ac07f3b9df0b2ebae45da635 Mon Sep 17 00:00:00 2001 From: sue Date: Wed, 3 Jan 2024 17:39:33 +0900 Subject: [PATCH 2/7] =?UTF-8?q?Deploy:=20preview=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/preview.yaml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/preview.yaml diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml new file mode 100644 index 00000000..26539ae2 --- /dev/null +++ b/.github/workflows/preview.yaml @@ -0,0 +1,21 @@ +name: GitHub Actions Vercel Preview Deployment +env: + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} +on: + push: + branches-ignore: + - main +jobs: + Deploy-Preview: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Install Vercel CLI + run: npm install --global vercel@canary + - 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 }} From 34ec5bb383e2b988d5e16aad79e5837f6a74727d Mon Sep 17 00:00:00 2001 From: sue Date: Wed, 3 Jan 2024 17:45:47 +0900 Subject: [PATCH 3/7] =?UTF-8?q?Deploy:=20preview=20=EC=9E=AC=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/preview.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 26539ae2..bdf86495 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -19,3 +19,17 @@ jobs: run: vercel build --token=${{ secrets.VERCEL_TOKEN }} - name: Deploy Project Artifacts to Vercel run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: '14' # 또는 원하는 버전 + - name: Install pnpm + run: npm install -g pnpm + - name: Install dependencies + run: pnpm install + - name: Build + run: vercel build --token ${{ secrets.VERCEL_TOKEN }} From 7e783ab49276d17bff24fbbbb2703198bcf8bbc1 Mon Sep 17 00:00:00 2001 From: sue Date: Wed, 3 Jan 2024 17:51:04 +0900 Subject: [PATCH 4/7] =?UTF-8?q?Deploy:=20preview=20=EC=9E=AC=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/preview.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index bdf86495..4f0be09a 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -13,23 +13,11 @@ jobs: - 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 }} - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Node.js - uses: actions/setup-node@v2 - with: - node-version: '14' # 또는 원하는 버전 - - name: Install pnpm - run: npm install -g pnpm - - name: Install dependencies - run: pnpm install - - name: Build - run: vercel build --token ${{ secrets.VERCEL_TOKEN }} From ddf844599418fb140a2e96201513114780aebabd Mon Sep 17 00:00:00 2001 From: sue Date: Wed, 3 Jan 2024 18:08:15 +0900 Subject: [PATCH 5/7] =?UTF-8?q?Deploy:=20preview=20on=20=EC=9E=AC=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/preview.yaml | 7 +++++-- .github/workflows/production.yaml | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/production.yaml diff --git a/.github/workflows/preview.yaml b/.github/workflows/preview.yaml index 4f0be09a..72421852 100644 --- a/.github/workflows/preview.yaml +++ b/.github/workflows/preview.yaml @@ -4,8 +4,11 @@ env: VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} on: push: - branches-ignore: - - main + branches: + - dev + pull_request: + types: + - opened jobs: Deploy-Preview: runs-on: ubuntu-latest 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 }} From d21900b4f195a7e48f2cbc6e67fbae839fcacfcb Mon Sep 17 00:00:00 2001 From: sue Date: Wed, 3 Jan 2024 18:10:34 +0900 Subject: [PATCH 6/7] =?UTF-8?q?Deploy:=20readme=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5166a8dc..77fa0b13 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,9 @@ ## 📝 프로젝트 소개 + 여정공유 여행플랫폼 ## 📖 Commit convention + - Feat : 새로운 기능 추가 - Fix : 버그 수정 - Env : 개발 환경 관련 설정 @@ -13,4 +15,4 @@ - Test : 테스트 추가/수정 - Chore : 빌드 관련 코드 수정 - Rename : 파일 및 폴더명 수정 -- Remove : 파일 삭제 +- Remove : 파일 삭제. From 72138a8bde89db33716a2b4a8de40728fae6d794 Mon Sep 17 00:00:00 2001 From: Hojin Date: Wed, 3 Jan 2024 18:24:45 +0900 Subject: [PATCH 7/7] =?UTF-8?q?Chore:=20=EA=B9=83=ED=97=99=EC=95=A1?= =?UTF-8?q?=EC=85=98=20=ED=85=8C=EC=8A=A4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 77fa0b13..52cde81a 100644 --- a/README.md +++ b/README.md @@ -14,5 +14,5 @@ - Docs : 내부 문서 추가/수정 - Test : 테스트 추가/수정 - Chore : 빌드 관련 코드 수정 -- Rename : 파일 및 폴더명 수정 +- Rename : 파일 및 폴더명 수정. - Remove : 파일 삭제.