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 #170

Merged
merged 3 commits into from
Jan 15, 2024
Merged

Dev #170

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
4 changes: 2 additions & 2 deletions src/api/member.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const getMemberTrips = async (page = 0, size = 10) => {
}
};

// 나의 관심 여행지 조회
// 나의 관심 목록 조회
export const getMemberTours = async (page?: number, size?: number) => {
try {
const res = await authClient.get(`member/tours?&page=${page}&size=${size}`);
Expand Down Expand Up @@ -97,7 +97,7 @@ export const getMemberReviews = async (page?: number, size?: number) => {
}
};

// 나의 관심 여행지 삭제
// 나의 관심 목록 삭제
// export const deleteMemberTours = async (tourItemId: number) => {
// const res = await authClient.delete(`member/tours/${tourItemId}`);
// return res;
Expand Down
4 changes: 2 additions & 2 deletions src/api/tours.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const getDetailTours = async (tourItemId: number) => {
}
};

// 관심 여행지 등록
// 관심 목록 등록
export const postLikedTours = async (options: { id: number }) => {
try {
const { id } = options;
Expand All @@ -48,7 +48,7 @@ export const postLikedTours = async (options: { id: number }) => {
}
};

// 관심 여행지 삭제
// 관심 목록 삭제
export const deleteLikedTours = async (options: { id: number }) => {
try {
const { id } = options;
Expand Down
4 changes: 2 additions & 2 deletions src/api/trips.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ export const getTripsLike = async (
return res;
};

// 우리의 관심 여행지 등록
// 우리의 관심 목록 등록
export const postTripsLike = async (tripId: number, tourItemIds: number[]) => {
const res = await client.post(`trips/${tripId}/tripLikedTours`, tourItemIds);
return res;
};

// 우리의 관심 여행지 좋아요/싫어요
// 우리의 관심 목록 좋아요/싫어요
export const postTripsLikeHate = async (
tripId: number,
tourId: number,
Expand Down
4 changes: 2 additions & 2 deletions src/components/Auth/Login/KakaoLogin.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ const KakaoLogin = () => {
genderType: gender,
survey: null,
});
if (signup) {
if (signup === 'true') {
// signup이 true면 이미 회원가입을 했던 유저
navigate('/');
} else {
} else if (signup === 'false') {
// signup이 false면 이전에 회원가입을 하지 않았던 유저
navigate('/signup/success');
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/MyTrip/MyTrip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const MyTrip = () => {
/>
) : (
<NoDataMessage
message1="저장된 관심 여행지가 없습니다."
message1="저장된 관심 목록이 없습니다."
message2="가고 싶은 장소를 저장해보세요!"
icon={<PenIcon size={44} fill="#EDEDED" color="#EDEDED" />}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Mypage/MypageList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const MypageList = () => {
return (
<div>
<MypageItem link="/mytrip">나의 여정</MypageItem>
<MypageItem link="/wishlist">나의 관심 여행지</MypageItem>
<MypageItem link="/wishlist">나의 관심 목록</MypageItem>
<MypageItem link="/myPageReview">나의 리뷰</MypageItem>
<MypageItem link="/mypage/survey">나의 여행 취향 설정</MypageItem>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/components/Wish/Wish.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const Wish = () => {
return (
<div className="mt-3 min-h-[100vh]">
<div className="sticky top-0 z-[105] bg-white py-0.5">
<h1 className="title2 pt-3">나의 관심 여행지</h1>
<h1 className="title2 pt-3">나의 관심 목록</h1>
<WishCategory onCategoryClick={handleCategoryClick} />
</div>

Expand All @@ -59,7 +59,7 @@ const Wish = () => {
/>
) : (
<NoDataMessage
message1="저장된 관심 여행지가 없습니다."
message1="저장된 관심 목록이 없습니다."
message2="가고 싶은 장소를 저장해보세요!"
icon={<HeartIcon size={44} fill="#EDEDED" color="#EDEDED" />}
/>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/like/Like.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const Like = ({ liked, id }: LikeProps) => {
title={'로그인'}
message={
<>
관심 여행지 등록시 로그인이 필요합니다.
관심 목록 등록시 로그인이 필요합니다.
<br />
로그인 하시겠습니까?
</>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/nav/Nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ const Nav = () => {
title={'로그인'}
message={
<>
관심 여행지 조회를 위해 로그인이 필요합니다.
관심 목록 조회를 위해 로그인이 필요합니다.
<br />
로그인 하시겠습니까?
</>
Expand Down