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
205 changes: 109 additions & 96 deletions apps/what-today/src/pages/main/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,101 +16,139 @@ import {
TourIcon,
WellbeingIcon,
} from '@what-today/design-system';
import { useEffect, useState } from 'react';
import { useCallback, useEffect, useMemo, useState } from 'react';
import React from 'react';
import { useNavigate } from 'react-router-dom';

import type { Activity } from '@/apis/activities';
import { getActivities } from '@/apis/activities';
import { type Activity, getActivities } from '@/apis/activities';

// React.memo로 MainCard 최적화
const MemoizedMainCard = React.memo(MainCard.Root);

export default function MainPage() {
const [currentPage, setCurrentPage] = useState(1);
const [itemsPerPage, setItemsPerPage] = useState(4);
const [searchResult, setSearchResult] = useState<Activity[]>([]);
const [sortOrder, setSortOrder] = useState<'latest' | 'asc' | 'desc'>('latest'); // 기본값 최신순
const [searchKeyword, setSearchKeyword] = useState('');
const [sortOrder, setSortOrder] = useState<'latest' | 'asc' | 'desc'>('latest');
const [selectedValue, setSelectedValue] = useState<SelectItem | null>(null);
const [selectedCategory, setSelectedCategory] = useState<string | number>('');
const navigate = useNavigate();

// 반응형 카드 수 조정
// ✅ 반응형 카드 수
const handleResize = useCallback(() => {
const width = window.innerWidth;
if (width < 790) setItemsPerPage(6);
else if (width < 1024) setItemsPerPage(4);
else setItemsPerPage(8);
}, []);

useEffect(() => {
const handleResize = () => {
const width = window.innerWidth;
if (width < 790) setItemsPerPage(6);
else if (width < 1024) setItemsPerPage(4);
else setItemsPerPage(8);
};
handleResize();
window.addEventListener('resize', handleResize);
return () => window.removeEventListener('resize', handleResize);
}, []);
}, [handleResize]);

