fix(web): localize history pagination loading
This commit is contained in:
1 parent
aa07ec0304
commit
fe7a482969
2 files changed
+197
-164
No files matched your search
+196
-164
@@ -19,9 +19,74 @@ function SkeletonBlock({ className }: { className: string }) {
|
||||
);
|
||||
}
|
||||
|
||||
function HistoryRecordsSkeleton() {
|
||||
const historySkeletons = Array.from({ length: 5 });
|
||||
|
||||
return (
|
||||
<>
|
||||
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||
<table className="w-full text-left">
|
||||
<thead>
|
||||
<tr className="bg-base-200/60 border-b border-base-content/10">
|
||||
{['날짜', '내전', '상태', '맵', '참가', '결과'].map((label) => (
|
||||
<th key={label} className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-3 w-10" />
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{historySkeletons.map((_, index) => (
|
||||
<tr
|
||||
key={index}
|
||||
className="border-b border-base-content/5 last:border-b-0"
|
||||
>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-3 w-16" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-4 w-36" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-5 w-12" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-5 w-16" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-3 w-10" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-3 w-14" />
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div className="md:hidden border border-base-content/10">
|
||||
{historySkeletons.map((_, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className="border-b border-base-content/5 last:border-b-0 p-3"
|
||||
>
|
||||
<div className="flex items-start justify-between gap-3">
|
||||
<div className="min-w-0 flex-1 space-y-2">
|
||||
<SkeletonBlock className="h-3 w-28" />
|
||||
<SkeletonBlock className="h-4 w-32" />
|
||||
</div>
|
||||
<SkeletonBlock className="h-5 w-12 shrink-0" />
|
||||
</div>
|
||||
<SkeletonBlock className="mt-2 h-3 w-40" />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
function HomePageSkeleton() {
|
||||
const upcomingSkeletons = Array.from({ length: UPCOMING_GRID_MATCH_LIMIT });
|
||||
const historySkeletons = Array.from({ length: 5 });
|
||||
|
||||
return (
|
||||
<main
|
||||
@@ -85,63 +150,7 @@ function HomePageSkeleton() {
|
||||
|
||||
<section className="pb-12">
|
||||
<SkeletonBlock className="h-3 w-24 mb-3" />
|
||||
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||
<table className="w-full text-left">
|
||||
<thead>
|
||||
<tr className="bg-base-200/60 border-b border-base-content/10">
|
||||
{['날짜', '내전', '상태', '맵', '참가', '결과'].map((label) => (
|
||||
<th key={label} className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-3 w-10" />
|
||||
</th>
|
||||
))}
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{historySkeletons.map((_, index) => (
|
||||
<tr
|
||||
key={index}
|
||||
className="border-b border-base-content/5 last:border-b-0"
|
||||
>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-3 w-16" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-4 w-36" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-5 w-12" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-5 w-16" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-3 w-10" />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<SkeletonBlock className="h-3 w-14" />
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div className="md:hidden border border-base-content/10">
|
||||
{historySkeletons.map((_, index) => (
|
||||
<div
|
||||
key={index}
|
||||
className="border-b border-base-content/5 last:border-b-0 p-3"
|
||||
>
|
||||
<div className="flex items-start justify-between gap-3">
|
||||
<div className="min-w-0 flex-1 space-y-2">
|
||||
<SkeletonBlock className="h-3 w-28" />
|
||||
<SkeletonBlock className="h-4 w-32" />
|
||||
</div>
|
||||
<SkeletonBlock className="h-5 w-12 shrink-0" />
|
||||
</div>
|
||||
<SkeletonBlock className="mt-2 h-3 w-40" />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
<HistoryRecordsSkeleton />
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
@@ -305,11 +314,11 @@ export default function HomePage() {
|
||||
);
|
||||
}
|
||||
|
||||
if (upcomingMatchesQuery.isLoading || historyMatchesQuery.isLoading) {
|
||||
if (upcomingMatchesQuery.isLoading) {
|
||||
return <HomePageSkeleton />;
|
||||
}
|
||||
|
||||
if (upcomingMatchesQuery.error || historyMatchesQuery.error) {
|
||||
if (upcomingMatchesQuery.error) {
|
||||
return (
|
||||
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
||||
<span className="text-sm text-red-500">
|
||||
@@ -329,11 +338,15 @@ export default function HomePage() {
|
||||
const historyTotal = historyMatchesQuery.data?.total ?? 0;
|
||||
const historyLimit =
|
||||
historyMatchesQuery.data?.limit ?? HISTORY_MATCH_PAGE_SIZE;
|
||||
const historyPageFromApi = historyMatchesQuery.data?.page ?? historyPage;
|
||||
const historyPageCount = Math.max(
|
||||
1,
|
||||
Math.ceil(historyTotal / historyLimit),
|
||||
);
|
||||
const isHistoryPageLoading =
|
||||
historyMatchesQuery.isLoading ||
|
||||
(historyMatchesQuery.isFetching && historyMatchesQuery.isPlaceholderData);
|
||||
const hasHistoryError =
|
||||
Boolean(historyMatchesQuery.error) && !historyMatchesQuery.data;
|
||||
const goToPreviousHistoryPage = () =>
|
||||
setHistoryPage((page) => Math.max(1, page - 1));
|
||||
const goToNextHistoryPage = () => setHistoryPage((page) => page + 1);
|
||||
@@ -451,116 +464,135 @@ export default function HomePage() {
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="pb-12">
|
||||
<section
|
||||
className="pb-12"
|
||||
aria-busy={isHistoryPageLoading}
|
||||
aria-live="polite"
|
||||
>
|
||||
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
|
||||
지난 내전 기록
|
||||
</h2>
|
||||
{/* 데스크톱: 테이블 */}
|
||||
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||
<table className="w-full text-left">
|
||||
<thead>
|
||||
<tr className="bg-base-200/60 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/40">
|
||||
<th className="py-2.5 px-4 font-semibold">날짜</th>
|
||||
<th className="py-2.5 px-4 font-semibold">내전</th>
|
||||
<th className="py-2.5 px-4 font-semibold">상태</th>
|
||||
<th className="py-2.5 px-4 font-semibold">맵</th>
|
||||
<th className="py-2.5 px-4 font-semibold">참가</th>
|
||||
<th className="py-2.5 px-4 font-semibold">결과</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{historyMatches.length > 0 ? (
|
||||
historyMatches.map((match) => (
|
||||
<tr
|
||||
key={match.id}
|
||||
className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors"
|
||||
>
|
||||
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
|
||||
{match.date}
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<Link
|
||||
to={`/match/${match.id}`}
|
||||
className="text-sm font-medium text-base-content hover:text-primary transition-colors"
|
||||
>
|
||||
{match.title}
|
||||
</Link>
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<StatusBadge status={getStatusLabel(match.status)} />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<MapBadge map={match.map} />
|
||||
</td>
|
||||
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||
{match.participants.length}명
|
||||
</td>
|
||||
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||
{match.result?.winner ? `${match.result.winner} 승리` : '-'}
|
||||
</td>
|
||||
{isHistoryPageLoading ? (
|
||||
<HistoryRecordsSkeleton />
|
||||
) : hasHistoryError ? (
|
||||
<div className="border border-base-content/10 px-4 py-8 text-center text-sm text-red-500">
|
||||
지난 내전 기록을 불러오지 못했습니다.
|
||||
</div>
|
||||
) : (
|
||||
<>
|
||||
{/* 데스크톱: 테이블 */}
|
||||
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||
<table className="w-full text-left">
|
||||
<thead>
|
||||
<tr className="bg-base-200/60 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/40">
|
||||
<th className="py-2.5 px-4 font-semibold">날짜</th>
|
||||
<th className="py-2.5 px-4 font-semibold">내전</th>
|
||||
<th className="py-2.5 px-4 font-semibold">상태</th>
|
||||
<th className="py-2.5 px-4 font-semibold">맵</th>
|
||||
<th className="py-2.5 px-4 font-semibold">참가</th>
|
||||
<th className="py-2.5 px-4 font-semibold">결과</th>
|
||||
</tr>
|
||||
))
|
||||
) : (
|
||||
<tr>
|
||||
<td
|
||||
colSpan={6}
|
||||
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
||||
>
|
||||
아직 내전 기록이 없습니다.
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{/* 모바일: 카드 리스트 */}
|
||||
<div className="md:hidden border border-base-content/10">
|
||||
{historyMatches.length > 0 ? (
|
||||
historyMatches.map((match) => {
|
||||
const resultLabel = match.result?.winner
|
||||
? `${match.result.winner} 승리`
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<Link
|
||||
key={match.id}
|
||||
to={`/match/${match.id}`}
|
||||
className="block border-b border-base-content/5 last:border-b-0 p-3 hover:bg-base-content/[0.02] transition-colors"
|
||||
>
|
||||
<div className="flex items-start justify-between gap-3">
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="text-[11px] font-medium text-base-content/40">
|
||||
{match.compactDateTime || `${match.date} ${match.time}`}
|
||||
</div>
|
||||
<div className="mt-1 text-sm font-semibold leading-snug text-base-content break-words">
|
||||
{match.title}
|
||||
</div>
|
||||
</div>
|
||||
<div className="shrink-0">
|
||||
<StatusBadge status={getStatusLabel(match.status)} />
|
||||
</div>
|
||||
</div>
|
||||
<div className="mt-2">
|
||||
<HistoryMetaText
|
||||
map={match.map}
|
||||
participants={match.participants.length}
|
||||
result={resultLabel}
|
||||
/>
|
||||
</div>
|
||||
</Link>
|
||||
);
|
||||
})
|
||||
) : (
|
||||
<div className="py-6 px-4 text-sm text-base-content/35 text-center">
|
||||
아직 내전 기록이 없습니다.
|
||||
</thead>
|
||||
<tbody>
|
||||
{historyMatches.length > 0 ? (
|
||||
historyMatches.map((match) => (
|
||||
<tr
|
||||
key={match.id}
|
||||
className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors"
|
||||
>
|
||||
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
|
||||
{match.date}
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<Link
|
||||
to={`/match/${match.id}`}
|
||||
className="text-sm font-medium text-base-content hover:text-primary transition-colors"
|
||||
>
|
||||
{match.title}
|
||||
</Link>
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<StatusBadge status={getStatusLabel(match.status)} />
|
||||
</td>
|
||||
<td className="py-2.5 px-4">
|
||||
<MapBadge map={match.map} />
|
||||
</td>
|
||||
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||
{match.participants.length}명
|
||||
</td>
|
||||
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||
{match.result?.winner
|
||||
? `${match.result.winner} 승리`
|
||||
: '-'}
|
||||
</td>
|
||||
</tr>
|
||||
))
|
||||
) : (
|
||||
<tr>
|
||||
<td
|
||||
colSpan={6}
|
||||
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
||||
>
|
||||
아직 내전 기록이 없습니다.
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
{historyTotal > 0 && (
|
||||
|
||||
{/* 모바일: 카드 리스트 */}
|
||||
<div className="md:hidden border border-base-content/10">
|
||||
{historyMatches.length > 0 ? (
|
||||
historyMatches.map((match) => {
|
||||
const resultLabel = match.result?.winner
|
||||
? `${match.result.winner} 승리`
|
||||
: undefined;
|
||||
|
||||
return (
|
||||
<Link
|
||||
key={match.id}
|
||||
to={`/match/${match.id}`}
|
||||
className="block border-b border-base-content/5 last:border-b-0 p-3 hover:bg-base-content/[0.02] transition-colors"
|
||||
>
|
||||
<div className="flex items-start justify-between gap-3">
|
||||
<div className="min-w-0 flex-1">
|
||||
<div className="text-[11px] font-medium text-base-content/40">
|
||||
{match.compactDateTime ||
|
||||
`${match.date} ${match.time}`}
|
||||
</div>
|
||||
<div className="mt-1 text-sm font-semibold leading-snug text-base-content break-words">
|
||||
{match.title}
|
||||
</div>
|
||||
</div>
|
||||
<div className="shrink-0">
|
||||
<StatusBadge
|
||||
status={getStatusLabel(match.status)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="mt-2">
|
||||
<HistoryMetaText
|
||||
map={match.map}
|
||||
participants={match.participants.length}
|
||||
result={resultLabel}
|
||||
/>
|
||||
</div>
|
||||
</Link>
|
||||
);
|
||||
})
|
||||
) : (
|
||||
<div className="py-6 px-4 text-sm text-base-content/35 text-center">
|
||||
아직 내전 기록이 없습니다.
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
{!hasHistoryError && historyTotal > 0 && (
|
||||
<div className="mt-3 flex justify-end">
|
||||
<HistoryPagination
|
||||
page={historyPageFromApi}
|
||||
page={historyPage}
|
||||
pageCount={historyPageCount}
|
||||
total={historyTotal}
|
||||
isFetching={historyMatchesQuery.isFetching}
|
||||
|
||||
Reference in new issue
Block a user