fix(web): split home matches by schedule
This commit is contained in:
1 parent
6697cd8ea1
commit
f586542dc3
6 files changed
+524
-37
No files matched your search
@@ -72,16 +72,27 @@ export class MatchController {
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Query('status') status?: MatchStatus,
|
||||
@Query('limit') limit?: string,
|
||||
@Query('page') page?: string,
|
||||
@Query('offset') offset?: string,
|
||||
@Query('scheduledFrom') scheduledFrom?: string,
|
||||
@Query('scheduledTo') scheduledTo?: string,
|
||||
@Query('sort') sort?: 'asc' | 'desc',
|
||||
) {
|
||||
const matches = await this.matchService.list({
|
||||
const result = await this.matchService.listPage({
|
||||
communityId,
|
||||
status,
|
||||
limit: limit ? Number(limit) : undefined,
|
||||
limit: this.toOptionalNumber(limit),
|
||||
page: this.toOptionalNumber(page),
|
||||
offset: this.toOptionalNumber(offset),
|
||||
scheduledFrom: this.toOptionalDate(scheduledFrom),
|
||||
scheduledTo: this.toOptionalDate(scheduledTo),
|
||||
sort,
|
||||
});
|
||||
if (!currentUser) return { matches };
|
||||
if (!currentUser) return result;
|
||||
const myId = currentUser._id;
|
||||
return {
|
||||
matches: matches.map((m) => this.annotateJoined(m, myId)),
|
||||
...result,
|
||||
matches: result.matches.map((m) => this.annotateJoined(m, myId)),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -211,4 +222,15 @@ export class MatchController {
|
||||
throw new BadRequestException('Different community.');
|
||||
}
|
||||
}
|
||||
|
||||
private toOptionalNumber(value?: string): number | undefined {
|
||||
const numberValue = Number(value);
|
||||
return Number.isFinite(numberValue) ? numberValue : undefined;
|
||||
}
|
||||
|
||||
private toOptionalDate(value?: string): Date | undefined {
|
||||
if (!value) return undefined;
|
||||
const date = new Date(value);
|
||||
return Number.isNaN(date.getTime()) ? undefined : date;
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,135 @@ describe('MatchService', () => {
|
||||
};
|
||||
}
|
||||
|
||||
function createServiceWithListModel() {
|
||||
const exec = jest.fn().mockResolvedValue([{ title: 'second page' }]);
|
||||
const limit = jest.fn().mockReturnValue({ exec });
|
||||
const skip = jest.fn().mockReturnValue({ limit });
|
||||
const sort = jest.fn().mockReturnValue({ skip });
|
||||
const find = jest.fn().mockReturnValue({ sort });
|
||||
const countExec = jest.fn().mockResolvedValue(12);
|
||||
const countDocuments = jest.fn().mockReturnValue({ exec: countExec });
|
||||
const MatchModel = {
|
||||
find,
|
||||
countDocuments,
|
||||
};
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||
if (name === 'match') return MatchModel;
|
||||
return {};
|
||||
}),
|
||||
};
|
||||
const tournamentCodeService = {
|
||||
buildSlots: jest.fn().mockResolvedValue([]),
|
||||
releaseFromMatch: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const communityStatsService = {
|
||||
invalidateCommunity: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const matchStatsService = {
|
||||
buildAndUpsert: jest.fn().mockResolvedValue(undefined),
|
||||
removeByMatch: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
|
||||
return {
|
||||
service: new MatchService(
|
||||
connectionService as never,
|
||||
tournamentCodeService as never,
|
||||
communityStatsService as never,
|
||||
matchStatsService as never,
|
||||
),
|
||||
MatchModel,
|
||||
sort,
|
||||
skip,
|
||||
limit,
|
||||
};
|
||||
}
|
||||
|
||||
it('returns a paginated match list with total count', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const { service, MatchModel, sort, skip, limit } =
|
||||
createServiceWithListModel();
|
||||
|
||||
const page = await service.listPage({
|
||||
communityId,
|
||||
page: 2,
|
||||
limit: 5,
|
||||
});
|
||||
|
||||
expect(MatchModel.find).toHaveBeenCalledWith({ communityId });
|
||||
expect(MatchModel.countDocuments).toHaveBeenCalledWith({ communityId });
|
||||
expect(sort).toHaveBeenCalledWith({ scheduledAt: -1 });
|
||||
expect(skip).toHaveBeenCalledWith(5);
|
||||
expect(limit).toHaveBeenCalledWith(5);
|
||||
expect(page).toEqual({
|
||||
matches: [{ title: 'second page' }],
|
||||
total: 12,
|
||||
page: 2,
|
||||
limit: 5,
|
||||
});
|
||||
});
|
||||
|
||||
it('applies offset before page-based pagination', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const { service, skip } = createServiceWithListModel();
|
||||
|
||||
const page = await service.listPage({
|
||||
communityId,
|
||||
offset: 4,
|
||||
page: 2,
|
||||
limit: 5,
|
||||
});
|
||||
|
||||
expect(skip).toHaveBeenCalledWith(9);
|
||||
expect(page.total).toBe(8);
|
||||
});
|
||||
|
||||
it('filters future matches and sorts oldest first for upcoming sections', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const scheduledFrom = new Date('2026-06-08T12:00:00.000Z');
|
||||
const { service, MatchModel, sort } = createServiceWithListModel();
|
||||
|
||||
await service.listPage({
|
||||
communityId,
|
||||
scheduledFrom,
|
||||
sort: 'asc',
|
||||
limit: 4,
|
||||
});
|
||||
|
||||
expect(MatchModel.find).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
scheduledAt: { $gte: scheduledFrom },
|
||||
});
|
||||
expect(MatchModel.countDocuments).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
scheduledAt: { $gte: scheduledFrom },
|
||||
});
|
||||
expect(sort).toHaveBeenCalledWith({ scheduledAt: 1 });
|
||||
});
|
||||
|
||||
it('filters past matches and keeps newest first for history sections', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const scheduledTo = new Date('2026-06-08T12:00:00.000Z');
|
||||
const { service, MatchModel, sort } = createServiceWithListModel();
|
||||
|
||||
await service.listPage({
|
||||
communityId,
|
||||
scheduledTo,
|
||||
sort: 'desc',
|
||||
limit: 10,
|
||||
});
|
||||
|
||||
expect(MatchModel.find).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
scheduledAt: { $lt: scheduledTo },
|
||||
});
|
||||
expect(MatchModel.countDocuments).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
scheduledAt: { $lt: scheduledTo },
|
||||
});
|
||||
expect(sort).toHaveBeenCalledWith({ scheduledAt: -1 });
|
||||
});
|
||||
|
||||
it('clears game schedule when a built match returns to recruiting', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const match = {
|
||||
|
||||
@@ -23,6 +23,8 @@ import { TournamentCodeService } from '../tournament-code/tournament-code.servic
|
||||
const MATCH_SHORT_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
|
||||
const MATCH_SHORT_CODE_LENGTH = 4;
|
||||
const MATCH_SHORT_CODE_GENERATION_ATTEMPTS = 20;
|
||||
const DEFAULT_MATCH_LIST_LIMIT = 50;
|
||||
const MAX_MATCH_LIST_LIMIT = 200;
|
||||
|
||||
interface CreateMatchParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
@@ -40,6 +42,23 @@ interface ListMatchesQuery {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
status?: MatchStatus;
|
||||
limit?: number;
|
||||
scheduledFrom?: Date;
|
||||
scheduledTo?: Date;
|
||||
sort?: 'asc' | 'desc';
|
||||
}
|
||||
|
||||
interface ListMatchesPageQuery extends ListMatchesQuery {
|
||||
page?: number;
|
||||
offset?: number;
|
||||
}
|
||||
|
||||
interface MatchListFilter {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
status?: MatchStatus;
|
||||
scheduledAt?: {
|
||||
$gte?: Date;
|
||||
$lt?: Date;
|
||||
};
|
||||
}
|
||||
|
||||
interface JoinMatchParams {
|
||||
@@ -101,19 +120,42 @@ export class MatchService {
|
||||
|
||||
public async list(query: ListMatchesQuery): Promise<MatchDocument[]> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const filter: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
status?: MatchStatus;
|
||||
} = {
|
||||
communityId: query.communityId,
|
||||
};
|
||||
if (query.status) filter.status = query.status;
|
||||
const filter = this.buildListFilter(query);
|
||||
return MatchModel.find(filter)
|
||||
.sort({ scheduledAt: -1 })
|
||||
.limit(Math.min(query.limit ?? 50, 200))
|
||||
.sort(this.buildListSort(query.sort))
|
||||
.limit(this.normalizeListLimit(query.limit))
|
||||
.exec();
|
||||
}
|
||||
|
||||
public async listPage(query: ListMatchesPageQuery): Promise<{
|
||||
matches: MatchDocument[];
|
||||
total: number;
|
||||
page: number;
|
||||
limit: number;
|
||||
}> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const filter = this.buildListFilter(query);
|
||||
const page = this.normalizeListPage(query.page);
|
||||
const limit = this.normalizeListLimit(query.limit);
|
||||
const offset = this.normalizeListOffset(query.offset);
|
||||
const skip = offset + (page - 1) * limit;
|
||||
const [matches, rawTotal] = await Promise.all([
|
||||
MatchModel.find(filter)
|
||||
.sort(this.buildListSort(query.sort))
|
||||
.skip(skip)
|
||||
.limit(limit)
|
||||
.exec(),
|
||||
MatchModel.countDocuments(filter).exec(),
|
||||
]);
|
||||
|
||||
return {
|
||||
matches,
|
||||
total: Math.max(rawTotal - offset, 0),
|
||||
page,
|
||||
limit,
|
||||
};
|
||||
}
|
||||
|
||||
public async ensureShortCode(match: MatchDocument): Promise<MatchDocument> {
|
||||
if (match.shortCode) return match;
|
||||
|
||||
@@ -394,6 +436,44 @@ export class MatchService {
|
||||
};
|
||||
}
|
||||
|
||||
private buildListFilter(query: ListMatchesQuery): MatchListFilter {
|
||||
const filter: MatchListFilter = {
|
||||
communityId: query.communityId,
|
||||
};
|
||||
if (query.status) filter.status = query.status;
|
||||
if (query.scheduledFrom || query.scheduledTo) {
|
||||
filter.scheduledAt = {};
|
||||
if (query.scheduledFrom) filter.scheduledAt.$gte = query.scheduledFrom;
|
||||
if (query.scheduledTo) filter.scheduledAt.$lt = query.scheduledTo;
|
||||
}
|
||||
return filter;
|
||||
}
|
||||
|
||||
private buildListSort(sort?: 'asc' | 'desc'): { scheduledAt: 1 | -1 } {
|
||||
return { scheduledAt: sort === 'asc' ? 1 : -1 };
|
||||
}
|
||||
|
||||
private normalizeListLimit(limit?: number): number {
|
||||
if (!Number.isFinite(limit) || !limit || limit < 1) {
|
||||
return DEFAULT_MATCH_LIST_LIMIT;
|
||||
}
|
||||
return Math.min(Math.floor(limit), MAX_MATCH_LIST_LIMIT);
|
||||
}
|
||||
|
||||
private normalizeListPage(page?: number): number {
|
||||
if (!Number.isFinite(page) || !page || page < 1) {
|
||||
return 1;
|
||||
}
|
||||
return Math.floor(page);
|
||||
}
|
||||
|
||||
private normalizeListOffset(offset?: number): number {
|
||||
if (!Number.isFinite(offset) || !offset || offset < 1) {
|
||||
return 0;
|
||||
}
|
||||
return Math.floor(offset);
|
||||
}
|
||||
|
||||
private async generateUniqueShortCode(
|
||||
MatchModel: mongoose.Model<Match>,
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
|
||||
@@ -50,6 +50,11 @@ const DDRAGON_MANIFEST_STALE_MS = 24 * 60 * 60 * 1000;
|
||||
interface MatchesQueryOptions {
|
||||
status?: MatchStatus;
|
||||
limit?: number;
|
||||
page?: number;
|
||||
offset?: number;
|
||||
scheduledFrom?: string;
|
||||
scheduledTo?: string;
|
||||
sort?: 'asc' | 'desc';
|
||||
}
|
||||
|
||||
export interface UserHistoryFilters {
|
||||
@@ -74,6 +79,11 @@ function createMatchesPath(
|
||||
const searchParams = new URLSearchParams();
|
||||
if (options.status) searchParams.set('status', options.status);
|
||||
if (options.limit) searchParams.set('limit', String(options.limit));
|
||||
if (options.page) searchParams.set('page', String(options.page));
|
||||
if (options.offset) searchParams.set('offset', String(options.offset));
|
||||
if (options.scheduledFrom) searchParams.set('scheduledFrom', options.scheduledFrom);
|
||||
if (options.scheduledTo) searchParams.set('scheduledTo', options.scheduledTo);
|
||||
if (options.sort) searchParams.set('sort', options.sort);
|
||||
|
||||
const queryString = searchParams.toString();
|
||||
return `/communities/${communityId}/matches${queryString ? `?${queryString}` : ''}`;
|
||||
@@ -93,7 +103,17 @@ export function useMatches(
|
||||
communityId = DEFAULT_COMMUNITY_ID,
|
||||
) {
|
||||
return useQuery({
|
||||
queryKey: ['matches', communityId, options.status ?? null, options.limit ?? null],
|
||||
queryKey: [
|
||||
'matches',
|
||||
communityId,
|
||||
options.status ?? null,
|
||||
options.limit ?? null,
|
||||
options.page ?? null,
|
||||
options.offset ?? null,
|
||||
options.scheduledFrom ?? null,
|
||||
options.scheduledTo ?? null,
|
||||
options.sort ?? null,
|
||||
],
|
||||
queryFn: async () => {
|
||||
const response = await apiFetch<MatchesResponse>(
|
||||
createMatchesPath(communityId, options),
|
||||
@@ -105,6 +125,30 @@ export function useMatches(
|
||||
});
|
||||
}
|
||||
|
||||
export function useMatchesPage(
|
||||
options: MatchesQueryOptions,
|
||||
communityId = DEFAULT_COMMUNITY_ID,
|
||||
) {
|
||||
return useQuery({
|
||||
queryKey: [
|
||||
'matches-page',
|
||||
communityId,
|
||||
options.status ?? null,
|
||||
options.limit ?? null,
|
||||
options.page ?? null,
|
||||
options.offset ?? null,
|
||||
options.scheduledFrom ?? null,
|
||||
options.scheduledTo ?? null,
|
||||
options.sort ?? null,
|
||||
],
|
||||
queryFn: () =>
|
||||
apiFetch<MatchesResponse>(createMatchesPath(communityId, options), {
|
||||
auth: 'none',
|
||||
}),
|
||||
enabled: Boolean(communityId),
|
||||
});
|
||||
}
|
||||
|
||||
export function useMatch(matchId: string | undefined, communityId = DEFAULT_COMMUNITY_ID) {
|
||||
return useQuery({
|
||||
queryKey: ['match', communityId, matchId ?? null],
|
||||
|
||||
@@ -340,6 +340,9 @@ export interface MeResponse {
|
||||
|
||||
export interface MatchesResponse {
|
||||
matches: ApiMatch[];
|
||||
total: number;
|
||||
page: number;
|
||||
limit: number;
|
||||
}
|
||||
|
||||
export interface MatchMutationRequest {
|
||||
|
||||
+232
-23
@@ -1,10 +1,134 @@
|
||||
import { useState } from 'react';
|
||||
import { ChevronLeft, ChevronRight } from 'lucide-react';
|
||||
import { Link } from 'react-router';
|
||||
import { mapApiMatchToMatchDetail } from '../api/mappers';
|
||||
import { useMatches, useMe } from '../api/hooks';
|
||||
import { useMatches, useMatchesPage, useMe } from '../api/hooks';
|
||||
import { DEFAULT_COMMUNITY_ID } from '../config';
|
||||
|
||||
const UPCOMING_GRID_MATCH_LIMIT = 3;
|
||||
const UPCOMING_MATCH_LIST_LIMIT = UPCOMING_GRID_MATCH_LIMIT + 1;
|
||||
const HISTORY_MATCH_PAGE_SIZE = 10;
|
||||
const EMPTY_SCHEDULE_TEXT = '예정된 매치가 없습니다.';
|
||||
|
||||
function SkeletonBlock({ className }: { className: string }) {
|
||||
return (
|
||||
<div
|
||||
aria-hidden="true"
|
||||
className={`animate-pulse bg-base-content/10 ${className}`}
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
function HomePageSkeleton() {
|
||||
const upcomingSkeletons = Array.from({ length: UPCOMING_GRID_MATCH_LIMIT });
|
||||
const historySkeletons = Array.from({ length: 5 });
|
||||
|
||||
return (
|
||||
<main
|
||||
className="max-w-5xl mx-auto px-4 sm:px-6"
|
||||
aria-busy="true"
|
||||
aria-live="polite"
|
||||
>
|
||||
<span className="sr-only">매치 목록을 불러오는 중...</span>
|
||||
|
||||
<section className="pt-8 pb-6">
|
||||
<div className="flex items-center justify-between gap-3 mb-3">
|
||||
<SkeletonBlock className="h-3 w-20" />
|
||||
<div className="flex items-center gap-3">
|
||||
<SkeletonBlock className="h-3 w-16" />
|
||||
<SkeletonBlock className="h-3 w-20" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="border border-base-content/10 bg-base-200/50">
|
||||
<div className="p-5 sm:p-6">
|
||||
<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="flex items-center gap-2.5 flex-wrap">
|
||||
<SkeletonBlock className="h-7 w-52 sm:w-64" />
|
||||
<SkeletonBlock className="h-5 w-12" />
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<SkeletonBlock className="h-4 w-full max-w-xl" />
|
||||
<SkeletonBlock className="h-4 w-4/5 max-w-lg" />
|
||||
</div>
|
||||
<div className="flex items-center gap-3 flex-wrap pt-1">
|
||||
<SkeletonBlock className="h-3 w-24" />
|
||||
<SkeletonBlock className="h-3 w-12" />
|
||||
<SkeletonBlock className="h-5 w-16" />
|
||||
</div>
|
||||
</div>
|
||||
<SkeletonBlock className="h-8 w-24 sm:shrink-0" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="pb-6">
|
||||
<SkeletonBlock className="h-3 w-24 mb-3" />
|
||||
<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) => (
|
||||
<div key={index} className="bg-base-100 h-full p-4 min-h-[122px]">
|
||||
<div className="flex items-center justify-between mb-3 gap-3">
|
||||
<SkeletonBlock className="h-4 w-28" />
|
||||
<SkeletonBlock className="h-5 w-12 shrink-0" />
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<SkeletonBlock className="h-3 w-24" />
|
||||
<SkeletonBlock className="h-3 w-12" />
|
||||
</div>
|
||||
<SkeletonBlock className="h-5 w-16 mt-3" />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section className="pb-12">
|
||||
<SkeletonBlock className="h-3 w-24 mb-3" />
|
||||
<div className="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>
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
|
||||
function StatusBadge({ status }: { status: string }) {
|
||||
const styles: Record<string, string> = {
|
||||
@@ -46,13 +170,73 @@ function getStatusLabel(status: string) {
|
||||
}
|
||||
}
|
||||
|
||||
interface HistoryPaginationProps {
|
||||
page: number;
|
||||
pageCount: number;
|
||||
total: number;
|
||||
isFetching: boolean;
|
||||
onPrevious: () => void;
|
||||
onNext: () => void;
|
||||
}
|
||||
|
||||
function HistoryPagination({
|
||||
page,
|
||||
pageCount,
|
||||
total,
|
||||
isFetching,
|
||||
onPrevious,
|
||||
onNext,
|
||||
}: HistoryPaginationProps) {
|
||||
const hasPrevious = page > 1;
|
||||
const hasNext = page < pageCount;
|
||||
|
||||
return (
|
||||
<div className="flex flex-wrap items-center gap-2 text-xs text-base-content/40">
|
||||
<span className="font-medium whitespace-nowrap">
|
||||
총 {total}개 · {page}/{pageCount}페이지
|
||||
</span>
|
||||
<div className="flex items-center gap-1">
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-ghost btn-xs px-2"
|
||||
disabled={!hasPrevious || isFetching}
|
||||
onClick={onPrevious}
|
||||
>
|
||||
<ChevronLeft className="h-3.5 w-3.5" aria-hidden="true" />
|
||||
이전
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-ghost btn-xs px-2"
|
||||
disabled={!hasNext || isFetching}
|
||||
onClick={onNext}
|
||||
>
|
||||
다음
|
||||
<ChevronRight className="h-3.5 w-3.5" aria-hidden="true" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default function HomePage() {
|
||||
const [timelineNow] = useState(() => new Date().toISOString());
|
||||
const [historyPage, setHistoryPage] = useState(1);
|
||||
const upcomingMatchesQuery = useMatches(
|
||||
{ limit: UPCOMING_MATCH_LIST_LIMIT },
|
||||
{
|
||||
limit: UPCOMING_MATCH_LIST_LIMIT,
|
||||
scheduledFrom: timelineNow,
|
||||
sort: 'asc',
|
||||
},
|
||||
DEFAULT_COMMUNITY_ID,
|
||||
);
|
||||
const finishedMatchesQuery = useMatches(
|
||||
{ status: 'finished', limit: 10 },
|
||||
const historyMatchesQuery = useMatchesPage(
|
||||
{
|
||||
limit: HISTORY_MATCH_PAGE_SIZE,
|
||||
page: historyPage,
|
||||
scheduledTo: timelineNow,
|
||||
sort: 'desc',
|
||||
},
|
||||
DEFAULT_COMMUNITY_ID,
|
||||
);
|
||||
const meQuery = useMe();
|
||||
@@ -67,15 +251,11 @@ export default function HomePage() {
|
||||
);
|
||||
}
|
||||
|
||||
if (upcomingMatchesQuery.isLoading || finishedMatchesQuery.isLoading) {
|
||||
return (
|
||||
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
||||
<span className="text-sm text-base-content/40">매치 목록을 불러오는 중...</span>
|
||||
</main>
|
||||
);
|
||||
if (upcomingMatchesQuery.isLoading || historyMatchesQuery.isLoading) {
|
||||
return <HomePageSkeleton />;
|
||||
}
|
||||
|
||||
if (upcomingMatchesQuery.error || finishedMatchesQuery.error) {
|
||||
if (upcomingMatchesQuery.error || historyMatchesQuery.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">
|
||||
@@ -87,8 +267,19 @@ export default function HomePage() {
|
||||
|
||||
const upcomingMatches =
|
||||
upcomingMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
||||
const finishedMatches =
|
||||
finishedMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
||||
const historyMatches =
|
||||
historyMatchesQuery.data?.matches.map(mapApiMatchToMatchDetail) ?? [];
|
||||
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 goToPreviousHistoryPage = () =>
|
||||
setHistoryPage((page) => Math.max(1, page - 1));
|
||||
const goToNextHistoryPage = () => setHistoryPage((page) => page + 1);
|
||||
const nextMatch = upcomingMatches[0];
|
||||
const upcomingCards = (nextMatch
|
||||
? upcomingMatches.slice(1)
|
||||
@@ -128,7 +319,7 @@ export default function HomePage() {
|
||||
{nextMatch ? (
|
||||
<Link to={`/match/${nextMatch.id}`} className="block group">
|
||||
<div className="border border-base-content/10 bg-base-200/50 hover:bg-base-200 transition-colors">
|
||||
<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="space-y-2.5">
|
||||
<div className="flex items-center gap-2.5 flex-wrap">
|
||||
@@ -160,8 +351,10 @@ export default function HomePage() {
|
||||
</div>
|
||||
</Link>
|
||||
) : (
|
||||
<div className="border border-base-content/10 bg-base-100 px-5 py-10 text-center text-sm text-base-content/40">
|
||||
아직 등록된 내전이 없습니다.
|
||||
<div className="border border-base-content/10 bg-base-200/50">
|
||||
<div className="p-5 sm:p-6 min-h-[150px] flex items-center justify-center text-center text-sm text-base-content/40">
|
||||
{EMPTY_SCHEDULE_TEXT}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
@@ -174,7 +367,7 @@ export default function HomePage() {
|
||||
{upcomingCards.length > 0 ? (
|
||||
upcomingCards.map((match) => (
|
||||
<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">
|
||||
<div className="bg-base-100 hover:bg-base-200/50 transition-colors cursor-pointer h-full p-4 min-h-[122px]">
|
||||
<div className="flex items-center justify-between mb-2.5">
|
||||
<h3 className="text-sm font-bold text-base-content truncate mr-2">
|
||||
{match.title}
|
||||
@@ -194,8 +387,8 @@ export default function HomePage() {
|
||||
</Link>
|
||||
))
|
||||
) : (
|
||||
<div className="bg-base-100 px-4 py-6 text-sm text-base-content/35 col-span-full">
|
||||
예정된 추가 매치가 없습니다.
|
||||
<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">
|
||||
{EMPTY_SCHEDULE_TEXT}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -211,14 +404,15 @@ export default function HomePage() {
|
||||
<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>
|
||||
{finishedMatches.length > 0 ? (
|
||||
finishedMatches.map((match) => (
|
||||
{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"
|
||||
@@ -234,6 +428,9 @@ export default function HomePage() {
|
||||
{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>
|
||||
@@ -248,16 +445,28 @@ export default function HomePage() {
|
||||
) : (
|
||||
<tr>
|
||||
<td
|
||||
colSpan={5}
|
||||
colSpan={6}
|
||||
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
||||
>
|
||||
아직 종료된 내전 기록이 없습니다.
|
||||
아직 내전 기록이 없습니다.
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{historyTotal > 0 && (
|
||||
<div className="mt-3 flex justify-end">
|
||||
<HistoryPagination
|
||||
page={historyPageFromApi}
|
||||
pageCount={historyPageCount}
|
||||
total={historyTotal}
|
||||
isFetching={historyMatchesQuery.isFetching}
|
||||
onPrevious={goToPreviousHistoryPage}
|
||||
onNext={goToNextHistoryPage}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
</main>
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user