Skip to content
Merged
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
2 changes: 1 addition & 1 deletion src/@types/travel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export interface TravelDetail {
travelPlan: TravelPlan[];
participant: Participant[];
participationFlag: boolean | null;
isBookmark: boolean | null;
bookmarkFlag: boolean | null;
}

export interface TravelReviewRateScore {
Expand Down
2 changes: 1 addition & 1 deletion src/components/travel/detail/TravelDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ const TravelDetail = ({ travelDetail }: { travelDetail: TravelType }) => {
startAt={travelDetail.startAt}
endAt={travelDetail.endAt}
organizer={organizer}
isBookmark={travelDetail.isBookmark}
bookmarkFlag={travelDetail.bookmarkFlag}
/>
{!dateOver && (
<TravelButtons
Expand Down
2 changes: 1 addition & 1 deletion src/components/travel/detail/TravelDetailCategory.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ describe('TravelDetailCategory', () => {
travelPlan={mockTravelPlan}
startAt={mockStartAt}
endAt={endAt}
isBookmark
bookmarkFlag
/>,
);

Expand Down
6 changes: 3 additions & 3 deletions src/components/travel/detail/TravelDetailCategory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type Props = Pick<
| 'startAt'
| 'endAt'
| 'participationFlag'
| 'isBookmark'
| 'bookmarkFlag'
> & { organizer?: Participant };
type Category = 'details' | 'itinerary' | 'review';

Expand All @@ -35,7 +35,7 @@ const TravelDetailCategory = ({
endAt,
participationFlag,
organizer,
isBookmark,
bookmarkFlag,
}: Props) => {
const [category, setCategory] = useState<Category>('details');

Expand Down Expand Up @@ -77,7 +77,7 @@ const TravelDetailCategory = ({
organizer={organizer}
hashTags={hashTags}
description={description}
isBookmark={isBookmark}
bookmarkFlag={bookmarkFlag}
/>
)}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe('TabTravelDetail', () => {
organizer={mock.organizer}
hashTags={mock.hashTags}
description={mock.description}
isBookmark
bookmarkFlag
/>,
);
});
Expand Down Expand Up @@ -83,7 +83,7 @@ describe('여행 모임장일 때', () => {
organizer={mock.organizer}
hashTags={mock.hashTags}
description={mock.description}
isBookmark={null}
bookmarkFlag={null}
/>,
);
});
Expand Down Expand Up @@ -132,7 +132,7 @@ describe('여행 모임장이 아닐 때', () => {
organizer={mockParticipation.organizer}
hashTags={mockParticipation.hashTags}
description={mockParticipation.description}
isBookmark
bookmarkFlag
/>,
);
});
Expand Down
6 changes: 3 additions & 3 deletions src/components/travel/detail/category/TabTravelDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ const TabTravelDetail = ({
organizer,
hashTags,
description,
isBookmark,
bookmarkFlag,
}: {
travelId: number;
participationFlag: boolean | null;
organizer?: Participant;
hashTags: string;
description: string;
isBookmark: boolean | null;
bookmarkFlag: boolean | null;
}) => {
const { data: user } = useGetUser();

Expand All @@ -37,7 +37,7 @@ const TabTravelDetail = ({
{participationFlag !== null && user && organizer && (
<TravelDetailButtons
travelId={travelId}
isBookmark={isBookmark}
bookmarkFlag={bookmarkFlag}
userId={user.userId}
organizerId={organizer.id}
/>
Expand Down
10 changes: 5 additions & 5 deletions src/components/travel/detail/category/TravelDetailButtons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@ import Link from 'next/link';
const TravelDetailButtons = ({
organizerId,
userId,
isBookmark,
bookmarkFlag,
travelId,
}: {
organizerId: number;
userId: number;
isBookmark: boolean | null;
bookmarkFlag: boolean | null;
travelId: number;
}) => {
const [isLoading, setIsLoading] = useState(true);
const [isBookmarked, setIsBookmarked] = useState(isBookmark);
const [isBookmarked, setIsBookmarked] = useState(bookmarkFlag);
const { mutate: postBookMark } = useBookmarkTravel();
const { mutate: deleteBookMark } = useDeleteBookmarkTravel();

useEffect(() => {
setIsBookmarked(isBookmark);
setIsBookmarked(bookmarkFlag);
setIsLoading(false);
}, [isBookmark]);
}, [bookmarkFlag]);

const handleClickBookMark = () => {
if (isBookmarked) {
Expand Down
2 changes: 1 addition & 1 deletion src/mocks/data/travel/travelDetail.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"registrationEnd": "20241225",
"tripDuration": 3,
"participationFlag": null,
"isBookmark": true,
"bookmarkFlag": true,
"travelPlan": [
{
"tripDay": 1,
Expand Down
Loading