Compare commits

..
Author SHA1 Message Date
dahyeon 8aff1be225 fix: align home page loading states 2026-06-09 19:13:34 -07:00
+156 -61
View File
@@ -11,15 +11,33 @@ const HISTORY_MATCH_PAGE_SIZE = 10;
const EMPTY_SCHEDULE_TEXT = '예정된 매치가 없습니다.'; const EMPTY_SCHEDULE_TEXT = '예정된 매치가 없습니다.';
const HISTORY_TABLE_ROW_CLASS = const HISTORY_TABLE_ROW_CLASS =
'h-10 border-b border-base-content/5 last:border-b-0'; 'h-10 border-b border-base-content/5 last:border-b-0';
const SECTION_HEADING_CLASS =
function SkeletonBlock({ className }: { className: string }) { 'text-xs font-bold text-base-content/40 uppercase tracking-widest';
return ( const ADMIN_LINK_CLASS =
<div 'text-xs font-bold text-base-content/35 hover:text-primary';
aria-hidden="true" const STATS_LINK_CLASS = 'text-xs font-bold text-primary hover:underline';
className={`animate-pulse bg-base-content/10 ${className}`} const STATUS_BADGE_CLASS =
/> 'inline-flex items-center whitespace-nowrap text-xs font-semibold px-1.5 py-0.5 border';
); const MAP_BADGE_CLASS =
} 'inline-flex items-center whitespace-nowrap text-xs px-1.5 py-0.5 border';
const NEXT_MATCH_TITLE_CLASS =
'text-xl sm:text-2xl font-bold text-base-content leading-tight';
const NEXT_MATCH_DESCRIPTION_CLASS =
'text-sm text-base-content/50 max-w-xl leading-relaxed';
const NEXT_MATCH_META_CLASS =
'flex items-center gap-3 text-xs text-base-content/40 flex-wrap';
const NEXT_MATCH_PARTICIPANT_BADGE_CLASS =
'inline-flex items-center whitespace-nowrap bg-accent text-accent-content px-1.5 py-0.5 font-semibold';
const DETAIL_BUTTON_CLASS = 'btn btn-secondary btn-sm px-6 text-xs font-semibold';
const UPCOMING_CARD_FRAME_CLASS = 'bg-base-100 h-full p-4 min-h-[135px]';
const UPCOMING_CARD_TITLE_CLASS =
'text-sm font-bold text-base-content truncate mr-2';
const UPCOMING_CARD_META_CLASS = 'space-y-1 text-xs text-base-content/40';
const HISTORY_MOBILE_DATE_CLASS = 'text-xs font-medium text-base-content/40';
const HISTORY_MOBILE_TITLE_CLASS =
'mt-1 text-sm font-semibold leading-snug text-base-content break-words';
const HISTORY_MOBILE_META_CLASS =
'flex flex-wrap items-center gap-x-1.5 gap-y-1 text-xs text-base-content/45';
function SkeletonText({ function SkeletonText({
children, children,
@@ -87,7 +105,11 @@ function HistoryTableHeader() {
); );
} }
function HistoryRecordsSkeleton({ rows = 5 }: { rows?: number }) { function HistoryRecordsSkeleton({
rows = HISTORY_MATCH_PAGE_SIZE,
}: {
rows?: number;
}) {
const historySkeletons = Array.from({ length: rows }); const historySkeletons = Array.from({ length: rows });
return ( return (
@@ -118,12 +140,12 @@ function HistoryRecordsSkeleton({ rows = 5 }: { rows?: number }) {
</SkeletonText> </SkeletonText>
</td> </td>
<td className="py-2.5 px-4"> <td className="py-2.5 px-4">
<SkeletonBadge className="inline-flex items-center whitespace-nowrap text-xs font-semibold px-1.5 py-0.5 border border-transparent"> <SkeletonBadge className={`${STATUS_BADGE_CLASS} border-transparent`}>
팀빌딩 팀빌딩
</SkeletonBadge> </SkeletonBadge>
</td> </td>
<td className="py-2.5 px-4"> <td className="py-2.5 px-4">
<SkeletonBadge className="inline-flex items-center whitespace-nowrap text-xs px-1.5 py-0.5 border border-transparent"> <SkeletonBadge className={`${MAP_BADGE_CLASS} border-transparent`}>
소환사의 협곡 소환사의 협곡
</SkeletonBadge> </SkeletonBadge>
</td> </td>
@@ -154,13 +176,41 @@ function HistoryRecordsSkeleton({ rows = 5 }: { rows?: number }) {
className="border-b border-base-content/5 last:border-b-0 p-3" className="border-b border-base-content/5 last:border-b-0 p-3"
> >
<div className="flex items-start justify-between gap-3"> <div className="flex items-start justify-between gap-3">
<div className="min-w-0 flex-1 space-y-2"> <div className="min-w-0 flex-1">
<SkeletonBlock className="h-3 w-28" /> <SkeletonText
<SkeletonBlock className="h-4 w-32" /> className={HISTORY_MOBILE_DATE_CLASS}
skeletonClassName="h-[1em] w-28"
>
6/8 (월) 21:00
</SkeletonText>
<SkeletonText
className={HISTORY_MOBILE_TITLE_CLASS}
skeletonClassName="h-[1em] w-32 max-w-full"
>
정기 내전
</SkeletonText>
</div>
<div className="shrink-0">
<SkeletonBadge className={`${STATUS_BADGE_CLASS} border-transparent`}>
팀빌딩
</SkeletonBadge>
</div>
</div>
<div className="mt-2">
<div className={HISTORY_MOBILE_META_CLASS}>
<SkeletonText skeletonClassName="h-[1em] w-20">
소환사의 협곡
</SkeletonText>
<span className="invisible text-base-content/20">·</span>
<SkeletonText skeletonClassName="h-[1em] w-8">
10명
</SkeletonText>
<span className="invisible text-base-content/20">·</span>
<SkeletonText skeletonClassName="h-[1em] w-14">
1팀 승리
</SkeletonText>
</div> </div>
<SkeletonBlock className="h-5 w-12 shrink-0" />
</div> </div>
<SkeletonBlock className="mt-2 h-3 w-40" />
</div> </div>
))} ))}
</div> </div>
@@ -181,58 +231,103 @@ function HomePageSkeleton() {
<section className="pt-8 pb-6"> <section className="pt-8 pb-6">
<div className="flex items-center justify-between gap-3 mb-3"> <div className="flex items-center justify-between gap-3 mb-3">
<SkeletonBlock className="h-3 w-20" /> <h2 className={SECTION_HEADING_CLASS}>
다음 내전
</h2>
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<SkeletonBlock className="h-3 w-16" /> <Link
<SkeletonBlock className="h-3 w-20" /> to={`/communities/${DEFAULT_COMMUNITY_ID}/internal-stats`}
className={STATS_LINK_CLASS}
>
내전 전적 보기
</Link>
</div> </div>
</div> </div>
<div className="border border-base-content/10 bg-base-200/50"> <div className="border border-base-content/10 bg-base-200/50">
<div className="p-5 sm:p-6"> <div className="p-5 sm:p-6 min-h-[150px]">
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4"> <div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
<div className="space-y-3 flex-1"> <div className="space-y-2.5 flex-1">
<div className="flex items-center gap-2.5 flex-wrap"> <div className="flex items-center gap-2.5 flex-wrap">
<SkeletonBlock className="h-7 w-52 sm:w-64" /> <SkeletonText
<SkeletonBlock className="h-5 w-12" /> className={NEXT_MATCH_TITLE_CLASS}
skeletonClassName="h-[1em] w-52 sm:w-64 max-w-full"
>
롤림푸스 경매 테스트 매치
</SkeletonText>
<SkeletonBadge className={`${STATUS_BADGE_CLASS} border-transparent`}>
모집중
</SkeletonBadge>
</div> </div>
<div className="space-y-2"> <div className={NEXT_MATCH_DESCRIPTION_CLASS}>
<SkeletonBlock className="h-4 w-full max-w-xl" /> <SkeletonText skeletonClassName="h-[1em] w-full max-w-xl">
<SkeletonBlock className="h-4 w-4/5 max-w-lg" /> Socket.IO 경매 페이지 검증용으로 생성된 매치입니다.
</SkeletonText>
</div> </div>
<div className="flex items-center gap-3 flex-wrap pt-1"> <div className={NEXT_MATCH_META_CLASS}>
<SkeletonBlock className="h-3 w-24" /> <SkeletonText skeletonClassName="h-[1em] w-24">
<SkeletonBlock className="h-3 w-12" /> 6월 11일 21:00
<SkeletonBlock className="h-5 w-16" /> </SkeletonText>
<span className="invisible text-base-content/15">|</span>
<SkeletonBadge className={NEXT_MATCH_PARTICIPANT_BADGE_CLASS}>
10/10명
</SkeletonBadge>
<span className="invisible text-base-content/15">|</span>
<SkeletonBadge className={`${MAP_BADGE_CLASS} border-transparent`}>
소환사의 협곡
</SkeletonBadge>
</div> </div>
</div> </div>
<SkeletonBlock className="h-8 w-24 sm:shrink-0" /> <div className="sm:shrink-0">
<SkeletonBadge className={DETAIL_BUTTON_CLASS}>
상세 보기
</SkeletonBadge>
</div>
</div> </div>
</div> </div>
</div> </div>
</section> </section>
<section className="pb-6"> <section className="pb-6">
<SkeletonBlock className="h-3 w-24 mb-3" /> <h2 className={`${SECTION_HEADING_CLASS} mb-3`}>
예정된 내전
</h2>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-px bg-base-content/10 border border-base-content/10"> <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-px bg-base-content/10 border border-base-content/10">
{upcomingSkeletons.map((_, index) => ( {upcomingSkeletons.map((_, index) => (
<div key={index} className="bg-base-100 h-full p-4 min-h-[122px]"> <div key={index} className={UPCOMING_CARD_FRAME_CLASS}>
<div className="flex items-center justify-between mb-3 gap-3"> <div className="flex items-center justify-between mb-2.5 gap-3">
<SkeletonBlock className="h-4 w-28" /> <SkeletonText
<SkeletonBlock className="h-5 w-12 shrink-0" /> className={UPCOMING_CARD_TITLE_CLASS}
skeletonClassName="h-[1em] w-28 max-w-full"
>
정기 내전
</SkeletonText>
<SkeletonBadge className={`${STATUS_BADGE_CLASS} border-transparent shrink-0`}>
모집중
</SkeletonBadge>
</div> </div>
<div className="space-y-2"> <div className={UPCOMING_CARD_META_CLASS}>
<SkeletonBlock className="h-3 w-24" /> <SkeletonText skeletonClassName="h-[1em] w-24">
<SkeletonBlock className="h-3 w-12" /> 6월 11일 21:00
</SkeletonText>
<SkeletonText skeletonClassName="h-[1em] w-12">
10/10명
</SkeletonText>
</div>
<div className="mt-2.5">
<SkeletonBadge className={`${MAP_BADGE_CLASS} border-transparent`}>
소환사의 협곡
</SkeletonBadge>
</div> </div>
<SkeletonBlock className="h-5 w-16 mt-3" />
</div> </div>
))} ))}
</div> </div>
</section> </section>
<section className="pb-12"> <section className="pb-12">
<SkeletonBlock className="h-3 w-24 mb-3" /> <h2 className={`${SECTION_HEADING_CLASS} mb-3`}>
지난 내전 기록
</h2>
<HistoryRecordsSkeleton /> <HistoryRecordsSkeleton />
</section> </section>
</main> </main>
@@ -249,7 +344,7 @@ function StatusBadge({ status }: { status: string }) {
return ( return (
<span <span
className={`inline-flex items-center whitespace-nowrap text-xs font-semibold px-1.5 py-0.5 border ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`} className={`${STATUS_BADGE_CLASS} ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`}
> >
{status} {status}
</span> </span>
@@ -258,7 +353,7 @@ function StatusBadge({ status }: { status: string }) {
function MapBadge({ map }: { map: string }) { function MapBadge({ map }: { map: string }) {
return ( return (
<span className="inline-flex items-center whitespace-nowrap text-xs px-1.5 py-0.5 border border-base-content/10 text-base-content/50"> <span className={`${MAP_BADGE_CLASS} border-base-content/10 text-base-content/50`}>
{map} {map}
</span> </span>
); );
@@ -302,7 +397,7 @@ function HistoryMetaText({
result?: string; result?: string;
}) { }) {
return ( return (
<div className="flex flex-wrap items-center gap-x-1.5 gap-y-1 text-xs text-base-content/45"> <div className={HISTORY_MOBILE_META_CLASS}>
<span>{map}</span> <span>{map}</span>
<span className="text-base-content/20">·</span> <span className="text-base-content/20">·</span>
<span>{participants}명</span> <span>{participants}명</span>
@@ -448,21 +543,21 @@ export default function HomePage() {
<main className="max-w-5xl mx-auto px-4 sm:px-6"> <main className="max-w-5xl mx-auto px-4 sm:px-6">
<section className="pt-8 pb-6"> <section className="pt-8 pb-6">
<div className="flex items-center justify-between gap-3 mb-3"> <div className="flex items-center justify-between gap-3 mb-3">
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest"> <h2 className={SECTION_HEADING_CLASS}>
다음 내전 다음 내전
</h2> </h2>
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
{canManage && ( {canManage && (
<Link <Link
to={`/admin/communities/${DEFAULT_COMMUNITY_ID}/matches`} to={`/admin/communities/${DEFAULT_COMMUNITY_ID}/matches`}
className="text-xs font-bold text-base-content/35 hover:text-primary" className={ADMIN_LINK_CLASS}
> >
내전 관리 내전 관리
</Link> </Link>
)} )}
<Link <Link
to={`/communities/${DEFAULT_COMMUNITY_ID}/internal-stats`} to={`/communities/${DEFAULT_COMMUNITY_ID}/internal-stats`}
className="text-xs font-bold text-primary hover:underline" className={STATS_LINK_CLASS}
> >
내전 전적 보기 내전 전적 보기
</Link> </Link>
@@ -476,18 +571,18 @@ export default function HomePage() {
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4"> <div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
<div className="space-y-2.5"> <div className="space-y-2.5">
<div className="flex items-center gap-2.5 flex-wrap"> <div className="flex items-center gap-2.5 flex-wrap">
<h3 className="text-xl sm:text-2xl font-bold text-base-content leading-tight"> <h3 className={NEXT_MATCH_TITLE_CLASS}>
{nextMatch.title} {nextMatch.title}
</h3> </h3>
<StatusBadge status={getStatusLabel(nextMatch.status)} /> <StatusBadge status={getStatusLabel(nextMatch.status)} />
</div> </div>
<p className="text-sm text-base-content/50 max-w-xl leading-relaxed"> <p className={NEXT_MATCH_DESCRIPTION_CLASS}>
{nextMatch.description} {nextMatch.description}
</p> </p>
<div className="flex items-center gap-3 text-xs text-base-content/40 flex-wrap"> <div className={NEXT_MATCH_META_CLASS}>
<span>{nextMatch.date} {nextMatch.time}</span> <span>{nextMatch.date} {nextMatch.time}</span>
<span className="text-base-content/15">|</span> <span className="text-base-content/15">|</span>
<span className="bg-accent text-accent-content px-1.5 py-0.5 font-semibold"> <span className={NEXT_MATCH_PARTICIPANT_BADGE_CLASS}>
{nextMatch.participants.length}/{nextMatch.maxParticipants}명 {nextMatch.participants.length}/{nextMatch.maxParticipants}명
</span> </span>
<span className="text-base-content/15">|</span> <span className="text-base-content/15">|</span>
@@ -495,7 +590,7 @@ export default function HomePage() {
</div> </div>
</div> </div>
<div className="sm:shrink-0"> <div className="sm:shrink-0">
<span className="btn btn-secondary btn-sm px-6 text-xs font-semibold"> <span className={DETAIL_BUTTON_CLASS}>
상세 보기 상세 보기
</span> </span>
</div> </div>
@@ -513,21 +608,21 @@ export default function HomePage() {
</section> </section>
<section className="pb-6"> <section className="pb-6">
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3"> <h2 className={`${SECTION_HEADING_CLASS} mb-3`}>
예정된 내전 예정된 내전
</h2> </h2>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-px bg-base-content/10 border border-base-content/10"> <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-px bg-base-content/10 border border-base-content/10">
{upcomingCards.length > 0 ? ( {upcomingCards.length > 0 ? (
upcomingCards.map((match) => ( upcomingCards.map((match) => (
<Link key={match.id} to={`/match/${match.id}`}> <Link key={match.id} to={`/match/${match.id}`}>
<div className="bg-base-100 hover:bg-base-200/50 transition-colors cursor-pointer h-full p-4 min-h-[122px]"> <div className={`${UPCOMING_CARD_FRAME_CLASS} hover:bg-base-200/50 transition-colors cursor-pointer`}>
<div className="flex items-center justify-between mb-2.5"> <div className="flex items-center justify-between mb-2.5">
<h3 className="text-sm font-bold text-base-content truncate mr-2"> <h3 className={UPCOMING_CARD_TITLE_CLASS}>
{match.title} {match.title}
</h3> </h3>
<StatusBadge status={getStatusLabel(match.status)} /> <StatusBadge status={getStatusLabel(match.status)} />
</div> </div>
<div className="space-y-1 text-xs text-base-content/40"> <div className={UPCOMING_CARD_META_CLASS}>
<div>{match.date} {match.time}</div> <div>{match.date} {match.time}</div>
<div> <div>
{match.participants.length}/{match.maxParticipants}명 {match.participants.length}/{match.maxParticipants}명
@@ -540,7 +635,7 @@ export default function HomePage() {
</Link> </Link>
)) ))
) : ( ) : (
<div className="bg-base-100 h-full p-4 min-h-[122px] flex items-center justify-center text-center text-sm text-base-content/35"> <div className={`${UPCOMING_CARD_FRAME_CLASS} sm:col-span-2 lg:col-span-3 flex items-center justify-center text-center text-sm text-base-content/35`}>
{EMPTY_SCHEDULE_TEXT} {EMPTY_SCHEDULE_TEXT}
</div> </div>
)} )}
@@ -552,7 +647,7 @@ export default function HomePage() {
aria-busy={isHistoryPageLoading} aria-busy={isHistoryPageLoading}
aria-live="polite" aria-live="polite"
> >
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3"> <h2 className={`${SECTION_HEADING_CLASS} mb-3`}>
지난 내전 기록 지난 내전 기록
</h2> </h2>
{isHistoryPageLoading ? ( {isHistoryPageLoading ? (
@@ -634,11 +729,11 @@ export default function HomePage() {
> >
<div className="flex items-start justify-between gap-3"> <div className="flex items-start justify-between gap-3">
<div className="min-w-0 flex-1"> <div className="min-w-0 flex-1">
<div className="text-xs font-medium text-base-content/40"> <div className={HISTORY_MOBILE_DATE_CLASS}>
{match.compactDateTime || {match.compactDateTime ||
`${match.date} ${match.time}`} `${match.date} ${match.time}`}
</div> </div>
<div className="mt-1 text-sm font-semibold leading-snug text-base-content break-words"> <div className={HISTORY_MOBILE_TITLE_CLASS}>
{match.title} {match.title}
</div> </div>
</div> </div>