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

인기여행지 #55

Closed
wants to merge 61 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
80c35a9
Feat: 다중택일(라디오) 컴포넌트 구현
joanShim Dec 29, 2023
676509f
Merge branch 'FE-6--feat/Tours' of https://github.com/FinalDoubleTen/…
joanShim Dec 29, 2023
30bb6b8
Feat: 검색영역 아이콘 적용
joanShim Dec 29, 2023
a1d9bb8
Feat: 검색값 입력에 따른 컴포넌트 조건부 렌더 구현
joanShim Dec 29, 2023
1505b2e
Design: 그리드 칼럼 수정
joanShim Dec 31, 2023
84646ff
Fix: package.json 충돌 해결
seungjun222 Jan 2, 2024
ea4e20b
Feat: 지역선택값 쿼리파라미터에 저장
joanShim Jan 2, 2024
1612cd2
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
joanShim Jan 2, 2024
4e1a3c0
Feat: 리뷰/댓글 마크업 API 연동(READ만)
seungjun222 Jan 2, 2024
0df83b5
Feat: 리뷰 post 구현
seungjun222 Jan 2, 2024
711f3dd
Feat: 비동기 데이터 예외처리
seungjun222 Jan 2, 2024
0796336
Feat: 검색어 입력 debounce 구현
joanShim Jan 3, 2024
9634a54
Feat: api 요청에 필요한 파라미터 쿼리스트링에 저장
joanShim Jan 3, 2024
0d42d40
Merge branch 'main' of https://github.com/FinalDoubleTen/TenTenFE int…
joanShim Jan 3, 2024
685ecfc
Chore: dev 배포 테스트
LeHiHo Jan 3, 2024
5413cf8
Feat: 리뷰/댓글 post 기능 구현
seungjun222 Jan 3, 2024
2b151b5
Feat: 리뷰작성 예외처리
seungjun222 Jan 3, 2024
dd3d19e
Feat: 댓글 없을 시 예외처리
seungjun222 Jan 3, 2024
a670d2d
Feat: 리뷰 삭제 구현
seungjun222 Jan 3, 2024
a96bb13
Design: 여행지 css 수정
suehub Jan 3, 2024
278954f
Feat: 댓글 삭제 구현
seungjun222 Jan 3, 2024
cbb8543
refactor: api key 삭제
NohWookJin Jan 3, 2024
45b427d
refactor: 아이콘 컴포넌트 사용
NohWookJin Jan 3, 2024
f86e5fc
refactor: 아이콘 컴포넌트 사용
NohWookJin Jan 3, 2024
d7ca3a4
refactor: 아이콘 컴포넌트 사용
NohWookJin Jan 3, 2024
e6452ca
refactor: 컴포넌트 내 api key 사용 변경
NohWookJin Jan 3, 2024
365949e
refactor: 아이콘 컴포넌트 사용
NohWookJin Jan 3, 2024
89e1390
feat: 일부 아이콘 onClick props 추가
NohWookJin Jan 3, 2024
3a448bf
Chore: 배포오류 수정
NohWookJin Jan 3, 2024
331fa77
refactor: 아이콘 컴포넌트로 이동 및 삭제
NohWookJin Jan 3, 2024
844a64d
feat: 전화번호 예외 처리
NohWookJin Jan 3, 2024
27c71f0
style: 스타일 변경
NohWookJin Jan 3, 2024
cac3495
feat: Left Arrow 아이콘 추가 및 변경
NohWookJin Jan 3, 2024
6e689a2
Feat: Infinite Scroll 구현
joanShim Jan 3, 2024
95e45d5
Feat: 리뷰 수정 구현
seungjun222 Jan 3, 2024
2dce20b
refactor: text 길이 예외 처리
NohWookJin Jan 3, 2024
7f8d8c0
style: 아이콘 props 수정
NohWookJin Jan 3, 2024
ab8c09d
style: 아이콘 좌표 변경
NohWookJin 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
03db8d2
Feat: 댓글 수정 구현
seungjun222 Jan 3, 2024
d314207
Fix: 기타 디버깅 및 사용성 개선
seungjun222 Jan 3, 2024
21006c2
Merge pull request #49 from FinalDoubleTen/FE-28--feat/Comment/MarkupAPI
seungjun222 Jan 3, 2024
0a32f2c
Feat: 검색결과 아이템 클릭시 디테일 페이지로 이동
joanShim Jan 4, 2024
8bf65ad
Feat: 로딩 spinner 추가
joanShim Jan 4, 2024
f894de1
Merge branch 'dev' of https://github.com/FinalDoubleTen/TenTenFE into…
joanShim Jan 4, 2024
22091e9
Merge remote-tracking branch 'origin/FE-5--feat/Comment' into dev
seungjun222 Jan 4, 2024
860b70e
Merge pull request #51 from FinalDoubleTen/FE-27--feat/Search/API
joanShim Jan 4, 2024
0f2ba07
Fix: conflict 해결
seungjun222 Jan 4, 2024
0ceb32d
Design: 여정생성 버튼추가
suehub Jan 4, 2024
ceafddf
Merge branch dev of https://github.com/FinalDoubleTen/TenTenFE into F…
suehub Jan 4, 2024
761741a
Fix: 상세리뷰 무한스크롤 에러로 인해 적용 중단
seungjun222 Jan 4, 2024
e7dda51
Merge branch 'dev' into FE-8--feat/Detail
NohWookJin Jan 4, 2024
afe58bc
Revert "Merge branch dev of https://github.com/FinalDoubleTen/TenTenF…
suehub Jan 4, 2024
4d9794a
Design: 메인페이지 css 수정
suehub Jan 4, 2024
f4b214a
Design: 메인페이지 css 수정
suehub Jan 4, 2024
9af6188
Merge pull request #46 from FinalDoubleTen/FE-8--feat/Detail
LeHiHo Jan 4, 2024
7196f8a
Merge branch 'dev' into FE-4--feat/Search/publish
LeHiHo Jan 4, 2024
c852b42
Merge pull request #52 from FinalDoubleTen/FE-4--feat/Search/publish
LeHiHo Jan 4, 2024
6cc9791
Merge branch dev of https://github.com/FinalDoubleTen/TenTenFE into F…
suehub Jan 4, 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
- Docs : 내부 문서 추가/수정
- Test : 테스트 추가/수정
- Chore : 빌드 관련 코드 수정
- Rename : 파일 및 폴더명 수정
- Rename : 파일 및 폴더명 수정.
- Remove : 파일 삭제.
3 changes: 0 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,4 @@
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
<script
type="text/javascript"
src="//dapi.kakao.com/v2/maps/sdk.js?appkey=%VITE_KAKAO_API_KEY%"></script>
</html>
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
"dependencies": {
"@pnpm-monorepo/shared": "^1.0.0",
"@radix-ui/react-collapsible": "^1.0.3",
"@radix-ui/react-radio-group": "^1.1.3",
"@radix-ui/react-toggle-group": "^1.0.4",
"@svgr/rollup": "^8.1.0",
"@tanstack/react-query": "^5.14.6",
"@tanstack/react-query-devtools": "^5.14.6",
Expand Down
182 changes: 182 additions & 0 deletions pnpm-lock.yaml

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

3 changes: 3 additions & 0 deletions src/@types/tours.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,7 @@ export interface TourType {
ratingAverage: number;
reviewCount: number;
smallThumbnailUrl: string;
tourAddress?: string;
longitude?: string;
latitude?: string;
}
34 changes: 24 additions & 10 deletions src/api/tours.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,29 @@ export const getToursReviews = async (tourItemId: number) => {
};

// 여행지 검색
export const getToursSearch = async (
region: number,
category: number,
searchWord: string,
page: number,
size: number,
) => {
const res = await client.get(
`tours/search?region=${region}&category=${category}&searchWord=${searchWord}&page=${page}&size=${size}}`,
);
export const getToursSearch = async (options: {
region?: string;
searchWord: string;
category?: string;
page?: number;
size?: number;
}) => {
const { region, searchWord, category, page = 0, size } = options;

let query = `tours/search?searchWord=${searchWord}`;

if (region) {
query += `&region=${region}`;
}

if (category) {
query += `&category=${category}`;
}
query += `&page=${page}`;

if (size) {
query += `&size=${size}`;
}
const res = await client.get(query);
return res;
};
16 changes: 0 additions & 16 deletions src/assets/images/Calendar.svg

This file was deleted.

5 changes: 0 additions & 5 deletions src/assets/images/Check.svg

This file was deleted.

5 changes: 5 additions & 0 deletions src/assets/images/DeleteInput.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 0 additions & 12 deletions src/assets/images/Heart.svg

This file was deleted.

5 changes: 0 additions & 5 deletions src/assets/images/Left.svg

This file was deleted.

7 changes: 0 additions & 7 deletions src/assets/images/Map.svg

This file was deleted.

9 changes: 0 additions & 9 deletions src/assets/images/Pen.svg

This file was deleted.

5 changes: 0 additions & 5 deletions src/assets/images/Phone.svg

This file was deleted.

6 changes: 6 additions & 0 deletions src/assets/images/Search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 0 additions & 8 deletions src/assets/images/Star.svg

This file was deleted.

Loading
Loading