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

[Feature] - 검색 결과 페이지 내 필터링 옵션 적용 #565

Merged
merged 5 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
Original file line number Diff line number Diff line change
@@ -1,14 +1,32 @@
import { css } from "@emotion/react";
import styled from "@emotion/styled";

import { SPACING } from "@styles/tokens";
import theme from "@styles/theme";
import { PRIMITIVE_COLORS, SPACING } from "@styles/tokens";

export const Layout = styled.div`
display: flex;
flex-direction: column;

margin-top: ${SPACING.xxl};
min-height: calc(100vh - 16rem);
padding-top: 15rem;
`;

export const FixedLayout = styled.div`
display: flex;
flex-direction: column;
position: fixed;
top: 11rem;
z-index: 10;

width: 100%;
max-width: 48rem;
margin: 0 auto;
padding: ${({ theme }) => theme.spacing.m};

background-color: ${PRIMITIVE_COLORS.white};
gap: ${({ theme }) => theme.spacing.m};
`;

export const searchResultTextStyle = css`
Expand Down Expand Up @@ -36,3 +54,54 @@ export const MainPageTraveloguesList = styled.ul`
padding: 0 ${SPACING.m};
gap: ${SPACING.m};
`;

export const TagsContainer = styled.div`
display: flex;
flex-direction: column;
gap: ${({ theme }) => theme.spacing.s};
`;

export const SingleSelectionTagsContainer = styled.div`
display: flex;
gap: ${({ theme }) => theme.spacing.s};

& > li {
cursor: pointer;
}
`;

export const MultiSelectionTagsContainer = styled.ul`
display: flex;
overflow: scroll hidden;
gap: ${({ theme }) => theme.spacing.s};

height: 3rem;
margin: 0 -${({ theme }) => theme.spacing.m};
padding: 0 ${({ theme }) => theme.spacing.m};

white-space: nowrap;
-webkit-overflow-scrolling: touch;

::-webkit-scrollbar {
display: none;
}

& > li {
cursor: pointer;
}
`;

export const OptionContainer = styled.button`
display: flex;
justify-content: space-between;

