Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #32

Closed
wants to merge 18 commits into from
Closed

Dev #32

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .github/workflows/preview.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
22 changes: 22 additions & 0 deletions .github/workflows/production.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
## 📝 프로젝트 소개

여정공유 여행플랫폼

## 📖 Commit convention

- Feat : 새로운 기능 추가
- Fix : 버그 수정
- Env : 개발 환경 관련 설정
Expand All @@ -12,5 +14,5 @@
- Docs : 내부 문서 추가/수정
- Test : 테스트 추가/수정
- Chore : 빌드 관련 코드 수정
- Rename : 파일 및 폴더명 수정
- Remove : 파일 삭제
- Rename : 파일 및 폴더명 수정.
- Remove : 파일 삭제.
39 changes: 31 additions & 8 deletions src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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 {
Expand Down
6 changes: 5 additions & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
},
},
Expand Down
Loading