// 활동 리스트 요청
const { data: activities = [] } = useQuery({
// ✅ 데이터 불러오기
const { data: activities = [] } = useQuery<Activity[]>({
queryKey: ['activities'],
queryFn: () => getActivities(),
staleTime: 1000 * 60 * 5,
queryFn: () => getActivities({ size: 100 }),
staleTime: 1000 * 60 * 10,
gcTime: 1000 * 60 * 30,
refetchOnWindowFocus: false,
refetchOnMount: false,
});

// ✅ 인기 체험: 리뷰 많은 순
const popularActivities = [...activities]
.sort((a, b) => {
if (b.reviewCount === a.reviewCount) {
return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
}
return b.reviewCount - a.reviewCount;
})
.slice(0, 12);

// ✅ 모든 체험 초기값: 최신순
useEffect(() => {
if (activities.length > 0 && searchResult.length === 0) {
const latestSorted = [...activities].sort(
(a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
);
setSearchResult(latestSorted);
}
// 인기 체험
const popularActivities = useMemo(() => {
if (!activities.length) return [];
return activities
.slice()
.sort((a, b) => {
if (b.reviewCount === a.reviewCount) {
return new Date(b.createdAt ?? 0).getTime() - new Date(a.createdAt ?? 0).getTime();
}
return b.reviewCount - a.reviewCount;
})
.slice(0, 12);
}, [activities]);

// 검색
const handleSearch = (keyword: string) => {
const sortedLatest = (list: Activity[]) =>
[...list].sort((a, b) => new Date(b.createdAt ?? 0).getTime() - new Date(a.createdAt ?? 0).getTime());

if (keyword === '') {
setSearchResult(sortedLatest(activities));
setCurrentPage(1);
setSortOrder('latest');
setSelectedValue(null);
setSelectedCategory('');
return;
// 1단계: 필터링
const filteredItems = useMemo(() => {
if (!searchKeyword && selectedCategory === '') return activities;
return activities.filter((item) => {
const matchesSearch = !searchKeyword || item.title.toLowerCase().includes(searchKeyword.toLowerCase());
const matchesCategory = selectedCategory === '' || item.category === selectedCategory;
return matchesSearch && matchesCategory;
});
}, [activities, searchKeyword, selectedCategory]);

// 2단계: 정렬
const sortedItems = useMemo(() => {
if (sortOrder === 'latest') {
return [...filteredItems].sort(
(a, b) => new Date(b.createdAt ?? 0).getTime() - new Date(a.createdAt ?? 0).getTime(),
);
}
return [...filteredItems].sort((a, b) => {
if (sortOrder === 'asc') return a.price - b.price;
return b.price - a.price;
});
}, [filteredItems, sortOrder]);

// 3단계: 페이지 아이템
const pagedItems = useMemo(() => {
const startIndex = (currentPage - 1) * itemsPerPage;
const endIndex = startIndex + itemsPerPage;
return sortedItems.slice(startIndex, endIndex);
}, [sortedItems, currentPage, itemsPerPage]);

const totalPages = useMemo(() => Math.ceil(sortedItems.length / itemsPerPage), [sortedItems.length, itemsPerPage]);

// 이벤트 핸들러
const handlePageChange = useCallback(
(page: number) => {
if (page === currentPage) return;
setCurrentPage(page);
},
[currentPage],
);

const result = activities.filter((item) => item.title.toLowerCase().includes(keyword.toLowerCase()));

setSearchResult(sortedLatest(result)); // ✅ 검색 후에도 최신순 유지
const handleSearch = useCallback((keyword: string) => {
setSearchKeyword(keyword);
setCurrentPage(1);
setSortOrder('latest');
setSelectedValue(null);
setSelectedCategory('');
};
}, []);

// 정렬 변경 시 페이지 초기화
useEffect(() => {
const handleSortChange = useCallback((item: SelectItem | null) => {
setSelectedValue(item);
if (item) setSortOrder(item.value as 'asc' | 'desc');
setCurrentPage(1);
}, [sortOrder]);

const filteredItems =
selectedCategory !== '' ? searchResult.filter((item) => item.category === selectedCategory) : searchResult;
}, []);

// 정렬 로직
const sortedItems = [...filteredItems].sort((a, b) => {
if (sortOrder === 'asc') return a.price - b.price;
if (sortOrder === 'desc') return b.price - a.price;
return new Date(b.createdAt ?? 0).getTime() - new Date(a.createdAt ?? 0).getTime(); // 최신순
});
const handleCategoryChange = useCallback((category: string | number) => {
setSelectedCategory(category);
setCurrentPage(1);
}, []);

const totalPages = Math.ceil(sortedItems.length / itemsPerPage);
const pagedItems = sortedItems.slice((currentPage - 1) * itemsPerPage, currentPage * itemsPerPage);
// 카드 렌더링 최적화
const renderCards = useCallback(() => {
return pagedItems.map((item, index) => (
<MemoizedMainCard
key={`${item.id}-${currentPage}-${index}`}
bannerImageUrl={item.bannerImageUrl}
price={item.price}
rating={item.rating}
reviewCount={item.reviewCount}
title={item.title}
onClick={() => navigate(`/activities/${item.id}`)}
>
<MainCard.Image />
<MainCard.Content />
</MemoizedMainCard>
));
}, [pagedItems, currentPage, navigate]);

return (
<>
Expand All @@ -122,11 +160,7 @@ export default function MainPage() {
<div className='flex flex-col gap-20'>
<h2 className='title-text'>🔥 인기 체험</h2>
<div className='-mx-15 flex'>
<Carousel
items={popularActivities}
itemsPerPage={itemsPerPage}
onClick={(id) => navigate(`/activities/${id}`)}
/>
<Carousel items={popularActivities} itemsPerPage={4} onClick={(id) => navigate(`/activities/${id}`)} />
</div>
</div>

Expand All @@ -142,15 +176,7 @@ export default function MainPage() {
<div className='flex flex-wrap items-center justify-between gap-12'>
<h2 className='title-text flex items-center gap-12'>🛼 모든 체험</h2>

<Select.Root
value={selectedValue}
onChangeValue={(item) => {
setSelectedValue(item);
if (item) {
setSortOrder(item.value as 'asc' | 'desc');
}
}}
>
<Select.Root value={selectedValue} onChangeValue={handleSortChange}>
<Select.Trigger className='flex min-w-fit gap-6 rounded-lg border border-gray-300 bg-white px-8 text-sm'>
<Select.Value className='body-text text-gray-950' placeholder='가격' />
</Select.Trigger>
Expand All @@ -167,12 +193,12 @@ export default function MainPage() {
</Select.Root>
</div>

{/* 카테고리 라디오 버튼 */}
{/* 카테고리 */}
<div className='overflow-x-hidden'>
<RadioGroup
radioGroupClassName='items-center min-w-0 max-w-full overflow-x-auto no-scrollbar'
selectedValue={selectedCategory}
onSelect={setSelectedCategory}
onSelect={handleCategoryChange}
>
<RadioGroup.Radio className='flex gap-8' value='문화 · 예술'>
<ArtIcon className='size-12' />
Expand Down Expand Up @@ -208,25 +234,12 @@ export default function MainPage() {
<NoResult />
</div>
) : (
pagedItems.map((item) => (
<MainCard.Root
key={item.id}
bannerImageUrl={item.bannerImageUrl}
price={item.price}
rating={item.rating}
reviewCount={item.reviewCount}
title={item.title}
onClick={() => navigate(`/activities/${item.id}`)}
>
<MainCard.Image />
<MainCard.Content />
</MainCard.Root>
))
renderCards()
)}
</div>

{filteredItems.length > 0 && (
<Pagination currentPage={currentPage} totalPages={totalPages} onPageChange={setCurrentPage} />
<Pagination currentPage={currentPage} totalPages={totalPages} onPageChange={handlePageChange} />
)}
</div>
</div>
Expand Down
27 changes: 0 additions & 27 deletions packages/design-system/src/components/Carousel/MobileCarousel.tsx

This file was deleted.

1 change: 1 addition & 0 deletions packages/design-system/src/components/MainCard/Image.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export default function MainCardImage({ className }: { className?: string }) {
<img
alt={`${title} 체험 이미지`}
className='h-260 w-full rounded-xl object-cover md:h-366 lg:h-300'
loading='lazy'
src={bannerImageUrl}
/>
</div>
Expand Down