width: 100%;
`;

export const selectedOptionStyle = css`
color: ${theme.colors.primary};
`;

export const unselectedOptionStyle = css`
color: ${theme.colors.text.secondary};
`;
Original file line number Diff line number Diff line change
@@ -1,16 +1,38 @@
import { useEffect, useMemo } from "react";

import { css } from "@emotion/react";

import type { SearchType } from "@type/domain/travelogue";

import useInfiniteSearchTravelogues from "@queries/useInfiniteSearchTravelogues";
import useInfiniteTravelogues from "@queries/useInfiniteTravelogues";

import { Text } from "@components/common";
import {
Chip,
Icon,
SearchFallback,
SingleSelectionTagModalBottomSheet,
Text,
} from "@components/common";
import {
SORTING_OPTIONS,
SORTING_OPTIONS_MAP,
TRAVEL_PERIOD_OPTIONS,
TRAVEL_PERIOD_OPTIONS_MAP,
} from "@components/pages/main/MainPage.constants";
import TravelogueCard from "@components/pages/main/TravelogueCard/TravelogueCard";
import TravelogueCardSkeleton from "@components/pages/main/TravelogueCard/skeleton/TravelogueCardSkeleton";

import { useDragScroll } from "@hooks/useDragScroll";
import useIntersectionObserver from "@hooks/useIntersectionObserver";
import useMultiSelectionTag from "@hooks/useMultiSelectionTag";
import useSingleSelectionTag from "@hooks/useSingleSelectionTag";

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

import { removeEmoji } from "@utils/removeEmojis";

import theme from "@styles/theme";

import EmptySearchResult from "./EmptySearchResult";
import * as S from "./TravelogueList.styled";
Expand All @@ -23,14 +45,184 @@ interface TravelogueListProps {
}

const TravelogueList = ({ keyword, searchType }: TravelogueListProps) => {
const { travelogues, status, fetchNextPage, isPaused, error } = useInfiniteSearchTravelogues(
const {
selectedTagIDs,
sortedTags,
multiSelectionTagAnimationKey,
handleClickTag,
resetMultiSelectionTag,
} = useMultiSelectionTag(STORAGE_KEYS_MAP.mainPageSelectedTagIDs);

const {
sorting,
travelPeriod,
singleSelectionAnimationKey,
resetSingleSelectionTags,
increaseSingleSelectionAnimationKey,
} = useSingleSelectionTag(STORAGE_KEYS_MAP.mainPageSort, STORAGE_KEYS_MAP.mainPageTravelPeriod);
Copy link
Contributor

Choose a reason for hiding this comment

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

storage key를 다르게 써야하지 않을까라는 생각이 듭니다! 왜냐하면 search 페이지에서 표시한 테그들이 메인에도 남아있으면 사용자 입장에서 당황스러울 거 같아서요 지니의 생각은 어떤가요?


const { scrollRef, handleMouseDown, handleMouseMove, handleMouseUp } =
useDragScroll<HTMLUListElement>();

const isTagsSelected = useMemo(() => {
return (
selectedTagIDs.length !== 0 ||
sorting.selectedOption !== "likeCount" ||
travelPeriod.selectedOption !== ""
);
}, [selectedTagIDs, sorting.selectedOption, travelPeriod.selectedOption]);

useEffect(() => {
increaseSingleSelectionAnimationKey();
}, [isTagsSelected, increaseSingleSelectionAnimationKey]);

const handleClickResetButton = () => {
resetMultiSelectionTag();
resetSingleSelectionTags();
};

const { travelogues, status, fetchNextPage, isPaused, error } = useInfiniteTravelogues({
selectedTagIDs,
selectedSortingOption: sorting.selectedOption,
selectedTravelPeriodOption: travelPeriod.selectedOption,
keyword,
searchType,
);
});

const { lastElementRef } = useIntersectionObserver(fetchNextPage);

const renderTags = () => {
return (
<>
{sorting.isModalOpen && (
<SingleSelectionTagModalBottomSheet
isOpen={sorting.isModalOpen}
onClose={sorting.handleCloseModal}
mainText="여행기 정렬을 선택해 주세요!"
>
{SORTING_OPTIONS.map((option, index) => (
<S.OptionContainer key={index} onClick={() => sorting.handleClickOption(option)}>
{option === sorting.selectedOption ? (
<>
<Text textType="detailBold" css={S.selectedOptionStyle}>
{SORTING_OPTIONS_MAP[option]}
</Text>
<Icon iconType="down-arrow" size="12" color={theme.colors.primary} />
</>
) : (
<Text textType="detail" css={S.unselectedOptionStyle}>
{SORTING_OPTIONS_MAP[option]}
</Text>
)}
</S.OptionContainer>
))}
</SingleSelectionTagModalBottomSheet>
)}

{travelPeriod.isModalOpen && (
<SingleSelectionTagModalBottomSheet
isOpen={travelPeriod.isModalOpen}
onClose={travelPeriod.handleCloseModal}
mainText="여행 기간을 선택해 주세요!"
>
{TRAVEL_PERIOD_OPTIONS.map((option, index) => (
<S.OptionContainer key={index} onClick={() => travelPeriod.handleClickOption(option)}>
{option === travelPeriod.selectedOption ? (
<>
<Text textType="detailBold" css={S.selectedOptionStyle}>
{TRAVEL_PERIOD_OPTIONS_MAP[option]}
</Text>
<Icon iconType="down-arrow" size="12" color={theme.colors.primary} />
</>
) : (
<Text textType="detail" css={S.unselectedOptionStyle}>
{TRAVEL_PERIOD_OPTIONS_MAP[option]}
</Text>
)}
</S.OptionContainer>
))}
</SingleSelectionTagModalBottomSheet>
)}

<S.TagsContainer>
<S.SingleSelectionTagsContainer>
{isTagsSelected && (
<Chip
key={`reset-${singleSelectionAnimationKey}`}
label={`초기화`}
isSelected={false}
onClick={handleClickResetButton}
iconPosition="left"
iconType="reset-icon"
/>
)}
<Chip
as="button"
aria-label="여행기 정렬"
key={`sorting-${singleSelectionAnimationKey}`}
label={SORTING_OPTIONS_MAP[sorting.selectedOption]}
isSelected={true}
onClick={sorting.handleOpenModal}
iconPosition="left"
iconType="sort-icon"
/>
<Chip
as="button"
aria-label="여행기 필터"
key={`travelPeriod-${singleSelectionAnimationKey}`}
label={
travelPeriod.selectedOption
? TRAVEL_PERIOD_OPTIONS_MAP[travelPeriod.selectedOption]
: "여행 기간"
}
iconPosition="right"
isSelected={travelPeriod.selectedOption !== ""}
onClick={travelPeriod.handleOpenModal}
/>
</S.SingleSelectionTagsContainer>

<S.MultiSelectionTagsContainer
ref={scrollRef}
onMouseDown={handleMouseDown}
onMouseUp={handleMouseUp}
onMouseMove={handleMouseMove}
>
{sortedTags.map((tag, index) => {
const isSelected = selectedTagIDs.includes(tag.id);
const tagName = removeEmoji(tag.tag);

return (
<li key={`${tag.id}-${multiSelectionTagAnimationKey}`}>
<Chip
as="button"
key={`${tag.id}-${multiSelectionTagAnimationKey}`}
index={index}
label={tag.tag}
isSelected={isSelected}
onClick={() => handleClickTag(tag.id)}
aria-label={`${tagName} 태그`}
/>
</li>
);
})}
</S.MultiSelectionTagsContainer>
</S.TagsContainer>
</>
);
};

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

if (status === "error") {
Expand All @@ -43,9 +235,11 @@ const TravelogueList = ({ keyword, searchType }: TravelogueListProps) => {

return (
<S.Layout>
{keyword && (
<Text css={S.searchResultTextStyle} textType="title">{`"${keyword}" 검색 결과`}</Text>
)}
<S.FixedLayout>
{keyword && <Text textType="title">{`"${keyword}" 검색 결과`}</Text>}
{renderTags()}
</S.FixedLayout>

<S.MainPageTraveloguesList>
{status === "pending" && (
<S.MainPageTraveloguesList>
Expand Down
20 changes: 15 additions & 5 deletions frontend/src/constants/queryKey.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,25 @@ export const QUERY_KEYS_MAP = {
searchType,
keyword,
],
tag: (
selectedTagIDs: number[],
selectedSortingOption: SortingOption,
selectedTravelPeriodOption: TravelPeriodOption,
) => [
tag: ({
selectedTagIDs,
selectedSortingOption,
selectedTravelPeriodOption,
keyword,
searchType,
}: {
selectedTagIDs: number[];
selectedSortingOption: SortingOption;
selectedTravelPeriodOption: TravelPeriodOption;
keyword?: string;
searchType?: SearchType;
}) => [
...QUERY_KEYS_MAP.travelogue.all,
...selectedTagIDs,
selectedSortingOption,
selectedTravelPeriodOption,
keyword,
searchType,
],
likes: () => [...QUERY_KEYS_MAP.travelogue.all, "likes"],
},
Expand Down
Loading
Loading