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

Feat: 인기여행지 무한스크롤 #48

Merged
merged 51 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
2d6d624
Design: 색상, 타이포그래피 수정
jseo9732 Jan 3, 2024
e0c4f39
refactor: 폴더명 변경
NohWookJin Jan 3, 2024
14c6ad0
Merge pull request #15 from FinalDoubleTen/FE-8--feat/Detail
LeHiHo Jan 3, 2024
73783bf
Merge pull request #19 from FinalDoubleTen/FE-6--feat/Tours
LeHiHo Jan 3, 2024
d3ba278
CHore: 1차 충돌해결
LeHiHo Jan 3, 2024
45e06b5
refactor: 스타일 수정
NohWookJin Jan 3, 2024
d067e7e
Merge branch 'dev' into FE-8--feat/Detail
LeHiHo Jan 3, 2024
d7c03e7
Merge pull request #20 from FinalDoubleTen/FE-8--feat/Detail
LeHiHo Jan 3, 2024
834627b
style: width, height 수정
NohWookJin Jan 3, 2024
64549cb
Merge pull request #21 from FinalDoubleTen/FE-8--feat/Detail
LeHiHo Jan 3, 2024
9b419e0
Chore: 2차 충돌해결
LeHiHo Jan 3, 2024
9e38fec
Chore: 2차 충돌해결
LeHiHo Jan 3, 2024
8cf0099
Chore: 배포오류 수정
LeHiHo Jan 3, 2024
aaeadd7
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
jseo9732 Jan 3, 2024
185079c
Deploy: preview 설정
suehub Jan 3, 2024
8117a4e
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
suehub Jan 3, 2024
34ec5bb
Deploy: preview 재설정
suehub Jan 3, 2024
7e783ab
Deploy: preview 재설정
suehub Jan 3, 2024
ddf8445
Deploy: preview on 재설정
suehub Jan 3, 2024
ed1151a
Merge pull request #25 from FinalDoubleTen/FE-16--feat/Tours/TourList
LeHiHo Jan 3, 2024
d21900b
Deploy: readme 수정
suehub Jan 3, 2024
5c8461f
Merge pull request #27 from FinalDoubleTen/FE-16--feat/Tours/TourList
LeHiHo Jan 3, 2024
72138a8
Chore: 깃헙액션 테스트
LeHiHo Jan 3, 2024
c69840c
Deploy: yaml 파일 수정
suehub Jan 3, 2024
b567d2a
Deploy: yaml 파일 수정
suehub Jan 3, 2024
b26721f
Deploy: yaml 파일 수정
suehub Jan 3, 2024
0871b00
Deploy: yaml 파일 수정
suehub Jan 3, 2024
935ac18
Merge pull request #29 from FinalDoubleTen/FE-16--feat/Tours/TourList
LeHiHo Jan 3, 2024
b519a5e
Deploy: yaml 파일 수정
suehub Jan 3, 2024
85caac0
Merge pull request #31 from FinalDoubleTen/FE-16--feat/Tours/TourList
suehub Jan 3, 2024
31edb24
Deploy: yaml 파일 수정
suehub Jan 3, 2024
56183bb
Merge pull request #33 from FinalDoubleTen/FE-16--feat/Tours/TourList
suehub Jan 3, 2024
8f3339e
Deploy: yaml 파일 수정
suehub Jan 3, 2024
09fa3ab
Merge pull request #35 from FinalDoubleTen/FE-16--feat/Tours/TourList
LeHiHo Jan 3, 2024
4c35418
Deploy: yaml 파일 수정
suehub Jan 3, 2024
b615dc6
Merge pull request #37 from FinalDoubleTen/FE-16--feat/Tours/TourList
LeHiHo Jan 3, 2024
1299fee
Deploy: production.ymal 수정
suehub Jan 3, 2024
c897b57
Merge pull request #39 from FinalDoubleTen/FE-16--feat/Tours/TourList
LeHiHo Jan 3, 2024
042f80c
Env: 깃헙액션 테스트
LeHiHo Jan 3, 2024
d193751
Env: 깃헙액션 테스트
LeHiHo Jan 3, 2024
3998952
Env: 깃헙액션 수정
LeHiHo Jan 3, 2024
1836af3
Deploy: production.yaml 삭제
suehub Jan 3, 2024
8c61f86
Deploy: production.yaml 삭제
suehub Jan 3, 2024
36ae905
Env: dev 배포 확인용
LeHiHo Jan 3, 2024
62ef262
Env: dev 배포 확인용
LeHiHo Jan 3, 2024
933b48d
Chore: test 문구 삭제
LeHiHo Jan 3, 2024
685ecfc
Chore: dev 배포 테스트
LeHiHo Jan 3, 2024
a96bb13
Design: 여행지 css 수정
suehub Jan 3, 2024
2f608cd
Feat: 여행지 무한스크롤 구현
suehub Jan 3, 2024
997a430
Feat: 라우팅 시 스크롤 상단 이동
suehub Jan 3, 2024
1ea06bf
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
suehub Jan 3, 2024
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
23 changes: 23 additions & 0 deletions .github/workflows/preview.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: GitHub Actions Vercel Preview Deployment
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
on:
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 }}
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 : 파일 삭제.
106 changes: 102 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"prettier": "^3.1.1",
"prettier-plugin-tailwindcss": "^0.5.9",
"tailwindcss": "^3.4.0",
"terser": "^5.26.0",
"typescript": "^5.2.2",
"vite": "^5.0.8"
}
Expand Down
48 changes: 45 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading