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.

Sign up for GitHub

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

[Feature] - 마이페이지 좋아요 탭 및 검색 창 국가 탭 기능 구현 #556

Merged
merged 8 commits into from
Oct 22, 2024
Merged

[Feature] - 마이페이지 좋아요 탭 및 검색 창 국가 탭 기능 구현 #556

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bd935f9
refactor(MyPage): 프로필 이미지 수정 모달 text 변경
simorimi Oct 21, 2024
7e94a10
feat(TravelogueList): 여행기 검색 나라 탭 추가
simorimi Oct 21, 2024
3018ff4
refactor(Tab): 스타일링 수정
simorimi Oct 21, 2024
560ea7a
refactor(MyTravelogue): 불필요한 스타일 제거 및 일관성을 위하여 게시일 텍스트 제거
simorimi Oct 21, 2024
bdf6ba7
feat(useInfiniteMyLikes): 훅 기능 구현
simorimi Oct 21, 2024
c23ef37
feat(MyLikes): 좋아요 탭 UI 구현
simorimi Oct 21, 2024
574fe3b
refactor: 좋아요 버튼 클릭시 마이페이지 좋아요 무효화 하도록 수정
simorimi Oct 21, 2024
9c38e9c
refactor(MyLikes): 마이페이지텝 컴포넌트 좋아요 탭에서도 재사용하도록 수정
simorimi Oct 21, 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
22 changes: 22 additions & 0 deletions frontend/src/components/pages/search/TravelogueList/EmptySearchResult.tsx
View file
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

분리 좋네요! 👍

Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { SearchFallback, Text } from "@components/common";

import * as S from "./TravelogueList.styled";

interface EmptySearchResultProps {
keyword: string | undefined;
}

const EmptySearchResult = ({ keyword }: EmptySearchResultProps) => {
return (
<S.Layout>
{keyword && (
<Text css={S.searchResultTextStyle} textType="title">{`"${keyword}" 검색 결과`}</Text>
)}
<S.SearchFallbackWrapper>
<SearchFallback title="휑" text="검색 결과가 없어요." />
</S.SearchFallbackWrapper>
</S.Layout>
);
};

export default EmptySearchResult;
16 changes: 4 additions & 12 deletions frontend/src/components/pages/search/TravelogueList/TravelogueList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import type { SearchType } from "@type/domain/travelogue";

import useInfiniteSearchTravelogues from "@queries/useInfiniteSearchTravelogues";

import { SearchFallback, Text } from "@components/common";
import { Text } from "@components/common";
import TravelogueCard from "@components/pages/main/TravelogueCard/TravelogueCard";
import TravelogueCardSkeleton from "@components/pages/main/TravelogueCard/skeleton/TravelogueCardSkeleton";

import useIntersectionObserver from "@hooks/useIntersectionObserver";

import { ERROR_MESSAGE_MAP } from "@constants/errorMessage";

import EmptySearchResult from "./EmptySearchResult";
import * as S from "./TravelogueList.styled";

const SKELETON_COUNT = 5;
Expand All @@ -29,22 +30,13 @@ const TravelogueList = ({ keyword, searchType }: TravelogueListProps) => {
const { lastElementRef } = useIntersectionObserver(fetchNextPage);

if (travelogues.length === 0 && status === "success") {
return (
<S.Layout>
{keyword && (
<Text css={S.searchResultTextStyle} textType="title">{`"${keyword}" 검색 결과`}</Text>
)}
<S.SearchFallbackWrapper>
<SearchFallback title="휑" text="검색 결과가 없어요." />
</S.SearchFallbackWrapper>
</S.Layout>
);
return <EmptySearchResult keyword={keyword} />;
}

if (status === "error") {
error && alert(error.message);

return <SearchFallback title="휑" text="검색 결과가 없어요." />;
return <EmptySearchResult keyword={keyword} />;
}

if (isPaused) alert(ERROR_MESSAGE_MAP.network);
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/pages/search/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export const TAB_CONTENT = [
{ label: "제목", searchType: "TITLE" },
{ label: "작성자", searchType: "AUTHOR" },
{ label: "나라", searchType: "COUNTRY" },
] as const;