Compare commits
4
Commits
release/73
...
release/74
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd5a82aa93 | ||
|
|
7a62e52d60 | ||
|
|
6fc58fec1d | ||
|
|
f586542dc3 |
No files matched your search
@@ -72,16 +72,27 @@ export class MatchController {
|
|||||||
communityId: mongoose.Types.ObjectId,
|
communityId: mongoose.Types.ObjectId,
|
||||||
@Query('status') status?: MatchStatus,
|
@Query('status') status?: MatchStatus,
|
||||||
@Query('limit') limit?: string,
|
@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,
|
communityId,
|
||||||
status,
|
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;
|
const myId = currentUser._id;
|
||||||
return {
|
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.');
|
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 () => {
|
it('clears game schedule when a built match returns to recruiting', async () => {
|
||||||
const communityId = new mongoose.Types.ObjectId();
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
const match = {
|
const match = {
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ import { TournamentCodeService } from '../tournament-code/tournament-code.servic
|
|||||||
const MATCH_SHORT_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
|
const MATCH_SHORT_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
|
||||||
const MATCH_SHORT_CODE_LENGTH = 4;
|
const MATCH_SHORT_CODE_LENGTH = 4;
|
||||||
const MATCH_SHORT_CODE_GENERATION_ATTEMPTS = 20;
|
const MATCH_SHORT_CODE_GENERATION_ATTEMPTS = 20;
|
||||||
|
const DEFAULT_MATCH_LIST_LIMIT = 50;
|
||||||
|
const MAX_MATCH_LIST_LIMIT = 200;
|
||||||
|
|
||||||
interface CreateMatchParams {
|
interface CreateMatchParams {
|
||||||
communityId: mongoose.Types.ObjectId;
|
communityId: mongoose.Types.ObjectId;
|
||||||
@@ -40,6 +42,23 @@ interface ListMatchesQuery {
|
|||||||
communityId: mongoose.Types.ObjectId;
|
communityId: mongoose.Types.ObjectId;
|
||||||
status?: MatchStatus;
|
status?: MatchStatus;
|
||||||
limit?: number;
|
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 {
|
interface JoinMatchParams {
|
||||||
@@ -101,19 +120,42 @@ export class MatchService {
|
|||||||
|
|
||||||
public async list(query: ListMatchesQuery): Promise<MatchDocument[]> {
|
public async list(query: ListMatchesQuery): Promise<MatchDocument[]> {
|
||||||
const MatchModel = await this.connectionService.getModel('match');
|
const MatchModel = await this.connectionService.getModel('match');
|
||||||
const filter: {
|
const filter = this.buildListFilter(query);
|
||||||
communityId: mongoose.Types.ObjectId;
|
|
||||||
status?: MatchStatus;
|
|
||||||
} = {
|
|
||||||
communityId: query.communityId,
|
|
||||||
};
|
|
||||||
if (query.status) filter.status = query.status;
|
|
||||||
return MatchModel.find(filter)
|
return MatchModel.find(filter)
|
||||||
.sort({ scheduledAt: -1 })
|
.sort(this.buildListSort(query.sort))
|
||||||
.limit(Math.min(query.limit ?? 50, 200))
|
.limit(this.normalizeListLimit(query.limit))
|
||||||
.exec();
|
.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> {
|
public async ensureShortCode(match: MatchDocument): Promise<MatchDocument> {
|
||||||
if (match.shortCode) return match;
|
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(
|
private async generateUniqueShortCode(
|
||||||
MatchModel: mongoose.Model<Match>,
|
MatchModel: mongoose.Model<Match>,
|
||||||
communityId: mongoose.Types.ObjectId,
|
communityId: mongoose.Types.ObjectId,
|
||||||
|
|||||||
+87
-1
@@ -1,4 +1,5 @@
|
|||||||
import { BrowserRouter, Link, Route, Routes } from "react-router";
|
import { BrowserRouter, Link, Route, Routes } from "react-router";
|
||||||
|
import type { ReactNode } from "react";
|
||||||
import { useMsal } from "@azure/msal-react";
|
import { useMsal } from "@azure/msal-react";
|
||||||
import { Moon, Sun } from "lucide-react";
|
import { Moon, Sun } from "lucide-react";
|
||||||
import DevAuthSwitcher from "./components/DevAuthSwitcher";
|
import DevAuthSwitcher from "./components/DevAuthSwitcher";
|
||||||
@@ -65,13 +66,60 @@ function ThemeToggle() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function AppFooter() {
|
||||||
|
return (
|
||||||
|
<footer className="border-t border-base-content/10 bg-base-100">
|
||||||
|
<div className="max-w-5xl mx-auto px-4 sm:px-6 py-8 text-xs text-base-content/35">
|
||||||
|
<nav className="flex items-center gap-4 mb-4 font-semibold text-base-content/45">
|
||||||
|
<Link to="/terms" className="hover:text-base-content">
|
||||||
|
서비스 이용약관
|
||||||
|
</Link>
|
||||||
|
<Link to="/privacy" className="hover:text-base-content">
|
||||||
|
개인정보처리방침
|
||||||
|
</Link>
|
||||||
|
</nav>
|
||||||
|
<p className="leading-relaxed max-w-4xl">
|
||||||
|
© 2026 LOLYMPUS. LOLYMPUS is not endorsed by Riot Games and
|
||||||
|
does not reflect the views or opinions of Riot Games or anyone
|
||||||
|
officially involved in producing or managing League of Legends.
|
||||||
|
League of Legends and Riot Games are trademarks or registered
|
||||||
|
trademarks of Riot Games, Inc. League of Legends © Riot Games, Inc.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function LegalPage({
|
||||||
|
title,
|
||||||
|
children,
|
||||||
|
}: {
|
||||||
|
title: string;
|
||||||
|
children: ReactNode;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<main className="max-w-3xl mx-auto px-4 sm:px-6 py-12">
|
||||||
|
<Link
|
||||||
|
to="/"
|
||||||
|
className="inline-flex text-xs text-base-content/40 hover:text-base-content mb-5"
|
||||||
|
>
|
||||||
|
← 홈으로
|
||||||
|
</Link>
|
||||||
|
<h1 className="text-2xl font-black text-base-content">{title}</h1>
|
||||||
|
<div className="mt-6 space-y-4 text-sm leading-7 text-base-content/60">
|
||||||
|
{children}
|
||||||
|
</div>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID);
|
const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID);
|
||||||
const communityLabel = communityQuery.data?.name ?? "LOLYMPUS";
|
const communityLabel = communityQuery.data?.name ?? "LOLYMPUS";
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<div className="min-h-screen bg-base-100">
|
<div className="min-h-screen bg-base-100 flex flex-col">
|
||||||
<nav className="bg-base-100 border-b border-base-content/10 sticky top-0 z-50">
|
<nav className="bg-base-100 border-b border-base-content/10 sticky top-0 z-50">
|
||||||
<div className="max-w-5xl mx-auto px-4 sm:px-6 flex items-center justify-between h-11">
|
<div className="max-w-5xl mx-auto px-4 sm:px-6 flex items-center justify-between h-11">
|
||||||
<Link
|
<Link
|
||||||
@@ -96,6 +144,7 @@ function App() {
|
|||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
|
<div className="flex-1">
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" element={<HomePage />} />
|
<Route path="/" element={<HomePage />} />
|
||||||
<Route path="/login" element={<LoginPage />} />
|
<Route path="/login" element={<LoginPage />} />
|
||||||
@@ -131,7 +180,44 @@ function App() {
|
|||||||
path="/admin/communities/:cid/legacy-matches"
|
path="/admin/communities/:cid/legacy-matches"
|
||||||
element={<LegacyMatchesPage />}
|
element={<LegacyMatchesPage />}
|
||||||
/>
|
/>
|
||||||
|
<Route
|
||||||
|
path="/terms"
|
||||||
|
element={
|
||||||
|
<LegalPage title="서비스 이용약관">
|
||||||
|
<p>
|
||||||
|
This service is provided for community tournament support,
|
||||||
|
including match scheduling, participation management, team
|
||||||
|
organization, and related statistics.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
By using this service, users agree not to interfere with
|
||||||
|
service operation, misuse community data, or submit content
|
||||||
|
that violates applicable laws or community rules.
|
||||||
|
</p>
|
||||||
|
</LegalPage>
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path="/privacy"
|
||||||
|
element={
|
||||||
|
<LegalPage title="개인정보처리방침">
|
||||||
|
<p>
|
||||||
|
This service processes account, profile, match
|
||||||
|
participation, team, and authentication data only as needed
|
||||||
|
to operate community tournament features.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
Users may request access, correction, or deletion of their
|
||||||
|
personal data through the service administrator, subject to
|
||||||
|
records that must be retained for service integrity or legal
|
||||||
|
obligations.
|
||||||
|
</p>
|
||||||
|
</LegalPage>
|
||||||
|
}
|
||||||
|
/>
|
||||||
</Routes>
|
</Routes>
|
||||||
|
</div>
|
||||||
|
<AppFooter />
|
||||||
<DevAuthSwitcher />
|
<DevAuthSwitcher />
|
||||||
</div>
|
</div>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
|
|||||||
@@ -50,6 +50,11 @@ const DDRAGON_MANIFEST_STALE_MS = 24 * 60 * 60 * 1000;
|
|||||||
interface MatchesQueryOptions {
|
interface MatchesQueryOptions {
|
||||||
status?: MatchStatus;
|
status?: MatchStatus;
|
||||||
limit?: number;
|
limit?: number;
|
||||||
|
page?: number;
|
||||||
|
offset?: number;
|
||||||
|
scheduledFrom?: string;
|
||||||
|
scheduledTo?: string;
|
||||||
|
sort?: 'asc' | 'desc';
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UserHistoryFilters {
|
export interface UserHistoryFilters {
|
||||||
@@ -74,6 +79,11 @@ function createMatchesPath(
|
|||||||
const searchParams = new URLSearchParams();
|
const searchParams = new URLSearchParams();
|
||||||
if (options.status) searchParams.set('status', options.status);
|
if (options.status) searchParams.set('status', options.status);
|
||||||
if (options.limit) searchParams.set('limit', String(options.limit));
|
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();
|
const queryString = searchParams.toString();
|
||||||
return `/communities/${communityId}/matches${queryString ? `?${queryString}` : ''}`;
|
return `/communities/${communityId}/matches${queryString ? `?${queryString}` : ''}`;
|
||||||
@@ -93,7 +103,17 @@ export function useMatches(
|
|||||||
communityId = DEFAULT_COMMUNITY_ID,
|
communityId = DEFAULT_COMMUNITY_ID,
|
||||||
) {
|
) {
|
||||||
return useQuery({
|
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 () => {
|
queryFn: async () => {
|
||||||
const response = await apiFetch<MatchesResponse>(
|
const response = await apiFetch<MatchesResponse>(
|
||||||
createMatchesPath(communityId, options),
|
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) {
|
export function useMatch(matchId: string | undefined, communityId = DEFAULT_COMMUNITY_ID) {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ['match', communityId, matchId ?? null],
|
queryKey: ['match', communityId, matchId ?? null],
|
||||||
|
|||||||
@@ -340,6 +340,9 @@ export interface MeResponse {
|
|||||||
|
|
||||||
export interface MatchesResponse {
|
export interface MatchesResponse {
|
||||||
matches: ApiMatch[];
|
matches: ApiMatch[];
|
||||||
|
total: number;
|
||||||
|
page: number;
|
||||||
|
limit: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface MatchMutationRequest {
|
export interface MatchMutationRequest {
|
||||||
|
|||||||
+339
-28
@@ -1,10 +1,151 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { ChevronLeft, ChevronRight } from 'lucide-react';
|
||||||
import { Link } from 'react-router';
|
import { Link } from 'react-router';
|
||||||
import { mapApiMatchToMatchDetail } from '../api/mappers';
|
import { mapApiMatchToMatchDetail } from '../api/mappers';
|
||||||
import { useMatches, useMe } from '../api/hooks';
|
import { useMatches, useMatchesPage, useMe } from '../api/hooks';
|
||||||
import { DEFAULT_COMMUNITY_ID } from '../config';
|
import { DEFAULT_COMMUNITY_ID } from '../config';
|
||||||
|
|
||||||
const UPCOMING_GRID_MATCH_LIMIT = 3;
|
const UPCOMING_GRID_MATCH_LIMIT = 3;
|
||||||
const UPCOMING_MATCH_LIST_LIMIT = UPCOMING_GRID_MATCH_LIMIT + 1;
|
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="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>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function StatusBadge({ status }: { status: string }) {
|
function StatusBadge({ status }: { status: string }) {
|
||||||
const styles: Record<string, string> = {
|
const styles: Record<string, string> = {
|
||||||
@@ -16,7 +157,7 @@ function StatusBadge({ status }: { status: string }) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
className={`inline-flex items-center text-[11px] font-semibold px-1.5 py-0.5 border ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`}
|
className={`inline-flex items-center whitespace-nowrap text-[11px] font-semibold px-1.5 py-0.5 border ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`}
|
||||||
>
|
>
|
||||||
{status}
|
{status}
|
||||||
</span>
|
</span>
|
||||||
@@ -25,7 +166,7 @@ function StatusBadge({ status }: { status: string }) {
|
|||||||
|
|
||||||
function MapBadge({ map }: { map: string }) {
|
function MapBadge({ map }: { map: string }) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex items-center text-[11px] px-1.5 py-0.5 border border-base-content/10 text-base-content/50">
|
<span className="inline-flex items-center whitespace-nowrap text-[11px] px-1.5 py-0.5 border border-base-content/10 text-base-content/50">
|
||||||
{map}
|
{map}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
@@ -46,13 +187,110 @@ function getStatusLabel(status: string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatCompactDateTime(dateLike: string) {
|
||||||
|
const date = new Date(dateLike);
|
||||||
|
if (Number.isNaN(date.getTime())) return '';
|
||||||
|
|
||||||
|
const weekday = new Intl.DateTimeFormat('ko-KR', {
|
||||||
|
weekday: 'short',
|
||||||
|
}).format(date);
|
||||||
|
const hours = String(date.getHours()).padStart(2, '0');
|
||||||
|
const minutes = String(date.getMinutes()).padStart(2, '0');
|
||||||
|
|
||||||
|
return `${date.getMonth() + 1}/${date.getDate()} (${weekday}) ${hours}:${minutes}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryMetaText({
|
||||||
|
map,
|
||||||
|
participants,
|
||||||
|
result,
|
||||||
|
}: {
|
||||||
|
map: string;
|
||||||
|
participants: number;
|
||||||
|
result?: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<div className="flex flex-wrap items-center gap-x-1.5 gap-y-1 text-[11px] text-base-content/45">
|
||||||
|
<span>{map}</span>
|
||||||
|
<span className="text-base-content/20">·</span>
|
||||||
|
<span>{participants}명</span>
|
||||||
|
{result && (
|
||||||
|
<>
|
||||||
|
<span className="text-base-content/20">·</span>
|
||||||
|
<span>{result}</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
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() {
|
export default function HomePage() {
|
||||||
|
const [timelineNow] = useState(() => new Date().toISOString());
|
||||||
|
const [historyPage, setHistoryPage] = useState(1);
|
||||||
const upcomingMatchesQuery = useMatches(
|
const upcomingMatchesQuery = useMatches(
|
||||||
{ limit: UPCOMING_MATCH_LIST_LIMIT },
|
{
|
||||||
|
limit: UPCOMING_MATCH_LIST_LIMIT,
|
||||||
|
scheduledFrom: timelineNow,
|
||||||
|
sort: 'asc',
|
||||||
|
},
|
||||||
DEFAULT_COMMUNITY_ID,
|
DEFAULT_COMMUNITY_ID,
|
||||||
);
|
);
|
||||||
const finishedMatchesQuery = useMatches(
|
const historyMatchesQuery = useMatchesPage(
|
||||||
{ status: 'finished', limit: 10 },
|
{
|
||||||
|
limit: HISTORY_MATCH_PAGE_SIZE,
|
||||||
|
page: historyPage,
|
||||||
|
scheduledTo: timelineNow,
|
||||||
|
sort: 'desc',
|
||||||
|
},
|
||||||
DEFAULT_COMMUNITY_ID,
|
DEFAULT_COMMUNITY_ID,
|
||||||
);
|
);
|
||||||
const meQuery = useMe();
|
const meQuery = useMe();
|
||||||
@@ -67,15 +305,11 @@ export default function HomePage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (upcomingMatchesQuery.isLoading || finishedMatchesQuery.isLoading) {
|
if (upcomingMatchesQuery.isLoading || historyMatchesQuery.isLoading) {
|
||||||
return (
|
return <HomePageSkeleton />;
|
||||||
<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.error || finishedMatchesQuery.error) {
|
if (upcomingMatchesQuery.error || historyMatchesQuery.error) {
|
||||||
return (
|
return (
|
||||||
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
||||||
<span className="text-sm text-red-500">
|
<span className="text-sm text-red-500">
|
||||||
@@ -87,8 +321,22 @@ export default function HomePage() {
|
|||||||
|
|
||||||
const upcomingMatches =
|
const upcomingMatches =
|
||||||
upcomingMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
upcomingMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
||||||
const finishedMatches =
|
const historyMatches =
|
||||||
finishedMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
historyMatchesQuery.data?.matches.map((match) => ({
|
||||||
|
...mapApiMatchToMatchDetail(match),
|
||||||
|
compactDateTime: formatCompactDateTime(match.scheduledAt),
|
||||||
|
})) ?? [];
|
||||||
|
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 nextMatch = upcomingMatches[0];
|
||||||
const upcomingCards = (nextMatch
|
const upcomingCards = (nextMatch
|
||||||
? upcomingMatches.slice(1)
|
? upcomingMatches.slice(1)
|
||||||
@@ -128,7 +376,7 @@ export default function HomePage() {
|
|||||||
{nextMatch ? (
|
{nextMatch ? (
|
||||||
<Link to={`/match/${nextMatch.id}`} className="block group">
|
<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="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="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">
|
||||||
@@ -160,8 +408,10 @@ export default function HomePage() {
|
|||||||
</div>
|
</div>
|
||||||
</Link>
|
</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>
|
</div>
|
||||||
)}
|
)}
|
||||||
</section>
|
</section>
|
||||||
@@ -174,7 +424,7 @@ export default function HomePage() {
|
|||||||
{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">
|
<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">
|
<div className="flex items-center justify-between mb-2.5">
|
||||||
<h3 className="text-sm font-bold text-base-content truncate mr-2">
|
<h3 className="text-sm font-bold text-base-content truncate mr-2">
|
||||||
{match.title}
|
{match.title}
|
||||||
@@ -194,8 +444,8 @@ export default function HomePage() {
|
|||||||
</Link>
|
</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>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -205,20 +455,22 @@ export default function HomePage() {
|
|||||||
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
|
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
|
||||||
지난 내전 기록
|
지난 내전 기록
|
||||||
</h2>
|
</h2>
|
||||||
<div className="border border-base-content/10 overflow-x-auto">
|
{/* 데스크톱: 테이블 */}
|
||||||
|
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||||
<table className="w-full text-left">
|
<table className="w-full text-left">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="bg-base-200/60 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/40">
|
<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>
|
<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>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{finishedMatches.length > 0 ? (
|
{historyMatches.length > 0 ? (
|
||||||
finishedMatches.map((match) => (
|
historyMatches.map((match) => (
|
||||||
<tr
|
<tr
|
||||||
key={match.id}
|
key={match.id}
|
||||||
className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors"
|
className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors"
|
||||||
@@ -234,13 +486,16 @@ export default function HomePage() {
|
|||||||
{match.title}
|
{match.title}
|
||||||
</Link>
|
</Link>
|
||||||
</td>
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<StatusBadge status={getStatusLabel(match.status)} />
|
||||||
|
</td>
|
||||||
<td className="py-2.5 px-4">
|
<td className="py-2.5 px-4">
|
||||||
<MapBadge map={match.map} />
|
<MapBadge map={match.map} />
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/50">
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
{match.participants.length}명
|
{match.participants.length}명
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/50">
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
{match.result?.winner ? `${match.result.winner} 승리` : '-'}
|
{match.result?.winner ? `${match.result.winner} 승리` : '-'}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -248,16 +503,72 @@ export default function HomePage() {
|
|||||||
) : (
|
) : (
|
||||||
<tr>
|
<tr>
|
||||||
<td
|
<td
|
||||||
colSpan={5}
|
colSpan={6}
|
||||||
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
||||||
>
|
>
|
||||||
아직 종료된 내전 기록이 없습니다.
|
아직 내전 기록이 없습니다.
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
)}
|
)}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</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">
|
||||||
|
아직 내전 기록이 없습니다.
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</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>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -184,13 +184,29 @@ function QueueRankCell({
|
|||||||
tier?: ApiTierInfo;
|
tier?: ApiTierInfo;
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex w-[54px] items-center gap-1">
|
<span className="grid grid-cols-[24px_auto] items-center gap-1">
|
||||||
<span>{label}</span>
|
<span>{label}</span>
|
||||||
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
|
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function PreferredPositionText({
|
||||||
|
mainPosition,
|
||||||
|
subPosition,
|
||||||
|
}: {
|
||||||
|
mainPosition: Position;
|
||||||
|
subPosition: Position;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<span className="inline-flex flex-col gap-0.5 text-[11px] font-medium leading-tight text-base-content/55 whitespace-nowrap sm:flex-row sm:items-center sm:gap-1 sm:leading-normal">
|
||||||
|
<span>주 {positionLabel[mainPosition]}</span>
|
||||||
|
<span className="hidden sm:inline">/</span>
|
||||||
|
<span>부 {positionLabel[subPosition]}</span>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function SoloRankPrefix({ tier }: { tier?: ApiTierInfo }) {
|
function SoloRankPrefix({ tier }: { tier?: ApiTierInfo }) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] font-black text-base-content/35">
|
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] font-black text-base-content/35">
|
||||||
@@ -214,7 +230,7 @@ function TierCell({ participant }: { participant: ParticipantView }) {
|
|||||||
const flexTier = tierByQueue(tiers, "RANKED_FLEX_SR");
|
const flexTier = tierByQueue(tiers, "RANKED_FLEX_SR");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center gap-2 text-[10px] font-black text-base-content/35 whitespace-nowrap">
|
<div className="flex flex-col items-start gap-1 text-[10px] font-black text-base-content/35 whitespace-nowrap sm:flex-row sm:items-center sm:gap-3">
|
||||||
<QueueRankCell label="SOLO" tier={soloTier} />
|
<QueueRankCell label="SOLO" tier={soloTier} />
|
||||||
<QueueRankCell label="FLEX" tier={flexTier} />
|
<QueueRankCell label="FLEX" tier={flexTier} />
|
||||||
</div>
|
</div>
|
||||||
@@ -334,17 +350,16 @@ function ParticipantRow({
|
|||||||
: participant.mainPosition;
|
: participant.mainPosition;
|
||||||
admin.onChangePositions(participant.userId, main, next);
|
admin.onChangePositions(participant.userId, main, next);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<tr className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors">
|
<tr className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors">
|
||||||
<td className="py-2 px-3 text-center text-[11px] text-base-content/30 w-8">
|
<td className="hidden py-2 px-3 text-center text-[11px] text-base-content/30 w-8 sm:table-cell">
|
||||||
{index + 1}
|
{index + 1}
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2 px-3">
|
<td className="py-2 px-3">
|
||||||
<Link
|
<Link
|
||||||
to={`/users/${participant.userId}/history`}
|
to={`/users/${participant.userId}/history`}
|
||||||
state={{ backTo: historyBackTo }}
|
state={{ backTo: historyBackTo }}
|
||||||
className="flex items-center gap-2 group"
|
className="flex min-w-0 items-center gap-2 group"
|
||||||
>
|
>
|
||||||
<div className="w-7 h-7 bg-base-content/10 overflow-hidden shrink-0">
|
<div className="w-7 h-7 bg-base-content/10 overflow-hidden shrink-0">
|
||||||
<img
|
<img
|
||||||
@@ -355,7 +370,7 @@ function ParticipantRow({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="min-w-0">
|
<div className="min-w-0">
|
||||||
<span className="font-medium text-[13px] text-base-content truncate block leading-tight group-hover:text-primary transition-colors">
|
<span className="font-medium text-[13px] text-base-content block leading-tight break-words group-hover:text-primary transition-colors sm:truncate">
|
||||||
{participant.summonerName}
|
{participant.summonerName}
|
||||||
</span>
|
</span>
|
||||||
<span className="inline-flex items-center gap-1 text-[10px] text-base-content/25 leading-tight">
|
<span className="inline-flex items-center gap-1 text-[10px] text-base-content/25 leading-tight">
|
||||||
@@ -374,7 +389,10 @@ function ParticipantRow({
|
|||||||
</td>
|
</td>
|
||||||
{assignedPos ? (
|
{assignedPos ? (
|
||||||
<td className="py-2 px-3">
|
<td className="py-2 px-3">
|
||||||
<PosBadge pos={assignedPos} />
|
<PreferredPositionText
|
||||||
|
mainPosition={participant.mainPosition}
|
||||||
|
subPosition={participant.subPosition}
|
||||||
|
/>
|
||||||
</td>
|
</td>
|
||||||
) : admin ? (
|
) : admin ? (
|
||||||
<>
|
<>
|
||||||
@@ -452,6 +470,53 @@ function ParticipantRow({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function TeamParticipantMobileRow({
|
||||||
|
participant,
|
||||||
|
}: {
|
||||||
|
participant: ParticipantView;
|
||||||
|
}) {
|
||||||
|
const { data: ddragon } = useDdragonManifest();
|
||||||
|
const location = useLocation();
|
||||||
|
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="grid grid-cols-[minmax(0,1fr)_64px_58px] items-center gap-x-2 border-b border-base-content/5 px-3 py-2 last:border-b-0">
|
||||||
|
<Link
|
||||||
|
to={`/users/${participant.userId}/history`}
|
||||||
|
state={{ backTo: historyBackTo }}
|
||||||
|
className="flex min-w-0 items-center gap-2 group"
|
||||||
|
>
|
||||||
|
<div className="h-7 w-7 shrink-0 overflow-hidden bg-base-content/10">
|
||||||
|
<img
|
||||||
|
src={profileIconUrl(ddragon, participant.profileIconId)}
|
||||||
|
alt=""
|
||||||
|
className="h-full w-full object-cover"
|
||||||
|
loading="lazy"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="min-w-0">
|
||||||
|
<span className="block break-words text-[13px] font-medium leading-tight text-base-content transition-colors group-hover:text-primary">
|
||||||
|
{participant.summonerName}
|
||||||
|
</span>
|
||||||
|
<span className="inline-flex items-center gap-1 text-[10px] leading-tight text-base-content/25">
|
||||||
|
#{participant.tag}
|
||||||
|
{participant.excluded && (
|
||||||
|
<span className="border border-amber-500/20 bg-amber-500/10 px-1 text-[9px] font-bold text-amber-500">
|
||||||
|
제외
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
<TierCell participant={participant} />
|
||||||
|
<PreferredPositionText
|
||||||
|
mainPosition={participant.mainPosition}
|
||||||
|
subPosition={participant.subPosition}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function ParticipantTable({
|
function ParticipantTable({
|
||||||
participants,
|
participants,
|
||||||
maxParticipants,
|
maxParticipants,
|
||||||
@@ -629,7 +694,7 @@ function ParticipantTable({
|
|||||||
<table className="w-full text-left">
|
<table className="w-full text-left">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="border-b border-base-content/10 bg-base-200/40 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
<tr className="border-b border-base-content/10 bg-base-200/40 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
||||||
<th className="py-2 px-3 w-8">#</th>
|
<th className="hidden py-2 px-3 w-8 sm:table-cell">#</th>
|
||||||
<th className="py-2 px-3">소환사</th>
|
<th className="py-2 px-3">소환사</th>
|
||||||
<th className="py-2 px-3">현재 티어</th>
|
<th className="py-2 px-3">현재 티어</th>
|
||||||
<th className="py-2 px-3">주 포지션</th>
|
<th className="py-2 px-3">주 포지션</th>
|
||||||
@@ -722,7 +787,20 @@ function TeamCard({
|
|||||||
진행 페이지
|
진행 페이지
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<table className="w-full table-fixed text-left">
|
<div className="sm:hidden">
|
||||||
|
<div className="grid grid-cols-[minmax(0,1fr)_64px_58px] gap-x-2 border-b border-base-content/8 bg-base-200/30 px-3 py-2 text-[11px] font-semibold uppercase tracking-wider text-base-content/35">
|
||||||
|
<span>소환사</span>
|
||||||
|
<span>현재 티어</span>
|
||||||
|
<span>포지션</span>
|
||||||
|
</div>
|
||||||
|
{team.participants.map((participant) => (
|
||||||
|
<TeamParticipantMobileRow
|
||||||
|
key={participant.id}
|
||||||
|
participant={participant}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<table className="hidden w-full table-fixed text-left sm:table">
|
||||||
<colgroup>
|
<colgroup>
|
||||||
<col className="w-11" />
|
<col className="w-11" />
|
||||||
<col />
|
<col />
|
||||||
@@ -731,7 +809,7 @@ function TeamCard({
|
|||||||
</colgroup>
|
</colgroup>
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="border-b border-base-content/8 bg-base-200/30 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
<tr className="border-b border-base-content/8 bg-base-200/30 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
||||||
<th className="py-2 px-3 w-8">#</th>
|
<th className="hidden py-2 px-3 w-8 sm:table-cell">#</th>
|
||||||
<th className="py-2 px-3">소환사</th>
|
<th className="py-2 px-3">소환사</th>
|
||||||
<th className="py-2 px-3">현재 티어</th>
|
<th className="py-2 px-3">현재 티어</th>
|
||||||
<th className="py-2 px-3">포지션</th>
|
<th className="py-2 px-3">포지션</th>
|
||||||
|
|||||||
Reference in new issue
Block a user