Compare commits
28
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ee3e5935d6 | ||
|
|
5ba68ea134 | ||
|
|
12869a7e9e | ||
|
|
d10e2ab011 | ||
|
|
170e42098a | ||
|
|
fe7a482969 | ||
|
|
aa07ec0304 | ||
|
|
cd5a82aa93 | ||
|
|
7a62e52d60 | ||
|
|
6fc58fec1d | ||
|
|
f586542dc3 | ||
|
|
6697cd8ea1 | ||
|
|
c435e8a6a5 | ||
|
|
15ae680ec7 | ||
|
|
bdea0287a5 | ||
|
|
b56728f843 | ||
|
|
7f2b34fd4b | ||
|
|
146349beb8 | ||
|
|
326e0c66b6 | ||
|
|
edfb960e97 | ||
|
|
b2d438785b | ||
|
|
b6dad78d02 | ||
|
|
42d4854f9c | ||
|
|
e9081d77c9 | ||
|
|
181beb85e5 | ||
|
|
ebca348723 | ||
|
|
de8bc87940 | ||
|
|
25f3ccad57 |
No files matched your search
@@ -322,6 +322,119 @@ describe('AuctionService', () => {
|
|||||||
expect(randomSpy).toHaveBeenCalled();
|
expect(randomSpy).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('includes tier history in auction player snapshots when starting an auction', async () => {
|
||||||
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
|
const communityId = new mongoose.Types.ObjectId();
|
||||||
|
const userIds = Array.from(
|
||||||
|
{ length: 10 },
|
||||||
|
() => new mongoose.Types.ObjectId(),
|
||||||
|
);
|
||||||
|
const participants = userIds.map((userId, index) => ({
|
||||||
|
userId,
|
||||||
|
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||||
|
joinedAt: new Date(index),
|
||||||
|
excluded: false,
|
||||||
|
}));
|
||||||
|
const match = {
|
||||||
|
_id: matchId,
|
||||||
|
communityId,
|
||||||
|
participants,
|
||||||
|
status: 'recruiting',
|
||||||
|
teamBuiltAt: undefined,
|
||||||
|
save: jest.fn().mockResolvedValue(undefined),
|
||||||
|
};
|
||||||
|
const tierHistory = [
|
||||||
|
{
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'GOLD',
|
||||||
|
rank: 'II',
|
||||||
|
leaguePoints: 42,
|
||||||
|
wins: 30,
|
||||||
|
losses: 24,
|
||||||
|
recordedAt: new Date('2026-05-01T00:00:00.000Z'),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
queueType: 'RANKED_SOLO_5x5',
|
||||||
|
tier: 'PLATINUM',
|
||||||
|
rank: 'IV',
|
||||||
|
leaguePoints: 15,
|
||||||
|
wins: 34,
|
||||||
|
losses: 27,
|
||||||
|
recordedAt: new Date('2026-05-08T00:00:00.000Z'),
|
||||||
|
},
|
||||||
|
];
|
||||||
|
const users = userIds.slice(2).map((userId, index) => ({
|
||||||
|
_id: userId,
|
||||||
|
riotAccounts: [
|
||||||
|
{
|
||||||
|
puuid: `puuid-${index}`,
|
||||||
|
gameName: `Player${index}`,
|
||||||
|
tagLine: 'KR1',
|
||||||
|
profileIconId: index,
|
||||||
|
tiers: [],
|
||||||
|
tierHistory: index === 0 ? tierHistory : [],
|
||||||
|
championMasteries: [],
|
||||||
|
recentStatsSummary: undefined,
|
||||||
|
lastRefreshRequestedAt: new Date(),
|
||||||
|
isPrimary: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}));
|
||||||
|
const auctionCreate = jest.fn().mockImplementation(async (payload) => ({
|
||||||
|
_id: new mongoose.Types.ObjectId(),
|
||||||
|
matchId,
|
||||||
|
toObject: jest.fn().mockReturnValue({ matchId, ...payload }),
|
||||||
|
}));
|
||||||
|
const { service } = createService({
|
||||||
|
match: {
|
||||||
|
findById: jest.fn().mockResolvedValue(match),
|
||||||
|
},
|
||||||
|
user: {
|
||||||
|
find: jest.fn().mockResolvedValue(users),
|
||||||
|
},
|
||||||
|
auction: {
|
||||||
|
findOne: jest.fn().mockResolvedValue(null),
|
||||||
|
create: auctionCreate,
|
||||||
|
},
|
||||||
|
community: {
|
||||||
|
findById: jest.fn().mockReturnValue({
|
||||||
|
select: jest.fn().mockReturnValue({
|
||||||
|
lean: jest.fn().mockReturnValue({
|
||||||
|
exec: jest.fn().mockResolvedValue({
|
||||||
|
riotPlatform: 'kr',
|
||||||
|
riotRegion: 'asia',
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await service.start({
|
||||||
|
matchId,
|
||||||
|
communityId,
|
||||||
|
captains: [
|
||||||
|
{ teamIndex: 1, userId: userIds[0] },
|
||||||
|
{ teamIndex: 2, userId: userIds[1] },
|
||||||
|
],
|
||||||
|
initialPoints: 1000,
|
||||||
|
maxTimerSeconds: 30,
|
||||||
|
bidExtensionSeconds: 5,
|
||||||
|
topTierThreshold: 'NONE',
|
||||||
|
manualTopTierUserIds: [],
|
||||||
|
});
|
||||||
|
|
||||||
|
const firstPlayerSnapshot = auctionCreate.mock.calls[0][0].order.find(
|
||||||
|
(player: { userId: mongoose.Types.ObjectId }) =>
|
||||||
|
player.userId.equals(userIds[2]),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(firstPlayerSnapshot).toMatchObject({
|
||||||
|
userId: userIds[2],
|
||||||
|
tierHistory,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('rejects bids when the team already has 5 members including captain', async () => {
|
it('rejects bids when the team already has 5 members including captain', async () => {
|
||||||
const matchId = new mongoose.Types.ObjectId();
|
const matchId = new mongoose.Types.ObjectId();
|
||||||
const auction = {
|
const auction = {
|
||||||
|
|||||||
@@ -174,6 +174,7 @@ export class AuctionService {
|
|||||||
profileIconId: primary.profileIconId,
|
profileIconId: primary.profileIconId,
|
||||||
preferredPositions: participant.preferredPositions,
|
preferredPositions: participant.preferredPositions,
|
||||||
tiers: primary.tiers,
|
tiers: primary.tiers,
|
||||||
|
tierHistory: primary.tierHistory ?? [],
|
||||||
masteries: primary.championMasteries,
|
masteries: primary.championMasteries,
|
||||||
recentStatsSummary: primary.recentStatsSummary,
|
recentStatsSummary: primary.recentStatsSummary,
|
||||||
passCount: 0,
|
passCount: 0,
|
||||||
@@ -919,6 +920,7 @@ export class AuctionService {
|
|||||||
'order.$.tagLine': account.tagLine,
|
'order.$.tagLine': account.tagLine,
|
||||||
'order.$.profileIconId': account.profileIconId,
|
'order.$.profileIconId': account.profileIconId,
|
||||||
'order.$.tiers': account.tiers,
|
'order.$.tiers': account.tiers,
|
||||||
|
'order.$.tierHistory': account.tierHistory ?? [],
|
||||||
'order.$.masteries': account.championMasteries,
|
'order.$.masteries': account.championMasteries,
|
||||||
'order.$.recentStatsSummary': account.recentStatsSummary,
|
'order.$.recentStatsSummary': account.recentStatsSummary,
|
||||||
updatedAt: new Date(),
|
updatedAt: new Date(),
|
||||||
|
|||||||
@@ -0,0 +1,148 @@
|
|||||||
|
import { SecretService } from '../global/secret/secret.service';
|
||||||
|
import { DakaoUrlShortenerService } from './dakao-url-shortener.service';
|
||||||
|
|
||||||
|
describe('DakaoUrlShortenerService', () => {
|
||||||
|
const originalEnv = process.env;
|
||||||
|
const originalFetch = global.fetch;
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
process.env = { ...originalEnv };
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
process.env = originalEnv;
|
||||||
|
global.fetch = originalFetch;
|
||||||
|
jest.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
function makeService(token = 'shortener-token') {
|
||||||
|
const secretService = {
|
||||||
|
get: jest.fn().mockResolvedValue(token),
|
||||||
|
} as unknown as jest.Mocked<SecretService>;
|
||||||
|
|
||||||
|
return {
|
||||||
|
service: new DakaoUrlShortenerService(secretService),
|
||||||
|
secretService,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
it('posts a production match detail URL with a deterministic slug', async () => {
|
||||||
|
process.env.NODE_ENV = 'prod';
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
status: 201,
|
||||||
|
json: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue({ shortUrl: 'https://go.dahyeon.us/lmtpAB12' }),
|
||||||
|
} as unknown as Response);
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
const shortUrl = await service.shortenMatchLink({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'ab12',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(shortUrl).toBe('https://go.dahyeon.us/lmtpAB12');
|
||||||
|
expect(global.fetch).toHaveBeenCalledWith(
|
||||||
|
'https://go.dahyeon.us/api/shorten',
|
||||||
|
expect.objectContaining({
|
||||||
|
method: 'POST',
|
||||||
|
headers: expect.objectContaining({
|
||||||
|
Accept: 'application/json',
|
||||||
|
Authorization: 'Bearer shortener-token',
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
const init = (global.fetch as jest.Mock).mock.calls[0][1] as RequestInit;
|
||||||
|
expect(JSON.parse(init.body as string)).toEqual({
|
||||||
|
slug: 'lmtpAB12',
|
||||||
|
url: 'https://lolympus.dahyeon.us/match/333333333333333333333333',
|
||||||
|
redirectStatus: 302,
|
||||||
|
expiresAt: null,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses staging slug prefix and configured target base URL outside production', async () => {
|
||||||
|
process.env.NODE_ENV = 'staging';
|
||||||
|
process.env.URL_SHORTENER_TARGET_BASE_URL =
|
||||||
|
'https://staging.lolympus.pages.dev/';
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
ok: true,
|
||||||
|
status: 201,
|
||||||
|
json: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue({ shortUrl: 'https://go.dahyeon.us/lmtsCD34' }),
|
||||||
|
} as unknown as Response);
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
await service.shortenMatchLink({
|
||||||
|
matchId: '444444444444444444444444',
|
||||||
|
shortCode: 'cd34',
|
||||||
|
});
|
||||||
|
|
||||||
|
const init = (global.fetch as jest.Mock).mock.calls[0][1] as RequestInit;
|
||||||
|
expect(JSON.parse(init.body as string)).toEqual(
|
||||||
|
expect.objectContaining({
|
||||||
|
slug: 'lmtsCD34',
|
||||||
|
url: 'https://staging.lolympus.pages.dev/match/444444444444444444444444',
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('builds the direct match detail URL for fallback output', () => {
|
||||||
|
process.env.URL_SHORTENER_TARGET_BASE_URL =
|
||||||
|
'https://staging.lolympus.pages.dev/';
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
expect(service.buildMatchDetailUrl('444444444444444444444444')).toBe(
|
||||||
|
'https://staging.lolympus.pages.dev/match/444444444444444444444444',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('skips shortener calls when the bearer token is missing', async () => {
|
||||||
|
global.fetch = jest.fn();
|
||||||
|
const { service } = makeService('');
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.shortenMatchLink({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
}),
|
||||||
|
).resolves.toBeUndefined();
|
||||||
|
expect(global.fetch).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns the deterministic short URL when the slug already exists', async () => {
|
||||||
|
process.env.NODE_ENV = 'prod';
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
ok: false,
|
||||||
|
status: 409,
|
||||||
|
text: jest.fn().mockResolvedValue('Conflict'),
|
||||||
|
} as unknown as Response);
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.shortenMatchLink({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
}),
|
||||||
|
).resolves.toBe('https://go.dahyeon.us/lmtpAB12');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('returns undefined when the shortener rejects the request', async () => {
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
ok: false,
|
||||||
|
status: 500,
|
||||||
|
text: jest.fn().mockResolvedValue('server error'),
|
||||||
|
} as unknown as Response);
|
||||||
|
const { service } = makeService();
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.shortenMatchLink({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
}),
|
||||||
|
).resolves.toBeUndefined();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,180 @@
|
|||||||
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
|
import { SecretService } from '../global/secret/secret.service';
|
||||||
|
|
||||||
|
const DEFAULT_SHORTENER_API_URL = 'https://go.dahyeon.us/api/shorten';
|
||||||
|
const DEFAULT_SHORTENER_BASE_URL = 'https://go.dahyeon.us';
|
||||||
|
const DEFAULT_TARGET_BASE_URL = 'https://lolympus.dahyeon.us';
|
||||||
|
const DEFAULT_TIMEOUT_MS = 1500;
|
||||||
|
|
||||||
|
interface ShortenMatchLinkParams {
|
||||||
|
matchId: string;
|
||||||
|
shortCode: string | undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ShortenerResponseBody {
|
||||||
|
shortUrl?: unknown;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class DakaoUrlShortenerService {
|
||||||
|
private readonly logger = new Logger(DakaoUrlShortenerService.name);
|
||||||
|
|
||||||
|
constructor(private readonly secretService: SecretService) {}
|
||||||
|
|
||||||
|
public async shortenMatchLink(
|
||||||
|
params: ShortenMatchLinkParams,
|
||||||
|
): Promise<string | undefined> {
|
||||||
|
const shortCode = params.shortCode?.trim().toUpperCase();
|
||||||
|
if (!shortCode) return undefined;
|
||||||
|
|
||||||
|
const token = await this.resolveToken();
|
||||||
|
if (!token) return undefined;
|
||||||
|
|
||||||
|
const slug = `${this.resolveSlugPrefix()}${shortCode}`;
|
||||||
|
const requestBody = {
|
||||||
|
slug,
|
||||||
|
url: this.buildMatchDetailUrl(params.matchId),
|
||||||
|
redirectStatus: 302,
|
||||||
|
expiresAt: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
const controller = new AbortController();
|
||||||
|
const timeout = setTimeout(
|
||||||
|
() => controller.abort(),
|
||||||
|
this.resolveTimeoutMs(),
|
||||||
|
);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const response = await fetch(this.resolveApiUrl(), {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
Accept: 'application/json',
|
||||||
|
Authorization: `Bearer ${token}`,
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify(requestBody),
|
||||||
|
signal: controller.signal,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (response.status === 409) {
|
||||||
|
return this.buildShortUrl(slug);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
await this.logFailedResponse(response, slug);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
const payload = await this.parseResponseBody(response);
|
||||||
|
const shortUrl = payload?.shortUrl;
|
||||||
|
return typeof shortUrl === 'string' && shortUrl.trim()
|
||||||
|
? shortUrl.trim()
|
||||||
|
: this.buildShortUrl(slug);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`URL shortener request failed for slug="${slug}": ${error instanceof Error ? error.message : String(error)}`,
|
||||||
|
);
|
||||||
|
return undefined;
|
||||||
|
} finally {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async resolveToken(): Promise<string | undefined> {
|
||||||
|
try {
|
||||||
|
const token = await this.secretService.get<string>(
|
||||||
|
'URL_SHORTENER_TOKEN',
|
||||||
|
'',
|
||||||
|
);
|
||||||
|
return token.trim() || undefined;
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`URL shortener token unavailable: ${error instanceof Error ? error.message : String(error)}`,
|
||||||
|
);
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveSlugPrefix(): 'lmtp' | 'lmts' {
|
||||||
|
const nodeEnv = process.env.NODE_ENV?.trim().toLowerCase();
|
||||||
|
return nodeEnv === 'prod' || nodeEnv === 'production' ? 'lmtp' : 'lmts';
|
||||||
|
}
|
||||||
|
|
||||||
|
public buildMatchDetailUrl(matchId: string): string {
|
||||||
|
return `${this.resolveTargetBaseUrl()}/match/${encodeURIComponent(matchId)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private buildShortUrl(slug: string): string {
|
||||||
|
return `${this.resolveShortenerBaseUrl()}/${encodeURIComponent(slug)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveApiUrl(): string {
|
||||||
|
return (
|
||||||
|
process.env.URL_SHORTENER_API_URL?.trim() || DEFAULT_SHORTENER_API_URL
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveShortenerBaseUrl(): string {
|
||||||
|
return (
|
||||||
|
this.normalizeBaseUrl(process.env.URL_SHORTENER_BASE_URL) ??
|
||||||
|
this.normalizeOrigin(this.resolveApiUrl()) ??
|
||||||
|
DEFAULT_SHORTENER_BASE_URL
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveTargetBaseUrl(): string {
|
||||||
|
return (
|
||||||
|
this.normalizeBaseUrl(process.env.URL_SHORTENER_TARGET_BASE_URL) ??
|
||||||
|
this.normalizeBaseUrl(process.env.WEB_ORIGIN) ??
|
||||||
|
DEFAULT_TARGET_BASE_URL
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private resolveTimeoutMs(): number {
|
||||||
|
const configured = Number(process.env.URL_SHORTENER_TIMEOUT_MS);
|
||||||
|
return Number.isFinite(configured) && configured > 0
|
||||||
|
? configured
|
||||||
|
: DEFAULT_TIMEOUT_MS;
|
||||||
|
}
|
||||||
|
|
||||||
|
private normalizeBaseUrl(value: string | undefined): string | undefined {
|
||||||
|
const raw = value?.split(',')[0]?.trim();
|
||||||
|
if (!raw) return undefined;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const url = new URL(raw);
|
||||||
|
const pathname = url.pathname.replace(/\/+$/u, '');
|
||||||
|
return `${url.origin}${pathname}`;
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private normalizeOrigin(value: string): string | undefined {
|
||||||
|
try {
|
||||||
|
return new URL(value).origin;
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async parseResponseBody(
|
||||||
|
response: Response,
|
||||||
|
): Promise<ShortenerResponseBody | undefined> {
|
||||||
|
try {
|
||||||
|
return (await response.json()) as ShortenerResponseBody;
|
||||||
|
} catch {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async logFailedResponse(
|
||||||
|
response: Response,
|
||||||
|
slug: string,
|
||||||
|
): Promise<void> {
|
||||||
|
const body = await response.text().catch(() => '');
|
||||||
|
this.logger.warn(
|
||||||
|
`URL shortener returned ${response.status} for slug="${slug}"${body ? `: ${body.slice(0, 200)}` : ''}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,7 +14,7 @@ function makeQuery<T>(value: T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function makeService(params: {
|
function makeService(params: {
|
||||||
user: Partial<UserDocument>;
|
user: Partial<UserDocument> | null;
|
||||||
community?: Record<string, unknown> | null;
|
community?: Record<string, unknown> | null;
|
||||||
riotAccountService?: Partial<RiotAccountService>;
|
riotAccountService?: Partial<RiotAccountService>;
|
||||||
enrichmentService?: Partial<RiotAccountEnrichmentService>;
|
enrichmentService?: Partial<RiotAccountEnrichmentService>;
|
||||||
@@ -22,6 +22,7 @@ function makeService(params: {
|
|||||||
const findOneAndUpdate = jest
|
const findOneAndUpdate = jest
|
||||||
.fn()
|
.fn()
|
||||||
.mockReturnValue(makeQuery(params.user as UserDocument));
|
.mockReturnValue(makeQuery(params.user as UserDocument));
|
||||||
|
const findOne = jest.fn().mockReturnValue(makeQuery(params.user));
|
||||||
const findById = jest.fn().mockReturnValue({
|
const findById = jest.fn().mockReturnValue({
|
||||||
select: jest.fn().mockReturnValue({
|
select: jest.fn().mockReturnValue({
|
||||||
lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})),
|
lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})),
|
||||||
@@ -29,7 +30,7 @@ function makeService(params: {
|
|||||||
});
|
});
|
||||||
const connectionService = {
|
const connectionService = {
|
||||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||||
if (name === 'user') return { findOneAndUpdate };
|
if (name === 'user') return { findOneAndUpdate, findOne };
|
||||||
if (name === 'community') return { findById };
|
if (name === 'community') return { findById };
|
||||||
throw new Error(`Unexpected model: ${name}`);
|
throw new Error(`Unexpected model: ${name}`);
|
||||||
}),
|
}),
|
||||||
@@ -51,6 +52,7 @@ function makeService(params: {
|
|||||||
),
|
),
|
||||||
connectionService,
|
connectionService,
|
||||||
findOneAndUpdate,
|
findOneAndUpdate,
|
||||||
|
findOne,
|
||||||
findById,
|
findById,
|
||||||
riotAccountService,
|
riotAccountService,
|
||||||
enrichmentService,
|
enrichmentService,
|
||||||
@@ -168,4 +170,78 @@ describe('DakaoUserService', () => {
|
|||||||
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
||||||
expect(save).toHaveBeenCalled();
|
expect(save).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('changes the primary Riot account for the Dakao user', async () => {
|
||||||
|
const save = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const oldPrimary = {
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
gameName: '기존소환사',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
isPrimary: true,
|
||||||
|
} as RiotAccount;
|
||||||
|
const nextPrimary = {
|
||||||
|
puuid: 'puuid-2',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
isPrimary: false,
|
||||||
|
} as RiotAccount;
|
||||||
|
const { service, findOne } = makeService({
|
||||||
|
user: {
|
||||||
|
_id: objectId('222222222222222222222222'),
|
||||||
|
kakaoTalkNickname: '이전닉',
|
||||||
|
riotAccounts: [oldPrimary, nextPrimary],
|
||||||
|
save,
|
||||||
|
} as Partial<UserDocument>,
|
||||||
|
});
|
||||||
|
|
||||||
|
const result = await service.changePrimaryRiotAccount({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
kakaoTalkNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(findOne).toHaveBeenCalledWith({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
});
|
||||||
|
expect(oldPrimary.isPrimary).toBe(false);
|
||||||
|
expect(nextPrimary.isPrimary).toBe(true);
|
||||||
|
expect(result.riotAccount).toBe(nextPrimary);
|
||||||
|
expect(result.user.kakaoTalkNickname).toBe('프리리');
|
||||||
|
expect(save).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('rejects primary account changes for unregistered Riot accounts', async () => {
|
||||||
|
const save = jest.fn().mockResolvedValue(undefined);
|
||||||
|
const { service } = makeService({
|
||||||
|
user: {
|
||||||
|
_id: objectId('222222222222222222222222'),
|
||||||
|
riotAccounts: [
|
||||||
|
{
|
||||||
|
puuid: 'puuid-1',
|
||||||
|
gameName: '기존소환사',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
isPrimary: true,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
save,
|
||||||
|
} as Partial<UserDocument>,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
service.changePrimaryRiotAccount({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
kakaoTalkNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
}),
|
||||||
|
).rejects.toMatchObject({
|
||||||
|
code: 'riot_account_not_found',
|
||||||
|
detail: '프리리#KR1',
|
||||||
|
});
|
||||||
|
expect(save).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@@ -230,6 +230,43 @@ export class DakaoUserService {
|
|||||||
return user;
|
return user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async changePrimaryRiotAccount(
|
||||||
|
context: ResolveContext,
|
||||||
|
): Promise<ResolveResult> {
|
||||||
|
const requestedGameName = normalizeRiotIdPart(context.gameName);
|
||||||
|
const requestedTagLine = normalizeRiotIdPart(context.tagLine);
|
||||||
|
const detail = `${requestedGameName}#${requestedTagLine}`;
|
||||||
|
|
||||||
|
const user = await this.findUserByKakaoTalkId({
|
||||||
|
communityId: context.communityId,
|
||||||
|
kakaoTalkId: context.kakaoTalkId,
|
||||||
|
});
|
||||||
|
if (!user) {
|
||||||
|
throw new DakaoUserError('riot_account_not_found', detail);
|
||||||
|
}
|
||||||
|
|
||||||
|
const target = user.riotAccounts.find(
|
||||||
|
(account) =>
|
||||||
|
normalizeRiotIdPart(account.gameName).toLowerCase() ===
|
||||||
|
requestedGameName.toLowerCase() &&
|
||||||
|
normalizeRiotIdPart(account.tagLine).toLowerCase() ===
|
||||||
|
requestedTagLine.toLowerCase(),
|
||||||
|
);
|
||||||
|
if (!target) {
|
||||||
|
throw new DakaoUserError('riot_account_not_found', detail);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (context.kakaoTalkNickname.trim()) {
|
||||||
|
user.kakaoTalkNickname = context.kakaoTalkNickname;
|
||||||
|
}
|
||||||
|
for (const account of user.riotAccounts) {
|
||||||
|
account.isPrimary = account.puuid === target.puuid;
|
||||||
|
}
|
||||||
|
await user.save();
|
||||||
|
|
||||||
|
return { user, riotAccount: target };
|
||||||
|
}
|
||||||
|
|
||||||
private toPositionPreferences(positions: Position[]): PositionPreference[] {
|
private toPositionPreferences(positions: Position[]): PositionPreference[] {
|
||||||
return positions.map((position, index) => ({
|
return positions.map((position, index) => ({
|
||||||
position,
|
position,
|
||||||
|
|||||||
@@ -10,11 +10,13 @@ import { DakaoOutboxSweeperService } from './dakao-outbox-sweeper.service';
|
|||||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||||
import { DakaoUserService } from './dakao-user.service';
|
import { DakaoUserService } from './dakao-user.service';
|
||||||
import { DakaoSendResultSubscriber } from './dakao-send-result.subscriber';
|
import { DakaoSendResultSubscriber } from './dakao-send-result.subscriber';
|
||||||
|
import { DakaoUrlShortenerService } from './dakao-url-shortener.service';
|
||||||
import { AccountRegisterHandler } from './handlers/account-register.handler';
|
import { AccountRegisterHandler } from './handlers/account-register.handler';
|
||||||
import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
||||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||||
import { MatchListHandler } from './handlers/match-list.handler';
|
import { MatchListHandler } from './handlers/match-list.handler';
|
||||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||||
|
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [RiotModule, MatchModule],
|
imports: [RiotModule, MatchModule],
|
||||||
@@ -31,11 +33,13 @@ import { PreferredPositionRegisterHandler } from './handlers/preferred-position-
|
|||||||
DakaoSubscriber,
|
DakaoSubscriber,
|
||||||
DakaoSendResultSubscriber,
|
DakaoSendResultSubscriber,
|
||||||
DakaoUserService,
|
DakaoUserService,
|
||||||
|
DakaoUrlShortenerService,
|
||||||
AccountRegisterHandler,
|
AccountRegisterHandler,
|
||||||
MatchListHandler,
|
MatchListHandler,
|
||||||
MatchJoinHandler,
|
MatchJoinHandler,
|
||||||
MatchCancelHandler,
|
MatchCancelHandler,
|
||||||
PreferredPositionRegisterHandler,
|
PreferredPositionRegisterHandler,
|
||||||
|
PrimaryAccountChangeHandler,
|
||||||
],
|
],
|
||||||
exports: [DakaoPublisher],
|
exports: [DakaoPublisher],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -0,0 +1,107 @@
|
|||||||
|
import { DakaoSubscriber } from './dakao.subscriber';
|
||||||
|
import { DakaoInboundEvent, DakaoSegment } from './dakao.types';
|
||||||
|
import { CommandParseError } from './parsers/command.parser';
|
||||||
|
|
||||||
|
function makeSubscriber(): DakaoSubscriber {
|
||||||
|
return new DakaoSubscriber(
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
{} as never,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const event = {
|
||||||
|
projectId: '111111111111111111111111',
|
||||||
|
chatroomId: 'chatroom-1',
|
||||||
|
nickname: '프리리',
|
||||||
|
userId: '12345',
|
||||||
|
origin: {
|
||||||
|
chatId: 'chat-1',
|
||||||
|
logId: 'log-1',
|
||||||
|
chatLog: {
|
||||||
|
logId: 'log-1',
|
||||||
|
chatId: 'chat-1',
|
||||||
|
authorId: '12345',
|
||||||
|
type: 1,
|
||||||
|
sendAt: 0,
|
||||||
|
message: '!내전',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
} satisfies DakaoInboundEvent;
|
||||||
|
|
||||||
|
describe('DakaoSubscriber', () => {
|
||||||
|
it('renders usage help with star emoticon command lines', () => {
|
||||||
|
const subscriber = makeSubscriber() as unknown as {
|
||||||
|
parseErrorReply: (
|
||||||
|
event: DakaoInboundEvent,
|
||||||
|
senderNickname: string,
|
||||||
|
err: CommandParseError,
|
||||||
|
) => DakaoSegment[];
|
||||||
|
};
|
||||||
|
|
||||||
|
const segments = subscriber.parseErrorReply(
|
||||||
|
event,
|
||||||
|
'프리리',
|
||||||
|
new CommandParseError('usage'),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(segments).toEqual([
|
||||||
|
{ kind: 'mention', userId: '12345', displayText: '프리리' },
|
||||||
|
{ kind: 'text', text: ' 사용법\n' },
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{ kind: 'text', text: ' !내전 일정\n' },
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text: ' !내전 신청 코드 소환사이름#태그 포지션1,포지션2\n',
|
||||||
|
},
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{ kind: 'text', text: ' !내전 계정등록 소환사이름#태그\n' },
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text: ' !내전 선호포지션등록 포지션1,포지션2\n',
|
||||||
|
},
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text: ' !내전 대표계정변경 소환사이름#태그',
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('keeps the unknown command header before star emoticon usage lines', () => {
|
||||||
|
const subscriber = makeSubscriber() as unknown as {
|
||||||
|
parseErrorReply: (
|
||||||
|
event: DakaoInboundEvent,
|
||||||
|
senderNickname: string,
|
||||||
|
err: CommandParseError,
|
||||||
|
) => DakaoSegment[];
|
||||||
|
};
|
||||||
|
|
||||||
|
const segments = subscriber.parseErrorReply(
|
||||||
|
event,
|
||||||
|
'프리리',
|
||||||
|
new CommandParseError('unknown_command', '폭파'),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(segments.slice(0, 2)).toEqual([
|
||||||
|
{ kind: 'mention', userId: '12345', displayText: '프리리' },
|
||||||
|
{ kind: 'text', text: ' 알 수 없는 명령어입니다.\n' },
|
||||||
|
]);
|
||||||
|
expect(segments).toContainEqual({
|
||||||
|
kind: 'emoticon',
|
||||||
|
id: '1200281_035',
|
||||||
|
altText: '스타',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -11,6 +11,7 @@ import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
|||||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||||
import { MatchListHandler } from './handlers/match-list.handler';
|
import { MatchListHandler } from './handlers/match-list.handler';
|
||||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||||
|
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||||
import { DakaoInboxService } from './dakao-inbox.service';
|
import { DakaoInboxService } from './dakao-inbox.service';
|
||||||
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
||||||
@@ -20,6 +21,13 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
private readonly logger = new Logger(DakaoSubscriber.name);
|
private readonly logger = new Logger(DakaoSubscriber.name);
|
||||||
private readonly natsNames = resolveDakaoNatsNames();
|
private readonly natsNames = resolveDakaoNatsNames();
|
||||||
private botUserId: string | undefined;
|
private botUserId: string | undefined;
|
||||||
|
private readonly usageCommands = [
|
||||||
|
'!내전 일정',
|
||||||
|
'!내전 신청 코드 소환사이름#태그 포지션1,포지션2',
|
||||||
|
'!내전 계정등록 소환사이름#태그',
|
||||||
|
'!내전 선호포지션등록 포지션1,포지션2',
|
||||||
|
'!내전 대표계정변경 소환사이름#태그',
|
||||||
|
];
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly natsService: NatsService,
|
private readonly natsService: NatsService,
|
||||||
@@ -33,6 +41,7 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
private readonly matchJoinHandler: MatchJoinHandler,
|
private readonly matchJoinHandler: MatchJoinHandler,
|
||||||
private readonly matchCancelHandler: MatchCancelHandler,
|
private readonly matchCancelHandler: MatchCancelHandler,
|
||||||
private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler,
|
private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler,
|
||||||
|
private readonly primaryAccountChangeHandler: PrimaryAccountChangeHandler,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async onModuleInit() {
|
async onModuleInit() {
|
||||||
@@ -126,6 +135,15 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
tagLine: command.tagLine,
|
tagLine: command.tagLine,
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
case 'primary-account-change':
|
||||||
|
segments = await this.primaryAccountChangeHandler.handle({
|
||||||
|
communityId,
|
||||||
|
senderUserId: event.userId,
|
||||||
|
senderNickname,
|
||||||
|
gameName: command.gameName,
|
||||||
|
tagLine: command.tagLine,
|
||||||
|
});
|
||||||
|
break;
|
||||||
case 'match-join':
|
case 'match-join':
|
||||||
segments = await this.matchJoinHandler.handle({
|
segments = await this.matchJoinHandler.handle({
|
||||||
communityId,
|
communityId,
|
||||||
@@ -256,9 +274,9 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
const text = ((): string => {
|
const text = ((): string => {
|
||||||
switch (err.code) {
|
switch (err.code) {
|
||||||
case 'unknown_command':
|
case 'unknown_command':
|
||||||
return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
return ` 알 수 없는 명령어입니다.\n`;
|
||||||
case 'usage':
|
case 'usage':
|
||||||
return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
return ` 내전 명령어 사용법\n`;
|
||||||
case 'invalid_match_id':
|
case 'invalid_match_id':
|
||||||
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
||||||
case 'invalid_riot_id':
|
case 'invalid_riot_id':
|
||||||
@@ -269,6 +287,22 @@ export class DakaoSubscriber implements OnModuleInit {
|
|||||||
return ` 명령을 처리할 수 없습니다.`;
|
return ` 명령을 처리할 수 없습니다.`;
|
||||||
}
|
}
|
||||||
})();
|
})();
|
||||||
|
if (err.code === 'unknown_command' || err.code === 'usage') {
|
||||||
|
return [...head, { kind: 'text', text }, ...this.usageCommandSegments()];
|
||||||
|
}
|
||||||
return [...head, { kind: 'text', text }];
|
return [...head, { kind: 'text', text }];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private usageCommandSegments(): DakaoSegment[] {
|
||||||
|
return this.usageCommands.flatMap((command, index) => [
|
||||||
|
{ kind: 'emoticon', id: '1200281_035', altText: '스타' } as const,
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text:
|
||||||
|
index === this.usageCommands.length - 1
|
||||||
|
? ` ${command}`
|
||||||
|
: ` ${command} \n`,
|
||||||
|
} as const,
|
||||||
|
]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,28 @@
|
|||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
import { MatchService } from '../../match/match.service';
|
import { MatchService } from '../../match/match.service';
|
||||||
|
import { DakaoUrlShortenerService } from '../dakao-url-shortener.service';
|
||||||
import { MatchListHandler } from './match-list.handler';
|
import { MatchListHandler } from './match-list.handler';
|
||||||
|
|
||||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||||
|
|
||||||
|
function makeHandler(params: {
|
||||||
|
matchService: Partial<MatchService>;
|
||||||
|
urlShortener?: Partial<DakaoUrlShortenerService>;
|
||||||
|
}): MatchListHandler {
|
||||||
|
return new MatchListHandler(
|
||||||
|
params.matchService as MatchService,
|
||||||
|
{
|
||||||
|
shortenMatchLink: jest.fn().mockResolvedValue(undefined),
|
||||||
|
buildMatchDetailUrl: jest.fn(
|
||||||
|
(matchId: string) => `https://lolympus.dahyeon.us/match/${matchId}`,
|
||||||
|
),
|
||||||
|
...params.urlShortener,
|
||||||
|
} as unknown as DakaoUrlShortenerService,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
describe('MatchListHandler', () => {
|
describe('MatchListHandler', () => {
|
||||||
it('prints short codes and compact KST dates', async () => {
|
it('prints short codes, compact KST dates, and short links', async () => {
|
||||||
const match = {
|
const match = {
|
||||||
_id: objectId('333333333333333333333333'),
|
_id: objectId('333333333333333333333333'),
|
||||||
title: '토요 내전',
|
title: '토요 내전',
|
||||||
@@ -17,8 +34,13 @@ describe('MatchListHandler', () => {
|
|||||||
const matchService = {
|
const matchService = {
|
||||||
list: jest.fn().mockResolvedValue([match]),
|
list: jest.fn().mockResolvedValue([match]),
|
||||||
ensureShortCode: jest.fn().mockResolvedValue(match),
|
ensureShortCode: jest.fn().mockResolvedValue(match),
|
||||||
} as unknown as MatchService;
|
};
|
||||||
const handler = new MatchListHandler(matchService);
|
const urlShortener = {
|
||||||
|
shortenMatchLink: jest
|
||||||
|
.fn()
|
||||||
|
.mockResolvedValue('https://go.dahyeon.us/lmtpAB12'),
|
||||||
|
};
|
||||||
|
const handler = makeHandler({ matchService, urlShortener });
|
||||||
|
|
||||||
const segments = await handler.handle({
|
const segments = await handler.handle({
|
||||||
communityId: objectId('111111111111111111111111'),
|
communityId: objectId('111111111111111111111111'),
|
||||||
@@ -27,6 +49,10 @@ describe('MatchListHandler', () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
expect(matchService.ensureShortCode).toHaveBeenCalledWith(match);
|
expect(matchService.ensureShortCode).toHaveBeenCalledWith(match);
|
||||||
|
expect(urlShortener.shortenMatchLink).toHaveBeenCalledWith({
|
||||||
|
matchId: '333333333333333333333333',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
});
|
||||||
expect(segments[1]).toMatchObject({
|
expect(segments[1]).toMatchObject({
|
||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: expect.stringContaining('토요 내전 (2/10) 5/2 19:30'),
|
text: expect.stringContaining('토요 내전 (2/10) 5/2 19:30'),
|
||||||
@@ -35,6 +61,10 @@ describe('MatchListHandler', () => {
|
|||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: expect.stringContaining('코드: AB12'),
|
text: expect.stringContaining('코드: AB12'),
|
||||||
});
|
});
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('링크: https://go.dahyeon.us/lmtpAB12'),
|
||||||
|
});
|
||||||
expect(segments[1]).toMatchObject({
|
expect(segments[1]).toMatchObject({
|
||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: expect.not.stringContaining('2026-05-02'),
|
text: expect.not.stringContaining('2026-05-02'),
|
||||||
@@ -43,5 +73,50 @@ describe('MatchListHandler', () => {
|
|||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: expect.not.stringContaining('ID:'),
|
text: expect.not.stringContaining('ID:'),
|
||||||
});
|
});
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.not.stringContaining('계정등록:'),
|
||||||
|
});
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.not.stringContaining('신청:'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('falls back to a direct match detail link when short link creation is skipped', async () => {
|
||||||
|
const match = {
|
||||||
|
_id: objectId('333333333333333333333333'),
|
||||||
|
title: '토요 내전',
|
||||||
|
shortCode: 'AB12',
|
||||||
|
participants: [],
|
||||||
|
maxParticipants: 10,
|
||||||
|
scheduledAt: new Date('2026-05-02T10:30:00.000Z'),
|
||||||
|
};
|
||||||
|
const handler = makeHandler({
|
||||||
|
matchService: {
|
||||||
|
list: jest.fn().mockResolvedValue([match]),
|
||||||
|
ensureShortCode: jest.fn().mockResolvedValue(match),
|
||||||
|
},
|
||||||
|
urlShortener: {
|
||||||
|
shortenMatchLink: jest.fn().mockResolvedValue(undefined),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const segments = await handler.handle({
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
senderUserId: 'kakao-user-1',
|
||||||
|
senderNickname: '프리리',
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('코드: AB12'),
|
||||||
|
});
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining(
|
||||||
|
'링크: https://lolympus.dahyeon.us/match/333333333333333333333333',
|
||||||
|
),
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -1,11 +1,18 @@
|
|||||||
import { Injectable } from '@nestjs/common';
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
import mongoose from 'mongoose';
|
import mongoose from 'mongoose';
|
||||||
|
import { MatchDocument } from '../../global/database/schema';
|
||||||
import { MatchService } from '../../match/match.service';
|
import { MatchService } from '../../match/match.service';
|
||||||
import { DakaoSegment } from '../dakao.types';
|
import { DakaoSegment } from '../dakao.types';
|
||||||
|
import { DakaoUrlShortenerService } from '../dakao-url-shortener.service';
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class MatchListHandler {
|
export class MatchListHandler {
|
||||||
constructor(private readonly matchService: MatchService) {}
|
private readonly logger = new Logger(MatchListHandler.name);
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly matchService: MatchService,
|
||||||
|
private readonly urlShortener: DakaoUrlShortenerService,
|
||||||
|
) {}
|
||||||
|
|
||||||
public async handle(params: {
|
public async handle(params: {
|
||||||
communityId: mongoose.Types.ObjectId;
|
communityId: mongoose.Types.ObjectId;
|
||||||
@@ -33,12 +40,16 @@ export class MatchListHandler {
|
|||||||
matches.map((match) => this.matchService.ensureShortCode(match)),
|
matches.map((match) => this.matchService.ensureShortCode(match)),
|
||||||
);
|
);
|
||||||
|
|
||||||
const lines = matchesWithCodes.map((m, i) => {
|
const lines = await Promise.all(
|
||||||
|
matchesWithCodes.map(async (m, i) => {
|
||||||
const filled = m.participants.length;
|
const filled = m.participants.length;
|
||||||
const cap = m.maxParticipants;
|
const cap = m.maxParticipants;
|
||||||
const time = formatScheduledAt(m.scheduledAt);
|
const time = formatScheduledAt(m.scheduledAt);
|
||||||
return `\n${i + 1}. ${m.title} (${filled}/${cap}) ${time}\n 코드: ${m.shortCode}`;
|
const shortUrl = await this.createShortUrl(m);
|
||||||
});
|
const linkLine = shortUrl ? `\n 링크: ${shortUrl}` : '';
|
||||||
|
return `\n${i + 1}. ${m.title} (${filled}/${cap}) ${time}\n 코드: ${m.shortCode}${linkLine}`;
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
@@ -48,10 +59,29 @@ export class MatchListHandler {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`,
|
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}`,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async createShortUrl(
|
||||||
|
match: MatchDocument,
|
||||||
|
): Promise<string | undefined> {
|
||||||
|
try {
|
||||||
|
const shortUrl = await this.urlShortener.shortenMatchLink({
|
||||||
|
matchId: String(match._id),
|
||||||
|
shortCode: match.shortCode,
|
||||||
|
});
|
||||||
|
return (
|
||||||
|
shortUrl ?? this.urlShortener.buildMatchDetailUrl(String(match._id))
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Failed to create dakao match short URL for match="${String(match._id)}": ${error instanceof Error ? error.message : String(error)}`,
|
||||||
|
);
|
||||||
|
return this.urlShortener.buildMatchDetailUrl(String(match._id));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatScheduledAt(date: Date): string {
|
function formatScheduledAt(date: Date): string {
|
||||||
|
|||||||
@@ -0,0 +1,73 @@
|
|||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||||
|
import { PrimaryAccountChangeHandler } from './primary-account-change.handler';
|
||||||
|
|
||||||
|
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||||
|
|
||||||
|
function makeHandler(dakaoUserService?: Partial<DakaoUserService>) {
|
||||||
|
return new PrimaryAccountChangeHandler({
|
||||||
|
changePrimaryRiotAccount: jest.fn(),
|
||||||
|
...dakaoUserService,
|
||||||
|
} as unknown as DakaoUserService);
|
||||||
|
}
|
||||||
|
|
||||||
|
const baseParams = {
|
||||||
|
communityId: objectId('111111111111111111111111'),
|
||||||
|
senderUserId: 'kakao-user-1',
|
||||||
|
senderNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
};
|
||||||
|
|
||||||
|
describe('PrimaryAccountChangeHandler', () => {
|
||||||
|
it('changes the primary Riot account through DakaoUserService', async () => {
|
||||||
|
const changePrimaryRiotAccount = jest.fn().mockResolvedValue({
|
||||||
|
user: { _id: objectId('222222222222222222222222') },
|
||||||
|
riotAccount: { gameName: '프리리', tagLine: 'KR1' },
|
||||||
|
});
|
||||||
|
const handler = makeHandler({
|
||||||
|
changePrimaryRiotAccount,
|
||||||
|
});
|
||||||
|
|
||||||
|
const segments = await handler.handle(baseParams);
|
||||||
|
|
||||||
|
expect(changePrimaryRiotAccount).toHaveBeenCalledWith({
|
||||||
|
communityId: baseParams.communityId,
|
||||||
|
kakaoTalkId: 'kakao-user-1',
|
||||||
|
kakaoTalkNickname: '프리리',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
expect(segments).toEqual([
|
||||||
|
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('대표 계정 변경 완료'),
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
expect(segments[1]).toMatchObject({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('대표 계정: 프리리#KR1'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('asks users to register the Riot account first when not found', async () => {
|
||||||
|
const handler = makeHandler({
|
||||||
|
changePrimaryRiotAccount: jest
|
||||||
|
.fn()
|
||||||
|
.mockRejectedValue(
|
||||||
|
new DakaoUserError('riot_account_not_found', '프리리#KR1'),
|
||||||
|
),
|
||||||
|
});
|
||||||
|
|
||||||
|
const segments = await handler.handle(baseParams);
|
||||||
|
|
||||||
|
expect(segments).toEqual([
|
||||||
|
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||||
|
expect.objectContaining({
|
||||||
|
kind: 'text',
|
||||||
|
text: expect.stringContaining('먼저 !내전 계정등록'),
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,81 @@
|
|||||||
|
import { Injectable } from '@nestjs/common';
|
||||||
|
import mongoose from 'mongoose';
|
||||||
|
import { DakaoSegment } from '../dakao.types';
|
||||||
|
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||||
|
|
||||||
|
interface PrimaryAccountChangeHandlerParams {
|
||||||
|
communityId: mongoose.Types.ObjectId;
|
||||||
|
senderUserId: string;
|
||||||
|
senderNickname: string;
|
||||||
|
gameName: string;
|
||||||
|
tagLine: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class PrimaryAccountChangeHandler {
|
||||||
|
constructor(private readonly dakaoUserService: DakaoUserService) {}
|
||||||
|
|
||||||
|
public async handle(
|
||||||
|
params: PrimaryAccountChangeHandlerParams,
|
||||||
|
): Promise<DakaoSegment[]> {
|
||||||
|
try {
|
||||||
|
const resolved = await this.dakaoUserService.changePrimaryRiotAccount({
|
||||||
|
communityId: params.communityId,
|
||||||
|
kakaoTalkId: params.senderUserId,
|
||||||
|
kakaoTalkNickname: params.senderNickname,
|
||||||
|
gameName: params.gameName,
|
||||||
|
tagLine: params.tagLine,
|
||||||
|
});
|
||||||
|
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
kind: 'mention',
|
||||||
|
userId: params.senderUserId,
|
||||||
|
displayText: params.senderNickname,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
kind: 'text',
|
||||||
|
text:
|
||||||
|
` 대표 계정 변경 완료` +
|
||||||
|
`\n대표 계정: ${resolved.riotAccount.gameName}#${resolved.riotAccount.tagLine}`,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof DakaoUserError) {
|
||||||
|
return this.errorReply(params, this.translateUserError(err));
|
||||||
|
}
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private errorReply(
|
||||||
|
params: PrimaryAccountChangeHandlerParams,
|
||||||
|
message: string,
|
||||||
|
): DakaoSegment[] {
|
||||||
|
return [
|
||||||
|
{
|
||||||
|
kind: 'mention',
|
||||||
|
userId: params.senderUserId,
|
||||||
|
displayText: params.senderNickname,
|
||||||
|
},
|
||||||
|
{ kind: 'text', text: ` ${message}` },
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
private translateUserError(err: DakaoUserError): string {
|
||||||
|
switch (err.code) {
|
||||||
|
case 'invalid_project_id':
|
||||||
|
return '커뮤니티 식별자가 올바르지 않습니다.';
|
||||||
|
case 'community_not_found':
|
||||||
|
return '연결된 커뮤니티를 찾을 수 없습니다.';
|
||||||
|
case 'riot_account_not_found':
|
||||||
|
return `등록된 라이엇 계정을 찾을 수 없습니다 (${err.detail ?? ''}). 먼저 !내전 계정등록 <닉네임>#<태그> 로 계정을 등록해주세요.`;
|
||||||
|
case 'riot_account_already_registered':
|
||||||
|
return `이미 등록된 라이엇 계정이 있습니다 (${err.detail ?? ''}).`;
|
||||||
|
case 'riot_account_conflict':
|
||||||
|
return `이미 다른 사용자가 등록한 라이엇 계정입니다 (${err.detail ?? ''}).`;
|
||||||
|
case 'riot_account_lookup_failed':
|
||||||
|
return '라이엇 계정 조회 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -121,6 +121,25 @@ describe('parseCommand', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('parses primary account change command', () => {
|
||||||
|
expect(parseCommand('!내전 대표계정변경 프리리#KR1')).toEqual({
|
||||||
|
kind: 'primary-account-change',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('normalizes primary account change riot id', () => {
|
||||||
|
const decomposedGameName = '프리리'.normalize('NFD');
|
||||||
|
expect(
|
||||||
|
parseCommand(`!내전 대표계정변경 ${decomposedGameName}\u200B#KR1\uFEFF`),
|
||||||
|
).toEqual({
|
||||||
|
kind: 'primary-account-change',
|
||||||
|
gameName: '프리리',
|
||||||
|
tagLine: 'KR1',
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
it('normalizes account register riot id', () => {
|
it('normalizes account register riot id', () => {
|
||||||
const decomposedGameName = '프리리'.normalize('NFD');
|
const decomposedGameName = '프리리'.normalize('NFD');
|
||||||
expect(
|
expect(
|
||||||
@@ -136,6 +155,10 @@ describe('parseCommand', () => {
|
|||||||
expect(() => parseCommand('안녕하세요')).toThrow(/not_a_command/);
|
expect(() => parseCommand('안녕하세요')).toThrow(/not_a_command/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('throws usage for bare command prefix', () => {
|
||||||
|
expect(() => parseCommand('!내전')).toThrow(/usage/);
|
||||||
|
});
|
||||||
|
|
||||||
it('throws unknown_command for unrecognized subcommands', () => {
|
it('throws unknown_command for unrecognized subcommands', () => {
|
||||||
expect(() => parseCommand('!내전 폭파')).toThrow(/unknown_command/);
|
expect(() => parseCommand('!내전 폭파')).toThrow(/unknown_command/);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ export type DakaoCommand =
|
|||||||
gameName: string;
|
gameName: string;
|
||||||
tagLine: string;
|
tagLine: string;
|
||||||
}
|
}
|
||||||
|
| {
|
||||||
|
kind: 'primary-account-change';
|
||||||
|
gameName: string;
|
||||||
|
tagLine: string;
|
||||||
|
}
|
||||||
| {
|
| {
|
||||||
kind: 'match-join';
|
kind: 'match-join';
|
||||||
matchAndRiotId: string;
|
matchAndRiotId: string;
|
||||||
@@ -70,6 +75,8 @@ export function parseCommand(rawMessage: string): DakaoCommand {
|
|||||||
return parseCancelArgs(args);
|
return parseCancelArgs(args);
|
||||||
case '계정등록':
|
case '계정등록':
|
||||||
return parseAccountRegisterArgs(args);
|
return parseAccountRegisterArgs(args);
|
||||||
|
case '대표계정변경':
|
||||||
|
return parsePrimaryAccountChangeArgs(args);
|
||||||
case '선호포지션등록':
|
case '선호포지션등록':
|
||||||
case '포지션등록':
|
case '포지션등록':
|
||||||
return parsePreferredPositionRegisterArgs(args);
|
return parsePreferredPositionRegisterArgs(args);
|
||||||
@@ -79,6 +86,24 @@ export function parseCommand(rawMessage: string): DakaoCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function parseAccountRegisterArgs(args: string): DakaoCommand {
|
function parseAccountRegisterArgs(args: string): DakaoCommand {
|
||||||
|
const riotId = parseRiotIdArgs(args);
|
||||||
|
return {
|
||||||
|
kind: 'account-register',
|
||||||
|
gameName: riotId.gameName,
|
||||||
|
tagLine: riotId.tagLine,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parsePrimaryAccountChangeArgs(args: string): DakaoCommand {
|
||||||
|
const riotId = parseRiotIdArgs(args);
|
||||||
|
return {
|
||||||
|
kind: 'primary-account-change',
|
||||||
|
gameName: riotId.gameName,
|
||||||
|
tagLine: riotId.tagLine,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseRiotIdArgs(args: string): { gameName: string; tagLine: string } {
|
||||||
if (args.length === 0) {
|
if (args.length === 0) {
|
||||||
throw new CommandParseError('usage');
|
throw new CommandParseError('usage');
|
||||||
}
|
}
|
||||||
@@ -94,11 +119,7 @@ function parseAccountRegisterArgs(args: string): DakaoCommand {
|
|||||||
throw new CommandParseError('invalid_riot_id', args);
|
throw new CommandParseError('invalid_riot_id', args);
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return { gameName, tagLine };
|
||||||
kind: 'account-register',
|
|
||||||
gameName,
|
|
||||||
tagLine,
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseCancelArgs(args: string): DakaoCommand {
|
function parseCancelArgs(args: string): DakaoCommand {
|
||||||
|
|||||||
@@ -593,6 +593,7 @@ export interface AuctionPlayerSnapshot {
|
|||||||
profileIconId: number;
|
profileIconId: number;
|
||||||
preferredPositions: PositionPreference[];
|
preferredPositions: PositionPreference[];
|
||||||
tiers: TierInfo[];
|
tiers: TierInfo[];
|
||||||
|
tierHistory: TierHistoryEntry[];
|
||||||
masteries: ChampionMasteryEntry[];
|
masteries: ChampionMasteryEntry[];
|
||||||
recentStatsSummary?: RiotRecentStatsSummary;
|
recentStatsSummary?: RiotRecentStatsSummary;
|
||||||
passCount: number;
|
passCount: number;
|
||||||
@@ -1531,6 +1532,11 @@ const AuctionPlayerSnapshotSubSchema = new Schema<AuctionPlayerSnapshot>(
|
|||||||
default: [],
|
default: [],
|
||||||
},
|
},
|
||||||
tiers: { type: [TierInfoSubSchema], required: true, default: [] },
|
tiers: { type: [TierInfoSubSchema], required: true, default: [] },
|
||||||
|
tierHistory: {
|
||||||
|
type: [TierHistoryEntrySubSchema],
|
||||||
|
required: true,
|
||||||
|
default: [],
|
||||||
|
},
|
||||||
masteries: {
|
masteries: {
|
||||||
type: [ChampionMasteryEntrySubSchema],
|
type: [ChampionMasteryEntrySubSchema],
|
||||||
required: true,
|
required: true,
|
||||||
|
|||||||
@@ -1,9 +1,4 @@
|
|||||||
import {
|
import { Inject, Injectable, Logger, OnModuleDestroy } from '@nestjs/common';
|
||||||
Inject,
|
|
||||||
Injectable,
|
|
||||||
Logger,
|
|
||||||
OnModuleDestroy,
|
|
||||||
} from '@nestjs/common';
|
|
||||||
import type { createClient } from 'redis';
|
import type { createClient } from 'redis';
|
||||||
import { GARNET_CLIENT } from './garnet.constants';
|
import { GARNET_CLIENT } from './garnet.constants';
|
||||||
|
|
||||||
@@ -203,6 +198,13 @@ export class GarnetService implements OnModuleDestroy {
|
|||||||
return this.client.xAck(key, group, ids);
|
return this.client.xAck(key, group, ids);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async deleteStreamEntries(
|
||||||
|
key: string,
|
||||||
|
ids: string | string[],
|
||||||
|
): Promise<number> {
|
||||||
|
return this.client.xDel(key, ids);
|
||||||
|
}
|
||||||
|
|
||||||
public async streamLength(key: string): Promise<number> {
|
public async streamLength(key: string): Promise<number> {
|
||||||
return this.client.xLen(key);
|
return this.client.xLen(key);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ function makeScheduler() {
|
|||||||
raw: jest.fn().mockReturnValue(rawClient),
|
raw: jest.fn().mockReturnValue(rawClient),
|
||||||
} as unknown as jest.Mocked<GarnetService> & { raw: jest.Mock };
|
} as unknown as jest.Mocked<GarnetService> & { raw: jest.Mock };
|
||||||
const rateLimiter = {
|
const rateLimiter = {
|
||||||
acquireBackground: jest.fn().mockResolvedValue(undefined),
|
isRefreshWindowOpen: jest.fn().mockResolvedValue(true),
|
||||||
} as unknown as jest.Mocked<RiotRateLimiterService>;
|
} as unknown as jest.Mocked<RiotRateLimiterService>;
|
||||||
const enrichmentService = {
|
const enrichmentService = {
|
||||||
markRefreshRequested: jest.fn().mockResolvedValue(undefined),
|
markRefreshRequested: jest.fn().mockResolvedValue(undefined),
|
||||||
@@ -84,9 +84,29 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
scheduler.onModuleDestroy();
|
scheduler.onModuleDestroy();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('does not query stale accounts outside the KST window', async () => {
|
it('uses the dawn refresh gate ratio inside the KST background window', async () => {
|
||||||
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
|
const { scheduler, rateLimiter } = makeScheduler();
|
||||||
|
|
||||||
|
await scheduler.tick();
|
||||||
|
|
||||||
|
expect(rateLimiter.isRefreshWindowOpen).toHaveBeenCalledWith(0.8);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('uses the opportunistic refresh gate ratio outside the KST background window', async () => {
|
||||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T17:59:59.000Z'));
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T17:59:59.000Z'));
|
||||||
const { scheduler, staleAccountRepository } = makeScheduler();
|
const { scheduler, rateLimiter, staleAccountRepository } = makeScheduler();
|
||||||
|
|
||||||
|
await scheduler.tick();
|
||||||
|
|
||||||
|
expect(rateLimiter.isRefreshWindowOpen).toHaveBeenCalledWith(0.5);
|
||||||
|
expect(staleAccountRepository.findStaleAccounts).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does not query stale accounts when the refresh gate is closed', async () => {
|
||||||
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
|
const { scheduler, rateLimiter, staleAccountRepository } = makeScheduler();
|
||||||
|
rateLimiter.isRefreshWindowOpen.mockResolvedValue(false);
|
||||||
|
|
||||||
await scheduler.tick();
|
await scheduler.tick();
|
||||||
|
|
||||||
@@ -103,21 +123,15 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
expect(staleAccountRepository.findStaleAccounts).not.toHaveBeenCalled();
|
expect(staleAccountRepository.findStaleAccounts).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('marks and enriches each stale candidate with background rate tokens', async () => {
|
it('marks and enriches each stale candidate without background precharge', async () => {
|
||||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
const {
|
const { scheduler, enrichmentService, staleAccountRepository } =
|
||||||
scheduler,
|
makeScheduler();
|
||||||
rateLimiter,
|
|
||||||
enrichmentService,
|
|
||||||
staleAccountRepository,
|
|
||||||
} = makeScheduler();
|
|
||||||
const candidates = [candidate('puuid-1'), candidate('puuid-2')];
|
const candidates = [candidate('puuid-1'), candidate('puuid-2')];
|
||||||
staleAccountRepository.findStaleAccounts.mockResolvedValue(candidates);
|
staleAccountRepository.findStaleAccounts.mockResolvedValue(candidates);
|
||||||
|
|
||||||
await scheduler.tick();
|
await scheduler.tick();
|
||||||
|
|
||||||
expect(rateLimiter.acquireBackground).toHaveBeenCalledTimes(2);
|
|
||||||
expect(rateLimiter.acquireBackground).toHaveBeenCalledWith(8);
|
|
||||||
expect(enrichmentService.markRefreshRequested).toHaveBeenCalledTimes(2);
|
expect(enrichmentService.markRefreshRequested).toHaveBeenCalledTimes(2);
|
||||||
expect(enrichmentService.markRefreshRequested).toHaveBeenNthCalledWith(
|
expect(enrichmentService.markRefreshRequested).toHaveBeenNthCalledWith(
|
||||||
1,
|
1,
|
||||||
@@ -131,6 +145,28 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('stops the candidate loop when the refresh gate closes mid-tick', async () => {
|
||||||
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
|
const {
|
||||||
|
scheduler,
|
||||||
|
rateLimiter,
|
||||||
|
enrichmentService,
|
||||||
|
staleAccountRepository,
|
||||||
|
} = makeScheduler();
|
||||||
|
staleAccountRepository.findStaleAccounts.mockResolvedValue([
|
||||||
|
candidate('puuid-1'),
|
||||||
|
candidate('puuid-2'),
|
||||||
|
]);
|
||||||
|
rateLimiter.isRefreshWindowOpen
|
||||||
|
.mockResolvedValueOnce(true)
|
||||||
|
.mockResolvedValueOnce(true)
|
||||||
|
.mockResolvedValueOnce(false);
|
||||||
|
|
||||||
|
await scheduler.tick();
|
||||||
|
|
||||||
|
expect(enrichmentService.enrichRiotAccount).toHaveBeenCalledTimes(1);
|
||||||
|
});
|
||||||
|
|
||||||
it('continues after a candidate throws and records a failure counter', async () => {
|
it('continues after a candidate throws and records a failure counter', async () => {
|
||||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
const { scheduler, rawClient, enrichmentService, staleAccountRepository } =
|
const { scheduler, rawClient, enrichmentService, staleAccountRepository } =
|
||||||
@@ -157,13 +193,8 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
|
|
||||||
it('skips candidates already in failure backoff', async () => {
|
it('skips candidates already in failure backoff', async () => {
|
||||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||||
const {
|
const { scheduler, garnet, enrichmentService, staleAccountRepository } =
|
||||||
scheduler,
|
makeScheduler();
|
||||||
garnet,
|
|
||||||
rateLimiter,
|
|
||||||
enrichmentService,
|
|
||||||
staleAccountRepository,
|
|
||||||
} = makeScheduler();
|
|
||||||
staleAccountRepository.findStaleAccounts.mockResolvedValue([
|
staleAccountRepository.findStaleAccounts.mockResolvedValue([
|
||||||
candidate('skip-me'),
|
candidate('skip-me'),
|
||||||
]);
|
]);
|
||||||
@@ -174,7 +205,6 @@ describe('BackgroundRefreshScheduler', () => {
|
|||||||
|
|
||||||
await scheduler.tick();
|
await scheduler.tick();
|
||||||
|
|
||||||
expect(rateLimiter.acquireBackground).not.toHaveBeenCalled();
|
|
||||||
expect(enrichmentService.markRefreshRequested).not.toHaveBeenCalled();
|
expect(enrichmentService.markRefreshRequested).not.toHaveBeenCalled();
|
||||||
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -19,11 +19,17 @@ const LEADER_TTL_SECONDS = 90;
|
|||||||
const LEADER_RENEW_INTERVAL_MS = 30_000;
|
const LEADER_RENEW_INTERVAL_MS = 30_000;
|
||||||
const STALE_THRESHOLD_MS = 6 * 60 * 60 * 1000;
|
const STALE_THRESHOLD_MS = 6 * 60 * 60 * 1000;
|
||||||
const PER_TICK_CANDIDATE_LIMIT = 20;
|
const PER_TICK_CANDIDATE_LIMIT = 20;
|
||||||
const ENRICH_COST_TOKENS = 8;
|
const DAWN_USAGE_RATIO = 0.8;
|
||||||
|
const OPPORTUNISTIC_USAGE_RATIO = 0.5;
|
||||||
const FAILURE_BACKOFF_KEY_PREFIX = 'riot:bg:fail';
|
const FAILURE_BACKOFF_KEY_PREFIX = 'riot:bg:fail';
|
||||||
const FAILURE_BACKOFF_THRESHOLD = 3;
|
const FAILURE_BACKOFF_THRESHOLD = 3;
|
||||||
const FAILURE_BACKOFF_TTL_SECONDS = 24 * 60 * 60;
|
const FAILURE_BACKOFF_TTL_SECONDS = 24 * 60 * 60;
|
||||||
|
|
||||||
|
interface RefreshGatePolicy {
|
||||||
|
mode: 'dawn' | 'opportunistic';
|
||||||
|
usageRatio: number;
|
||||||
|
}
|
||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class BackgroundRefreshScheduler
|
export class BackgroundRefreshScheduler
|
||||||
implements OnModuleInit, OnModuleDestroy
|
implements OnModuleInit, OnModuleDestroy
|
||||||
@@ -75,7 +81,11 @@ export class BackgroundRefreshScheduler
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async tick(): Promise<void> {
|
private async tick(): Promise<void> {
|
||||||
if (!isInKstBackgroundWindow()) return;
|
const initialGate = this.currentRefreshGatePolicy();
|
||||||
|
if (!(await this.rateLimiter.isRefreshWindowOpen(initialGate.usageRatio))) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
const isLeader = await this.tryBecomeLeader();
|
const isLeader = await this.tryBecomeLeader();
|
||||||
if (!isLeader) return;
|
if (!isLeader) return;
|
||||||
|
|
||||||
@@ -89,15 +99,20 @@ export class BackgroundRefreshScheduler
|
|||||||
let processed = 0;
|
let processed = 0;
|
||||||
let failed = 0;
|
let failed = 0;
|
||||||
let skipped = 0;
|
let skipped = 0;
|
||||||
|
let currentGate = initialGate;
|
||||||
|
|
||||||
for (const candidate of candidates) {
|
for (const candidate of candidates) {
|
||||||
if (!isInKstBackgroundWindow()) break;
|
currentGate = this.currentRefreshGatePolicy();
|
||||||
|
if (
|
||||||
|
!(await this.rateLimiter.isRefreshWindowOpen(currentGate.usageRatio))
|
||||||
|
) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
if (await this.isInFailureBackoff(candidate.puuid)) {
|
if (await this.isInFailureBackoff(candidate.puuid)) {
|
||||||
skipped += 1;
|
skipped += 1;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.rateLimiter.acquireBackground(ENRICH_COST_TOKENS);
|
|
||||||
await this.enrichmentService.markRefreshRequested(
|
await this.enrichmentService.markRefreshRequested(
|
||||||
candidate.userId,
|
candidate.userId,
|
||||||
candidate.puuid,
|
candidate.puuid,
|
||||||
@@ -130,10 +145,18 @@ export class BackgroundRefreshScheduler
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.logger.debug(
|
this.logger.debug(
|
||||||
`Background refresh tick: processed=${processed} failed=${failed} skipped=${skipped} candidates=${candidates.length}`,
|
`Background refresh tick: processed=${processed} failed=${failed} skipped=${skipped} candidates=${candidates.length} mode=${currentGate.mode} ratio=${currentGate.usageRatio}`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private currentRefreshGatePolicy(): RefreshGatePolicy {
|
||||||
|
const isDawn = isInKstBackgroundWindow();
|
||||||
|
return {
|
||||||
|
mode: isDawn ? 'dawn' : 'opportunistic',
|
||||||
|
usageRatio: isDawn ? DAWN_USAGE_RATIO : OPPORTUNISTIC_USAGE_RATIO,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
private async tryBecomeLeader(): Promise<boolean> {
|
private async tryBecomeLeader(): Promise<boolean> {
|
||||||
const current = await this.garnet.getString(LEADER_KEY);
|
const current = await this.garnet.getString(LEADER_KEY);
|
||||||
if (current === this.consumer) {
|
if (current === this.consumer) {
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ function execResult<T>(value: T) {
|
|||||||
function makeWorker() {
|
function makeWorker() {
|
||||||
const garnetService = {
|
const garnetService = {
|
||||||
acknowledgeStream: jest.fn().mockResolvedValue(undefined),
|
acknowledgeStream: jest.fn().mockResolvedValue(undefined),
|
||||||
|
deleteStreamEntries: jest.fn().mockResolvedValue(undefined),
|
||||||
} as unknown as jest.Mocked<GarnetService>;
|
} as unknown as jest.Mocked<GarnetService>;
|
||||||
const jobQueueService = {
|
const jobQueueService = {
|
||||||
markProcessing: jest.fn().mockResolvedValue(undefined),
|
markProcessing: jest.fn().mockResolvedValue(undefined),
|
||||||
@@ -74,6 +75,32 @@ function makeWorker() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
describe('RiotJobWorkerService', () => {
|
describe('RiotJobWorkerService', () => {
|
||||||
|
it('acknowledges and deletes invalid stream entries', async () => {
|
||||||
|
const { worker, garnetService } = makeWorker();
|
||||||
|
|
||||||
|
await (
|
||||||
|
worker as unknown as {
|
||||||
|
processEntry: (
|
||||||
|
stream: string,
|
||||||
|
entry: { id: string; message: Record<string, string> },
|
||||||
|
) => Promise<void>;
|
||||||
|
}
|
||||||
|
).processEntry('riot:queue:high', {
|
||||||
|
id: 'bad-1',
|
||||||
|
message: { job: 'not-json' },
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(garnetService.acknowledgeStream).toHaveBeenCalledWith(
|
||||||
|
'riot:queue:high',
|
||||||
|
RIOT_JOB_GROUP,
|
||||||
|
'bad-1',
|
||||||
|
);
|
||||||
|
expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith(
|
||||||
|
'riot:queue:high',
|
||||||
|
'bad-1',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
it('refreshes league entries while processing user history refresh jobs', async () => {
|
it('refreshes league entries while processing user history refresh jobs', async () => {
|
||||||
const { worker, enrichmentService, recentMatchesService, garnetService } =
|
const { worker, enrichmentService, recentMatchesService, garnetService } =
|
||||||
makeWorker();
|
makeWorker();
|
||||||
@@ -91,12 +118,14 @@ describe('RiotJobWorkerService', () => {
|
|||||||
priority: 'high',
|
priority: 'high',
|
||||||
};
|
};
|
||||||
|
|
||||||
await (worker as unknown as {
|
await (
|
||||||
|
worker as unknown as {
|
||||||
processEntry: (
|
processEntry: (
|
||||||
stream: string,
|
stream: string,
|
||||||
entry: { id: string; message: Record<string, string> },
|
entry: { id: string; message: Record<string, string> },
|
||||||
) => Promise<void>;
|
) => Promise<void>;
|
||||||
}).processEntry('riot:queue:high', {
|
}
|
||||||
|
).processEntry('riot:queue:high', {
|
||||||
id: '1-0',
|
id: '1-0',
|
||||||
message: { job: JSON.stringify(job) },
|
message: { job: JSON.stringify(job) },
|
||||||
});
|
});
|
||||||
@@ -112,5 +141,14 @@ describe('RiotJobWorkerService', () => {
|
|||||||
RIOT_JOB_GROUP,
|
RIOT_JOB_GROUP,
|
||||||
'1-0',
|
'1-0',
|
||||||
);
|
);
|
||||||
|
expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith(
|
||||||
|
'riot:queue:high',
|
||||||
|
'1-0',
|
||||||
|
);
|
||||||
|
expect(
|
||||||
|
garnetService.acknowledgeStream.mock.invocationCallOrder[0],
|
||||||
|
).toBeLessThan(
|
||||||
|
garnetService.deleteStreamEntries.mock.invocationCallOrder[0],
|
||||||
|
);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -79,10 +79,13 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async processEntry(stream: string, entry: StreamEntry): Promise<void> {
|
private async processEntry(
|
||||||
|
stream: string,
|
||||||
|
entry: StreamEntry,
|
||||||
|
): Promise<void> {
|
||||||
const job = this.parseJob(entry);
|
const job = this.parseJob(entry);
|
||||||
if (!job) {
|
if (!job) {
|
||||||
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id);
|
await this.acknowledgeAndDelete(stream, entry.id);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -134,7 +137,30 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
}`,
|
}`,
|
||||||
);
|
);
|
||||||
} finally {
|
} finally {
|
||||||
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id);
|
await this.acknowledgeAndDelete(stream, entry.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async acknowledgeAndDelete(
|
||||||
|
stream: string,
|
||||||
|
id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, id);
|
||||||
|
await this.deleteAcknowledgedEntry(stream, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async deleteAcknowledgedEntry(
|
||||||
|
stream: string,
|
||||||
|
id: string,
|
||||||
|
): Promise<void> {
|
||||||
|
try {
|
||||||
|
await this.garnetService.deleteStreamEntries(stream, id);
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.warn(
|
||||||
|
`Failed to delete acknowledged Riot job stream entry ${stream} ${id}: ${
|
||||||
|
error instanceof Error ? error.message : error
|
||||||
|
}`,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -192,9 +218,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
return job.kind === 'poll-tournament-result';
|
return job.kind === 'poll-tournament-result';
|
||||||
}
|
}
|
||||||
|
|
||||||
private isLegacyImportJob(
|
private isLegacyImportJob(job: RiotJobPayload): job is LegacyImportMemberJob {
|
||||||
job: RiotJobPayload,
|
|
||||||
): job is LegacyImportMemberJob {
|
|
||||||
return job.kind === 'legacy-import-member';
|
return job.kind === 'legacy-import-member';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,7 +243,8 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
|||||||
try {
|
try {
|
||||||
await this.garnetService.createConsumerGroup(stream, RIOT_JOB_GROUP);
|
await this.garnetService.createConsumerGroup(stream, RIOT_JOB_GROUP);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
const message =
|
||||||
|
error instanceof Error ? error.message : String(error);
|
||||||
if (!message.includes('BUSYGROUP')) throw error;
|
if (!message.includes('BUSYGROUP')) throw error;
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -3,63 +3,156 @@ import { RiotRateLimiterService } from './riot-rate-limiter.service';
|
|||||||
|
|
||||||
function makeService(sendCommand = jest.fn().mockResolvedValue(0)) {
|
function makeService(sendCommand = jest.fn().mockResolvedValue(0)) {
|
||||||
const garnet = {
|
const garnet = {
|
||||||
|
getString: jest.fn().mockResolvedValue(null),
|
||||||
raw: jest.fn().mockReturnValue({ sendCommand }),
|
raw: jest.fn().mockReturnValue({ sendCommand }),
|
||||||
} as unknown as GarnetService;
|
setString: jest.fn().mockResolvedValue(undefined),
|
||||||
|
} as unknown as jest.Mocked<GarnetService>;
|
||||||
return {
|
return {
|
||||||
service: new RiotRateLimiterService(garnet),
|
service: new RiotRateLimiterService(garnet),
|
||||||
|
garnet,
|
||||||
sendCommand,
|
sendCommand,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('RiotRateLimiterService background limiter', () => {
|
function observedState(params: {
|
||||||
|
count120: number;
|
||||||
|
limit120?: number;
|
||||||
|
observedAt: number;
|
||||||
|
windowStartAt: number;
|
||||||
|
}) {
|
||||||
|
return JSON.stringify({
|
||||||
|
count120: params.count120,
|
||||||
|
limit120: params.limit120 ?? 100,
|
||||||
|
observedAt: params.observedAt,
|
||||||
|
windowStartAt: params.windowStartAt,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('RiotRateLimiterService', () => {
|
||||||
afterEach(() => {
|
afterEach(() => {
|
||||||
jest.restoreAllMocks();
|
jest.restoreAllMocks();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('uses the background key namespace and passes cost to the Lua script', async () => {
|
it('uses global app rate keys and passes cost to the Lua script', async () => {
|
||||||
jest.spyOn(Date, 'now').mockReturnValue(1_000);
|
jest.spyOn(Date, 'now').mockReturnValue(1_000);
|
||||||
const { service, sendCommand } = makeService();
|
const { service, sendCommand } = makeService();
|
||||||
|
|
||||||
await service.acquireBackground(8);
|
await service.acquire('asia', 3);
|
||||||
|
|
||||||
expect(sendCommand).toHaveBeenCalledTimes(1);
|
expect(sendCommand).toHaveBeenCalledTimes(1);
|
||||||
const command = sendCommand.mock.calls[0][0] as string[];
|
const command = sendCommand.mock.calls[0][0] as string[];
|
||||||
expect(command[0]).toBe('EVAL');
|
expect(command[0]).toBe('EVAL');
|
||||||
expect(command[2]).toBe('2');
|
expect(command[2]).toBe('2');
|
||||||
expect(command[3]).toBe('riot:bg:rl:1000');
|
expect(command[3]).toBe('riot:rl:app:1000');
|
||||||
expect(command[4]).toBe('riot:bg:rl:120000');
|
expect(command[4]).toBe('riot:rl:app:120000');
|
||||||
expect(command[5]).toBe('1000');
|
expect(command[5]).toBe('1000');
|
||||||
expect(command[7]).toBe('8');
|
expect(command[7]).toBe('3');
|
||||||
});
|
});
|
||||||
|
|
||||||
it('reads cleaned background usage for both windows', async () => {
|
it('records the 120 second app rate observation from Riot headers', async () => {
|
||||||
jest.spyOn(Date, 'now').mockReturnValue(200_000);
|
jest.spyOn(Date, 'now').mockReturnValue(1_000_000);
|
||||||
const sendCommand = jest
|
const { service, garnet } = makeService();
|
||||||
.fn()
|
|
||||||
.mockImplementation(async (command: string[]) => {
|
|
||||||
if (command[0] === 'ZREMRANGEBYSCORE') return 0;
|
|
||||||
if (command[1] === 'riot:bg:rl:1000') return 3;
|
|
||||||
if (command[1] === 'riot:bg:rl:120000') return 24;
|
|
||||||
return 0;
|
|
||||||
});
|
|
||||||
const { service } = makeService(sendCommand);
|
|
||||||
|
|
||||||
await expect(service.getBackgroundUsage()).resolves.toEqual({
|
await service.recordAppRateLimitObservation('47:120,3:1', '100:120,20:1');
|
||||||
used1s: 3,
|
|
||||||
used2m: 24,
|
expect(garnet.setString).toHaveBeenCalledTimes(1);
|
||||||
|
const [key, raw, ttl] = garnet.setString.mock.calls[0];
|
||||||
|
expect(key).toBe('riot:app:rl:observed');
|
||||||
|
expect(ttl).toBe(300);
|
||||||
|
expect(JSON.parse(raw)).toEqual({
|
||||||
|
count120: 47,
|
||||||
|
limit120: 100,
|
||||||
|
observedAt: 1_000_000,
|
||||||
|
windowStartAt: 1_000_000,
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(sendCommand).toHaveBeenCalledWith([
|
it('resets the inferred window when Riot count decreases or observation is stale', async () => {
|
||||||
'ZREMRANGEBYSCORE',
|
const { service, garnet } = makeService();
|
||||||
'riot:bg:rl:1000',
|
|
||||||
'-inf',
|
jest.spyOn(Date, 'now').mockReturnValue(1_060_000);
|
||||||
'199000',
|
garnet.getString.mockResolvedValueOnce(
|
||||||
]);
|
observedState({
|
||||||
expect(sendCommand).toHaveBeenCalledWith([
|
count120: 80,
|
||||||
'ZREMRANGEBYSCORE',
|
observedAt: 1_050_000,
|
||||||
'riot:bg:rl:120000',
|
windowStartAt: 1_000_000,
|
||||||
'-inf',
|
}),
|
||||||
'80000',
|
);
|
||||||
]);
|
|
||||||
|
await service.recordAppRateLimitObservation('2:120', null);
|
||||||
|
|
||||||
|
expect(JSON.parse(garnet.setString.mock.calls[0][1])).toMatchObject({
|
||||||
|
count120: 2,
|
||||||
|
windowStartAt: 1_060_000,
|
||||||
|
});
|
||||||
|
|
||||||
|
jest.spyOn(Date, 'now').mockReturnValue(1_240_000);
|
||||||
|
garnet.getString.mockResolvedValueOnce(
|
||||||
|
observedState({
|
||||||
|
count120: 20,
|
||||||
|
observedAt: 1_120_000,
|
||||||
|
windowStartAt: 1_000_000,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
await service.recordAppRateLimitObservation('25:120', null);
|
||||||
|
|
||||||
|
expect(JSON.parse(garnet.setString.mock.calls[1][1])).toMatchObject({
|
||||||
|
count120: 25,
|
||||||
|
windowStartAt: 1_240_000,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('opens the refresh gate when there is no active observation', async () => {
|
||||||
|
const { service, garnet } = makeService();
|
||||||
|
|
||||||
|
await expect(service.isRefreshWindowOpen(0.5)).resolves.toBe(true);
|
||||||
|
|
||||||
|
garnet.getString.mockResolvedValueOnce(
|
||||||
|
observedState({
|
||||||
|
count120: 90,
|
||||||
|
observedAt: 1_000_000,
|
||||||
|
windowStartAt: 900_000,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
jest.spyOn(Date, 'now').mockReturnValue(1_120_000);
|
||||||
|
|
||||||
|
await expect(service.isRefreshWindowOpen(0.5)).resolves.toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
{ ratio: 0.5, count120: 49, expected: true },
|
||||||
|
{ ratio: 0.5, count120: 50, expected: false },
|
||||||
|
{ ratio: 0.8, count120: 79, expected: true },
|
||||||
|
{ ratio: 0.8, count120: 80, expected: false },
|
||||||
|
])(
|
||||||
|
'checks tail headroom for refresh gate ratio=$ratio count=$count120',
|
||||||
|
async ({ ratio, count120, expected }) => {
|
||||||
|
jest.spyOn(Date, 'now').mockReturnValue(1_070_000);
|
||||||
|
const { service, garnet } = makeService();
|
||||||
|
garnet.getString.mockResolvedValue(
|
||||||
|
observedState({
|
||||||
|
count120,
|
||||||
|
observedAt: 1_069_000,
|
||||||
|
windowStartAt: 1_000_000,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
await expect(service.isRefreshWindowOpen(ratio)).resolves.toBe(expected);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
it('keeps the refresh gate closed before the 120 second window tail', async () => {
|
||||||
|
jest.spyOn(Date, 'now').mockReturnValue(1_050_000);
|
||||||
|
const { service, garnet } = makeService();
|
||||||
|
garnet.getString.mockResolvedValue(
|
||||||
|
observedState({
|
||||||
|
count120: 10,
|
||||||
|
observedAt: 1_049_000,
|
||||||
|
windowStartAt: 1_000_000,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
await expect(service.isRefreshWindowOpen(0.8)).resolves.toBe(false);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -7,11 +7,19 @@ const APP_LIMITS = [
|
|||||||
{ windowMs: 120_000, max: 90 },
|
{ windowMs: 120_000, max: 90 },
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
const BACKGROUND_LIMITS = [
|
const APP_KEY_PREFIX = 'riot:rl:app';
|
||||||
{ windowMs: 1_000, max: 6 },
|
const APP_WINDOW_MS = 120_000;
|
||||||
{ windowMs: 120_000, max: 36 },
|
const TAIL_MS = 60_000;
|
||||||
] as const;
|
const APP_OBSERVED_KEY = 'riot:app:rl:observed';
|
||||||
const BACKGROUND_KEY_PREFIX = 'riot:bg:rl';
|
const APP_OBSERVED_TTL_SECONDS = 300;
|
||||||
|
const DEFAULT_APP_LIMIT_120 = 100;
|
||||||
|
|
||||||
|
interface AppRateObservation {
|
||||||
|
count120: number;
|
||||||
|
limit120: number;
|
||||||
|
observedAt: number;
|
||||||
|
windowStartAt: number;
|
||||||
|
}
|
||||||
|
|
||||||
const ACQUIRE_SCRIPT = `
|
const ACQUIRE_SCRIPT = `
|
||||||
local now = tonumber(ARGV[1])
|
local now = tonumber(ARGV[1])
|
||||||
@@ -81,85 +89,78 @@ export class RiotRateLimiterService {
|
|||||||
|
|
||||||
public async acquire(
|
public async acquire(
|
||||||
route: RiotRegionalRoute | RiotPlatformRoute,
|
route: RiotRegionalRoute | RiotPlatformRoute,
|
||||||
|
cost = 1,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
for (;;) {
|
|
||||||
const now = Date.now();
|
|
||||||
const waitMs = await this.checkAndAdd(route, now, 1);
|
|
||||||
if (waitMs <= 0) return;
|
|
||||||
|
|
||||||
if (waitMs >= 100) {
|
|
||||||
this.logger.warn(
|
|
||||||
`Riot API throttle waiting ${waitMs}ms for route=${route}.`,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
await sleep(waitMs);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async acquireBackground(cost = 1): Promise<void> {
|
|
||||||
const normalizedCost = normalizeCost(cost);
|
const normalizedCost = normalizeCost(cost);
|
||||||
for (;;) {
|
for (;;) {
|
||||||
const now = Date.now();
|
const now = Date.now();
|
||||||
const waitMs = await this.checkAndAddBackground(now, normalizedCost);
|
const waitMs = await this.checkAndAdd(now, normalizedCost);
|
||||||
if (waitMs <= 0) return;
|
if (waitMs <= 0) return;
|
||||||
|
|
||||||
if (waitMs >= 100) {
|
if (waitMs >= 100) {
|
||||||
this.logger.warn(
|
this.logger.warn(
|
||||||
`Background Riot throttle waiting ${waitMs}ms (cost=${normalizedCost}).`,
|
`Riot API throttle waiting ${waitMs}ms for route=${route} cost=${normalizedCost}.`,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
await sleep(waitMs);
|
await sleep(waitMs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async getBackgroundUsage(): Promise<{
|
public async recordAppRateLimitObservation(
|
||||||
used1s: number;
|
countHeader: string | null,
|
||||||
used2m: number;
|
limitHeader?: string | null,
|
||||||
}> {
|
): Promise<void> {
|
||||||
const client = this.garnet.raw();
|
const count120 = parseRateLimitHeader(countHeader, 120);
|
||||||
const now = Date.now();
|
if (count120 === null) return;
|
||||||
const usages = await Promise.all(
|
|
||||||
BACKGROUND_LIMITS.map(async (limit) => {
|
|
||||||
const key = `${BACKGROUND_KEY_PREFIX}:${limit.windowMs}`;
|
|
||||||
await client.sendCommand([
|
|
||||||
'ZREMRANGEBYSCORE',
|
|
||||||
key,
|
|
||||||
'-inf',
|
|
||||||
String(now - limit.windowMs),
|
|
||||||
]);
|
|
||||||
const response = await client.sendCommand(['ZCARD', key]);
|
|
||||||
const count = Number(response ?? 0);
|
|
||||||
return Number.isFinite(count) && count > 0 ? count : 0;
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
|
|
||||||
return {
|
const limit120 =
|
||||||
used1s: usages[0] ?? 0,
|
parseRateLimitHeader(limitHeader ?? null, 120) ?? DEFAULT_APP_LIMIT_120;
|
||||||
used2m: usages[1] ?? 0,
|
const now = Date.now();
|
||||||
|
const previous = await this.getAppRateObservation();
|
||||||
|
const windowStartAt =
|
||||||
|
!previous ||
|
||||||
|
now - previous.observedAt >= APP_WINDOW_MS ||
|
||||||
|
count120 < previous.count120
|
||||||
|
? now
|
||||||
|
: previous.windowStartAt;
|
||||||
|
|
||||||
|
const observation: AppRateObservation = {
|
||||||
|
count120,
|
||||||
|
limit120,
|
||||||
|
observedAt: now,
|
||||||
|
windowStartAt,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Concurrent responses can race here. This observation is advisory, so
|
||||||
|
// last-writer-wins is acceptable and self-corrects on the next Riot header.
|
||||||
|
await this.garnet.setString(
|
||||||
|
APP_OBSERVED_KEY,
|
||||||
|
JSON.stringify(observation),
|
||||||
|
APP_OBSERVED_TTL_SECONDS,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async checkAndAdd(
|
public async isRefreshWindowOpen(
|
||||||
route: RiotRegionalRoute | RiotPlatformRoute,
|
usageRatio: number,
|
||||||
now: number,
|
now = Date.now(),
|
||||||
cost: number,
|
): Promise<boolean> {
|
||||||
): Promise<number> {
|
const observation = await this.getAppRateObservation();
|
||||||
|
if (!observation) return true;
|
||||||
|
if (now - observation.observedAt >= APP_WINDOW_MS) return true;
|
||||||
|
|
||||||
|
const ratio = Number.isFinite(usageRatio) ? usageRatio : 0;
|
||||||
|
const headroomOk = observation.count120 < observation.limit120 * ratio;
|
||||||
|
const inTail = now >= observation.windowStartAt + APP_WINDOW_MS - TAIL_MS;
|
||||||
|
return headroomOk && inTail;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async checkAndAdd(now: number, cost: number): Promise<number> {
|
||||||
const keys = APP_LIMITS.map(
|
const keys = APP_LIMITS.map(
|
||||||
(limit) => `riot:rl:${route}:${limit.windowMs}`,
|
(limit) => `${APP_KEY_PREFIX}:${limit.windowMs}`,
|
||||||
);
|
);
|
||||||
return this.checkAndAddWithLimits(keys, APP_LIMITS, now, cost);
|
return this.checkAndAddWithLimits(keys, APP_LIMITS, now, cost);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async checkAndAddBackground(
|
|
||||||
now: number,
|
|
||||||
cost: number,
|
|
||||||
): Promise<number> {
|
|
||||||
const keys = BACKGROUND_LIMITS.map(
|
|
||||||
(limit) => `${BACKGROUND_KEY_PREFIX}:${limit.windowMs}`,
|
|
||||||
);
|
|
||||||
return this.checkAndAddWithLimits(keys, BACKGROUND_LIMITS, now, cost);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async checkAndAddWithLimits(
|
private async checkAndAddWithLimits(
|
||||||
keys: string[],
|
keys: string[],
|
||||||
limits: ReadonlyArray<{ windowMs: number; max: number }>,
|
limits: ReadonlyArray<{ windowMs: number; max: number }>,
|
||||||
@@ -187,6 +188,32 @@ export class RiotRateLimiterService {
|
|||||||
if (!Number.isFinite(waitMs) || waitMs < 0) return 0;
|
if (!Number.isFinite(waitMs) || waitMs < 0) return 0;
|
||||||
return waitMs;
|
return waitMs;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async getAppRateObservation(): Promise<AppRateObservation | null> {
|
||||||
|
const raw = await this.garnet.getString(APP_OBSERVED_KEY);
|
||||||
|
if (!raw) return null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const parsed = JSON.parse(raw) as Partial<AppRateObservation>;
|
||||||
|
if (
|
||||||
|
typeof parsed.count120 !== 'number' ||
|
||||||
|
typeof parsed.limit120 !== 'number' ||
|
||||||
|
typeof parsed.observedAt !== 'number' ||
|
||||||
|
typeof parsed.windowStartAt !== 'number'
|
||||||
|
) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
count120: parsed.count120,
|
||||||
|
limit120: parsed.limit120,
|
||||||
|
observedAt: parsed.observedAt,
|
||||||
|
windowStartAt: parsed.windowStartAt,
|
||||||
|
};
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeCost(cost: number): number {
|
function normalizeCost(cost: number): number {
|
||||||
@@ -194,6 +221,24 @@ function normalizeCost(cost: number): number {
|
|||||||
return Math.max(1, Math.floor(cost));
|
return Math.max(1, Math.floor(cost));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function parseRateLimitHeader(
|
||||||
|
header: string | null,
|
||||||
|
windowSeconds: number,
|
||||||
|
): number | null {
|
||||||
|
if (!header) return null;
|
||||||
|
|
||||||
|
for (const rawEntry of header.split(',')) {
|
||||||
|
const [rawCount, rawWindow] = rawEntry.trim().split(':');
|
||||||
|
const count = Number(rawCount);
|
||||||
|
const window = Number(rawWindow);
|
||||||
|
if (window === windowSeconds && Number.isFinite(count) && count >= 0) {
|
||||||
|
return count;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
function sleep(ms: number): Promise<void> {
|
function sleep(ms: number): Promise<void> {
|
||||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
import { SecretService } from '../global/secret/secret.service';
|
||||||
|
import { RiotClientService } from './riot.client.service';
|
||||||
|
import { RiotRateLimiterService } from './riot-rate-limiter.service';
|
||||||
|
|
||||||
|
describe('RiotClientService', () => {
|
||||||
|
const originalFetch = global.fetch;
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
global.fetch = originalFetch;
|
||||||
|
jest.restoreAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('records Riot app rate limit headers after a response', async () => {
|
||||||
|
const secretService = {
|
||||||
|
get: jest.fn().mockResolvedValue('riot-key'),
|
||||||
|
} as unknown as jest.Mocked<SecretService>;
|
||||||
|
const rateLimiter = {
|
||||||
|
acquire: jest.fn().mockResolvedValue(undefined),
|
||||||
|
recordAppRateLimitObservation: jest.fn().mockResolvedValue(undefined),
|
||||||
|
} as unknown as jest.Mocked<RiotRateLimiterService>;
|
||||||
|
global.fetch = jest.fn().mockResolvedValue({
|
||||||
|
headers: {
|
||||||
|
get: jest.fn((name: string) => {
|
||||||
|
if (name === 'X-App-Rate-Limit-Count') return '47:120,3:1';
|
||||||
|
if (name === 'X-App-Rate-Limit') return '100:120,20:1';
|
||||||
|
return null;
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
json: jest.fn().mockResolvedValue({ ok: true }),
|
||||||
|
ok: true,
|
||||||
|
status: 200,
|
||||||
|
} as unknown as Response);
|
||||||
|
const service = new RiotClientService(secretService, rateLimiter);
|
||||||
|
|
||||||
|
await service.get('/lol/status/v4/platform-data', { platform: 'kr' });
|
||||||
|
|
||||||
|
expect(rateLimiter.acquire).toHaveBeenCalledWith('kr');
|
||||||
|
expect(rateLimiter.recordAppRateLimitObservation).toHaveBeenCalledWith(
|
||||||
|
'47:120,3:1',
|
||||||
|
'100:120,20:1',
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -140,16 +140,18 @@ export class RiotClientService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const appRateLimitCount = response.headers.get('X-App-Rate-Limit-Count');
|
const appRateLimitCount = response.headers.get('X-App-Rate-Limit-Count');
|
||||||
|
const appRateLimit = response.headers.get('X-App-Rate-Limit');
|
||||||
|
void this.rateLimiter.recordAppRateLimitObservation(
|
||||||
|
appRateLimitCount,
|
||||||
|
appRateLimit,
|
||||||
|
);
|
||||||
if (appRateLimitCount && Math.random() < 0.05) {
|
if (appRateLimitCount && Math.random() < 0.05) {
|
||||||
this.logger.debug(`Riot rate usage ${routeKey}: ${appRateLimitCount}`);
|
this.logger.debug(`Riot rate usage ${routeKey}: ${appRateLimitCount}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const error = await this.createApiError(response, url);
|
const error = await this.createApiError(response, url);
|
||||||
if (
|
if (error.status === 429 && attempt === 0) {
|
||||||
error.status === 429 &&
|
|
||||||
attempt === 0
|
|
||||||
) {
|
|
||||||
await sleep((error.retryAfterSeconds ?? 1) * 1000);
|
await sleep((error.retryAfterSeconds ?? 1) * 1000);
|
||||||
return this.fetchWithRetry(
|
return this.fetchWithRetry(
|
||||||
url,
|
url,
|
||||||
|
|||||||
+16
-1
@@ -1,5 +1,5 @@
|
|||||||
<!doctype html>
|
<!doctype html>
|
||||||
<html lang="en">
|
<html lang="ko" data-theme="light">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||||
@@ -7,6 +7,21 @@
|
|||||||
<title>롤림푸스 - 내전 관리</title>
|
<title>롤림푸스 - 내전 관리</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
<script>
|
||||||
|
(() => {
|
||||||
|
let theme = "light";
|
||||||
|
try {
|
||||||
|
theme =
|
||||||
|
window.localStorage.getItem("lolympus.theme") === "dark"
|
||||||
|
? "dark"
|
||||||
|
: "light";
|
||||||
|
} catch {
|
||||||
|
theme = "light";
|
||||||
|
}
|
||||||
|
document.documentElement.dataset.theme = theme;
|
||||||
|
document.documentElement.style.colorScheme = theme;
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
<script type="module" src="/src/main.tsx"></script>
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
+116
-5
@@ -1,7 +1,9 @@
|
|||||||
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 DevAuthSwitcher from "./components/DevAuthSwitcher";
|
import DevAuthSwitcher from "./components/DevAuthSwitcher";
|
||||||
import { DEFAULT_COMMUNITY_ID } from "./config";
|
import { DEFAULT_COMMUNITY_ID, setTheme, useTheme } from "./config";
|
||||||
import { useCommunity } from "./api/hooks";
|
import { useCommunity } from "./api/hooks";
|
||||||
import { isMsalConfigured } from "./lib/auth/msal.config";
|
import { isMsalConfigured } from "./lib/auth/msal.config";
|
||||||
import AuthCallbackPage from "./pages/AuthCallback";
|
import AuthCallbackPage from "./pages/AuthCallback";
|
||||||
@@ -24,7 +26,10 @@ function MsalHeaderActions() {
|
|||||||
|
|
||||||
if (!account) {
|
if (!account) {
|
||||||
return (
|
return (
|
||||||
<Link className="btn btn-primary btn-xs px-3" to="/login">
|
<Link
|
||||||
|
className="btn btn-ghost btn-xs px-2 text-base-content/60 hover:text-base-content"
|
||||||
|
to="/login"
|
||||||
|
>
|
||||||
로그인
|
로그인
|
||||||
</Link>
|
</Link>
|
||||||
);
|
);
|
||||||
@@ -41,13 +46,80 @@ function MsalHeaderActions() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function ThemeToggle() {
|
||||||
|
const theme = useTheme();
|
||||||
|
const nextTheme = theme === "light" ? "dark" : "light";
|
||||||
|
const label = nextTheme === "dark" ? "다크 테마로 전환" : "라이트 테마로 전환";
|
||||||
|
const Icon = nextTheme === "dark" ? Moon : Sun;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span className="tooltip tooltip-bottom" data-tip={label}>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn btn-ghost btn-xs btn-square text-base-content/60 hover:text-base-content"
|
||||||
|
aria-label={label}
|
||||||
|
onClick={() => setTheme(nextTheme)}
|
||||||
|
>
|
||||||
|
<Icon className="h-3.5 w-3.5" aria-hidden="true" />
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
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
|
||||||
@@ -58,19 +130,21 @@ function App() {
|
|||||||
</Link>
|
</Link>
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
{/* {DEFAULT_COMMUNITY_ID ? (
|
{/* {DEFAULT_COMMUNITY_ID ? (
|
||||||
<span className="text-[10px] uppercase tracking-wider text-base-content/25">
|
<span className="text-xs uppercase tracking-wider text-base-content/25">
|
||||||
API Live
|
API Live
|
||||||
</span>
|
</span>
|
||||||
) : (
|
) : (
|
||||||
<span className="text-[10px] uppercase tracking-wider text-amber-500/70">
|
<span className="text-xs uppercase tracking-wider text-amber-500/70">
|
||||||
Set `VITE_DEFAULT_COMMUNITY_ID`
|
Set `VITE_DEFAULT_COMMUNITY_ID`
|
||||||
</span>
|
</span>
|
||||||
)} */}
|
)} */}
|
||||||
|
<ThemeToggle />
|
||||||
{isMsalConfigured && <MsalHeaderActions />}
|
{isMsalConfigured && <MsalHeaderActions />}
|
||||||
</div>
|
</div>
|
||||||
</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 />} />
|
||||||
@@ -106,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,31 @@ 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),
|
||||||
|
placeholderData: (previousData) => previousData,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
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],
|
||||||
@@ -225,6 +270,7 @@ function createUserHistoryPath(
|
|||||||
export function useUserHistoryProfile(
|
export function useUserHistoryProfile(
|
||||||
userId: string | undefined,
|
userId: string | undefined,
|
||||||
communityId = DEFAULT_COMMUNITY_ID,
|
communityId = DEFAULT_COMMUNITY_ID,
|
||||||
|
enabled = true,
|
||||||
) {
|
) {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ['user-history-profile', communityId, userId ?? null],
|
queryKey: ['user-history-profile', communityId, userId ?? null],
|
||||||
@@ -233,7 +279,7 @@ export function useUserHistoryProfile(
|
|||||||
`/communities/${communityId}/users/${userId}/history-profile`,
|
`/communities/${communityId}/users/${userId}/history-profile`,
|
||||||
{ auth: 'none' },
|
{ auth: 'none' },
|
||||||
),
|
),
|
||||||
enabled: Boolean(communityId && userId),
|
enabled: enabled && Boolean(communityId && userId),
|
||||||
retry: false,
|
retry: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import type {
|
|||||||
ApiPositionPreference,
|
ApiPositionPreference,
|
||||||
ApiRiotLaneStats,
|
ApiRiotLaneStats,
|
||||||
ApiRiotRecentStatsSummary,
|
ApiRiotRecentStatsSummary,
|
||||||
|
ApiTierHistoryEntry,
|
||||||
ApiTierInfo,
|
ApiTierInfo,
|
||||||
MatchStatus,
|
MatchStatus,
|
||||||
Position,
|
Position,
|
||||||
@@ -91,6 +92,7 @@ export interface AuctionPlayerView extends ParticipantView {
|
|||||||
level: number;
|
level: number;
|
||||||
points: number;
|
points: number;
|
||||||
}[];
|
}[];
|
||||||
|
tierHistory: ApiTierHistoryEntry[];
|
||||||
recentStats: {
|
recentStats: {
|
||||||
overall: ApiRiotLaneStats;
|
overall: ApiRiotLaneStats;
|
||||||
byLane: Partial<Record<RiotLane, ApiRiotLaneStats>>;
|
byLane: Partial<Record<RiotLane, ApiRiotLaneStats>>;
|
||||||
@@ -236,6 +238,7 @@ function mapAuctionPlayerToView(
|
|||||||
summonerName: player.gameName,
|
summonerName: player.gameName,
|
||||||
tag: player.tagLine,
|
tag: player.tagLine,
|
||||||
tier: selectPrimaryTier(player.tiers),
|
tier: selectPrimaryTier(player.tiers),
|
||||||
|
tierHistory: player.tierHistory ?? [],
|
||||||
mainPosition,
|
mainPosition,
|
||||||
subPosition,
|
subPosition,
|
||||||
profileIconId: player.profileIconId,
|
profileIconId: player.profileIconId,
|
||||||
@@ -288,12 +291,14 @@ function mapAuctionTeamToView(
|
|||||||
...participant,
|
...participant,
|
||||||
passCount: 0,
|
passCount: 0,
|
||||||
masteries: [],
|
masteries: [],
|
||||||
|
tierHistory: [],
|
||||||
recentStats: createEmptyRecentStatsView(),
|
recentStats: createEmptyRecentStatsView(),
|
||||||
}
|
}
|
||||||
: {
|
: {
|
||||||
...createFallbackParticipant(member.userId),
|
...createFallbackParticipant(member.userId),
|
||||||
passCount: 0,
|
passCount: 0,
|
||||||
masteries: [],
|
masteries: [],
|
||||||
|
tierHistory: [],
|
||||||
recentStats: createEmptyRecentStatsView(),
|
recentStats: createEmptyRecentStatsView(),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ export interface ApiRiotAccount {
|
|||||||
summonerLevel: number;
|
summonerLevel: number;
|
||||||
isPrimary: boolean;
|
isPrimary: boolean;
|
||||||
tiers: ApiTierInfo[];
|
tiers: ApiTierInfo[];
|
||||||
tierHistory: unknown[];
|
tierHistory: ApiTierHistoryEntry[];
|
||||||
matchIds: string[];
|
matchIds: string[];
|
||||||
championMasteries: ApiChampionMasteryEntry[];
|
championMasteries: ApiChampionMasteryEntry[];
|
||||||
championRecords: Record<string, Record<string, unknown>>;
|
championRecords: Record<string, Record<string, unknown>>;
|
||||||
@@ -247,6 +247,7 @@ export interface ApiAuctionPlayerSnapshot {
|
|||||||
profileIconId: number;
|
profileIconId: number;
|
||||||
preferredPositions: ApiPositionPreference[];
|
preferredPositions: ApiPositionPreference[];
|
||||||
tiers: ApiTierInfo[];
|
tiers: ApiTierInfo[];
|
||||||
|
tierHistory: ApiTierHistoryEntry[];
|
||||||
masteries: ApiChampionMasteryEntry[];
|
masteries: ApiChampionMasteryEntry[];
|
||||||
recentStatsSummary?: ApiRiotRecentStatsSummary;
|
recentStatsSummary?: ApiRiotRecentStatsSummary;
|
||||||
passCount: number;
|
passCount: number;
|
||||||
@@ -339,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 {
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ export default function DevAuthSwitcher() {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="fixed right-4 bottom-4 z-50 w-72 border border-base-content/10 bg-base-100/95 backdrop-blur px-3 py-3 shadow-xl">
|
<div className="fixed right-4 bottom-4 z-50 w-72 border border-base-content/10 bg-base-100/95 backdrop-blur px-3 py-3 shadow-xl">
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
|
<div className="text-xs font-bold uppercase tracking-wider text-base-content/35">
|
||||||
Dev Auth
|
Dev Auth
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2 text-[11px] text-base-content/45">
|
<div className="mt-2 text-xs text-base-content/45">
|
||||||
X-Auth-User-Id
|
X-Auth-User-Id
|
||||||
</div>
|
</div>
|
||||||
<input
|
<input
|
||||||
@@ -50,7 +50,7 @@ export default function DevAuthSwitcher() {
|
|||||||
Clear
|
Clear
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2 text-[10px] text-base-content/35 break-all">
|
<div className="mt-2 text-xs text-base-content/35 break-all">
|
||||||
현재값: {authUserId ?? '없음'}
|
현재값: {authUserId ?? '없음'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -0,0 +1,122 @@
|
|||||||
|
import type { ApiTierInfo } from "../api/types";
|
||||||
|
|
||||||
|
type RankBadgeSize = "sm" | "md";
|
||||||
|
type RankBadgeTooltipPlacement = "left" | "bottom";
|
||||||
|
|
||||||
|
const TIER_NAMES: Record<string, string> = {
|
||||||
|
IRON: "아이언",
|
||||||
|
BRONZE: "브론즈",
|
||||||
|
SILVER: "실버",
|
||||||
|
GOLD: "골드",
|
||||||
|
PLATINUM: "플래티넘",
|
||||||
|
EMERALD: "에메랄드",
|
||||||
|
DIAMOND: "다이아몬드",
|
||||||
|
MASTER: "마스터",
|
||||||
|
GRANDMASTER: "그랜드마스터",
|
||||||
|
CHALLENGER: "챌린저",
|
||||||
|
};
|
||||||
|
|
||||||
|
const SIZE_CLASSES: Record<RankBadgeSize, string> = {
|
||||||
|
sm: "h-[17px] min-w-[18px]",
|
||||||
|
md: "h-[18px] min-w-[20px]",
|
||||||
|
};
|
||||||
|
|
||||||
|
const TOOLTIP_CLASSES: Record<RankBadgeTooltipPlacement, string> = {
|
||||||
|
left: "tooltip-left",
|
||||||
|
bottom: "tooltip-bottom",
|
||||||
|
};
|
||||||
|
|
||||||
|
function normalizeRank(rank: string | undefined) {
|
||||||
|
switch (rank) {
|
||||||
|
case "I":
|
||||||
|
return "1";
|
||||||
|
case "II":
|
||||||
|
return "2";
|
||||||
|
case "III":
|
||||||
|
return "3";
|
||||||
|
case "IV":
|
||||||
|
return "4";
|
||||||
|
default:
|
||||||
|
return rank;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
||||||
|
switch (tier?.tier) {
|
||||||
|
case "CHALLENGER":
|
||||||
|
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
|
||||||
|
case "GRANDMASTER":
|
||||||
|
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
|
||||||
|
case "MASTER":
|
||||||
|
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
|
||||||
|
case "DIAMOND":
|
||||||
|
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
|
||||||
|
case "EMERALD":
|
||||||
|
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
|
||||||
|
case "PLATINUM":
|
||||||
|
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
|
||||||
|
case "GOLD":
|
||||||
|
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
|
||||||
|
case "SILVER":
|
||||||
|
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
|
||||||
|
case "BRONZE":
|
||||||
|
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
|
||||||
|
case "IRON":
|
||||||
|
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
|
||||||
|
default:
|
||||||
|
return "border-base-content/30 bg-transparent text-base-content/50";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function formatRankBadge(tier: ApiTierInfo | undefined) {
|
||||||
|
if (!tier) return "U";
|
||||||
|
const tierInitial =
|
||||||
|
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
|
||||||
|
const rank = normalizeRank(tier.rank);
|
||||||
|
return rank ? `${tierInitial}${rank}` : tierInitial;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function formatRankDetail(tier: ApiTierInfo | undefined) {
|
||||||
|
if (!tier) return "랭크 정보 없음";
|
||||||
|
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
|
||||||
|
const rank = normalizeRank(tier.rank);
|
||||||
|
const label = rank ? `${tierName} ${rank}` : tierName;
|
||||||
|
return `${label} - ${tier.leaguePoints} LP`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function RankBadge({
|
||||||
|
tier,
|
||||||
|
size = "md",
|
||||||
|
tooltipPlacement = "bottom",
|
||||||
|
}: {
|
||||||
|
tier?: ApiTierInfo;
|
||||||
|
size?: RankBadgeSize;
|
||||||
|
tooltipPlacement?: RankBadgeTooltipPlacement;
|
||||||
|
}) {
|
||||||
|
const tooltip = formatRankDetail(tier);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span
|
||||||
|
className={`tooltip ${TOOLTIP_CLASSES[tooltipPlacement]}`}
|
||||||
|
data-tip={tooltip}
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
className={`inline-flex ${SIZE_CLASSES[size]} shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-xs font-black leading-none ${rankBadgeClass(tier)}`}
|
||||||
|
aria-label={tooltip}
|
||||||
|
>
|
||||||
|
{formatRankBadge(tier)}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) {
|
||||||
|
return (
|
||||||
|
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
|
||||||
|
<RankBadge tier={tier} />
|
||||||
|
<span className="hidden font-bold text-base-content/55 sm:inline">
|
||||||
|
{formatRankDetail(tier)}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ import {
|
|||||||
CartesianGrid,
|
CartesianGrid,
|
||||||
Line,
|
Line,
|
||||||
LineChart,
|
LineChart,
|
||||||
|
ReferenceDot,
|
||||||
ReferenceLine,
|
ReferenceLine,
|
||||||
ResponsiveContainer,
|
ResponsiveContainer,
|
||||||
Tooltip,
|
Tooltip,
|
||||||
@@ -45,13 +46,29 @@ const TIER_SPAN = 400;
|
|||||||
const RANK_SPAN = 100;
|
const RANK_SPAN = 100;
|
||||||
|
|
||||||
const RANK_INDEX: Record<string, number> = { IV: 0, III: 1, II: 2, I: 3 };
|
const RANK_INDEX: Record<string, number> = { IV: 0, III: 1, II: 2, I: 3 };
|
||||||
|
const RANK_BY_INDEX = ["IV", "III", "II", "I"];
|
||||||
|
|
||||||
const QUEUE_LABELS: Record<string, string> = {
|
const QUEUE_LABELS: Record<string, string> = {
|
||||||
RANKED_SOLO_5x5: "솔로랭크",
|
RANKED_SOLO_5x5: "솔로랭크",
|
||||||
RANKED_FLEX_SR: "자유랭크",
|
RANKED_FLEX_SR: "자유랭크",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const TIER_COMPACT_NAMES: Record<string, string> = {
|
||||||
|
IRON: "I",
|
||||||
|
BRONZE: "B",
|
||||||
|
SILVER: "S",
|
||||||
|
GOLD: "G",
|
||||||
|
PLATINUM: "P",
|
||||||
|
EMERALD: "E",
|
||||||
|
DIAMOND: "D",
|
||||||
|
MASTER: "M",
|
||||||
|
GRANDMASTER: "GM",
|
||||||
|
CHALLENGER: "C",
|
||||||
|
};
|
||||||
|
|
||||||
type PeriodKey = "30" | "90" | "all";
|
type PeriodKey = "30" | "90" | "all";
|
||||||
|
type SummaryVariant = "footer" | "inline";
|
||||||
|
type SummaryDirection = "up" | "down" | "flat";
|
||||||
|
|
||||||
const PERIOD_OPTIONS: { key: PeriodKey; label: string; days: number | null }[] =
|
const PERIOD_OPTIONS: { key: PeriodKey; label: string; days: number | null }[] =
|
||||||
[
|
[
|
||||||
@@ -108,10 +125,38 @@ function formatTierLabel(entry: {
|
|||||||
return `${name}${rank ? ` ${rank}` : ""} · ${entry.leaguePoints ?? 0}LP`;
|
return `${name}${rank ? ` ${rank}` : ""} · ${entry.leaguePoints ?? 0}LP`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatTierCompactLabel(entry: {
|
||||||
|
tier: string;
|
||||||
|
rank?: string;
|
||||||
|
leaguePoints?: number;
|
||||||
|
}) {
|
||||||
|
const tier = TIER_COMPACT_NAMES[entry.tier] ?? entry.tier;
|
||||||
|
const lp = entry.leaguePoints ?? 0;
|
||||||
|
if (APEX_TIERS.has(entry.tier)) {
|
||||||
|
return `${tier} ${lp}LP`;
|
||||||
|
}
|
||||||
|
const rank = normalizeRank(entry.rank);
|
||||||
|
return `${tier}${rank} ${lp}LP`;
|
||||||
|
}
|
||||||
|
|
||||||
function formatTierShort(tier: string) {
|
function formatTierShort(tier: string) {
|
||||||
return TIER_NAMES[tier] ?? tier;
|
return TIER_NAMES[tier] ?? tier;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatPeriodChange(summary: {
|
||||||
|
first: ChartPoint;
|
||||||
|
last: ChartPoint;
|
||||||
|
direction: SummaryDirection;
|
||||||
|
}) {
|
||||||
|
const marker =
|
||||||
|
summary.direction === "up"
|
||||||
|
? "▲"
|
||||||
|
: summary.direction === "down"
|
||||||
|
? "▼"
|
||||||
|
: "·";
|
||||||
|
return `${formatTierShort(summary.first.tier)} ${marker} ${formatTierShort(summary.last.tier)}`;
|
||||||
|
}
|
||||||
|
|
||||||
function formatDate(ms: number) {
|
function formatDate(ms: number) {
|
||||||
return new Intl.DateTimeFormat("ko-KR", {
|
return new Intl.DateTimeFormat("ko-KR", {
|
||||||
month: "numeric",
|
month: "numeric",
|
||||||
@@ -129,6 +174,94 @@ type ChartPoint = {
|
|||||||
losses?: number;
|
losses?: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
type YGuide = {
|
||||||
|
value: number;
|
||||||
|
label: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
function isSamePoint(left: ChartPoint, right: ChartPoint) {
|
||||||
|
return left.ts === right.ts && left.value === right.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
function nearestApexPoint(value: number, points: ChartPoint[]) {
|
||||||
|
const apexPoints = points.filter((point) => APEX_TIERS.has(point.tier));
|
||||||
|
if (apexPoints.length === 0) return null;
|
||||||
|
|
||||||
|
return apexPoints.reduce((best, point) =>
|
||||||
|
Math.abs(point.value - value) < Math.abs(best.value - value) ? point : best,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function compactEntryFromLadderValue(value: number, points: ChartPoint[]) {
|
||||||
|
const rounded = Math.max(0, Math.round(value));
|
||||||
|
const masterBase = tierIndex("MASTER") * TIER_SPAN;
|
||||||
|
|
||||||
|
if (rounded >= masterBase) {
|
||||||
|
const apexPoint = nearestApexPoint(rounded, points);
|
||||||
|
const apexTier = apexPoint?.tier ?? "MASTER";
|
||||||
|
const apexBase = tierIndex(apexTier) * TIER_SPAN;
|
||||||
|
if (rounded >= apexBase) {
|
||||||
|
return {
|
||||||
|
tier: apexTier,
|
||||||
|
leaguePoints: rounded - apexBase,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
tier: "MASTER",
|
||||||
|
leaguePoints: rounded - masterBase,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
const tierIdx = Math.min(
|
||||||
|
TIER_ORDER.length - 1,
|
||||||
|
Math.floor(rounded / TIER_SPAN),
|
||||||
|
);
|
||||||
|
const tier = TIER_ORDER[tierIdx];
|
||||||
|
const withinTier = rounded - tierIdx * TIER_SPAN;
|
||||||
|
const rankIdx = Math.min(3, Math.floor(withinTier / RANK_SPAN));
|
||||||
|
|
||||||
|
return {
|
||||||
|
tier,
|
||||||
|
rank: RANK_BY_INDEX[rankIdx],
|
||||||
|
leaguePoints: withinTier - rankIdx * RANK_SPAN,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildAdaptiveYGuides(points: ChartPoint[]): YGuide[] {
|
||||||
|
if (points.length === 0) return [];
|
||||||
|
|
||||||
|
const min = Math.min(...points.map((point) => point.value));
|
||||||
|
const max = Math.max(...points.map((point) => point.value));
|
||||||
|
const paddedMin = min - 60;
|
||||||
|
const paddedMax = max + 60;
|
||||||
|
const steps = [50, 100, 200, 400, 800, 1200];
|
||||||
|
|
||||||
|
for (const step of steps) {
|
||||||
|
const start = Math.ceil(paddedMin / step) * step;
|
||||||
|
const end = Math.floor(paddedMax / step) * step;
|
||||||
|
const count = Math.floor((end - start) / step) + 1;
|
||||||
|
|
||||||
|
if (count >= 2 && count <= 4) {
|
||||||
|
return Array.from({ length: count }, (_, index) => {
|
||||||
|
const value = start + index * step;
|
||||||
|
return {
|
||||||
|
value,
|
||||||
|
label: formatTierCompactLabel(
|
||||||
|
compactEntryFromLadderValue(value, points),
|
||||||
|
),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const center = Math.round(((min + max) / 2) / 50) * 50;
|
||||||
|
return [center - 50, center + 50].map((value) => ({
|
||||||
|
value,
|
||||||
|
label: formatTierCompactLabel(compactEntryFromLadderValue(value, points)),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
function TierTooltip({
|
function TierTooltip({
|
||||||
active,
|
active,
|
||||||
payload,
|
payload,
|
||||||
@@ -143,7 +276,7 @@ function TierTooltip({
|
|||||||
? ` · ${point.wins}승 ${point.losses}패`
|
? ` · ${point.wins}승 ${point.losses}패`
|
||||||
: "";
|
: "";
|
||||||
return (
|
return (
|
||||||
<div className="border border-base-content/15 bg-base-100 px-3 py-2 text-[11px] shadow-lg">
|
<div className="border border-base-content/15 bg-base-100 px-3 py-2 text-xs shadow-lg">
|
||||||
<div className="font-bold text-base-content">{formatTierLabel(point)}</div>
|
<div className="font-bold text-base-content">{formatTierLabel(point)}</div>
|
||||||
<div className="mt-0.5 text-base-content/45">
|
<div className="mt-0.5 text-base-content/45">
|
||||||
{new Intl.DateTimeFormat("ko-KR", {
|
{new Intl.DateTimeFormat("ko-KR", {
|
||||||
@@ -159,8 +292,16 @@ function TierTooltip({
|
|||||||
|
|
||||||
export default function TierHistoryChart({
|
export default function TierHistoryChart({
|
||||||
entries,
|
entries,
|
||||||
|
className = "border border-base-content/10 bg-base-100 mb-5 overflow-hidden",
|
||||||
|
summaryVariant = "footer",
|
||||||
|
height = 220,
|
||||||
|
showHeader = true,
|
||||||
}: {
|
}: {
|
||||||
entries: ApiTierHistoryEntry[];
|
entries: ApiTierHistoryEntry[];
|
||||||
|
className?: string;
|
||||||
|
summaryVariant?: SummaryVariant;
|
||||||
|
height?: number;
|
||||||
|
showHeader?: boolean;
|
||||||
}) {
|
}) {
|
||||||
// 데이터에 존재하는 큐 목록 (솔로 우선)
|
// 데이터에 존재하는 큐 목록 (솔로 우선)
|
||||||
const availableQueues = useMemo(() => {
|
const availableQueues = useMemo(() => {
|
||||||
@@ -211,6 +352,10 @@ export default function TierHistoryChart({
|
|||||||
})).filter((line) => line.value >= min - TIER_SPAN && line.value <= max);
|
})).filter((line) => line.value >= min - TIER_SPAN && line.value <= max);
|
||||||
}, [points]);
|
}, [points]);
|
||||||
|
|
||||||
|
const adaptiveYGuides = useMemo(() => {
|
||||||
|
return summaryVariant === "inline" ? buildAdaptiveYGuides(points) : [];
|
||||||
|
}, [points, summaryVariant]);
|
||||||
|
|
||||||
const summary = useMemo(() => {
|
const summary = useMemo(() => {
|
||||||
if (points.length === 0) return null;
|
if (points.length === 0) return null;
|
||||||
const first = points[0];
|
const first = points[0];
|
||||||
@@ -218,7 +363,7 @@ export default function TierHistoryChart({
|
|||||||
const peak = points.reduce((best, point) =>
|
const peak = points.reduce((best, point) =>
|
||||||
point.value > best.value ? point : best,
|
point.value > best.value ? point : best,
|
||||||
);
|
);
|
||||||
const direction =
|
const direction: SummaryDirection =
|
||||||
last.value > first.value
|
last.value > first.value
|
||||||
? "up"
|
? "up"
|
||||||
: last.value < first.value
|
: last.value < first.value
|
||||||
@@ -227,9 +372,21 @@ export default function TierHistoryChart({
|
|||||||
return { first, last, peak, direction };
|
return { first, last, peak, direction };
|
||||||
}, [points]);
|
}, [points]);
|
||||||
|
|
||||||
|
const xDomain = useMemo(() => {
|
||||||
|
if (summaryVariant !== "inline" || points.length < 2) {
|
||||||
|
return ["dataMin", "dataMax"] as const;
|
||||||
|
}
|
||||||
|
|
||||||
|
const min = points[0].ts;
|
||||||
|
const max = points[points.length - 1].ts;
|
||||||
|
const span = Math.max(1, max - min);
|
||||||
|
const padding = Math.max(span * 0.18, 24 * 60 * 60 * 1000);
|
||||||
|
return [min - padding, max + padding] as const;
|
||||||
|
}, [points, summaryVariant]);
|
||||||
|
|
||||||
const header = (
|
const header = (
|
||||||
<div className="flex flex-wrap items-center justify-between gap-2 border-b border-base-content/10 bg-base-200/40 px-4 py-2.5">
|
<div className="flex flex-wrap items-center justify-between gap-2 border-b border-base-content/10 bg-base-200/40 px-4 py-2.5">
|
||||||
<h2 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
<h2 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
|
||||||
티어 변동
|
티어 변동
|
||||||
</h2>
|
</h2>
|
||||||
<div className="flex items-center gap-1.5">
|
<div className="flex items-center gap-1.5">
|
||||||
@@ -239,7 +396,7 @@ export default function TierHistoryChart({
|
|||||||
key={option}
|
key={option}
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setQueue(option)}
|
onClick={() => setQueue(option)}
|
||||||
className={`h-7 px-2 text-[11px] font-semibold border transition-colors ${
|
className={`h-7 px-2 text-xs font-semibold border transition-colors ${
|
||||||
activeQueue === option
|
activeQueue === option
|
||||||
? "border-primary/30 bg-primary/5 text-primary"
|
? "border-primary/30 bg-primary/5 text-primary"
|
||||||
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
||||||
@@ -249,7 +406,7 @@ export default function TierHistoryChart({
|
|||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
<select
|
<select
|
||||||
className="h-7 border border-base-content/10 bg-base-100 px-2 text-[11px] text-base-content focus:border-primary/30 focus:outline-none"
|
className="h-7 border border-base-content/10 bg-base-100 px-2 text-xs text-base-content focus:border-primary/30 focus:outline-none"
|
||||||
value={period}
|
value={period}
|
||||||
onChange={(event) => setPeriod(event.target.value as PeriodKey)}
|
onChange={(event) => setPeriod(event.target.value as PeriodKey)}
|
||||||
>
|
>
|
||||||
@@ -264,8 +421,8 @@ export default function TierHistoryChart({
|
|||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className="border border-base-content/10 bg-base-100 mb-5 overflow-hidden">
|
<section className={className}>
|
||||||
{header}
|
{showHeader && header}
|
||||||
{points.length < 2 ? (
|
{points.length < 2 ? (
|
||||||
<div className="px-4 py-10 text-center text-xs text-base-content/35">
|
<div className="px-4 py-10 text-center text-xs text-base-content/35">
|
||||||
티어 변동 기록이 아직 부족해요.
|
티어 변동 기록이 아직 부족해요.
|
||||||
@@ -274,11 +431,16 @@ export default function TierHistoryChart({
|
|||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<>
|
<>
|
||||||
<div className="px-2 pt-4 pb-1">
|
<div className="relative px-2 pt-4 pb-1">
|
||||||
<ResponsiveContainer width="100%" height={220}>
|
<ResponsiveContainer width="100%" height={height}>
|
||||||
<LineChart
|
<LineChart
|
||||||
data={points}
|
data={points}
|
||||||
margin={{ top: 8, right: 16, bottom: 4, left: 4 }}
|
margin={{
|
||||||
|
top: summaryVariant === "inline" ? 18 : 8,
|
||||||
|
right: summaryVariant === "inline" ? 20 : 16,
|
||||||
|
bottom: 4,
|
||||||
|
left: summaryVariant === "inline" ? 12 : 4,
|
||||||
|
}}
|
||||||
>
|
>
|
||||||
<CartesianGrid
|
<CartesianGrid
|
||||||
strokeDasharray="3 3"
|
strokeDasharray="3 3"
|
||||||
@@ -286,7 +448,24 @@ export default function TierHistoryChart({
|
|||||||
className="text-base-content/5"
|
className="text-base-content/5"
|
||||||
vertical={false}
|
vertical={false}
|
||||||
/>
|
/>
|
||||||
{tierLines.map((line) => (
|
{summaryVariant === "inline"
|
||||||
|
? adaptiveYGuides.map((guide) => (
|
||||||
|
<ReferenceLine
|
||||||
|
key={`${guide.value}-${guide.label}`}
|
||||||
|
y={guide.value}
|
||||||
|
stroke="currentColor"
|
||||||
|
className="text-base-content/12"
|
||||||
|
strokeDasharray="2 4"
|
||||||
|
label={{
|
||||||
|
value: guide.label,
|
||||||
|
position: "insideLeft",
|
||||||
|
fill: "currentColor",
|
||||||
|
fontSize: 10,
|
||||||
|
className: "text-base-content/35",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
: tierLines.map((line) => (
|
||||||
<ReferenceLine
|
<ReferenceLine
|
||||||
key={line.tier}
|
key={line.tier}
|
||||||
y={line.value}
|
y={line.value}
|
||||||
@@ -306,7 +485,7 @@ export default function TierHistoryChart({
|
|||||||
dataKey="ts"
|
dataKey="ts"
|
||||||
type="number"
|
type="number"
|
||||||
scale="time"
|
scale="time"
|
||||||
domain={["dataMin", "dataMax"]}
|
domain={xDomain}
|
||||||
tickFormatter={formatDate}
|
tickFormatter={formatDate}
|
||||||
tick={{ fontSize: 10, fill: "currentColor" }}
|
tick={{ fontSize: 10, fill: "currentColor" }}
|
||||||
className="text-base-content/40"
|
className="text-base-content/40"
|
||||||
@@ -326,6 +505,48 @@ export default function TierHistoryChart({
|
|||||||
className: "text-base-content/20",
|
className: "text-base-content/20",
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
{summaryVariant === "inline" && summary && (
|
||||||
|
<>
|
||||||
|
{!isSamePoint(summary.peak, summary.last) && (
|
||||||
|
<ReferenceDot
|
||||||
|
x={summary.peak.ts}
|
||||||
|
y={summary.peak.value}
|
||||||
|
r={3}
|
||||||
|
stroke="currentColor"
|
||||||
|
fill="currentColor"
|
||||||
|
className="text-amber-400"
|
||||||
|
label={{
|
||||||
|
value: formatTierCompactLabel(summary.peak),
|
||||||
|
position: "top",
|
||||||
|
fill: "currentColor",
|
||||||
|
fontSize: 10,
|
||||||
|
className: "text-amber-400",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
<ReferenceDot
|
||||||
|
x={summary.last.ts}
|
||||||
|
y={summary.last.value}
|
||||||
|
r={3}
|
||||||
|
stroke="currentColor"
|
||||||
|
fill="currentColor"
|
||||||
|
className={
|
||||||
|
isSamePoint(summary.peak, summary.last)
|
||||||
|
? "text-amber-400"
|
||||||
|
: "text-primary"
|
||||||
|
}
|
||||||
|
label={{
|
||||||
|
value: formatTierCompactLabel(summary.last),
|
||||||
|
position: "top",
|
||||||
|
fill: "currentColor",
|
||||||
|
fontSize: 10,
|
||||||
|
className: isSamePoint(summary.peak, summary.last)
|
||||||
|
? "text-amber-400"
|
||||||
|
: "text-primary",
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
<Line
|
<Line
|
||||||
type="monotone"
|
type="monotone"
|
||||||
dataKey="value"
|
dataKey="value"
|
||||||
@@ -339,8 +560,8 @@ export default function TierHistoryChart({
|
|||||||
</LineChart>
|
</LineChart>
|
||||||
</ResponsiveContainer>
|
</ResponsiveContainer>
|
||||||
</div>
|
</div>
|
||||||
{summary && (
|
{summary && summaryVariant === "footer" && (
|
||||||
<div className="flex flex-wrap items-center gap-x-5 gap-y-1 border-t border-base-content/8 px-4 py-2.5 text-[11px]">
|
<div className="flex flex-wrap items-center gap-x-5 gap-y-1 border-t border-base-content/8 px-4 py-2.5 text-xs">
|
||||||
<span className="text-base-content/45">
|
<span className="text-base-content/45">
|
||||||
현재{" "}
|
현재{" "}
|
||||||
<span className="font-bold text-base-content/75">
|
<span className="font-bold text-base-content/75">
|
||||||
@@ -364,13 +585,7 @@ export default function TierHistoryChart({
|
|||||||
: "text-base-content/55"
|
: "text-base-content/55"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{formatTierShort(summary.first.tier)}
|
{formatPeriodChange(summary)}
|
||||||
{summary.direction === "up"
|
|
||||||
? " ▲ "
|
|
||||||
: summary.direction === "down"
|
|
||||||
? " ▼ "
|
|
||||||
: " · "}
|
|
||||||
{formatTierShort(summary.last.tier)}
|
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -3,8 +3,12 @@ import { useSyncExternalStore } from 'react';
|
|||||||
const AUTH_USER_ID_STORAGE_KEY = 'lolympus.authUserId';
|
const AUTH_USER_ID_STORAGE_KEY = 'lolympus.authUserId';
|
||||||
const DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY = 'lolympus.devCaptainTeamIndex';
|
const DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY = 'lolympus.devCaptainTeamIndex';
|
||||||
const LEGACY_DEV_CAPTAIN_SIDE_STORAGE_KEY = 'lolympus.devCaptainSide';
|
const LEGACY_DEV_CAPTAIN_SIDE_STORAGE_KEY = 'lolympus.devCaptainSide';
|
||||||
|
const THEME_STORAGE_KEY = 'lolympus.theme';
|
||||||
const AUTH_USER_CHANGED_EVENT = 'lolympus:auth-user-changed';
|
const AUTH_USER_CHANGED_EVENT = 'lolympus:auth-user-changed';
|
||||||
const CAPTAIN_SIDE_CHANGED_EVENT = 'lolympus:captain-side-changed';
|
const CAPTAIN_SIDE_CHANGED_EVENT = 'lolympus:captain-side-changed';
|
||||||
|
const THEME_CHANGED_EVENT = 'lolympus:theme-changed';
|
||||||
|
|
||||||
|
export type AppTheme = 'light' | 'dark';
|
||||||
|
|
||||||
export const API_BASE_URL = (
|
export const API_BASE_URL = (
|
||||||
import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:3000'
|
import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:3000'
|
||||||
@@ -80,6 +84,40 @@ export function setDevCaptainTeamIndex(teamIndex: number | null) {
|
|||||||
dispatchWindowEvent(CAPTAIN_SIDE_CHANGED_EVENT);
|
dispatchWindowEvent(CAPTAIN_SIDE_CHANGED_EVENT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function normalizeTheme(value: string | null | undefined): AppTheme {
|
||||||
|
return value === 'dark' ? 'dark' : 'light';
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyTheme(theme: AppTheme) {
|
||||||
|
if (typeof document === 'undefined') return;
|
||||||
|
document.documentElement.dataset.theme = theme;
|
||||||
|
document.documentElement.style.colorScheme = theme;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getTheme(): AppTheme {
|
||||||
|
if (typeof window === 'undefined') return 'light';
|
||||||
|
try {
|
||||||
|
return normalizeTheme(window.localStorage.getItem(THEME_STORAGE_KEY));
|
||||||
|
} catch {
|
||||||
|
return 'light';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setTheme(theme: AppTheme) {
|
||||||
|
if (typeof window === 'undefined') return;
|
||||||
|
try {
|
||||||
|
window.localStorage.setItem(THEME_STORAGE_KEY, theme);
|
||||||
|
} catch {
|
||||||
|
// Keep applying the in-memory document theme even if persistence is blocked.
|
||||||
|
}
|
||||||
|
applyTheme(theme);
|
||||||
|
dispatchWindowEvent(THEME_CHANGED_EVENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function initializeTheme() {
|
||||||
|
applyTheme(getTheme());
|
||||||
|
}
|
||||||
|
|
||||||
export function useAuthUserId(): string | null {
|
export function useAuthUserId(): string | null {
|
||||||
return useSyncExternalStore<string | null>(
|
return useSyncExternalStore<string | null>(
|
||||||
(callback) => subscribeToWindowChanges(AUTH_USER_CHANGED_EVENT, callback),
|
(callback) => subscribeToWindowChanges(AUTH_USER_CHANGED_EVENT, callback),
|
||||||
@@ -95,3 +133,11 @@ export function useDevCaptainTeamIndex(): number | null {
|
|||||||
() => null,
|
() => null,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function useTheme(): AppTheme {
|
||||||
|
return useSyncExternalStore<AppTheme>(
|
||||||
|
(callback) => subscribeToWindowChanges(THEME_CHANGED_EVENT, callback),
|
||||||
|
getTheme,
|
||||||
|
() => 'light',
|
||||||
|
);
|
||||||
|
}
|
||||||
+103
-3
@@ -1,10 +1,15 @@
|
|||||||
@import url("https://fonts.googleapis.com/css2?family=Asta+Sans:wght@300..800&family=Gamja+Flower&display=swap");
|
@import url("https://fonts.googleapis.com/css2?family=Asta+Sans:wght@300..800&family=Gamja+Flower&display=swap");
|
||||||
|
|
||||||
@import "tailwindcss";
|
@import "tailwindcss";
|
||||||
|
@custom-variant dark (&:where([data-theme=dark], [data-theme=dark] *));
|
||||||
@plugin "daisyui" {
|
@plugin "daisyui" {
|
||||||
themes:
|
themes:
|
||||||
light --default,
|
light --default,
|
||||||
dark --prefersdark;
|
dark;
|
||||||
|
}
|
||||||
|
|
||||||
|
html {
|
||||||
|
scrollbar-gutter: stable;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
@@ -24,8 +29,97 @@ body {
|
|||||||
"Segoe UI Emoji",
|
"Segoe UI Emoji",
|
||||||
"Segoe UI Symbol",
|
"Segoe UI Symbol",
|
||||||
sans-serif;
|
sans-serif;
|
||||||
font-size: 14px;
|
font-size: 15px;
|
||||||
line-height: 1.5;
|
line-height: 1.55;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ── 가독성 개선: 의미 기반 텍스트 대비 토큰 ──
|
||||||
|
폰트 크기는 표준 스케일 토큰(text-xs=12px / text-sm=14px …)을 사용한다.
|
||||||
|
새 코드에서는 text-content-subtle/muted/disabled를 우선 사용한다. */
|
||||||
|
:root,
|
||||||
|
[data-theme="light"] {
|
||||||
|
--lts-text-subtle-strength: 62%;
|
||||||
|
--lts-text-muted-strength: 68%;
|
||||||
|
--lts-text-disabled-strength: 45%;
|
||||||
|
--lts-content-subtle: color-mix(
|
||||||
|
in oklab,
|
||||||
|
var(--color-base-content) var(--lts-text-subtle-strength),
|
||||||
|
transparent
|
||||||
|
);
|
||||||
|
--lts-content-muted: color-mix(
|
||||||
|
in oklab,
|
||||||
|
var(--color-base-content) var(--lts-text-muted-strength),
|
||||||
|
transparent
|
||||||
|
);
|
||||||
|
--lts-content-disabled: color-mix(
|
||||||
|
in oklab,
|
||||||
|
var(--color-base-content) var(--lts-text-disabled-strength),
|
||||||
|
transparent
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
[data-theme="dark"] {
|
||||||
|
--lts-text-subtle-strength: 66%;
|
||||||
|
--lts-text-muted-strength: 76%;
|
||||||
|
--lts-text-disabled-strength: 52%;
|
||||||
|
}
|
||||||
|
|
||||||
|
@theme inline {
|
||||||
|
--color-content-subtle: var(--lts-content-subtle);
|
||||||
|
--color-content-muted: var(--lts-content-muted);
|
||||||
|
--color-content-disabled: var(--lts-content-disabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
@layer utilities {
|
||||||
|
/* 기존 text-base-content/nn 알파 클래스 호환 shim.
|
||||||
|
hover/focus 상태 유틸이 specificity로 이길 수 있도록 !important를 쓰지 않는다. */
|
||||||
|
.text-base-content\/15,
|
||||||
|
.text-base-content\/20,
|
||||||
|
.text-base-content\/25,
|
||||||
|
.text-base-content\/30,
|
||||||
|
.text-base-content\/35 {
|
||||||
|
color: var(--lts-content-subtle);
|
||||||
|
}
|
||||||
|
|
||||||
|
.text-base-content\/40,
|
||||||
|
.text-base-content\/45,
|
||||||
|
.text-base-content\/50,
|
||||||
|
.text-base-content\/55 {
|
||||||
|
color: var(--lts-content-muted);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ════════════════════════════════════════════════════════════
|
||||||
|
🎛️ 튜닝 패널 (실험용) — 값만 바꾸면 dev에서 즉시 반영(HMR).
|
||||||
|
확정되면 element로 전환한 뒤 이 블록을 통째로 제거할 것.
|
||||||
|
색은 oklch(밝기% 채도 색상) 형식.
|
||||||
|
════════════════════════════════════════════════════════════ */
|
||||||
|
[data-theme="light"] {
|
||||||
|
/* ── 포인트 4색 (primary 주 액션 / secondary 강조 / accent 하이라이트 / info 정보·보조) ── */
|
||||||
|
|
||||||
|
/* 코랄레드 — primary 117곳 즉시 반영 */
|
||||||
|
--color-primary: oklch(0.708008 0.234375 24);
|
||||||
|
--color-primary-content: oklch(98% 0 0); /* 흰 글자 */
|
||||||
|
|
||||||
|
/* 바이올렛 — 버튼·뱃지·보더용 */
|
||||||
|
--color-secondary: oklch(0.481934 0.285938 285);
|
||||||
|
--color-secondary-content: oklch(98% 0 0); /* 흰 글자 */
|
||||||
|
|
||||||
|
/* 골드 — 배경·보더·아이콘만. 텍스트색(text-accent)으론 쓰지 말 것 */
|
||||||
|
--color-accent: oklch(0.853027 0.2 90);
|
||||||
|
--color-accent-content: oklch(22% 0.03 80); /* 어두운 글자 */
|
||||||
|
|
||||||
|
/* 시안 — 정보·링크·보조 강조. L70이라 흰배경 텍스트는 약함 → 배경/보더 위주 */
|
||||||
|
--color-info: oklch(70% 0.14523 200);
|
||||||
|
--color-info-content: oklch(24% 0.03 215); /* 어두운 글자 */
|
||||||
|
|
||||||
|
/* 텍스트 기본 진하기 (회색 알파의 기준색). 낮출수록 전체가 진해짐 */
|
||||||
|
--color-base-content: oklch(21% 0.006 285.885);
|
||||||
|
|
||||||
|
/* 표면 톤 */
|
||||||
|
--color-base-100: oklch(100% 0 0); /* 페이지/카드 배경 */
|
||||||
|
--color-base-200: oklch(98% 0 0); /* 살짝 들어간 표면 */
|
||||||
|
--color-base-300: oklch(95% 0 0); /* 구분선/보더 */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* poro.gg style: 모든 모서리 각지게 */
|
/* poro.gg style: 모든 모서리 각지게 */
|
||||||
@@ -44,3 +138,9 @@ body {
|
|||||||
.btn {
|
.btn {
|
||||||
border-radius: 0 !important;
|
border-radius: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* daisyUI 버튼의 흰색 inset 하이라이트 제거 — 색 위에 흰색을 6% 얹어
|
||||||
|
채도를 깎던 주범(P3/쨍한 색일수록 도드라짐). drop shadow(입체감)는 유지. */
|
||||||
|
.btn {
|
||||||
|
box-shadow: var(--btn-shadow) !important;
|
||||||
|
}
|
||||||
@@ -4,6 +4,9 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
|||||||
import './index.css';
|
import './index.css';
|
||||||
import App from './App.tsx';
|
import App from './App.tsx';
|
||||||
import { MsalAppProvider } from './lib/auth/MsalAppProvider.tsx';
|
import { MsalAppProvider } from './lib/auth/MsalAppProvider.tsx';
|
||||||
|
import { initializeTheme } from './config.ts';
|
||||||
|
|
||||||
|
initializeTheme();
|
||||||
|
|
||||||
const queryClient = new QueryClient({
|
const queryClient = new QueryClient({
|
||||||
defaultOptions: {
|
defaultOptions: {
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
import {
|
import {
|
||||||
|
lazy,
|
||||||
|
Suspense,
|
||||||
useEffect,
|
useEffect,
|
||||||
useMemo,
|
useMemo,
|
||||||
useRef,
|
useRef,
|
||||||
@@ -17,6 +19,7 @@ import {
|
|||||||
useMe,
|
useMe,
|
||||||
useResetAuction,
|
useResetAuction,
|
||||||
useUndoAuction,
|
useUndoAuction,
|
||||||
|
useUserHistoryProfile,
|
||||||
} from '../api/hooks';
|
} from '../api/hooks';
|
||||||
import {
|
import {
|
||||||
mapApiAuctionToAuctionState,
|
mapApiAuctionToAuctionState,
|
||||||
@@ -41,32 +44,21 @@ import {
|
|||||||
teamIndexColorClasses,
|
teamIndexColorClasses,
|
||||||
teamIndexLabel,
|
teamIndexLabel,
|
||||||
} from '../lib/league';
|
} from '../lib/league';
|
||||||
|
import { RankBadge, ResponsiveTierLabel } from '../components/RankBadge';
|
||||||
import type {
|
import type {
|
||||||
ApiAuction,
|
ApiAuction,
|
||||||
ApiAuctionChatMessage,
|
ApiAuctionChatMessage,
|
||||||
ApiRiotLaneStats,
|
ApiRiotLaneStats,
|
||||||
ApiTierInfo,
|
|
||||||
ApiUser,
|
ApiUser,
|
||||||
Position,
|
Position,
|
||||||
} from '../api/types';
|
} from '../api/types';
|
||||||
|
|
||||||
|
const TierHistoryChart = lazy(() => import('../components/TierHistoryChart'));
|
||||||
|
|
||||||
type CaptainRole = {
|
type CaptainRole = {
|
||||||
teamIndex: number;
|
teamIndex: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
const TIER_NAMES: Record<string, string> = {
|
|
||||||
IRON: '아이언',
|
|
||||||
BRONZE: '브론즈',
|
|
||||||
SILVER: '실버',
|
|
||||||
GOLD: '골드',
|
|
||||||
PLATINUM: '플래티넘',
|
|
||||||
EMERALD: '에메랄드',
|
|
||||||
DIAMOND: '다이아몬드',
|
|
||||||
MASTER: '마스터',
|
|
||||||
GRANDMASTER: '그랜드마스터',
|
|
||||||
CHALLENGER: '챌린저',
|
|
||||||
};
|
|
||||||
|
|
||||||
function formatPoints(value: number) {
|
function formatPoints(value: number) {
|
||||||
return value.toLocaleString();
|
return value.toLocaleString();
|
||||||
}
|
}
|
||||||
@@ -109,90 +101,6 @@ function resolveChatSenderLabel(
|
|||||||
return '관전자';
|
return '관전자';
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeRank(rank: string | undefined) {
|
|
||||||
switch (rank) {
|
|
||||||
case 'I':
|
|
||||||
return '1';
|
|
||||||
case 'II':
|
|
||||||
return '2';
|
|
||||||
case 'III':
|
|
||||||
return '3';
|
|
||||||
case 'IV':
|
|
||||||
return '4';
|
|
||||||
default:
|
|
||||||
return rank;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatRankBadge(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return 'U';
|
|
||||||
const tierInitial =
|
|
||||||
tier.tier === 'GRANDMASTER' ? 'GM' : tier.tier.slice(0, 1);
|
|
||||||
const rank = normalizeRank(tier.rank);
|
|
||||||
return rank ? `${tierInitial}${rank}` : tierInitial;
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatRankDetail(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return '랭크 정보 없음';
|
|
||||||
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
|
|
||||||
const rank = normalizeRank(tier.rank);
|
|
||||||
const label = rank ? `${tierName} ${rank}` : tierName;
|
|
||||||
return `${label} - ${tier.leaguePoints} LP`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
|
||||||
switch (tier?.tier) {
|
|
||||||
case 'CHALLENGER':
|
|
||||||
return 'border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200';
|
|
||||||
case 'GRANDMASTER':
|
|
||||||
return 'border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200';
|
|
||||||
case 'MASTER':
|
|
||||||
return 'border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200';
|
|
||||||
case 'DIAMOND':
|
|
||||||
return 'border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200';
|
|
||||||
case 'EMERALD':
|
|
||||||
return 'border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200';
|
|
||||||
case 'PLATINUM':
|
|
||||||
return 'border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200';
|
|
||||||
case 'GOLD':
|
|
||||||
return 'border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200';
|
|
||||||
case 'SILVER':
|
|
||||||
return 'border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200';
|
|
||||||
case 'BRONZE':
|
|
||||||
return 'border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200';
|
|
||||||
case 'IRON':
|
|
||||||
return 'border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300';
|
|
||||||
default:
|
|
||||||
return 'border-base-content/30 bg-transparent text-base-content/50';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
const tooltip = formatRankDetail(tier);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<span className="tooltip tooltip-bottom" data-tip={tooltip}>
|
|
||||||
<span
|
|
||||||
className={`inline-flex h-[18px] min-w-[20px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
|
|
||||||
aria-label={tooltip}
|
|
||||||
>
|
|
||||||
{formatRankBadge(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
return (
|
|
||||||
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
|
|
||||||
<RankBadge tier={tier} />
|
|
||||||
<span className="hidden font-bold text-base-content/55 sm:inline">
|
|
||||||
{formatRankDetail(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function isCurrentBidder(
|
function isCurrentBidder(
|
||||||
currentBidder: AuctionStateView['currentBidder'],
|
currentBidder: AuctionStateView['currentBidder'],
|
||||||
team: Pick<AuctionStateView['teams'][number], 'teamIndex'>,
|
team: Pick<AuctionStateView['teams'][number], 'teamIndex'>,
|
||||||
@@ -228,7 +136,7 @@ const POSITION_TO_RIOT_LANE = {
|
|||||||
|
|
||||||
function PosBadge({ pos }: { pos: Position }) {
|
function PosBadge({ pos }: { pos: Position }) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex items-center gap-1.5 text-[11px] font-medium px-1.5 py-0.5 border border-primary/20 text-primary bg-primary/5">
|
<span className="inline-flex items-center gap-1.5 text-xs font-medium px-1.5 py-0.5 border border-primary/20 text-primary bg-primary/5">
|
||||||
<img src={positionIcon[pos]} alt="" className="w-3.5 h-3.5 object-contain" />
|
<img src={positionIcon[pos]} alt="" className="w-3.5 h-3.5 object-contain" />
|
||||||
<span>{positionLabel[pos]}</span>
|
<span>{positionLabel[pos]}</span>
|
||||||
</span>
|
</span>
|
||||||
@@ -274,10 +182,10 @@ function RecentSoloStats({
|
|||||||
if (!primaryStats) {
|
if (!primaryStats) {
|
||||||
return (
|
return (
|
||||||
<div className="p-4">
|
<div className="p-4">
|
||||||
<h4 className="text-[10px] font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
|
<h4 className="text-xs font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
|
||||||
최근 솔로랭크
|
최근 솔로랭크
|
||||||
</h4>
|
</h4>
|
||||||
<div className="rounded border border-dashed border-base-content/10 px-3 py-6 text-center text-[11px] text-base-content/25">
|
<div className="rounded border border-dashed border-base-content/10 px-3 py-6 text-center text-xs text-base-content/25">
|
||||||
최근 솔로랭크 기록이 없습니다
|
최근 솔로랭크 기록이 없습니다
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -291,15 +199,15 @@ function RecentSoloStats({
|
|||||||
<div className="p-4">
|
<div className="p-4">
|
||||||
<div className="flex items-start justify-between gap-3 mb-3">
|
<div className="flex items-start justify-between gap-3 mb-3">
|
||||||
<div>
|
<div>
|
||||||
<h4 className="text-[10px] font-bold uppercase tracking-wider text-base-content/30">
|
<h4 className="text-xs font-bold uppercase tracking-wider text-base-content/30">
|
||||||
최근 솔로랭크
|
최근 솔로랭크
|
||||||
</h4>
|
</h4>
|
||||||
<div className="mt-1 flex items-center gap-2">
|
<div className="mt-1 flex items-center gap-2">
|
||||||
<span className="text-[12px] font-semibold text-base-content">
|
<span className="text-xs font-semibold text-base-content">
|
||||||
{positionLabel[player.mainPosition]}
|
{positionLabel[player.mainPosition]}
|
||||||
</span>
|
</span>
|
||||||
{player.recentStats.primarySource === 'overall' ? (
|
{player.recentStats.primarySource === 'overall' ? (
|
||||||
<span className="text-[10px] text-base-content/35">
|
<span className="text-xs text-base-content/35">
|
||||||
전체 기준
|
전체 기준
|
||||||
</span>
|
</span>
|
||||||
) : null}
|
) : null}
|
||||||
@@ -314,15 +222,15 @@ function RecentSoloStats({
|
|||||||
|
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<div className="flex items-baseline justify-between">
|
<div className="flex items-baseline justify-between">
|
||||||
<span className="text-[11px] text-base-content/40">전적</span>
|
<span className="text-xs text-base-content/40">전적</span>
|
||||||
<span className="text-[12px] text-base-content/60 tabular-nums">
|
<span className="text-xs text-base-content/60 tabular-nums">
|
||||||
<span className="text-blue-400">{primaryStats.wins}W</span>{' '}
|
<span className="text-blue-400">{primaryStats.wins}W</span>{' '}
|
||||||
<span className="text-red-400">{primaryStats.losses}L</span>
|
<span className="text-red-400">{primaryStats.losses}L</span>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-baseline justify-between">
|
<div className="flex items-baseline justify-between">
|
||||||
<span className="text-[11px] text-base-content/40">KDA</span>
|
<span className="text-xs text-base-content/40">KDA</span>
|
||||||
<span className="text-[12px] text-base-content/60 tabular-nums">
|
<span className="text-xs text-base-content/60 tabular-nums">
|
||||||
{primaryStats.avgKills}/{primaryStats.avgDeaths}/{primaryStats.avgAssists}
|
{primaryStats.avgKills}/{primaryStats.avgDeaths}/{primaryStats.avgAssists}
|
||||||
<span
|
<span
|
||||||
className={`ml-1 font-bold ${Number(primaryKdaRatio) >= 3 ? 'text-emerald-400' : 'text-base-content/50'}`}
|
className={`ml-1 font-bold ${Number(primaryKdaRatio) >= 3 ? 'text-emerald-400' : 'text-base-content/50'}`}
|
||||||
@@ -332,8 +240,8 @@ function RecentSoloStats({
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-baseline justify-between">
|
<div className="flex items-baseline justify-between">
|
||||||
<span className="text-[11px] text-base-content/40">분당 CS</span>
|
<span className="text-xs text-base-content/40">분당 CS</span>
|
||||||
<span className="text-[12px] text-base-content/60 tabular-nums">
|
<span className="text-xs text-base-content/60 tabular-nums">
|
||||||
{primaryStats.avgCsPerMin}
|
{primaryStats.avgCsPerMin}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -348,7 +256,7 @@ function RecentSoloStats({
|
|||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
key={position}
|
key={position}
|
||||||
className={`flex items-center justify-between gap-3 text-[11px] ${isMainLane ? 'font-semibold text-base-content' : 'text-base-content/65'}`}
|
className={`flex items-center justify-between gap-3 text-xs ${isMainLane ? 'font-semibold text-base-content' : 'text-base-content/65'}`}
|
||||||
>
|
>
|
||||||
<span className={isMainLane ? 'text-base-content' : 'text-base-content/35'}>
|
<span className={isMainLane ? 'text-base-content' : 'text-base-content/35'}>
|
||||||
{positionLabel[position]}
|
{positionLabel[position]}
|
||||||
@@ -396,10 +304,10 @@ function TeamPanel({
|
|||||||
<div className={`${tone.bg} px-3 py-2 border-b ${tone.border}`}>
|
<div className={`${tone.bg} px-3 py-2 border-b ${tone.border}`}>
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<span className={`text-[11px] font-bold uppercase tracking-wide ${tone.text}`}>
|
<span className={`text-xs font-bold uppercase tracking-wide ${tone.text}`}>
|
||||||
{teamIndexLabel(team.teamIndex, team.name)}
|
{teamIndexLabel(team.teamIndex, team.name)}
|
||||||
</span>
|
</span>
|
||||||
<span className="text-[10px] text-base-content/30">
|
<span className="text-xs text-base-content/30">
|
||||||
팀장: {team.captainName}
|
팀장: {team.captainName}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -407,7 +315,7 @@ function TeamPanel({
|
|||||||
{formatPoints(team.points)}P
|
{formatPoints(team.points)}P
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-1 flex items-center justify-between text-[10px]">
|
<div className="mt-1 flex items-center justify-between text-xs">
|
||||||
<span className="text-base-content/25">
|
<span className="text-base-content/25">
|
||||||
팀장 포함 {teamSize}/{AUCTION_MAX_TEAM_SIZE}
|
팀장 포함 {teamSize}/{AUCTION_MAX_TEAM_SIZE}
|
||||||
</span>
|
</span>
|
||||||
@@ -417,7 +325,7 @@ function TeamPanel({
|
|||||||
|
|
||||||
<div className="divide-y divide-base-content/5">
|
<div className="divide-y divide-base-content/5">
|
||||||
{team.members.length === 0 ? (
|
{team.members.length === 0 ? (
|
||||||
<div className="px-3 py-6 text-center text-[11px] text-base-content/20">
|
<div className="px-3 py-6 text-center text-xs text-base-content/20">
|
||||||
아직 멤버가 없습니다
|
아직 멤버가 없습니다
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
@@ -441,15 +349,15 @@ function TeamPanel({
|
|||||||
</div>
|
</div>
|
||||||
<RankBadge tier={member.tier} />
|
<RankBadge tier={member.tier} />
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
<span className="text-[12px] font-medium text-base-content truncate block leading-tight group-hover:text-primary transition-colors">
|
<span className="text-xs font-medium text-base-content truncate block leading-tight group-hover:text-primary transition-colors">
|
||||||
{member.summonerName}
|
{member.summonerName}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
<span className="shrink-0 text-[11px] font-semibold text-base-content/45">
|
<span className="shrink-0 text-xs font-semibold text-base-content/45">
|
||||||
{positionLabel[member.assignedPosition]}
|
{positionLabel[member.assignedPosition]}
|
||||||
</span>
|
</span>
|
||||||
<span className="text-[10px] text-amber-400/60 tabular-nums w-8 text-right">
|
<span className="text-xs text-amber-400/60 tabular-nums w-8 text-right">
|
||||||
{member.cost}
|
{member.cost}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -464,7 +372,7 @@ function TeamPanel({
|
|||||||
className="px-3 py-1.5 h-[34px] flex items-center"
|
className="px-3 py-1.5 h-[34px] flex items-center"
|
||||||
>
|
>
|
||||||
<div className="w-6 h-6 border border-dashed border-base-content/8 shrink-0" />
|
<div className="w-6 h-6 border border-dashed border-base-content/8 shrink-0" />
|
||||||
<span className="ml-2 text-[10px] text-base-content/10">—</span>
|
<span className="ml-2 text-xs text-base-content/10">—</span>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
@@ -481,7 +389,16 @@ function PlayerSpotlight({
|
|||||||
}) {
|
}) {
|
||||||
const { data: ddragon } = useDdragonManifest();
|
const { data: ddragon } = useDdragonManifest();
|
||||||
const player = state.currentPlayer;
|
const player = state.currentPlayer;
|
||||||
|
const historyProfileQuery = useUserHistoryProfile(
|
||||||
|
player?.userId,
|
||||||
|
DEFAULT_COMMUNITY_ID,
|
||||||
|
Boolean(player && player.tierHistory.length === 0),
|
||||||
|
);
|
||||||
if (!player) return null;
|
if (!player) return null;
|
||||||
|
const tierHistory =
|
||||||
|
player.tierHistory.length > 0
|
||||||
|
? player.tierHistory
|
||||||
|
: (historyProfileQuery.data?.tierHistory ?? []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="border border-base-content/10 bg-base-100">
|
<div className="border border-base-content/10 bg-base-100">
|
||||||
@@ -507,16 +424,16 @@ function PlayerSpotlight({
|
|||||||
>
|
>
|
||||||
{player.summonerName}
|
{player.summonerName}
|
||||||
</Link>
|
</Link>
|
||||||
<span className="text-[10px] text-base-content/25">
|
<span className="text-xs text-base-content/25">
|
||||||
#{player.tag}
|
#{player.tag}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="mb-2 text-[11px]">
|
<div className="mb-2 text-xs">
|
||||||
<ResponsiveTierLabel tier={player.tier} />
|
<ResponsiveTierLabel tier={player.tier} />
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-1.5">
|
<div className="flex items-center gap-1.5">
|
||||||
<PosBadge pos={player.mainPosition} />
|
<PosBadge pos={player.mainPosition} />
|
||||||
<span className="inline-flex items-center gap-0.5 text-[11px] px-1.5 py-0.5 border border-base-content/8 text-base-content/35">
|
<span className="inline-flex items-center gap-0.5 text-xs px-1.5 py-0.5 border border-base-content/8 text-base-content/35">
|
||||||
<img
|
<img
|
||||||
src={positionIcon[player.subPosition]}
|
src={positionIcon[player.subPosition]}
|
||||||
alt=""
|
alt=""
|
||||||
@@ -529,9 +446,25 @@ function PlayerSpotlight({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{tierHistory.length > 0 && (
|
||||||
|
<Suspense
|
||||||
|
fallback={
|
||||||
|
<div className="h-[180px] border-b border-base-content/8 bg-base-100" />
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<TierHistoryChart
|
||||||
|
entries={tierHistory}
|
||||||
|
className="border-b border-base-content/8 bg-base-100 overflow-hidden"
|
||||||
|
summaryVariant="inline"
|
||||||
|
height={180}
|
||||||
|
showHeader={false}
|
||||||
|
/>
|
||||||
|
</Suspense>
|
||||||
|
)}
|
||||||
|
|
||||||
<div className="grid grid-cols-2 divide-x divide-base-content/5">
|
<div className="grid grid-cols-2 divide-x divide-base-content/5">
|
||||||
<div className="p-4">
|
<div className="p-4">
|
||||||
<h4 className="text-[10px] font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
|
<h4 className="text-xs font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
|
||||||
숙련도 높은 챔피언
|
숙련도 높은 챔피언
|
||||||
</h4>
|
</h4>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
@@ -554,10 +487,10 @@ function PlayerSpotlight({
|
|||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
<div className="flex-1 min-w-0">
|
<div className="flex-1 min-w-0">
|
||||||
<div className="text-[12px] font-medium text-base-content truncate">
|
<div className="text-xs font-medium text-base-content truncate">
|
||||||
{displayName}
|
{displayName}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[10px] text-base-content/25">
|
<div className="text-xs text-base-content/25">
|
||||||
Lv.{mastery.level} · {(mastery.points / 1000).toFixed(0)}K
|
Lv.{mastery.level} · {(mastery.points / 1000).toFixed(0)}K
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -565,7 +498,7 @@ function PlayerSpotlight({
|
|||||||
);
|
);
|
||||||
})
|
})
|
||||||
) : (
|
) : (
|
||||||
<div className="text-[11px] text-base-content/25">
|
<div className="text-xs text-base-content/25">
|
||||||
숙련도 데이터가 없습니다.
|
숙련도 데이터가 없습니다.
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -578,13 +511,13 @@ function PlayerSpotlight({
|
|||||||
{(state.phase === 'bidding' || state.phase === 'sold') && (
|
{(state.phase === 'bidding' || state.phase === 'sold') && (
|
||||||
<div className="border-t border-base-content/8 px-4 py-3 bg-base-content/[0.02]">
|
<div className="border-t border-base-content/8 px-4 py-3 bg-base-content/[0.02]">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<span className="text-[11px] text-base-content/30 uppercase tracking-wider font-semibold">
|
<span className="text-xs text-base-content/30 uppercase tracking-wider font-semibold">
|
||||||
{state.phase === 'sold' ? '낙찰가' : '현재 입찰가'}
|
{state.phase === 'sold' ? '낙찰가' : '현재 입찰가'}
|
||||||
</span>
|
</span>
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
{state.currentBidder && (
|
{state.currentBidder && (
|
||||||
<span
|
<span
|
||||||
className={`text-[10px] font-bold uppercase ${teamIndexColorClasses(state.currentBidder.teamIndex).text}`}
|
className={`text-xs font-bold uppercase ${teamIndexColorClasses(state.currentBidder.teamIndex).text}`}
|
||||||
>
|
>
|
||||||
{teamIndexLabel(state.currentBidder.teamIndex)}
|
{teamIndexLabel(state.currentBidder.teamIndex)}
|
||||||
</span>
|
</span>
|
||||||
@@ -651,7 +584,7 @@ function BidControls({
|
|||||||
key={preset}
|
key={preset}
|
||||||
onClick={() => setBidAmount(Math.max(minBid, preset))}
|
onClick={() => setBidAmount(Math.max(minBid, preset))}
|
||||||
disabled={isActiveTeamFull}
|
disabled={isActiveTeamFull}
|
||||||
className={`text-[11px] px-2.5 py-1 border transition-colors ${
|
className={`text-xs px-2.5 py-1 border transition-colors ${
|
||||||
bidAmount === preset
|
bidAmount === preset
|
||||||
? 'border-primary/40 bg-primary/10 text-primary'
|
? 'border-primary/40 bg-primary/10 text-primary'
|
||||||
: 'border-base-content/10 text-base-content/40 hover:border-base-content/20'
|
: 'border-base-content/10 text-base-content/40 hover:border-base-content/20'
|
||||||
@@ -702,13 +635,13 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
|
|||||||
return (
|
return (
|
||||||
<div className="border border-base-content/10 bg-base-100 overflow-hidden">
|
<div className="border border-base-content/10 bg-base-100 overflow-hidden">
|
||||||
<div className="px-3 py-1.5 border-b border-base-content/8 bg-base-200/40">
|
<div className="px-3 py-1.5 border-b border-base-content/8 bg-base-200/40">
|
||||||
<span className="text-[10px] font-bold uppercase tracking-wider text-base-content/30">
|
<span className="text-xs font-bold uppercase tracking-wider text-base-content/30">
|
||||||
입찰 기록
|
입찰 기록
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="max-h-28 overflow-y-auto p-2 space-y-0.5">
|
<div className="max-h-28 overflow-y-auto p-2 space-y-0.5">
|
||||||
{bids.map((bid, index) => (
|
{bids.map((bid, index) => (
|
||||||
<div key={`${bid.teamIndex}-${bid.timestamp}-${index}`} className="flex items-center gap-2 text-[11px]">
|
<div key={`${bid.teamIndex}-${bid.timestamp}-${index}`} className="flex items-center gap-2 text-xs">
|
||||||
<span
|
<span
|
||||||
className={`font-bold uppercase ${teamIndexColorClasses(bid.teamIndex).text}`}
|
className={`font-bold uppercase ${teamIndexColorClasses(bid.teamIndex).text}`}
|
||||||
>
|
>
|
||||||
@@ -913,10 +846,10 @@ export default function AuctionPage() {
|
|||||||
|
|
||||||
const undoPanel = canManageAuction ? (
|
const undoPanel = canManageAuction ? (
|
||||||
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
|
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
|
<div className="text-xs font-bold uppercase tracking-wider text-base-content/35">
|
||||||
되돌리기 (Undo)
|
되돌리기 (Undo)
|
||||||
</div>
|
</div>
|
||||||
<div className="max-h-48 overflow-y-auto space-y-1 text-[11px]">
|
<div className="max-h-48 overflow-y-auto space-y-1 text-xs">
|
||||||
{historyQuery.data?.length ? (
|
{historyQuery.data?.length ? (
|
||||||
historyQuery.data.map((entry) => (
|
historyQuery.data.map((entry) => (
|
||||||
<button
|
<button
|
||||||
@@ -930,7 +863,7 @@ export default function AuctionPage() {
|
|||||||
#{entry.sequence}
|
#{entry.sequence}
|
||||||
</span>
|
</span>
|
||||||
<span className="text-base-content/45">{entry.actionLabel}</span>
|
<span className="text-base-content/45">{entry.actionLabel}</span>
|
||||||
<span className="text-[10px] text-base-content/25">
|
<span className="text-xs text-base-content/25">
|
||||||
{relativeTime(entry.takenAt)}
|
{relativeTime(entry.takenAt)}
|
||||||
</span>
|
</span>
|
||||||
</button>
|
</button>
|
||||||
@@ -990,7 +923,7 @@ export default function AuctionPage() {
|
|||||||
<h1 className="text-xl font-bold text-base-content leading-tight">
|
<h1 className="text-xl font-bold text-base-content leading-tight">
|
||||||
경매 팀빌딩
|
경매 팀빌딩
|
||||||
</h1>
|
</h1>
|
||||||
<p className="text-[11px] text-base-content/30 mt-0.5">
|
<p className="text-xs text-base-content/30 mt-0.5">
|
||||||
{Math.min(auctionState.currentPlayerIndex + 1, Math.max(auctionState.totalPlayers, 1))} /{' '}
|
{Math.min(auctionState.currentPlayerIndex + 1, Math.max(auctionState.totalPlayers, 1))} /{' '}
|
||||||
{auctionState.totalPlayers} 선수
|
{auctionState.totalPlayers} 선수
|
||||||
</p>
|
</p>
|
||||||
@@ -998,7 +931,7 @@ export default function AuctionPage() {
|
|||||||
<div className="flex flex-col items-end gap-2">
|
<div className="flex flex-col items-end gap-2">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<span
|
<span
|
||||||
className={`inline-flex items-center text-[11px] font-semibold px-2 py-1 border ${
|
className={`inline-flex items-center text-xs font-semibold px-2 py-1 border ${
|
||||||
auctionState.phase === 'bidding'
|
auctionState.phase === 'bidding'
|
||||||
? 'border-green-500/20 bg-green-500/10 text-green-400'
|
? 'border-green-500/20 bg-green-500/10 text-green-400'
|
||||||
: auctionState.phase === 'sold'
|
: auctionState.phase === 'sold'
|
||||||
@@ -1076,7 +1009,7 @@ export default function AuctionPage() {
|
|||||||
</div>
|
</div>
|
||||||
<Link
|
<Link
|
||||||
to={`/match/${id}`}
|
to={`/match/${id}`}
|
||||||
className="btn btn-primary btn-sm mt-4 px-6 text-[11px]"
|
className="btn btn-primary btn-sm mt-4 px-6 text-xs"
|
||||||
>
|
>
|
||||||
결과 확인
|
결과 확인
|
||||||
</Link>
|
</Link>
|
||||||
@@ -1112,7 +1045,7 @@ export default function AuctionPage() {
|
|||||||
|
|
||||||
{canManageAuction && (
|
{canManageAuction && (
|
||||||
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
|
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
|
<div className="text-xs font-bold uppercase tracking-wider text-base-content/35">
|
||||||
Auction Controls
|
Auction Controls
|
||||||
</div>
|
</div>
|
||||||
{auctionState.phase === 'presenting' && (
|
{auctionState.phase === 'presenting' && (
|
||||||
@@ -1169,7 +1102,7 @@ export default function AuctionPage() {
|
|||||||
<AlertTriangle className="h-3.5 w-3.5" />
|
<AlertTriangle className="h-3.5 w-3.5" />
|
||||||
경매 진행 취소
|
경매 진행 취소
|
||||||
</button>
|
</button>
|
||||||
<p className="mt-2 text-[11px] leading-relaxed text-base-content/35">
|
<p className="mt-2 text-xs leading-relaxed text-base-content/35">
|
||||||
경매 데이터와 진행 기록을 삭제하고 내전을 모집 상태로 되돌립니다.
|
경매 데이터와 진행 기록을 삭제하고 내전을 모집 상태로 되돌립니다.
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -1239,7 +1172,7 @@ export default function AuctionPage() {
|
|||||||
|
|
||||||
<label
|
<label
|
||||||
htmlFor="auction-cancel-confirm"
|
htmlFor="auction-cancel-confirm"
|
||||||
className="mt-5 block text-[11px] font-bold uppercase tracking-wider text-base-content/40"
|
className="mt-5 block text-xs font-bold uppercase tracking-wider text-base-content/40"
|
||||||
>
|
>
|
||||||
계속하려면 예 입력
|
계속하려면 예 입력
|
||||||
</label>
|
</label>
|
||||||
@@ -1358,7 +1291,7 @@ function PoolPanel({ state }: { state: AuctionStateView }) {
|
|||||||
|
|
||||||
<div className="flex-1 overflow-y-auto">
|
<div className="flex-1 overflow-y-auto">
|
||||||
{activePool.length === 0 ? (
|
{activePool.length === 0 ? (
|
||||||
<div className="px-3 py-8 text-center text-[11px] text-base-content/30">
|
<div className="px-3 py-8 text-center text-xs text-base-content/30">
|
||||||
{tab === 'waiting'
|
{tab === 'waiting'
|
||||||
? '대기 중인 유저가 없습니다'
|
? '대기 중인 유저가 없습니다'
|
||||||
: '유찰된 유저가 없습니다'}
|
: '유찰된 유저가 없습니다'}
|
||||||
@@ -1396,14 +1329,14 @@ function PoolTabButton({
|
|||||||
role="tab"
|
role="tab"
|
||||||
type="button"
|
type="button"
|
||||||
onClick={onClick}
|
onClick={onClick}
|
||||||
className={`relative px-1 pt-3 pb-2.5 mr-5 text-[12px] font-semibold transition-colors ${
|
className={`relative px-1 pt-3 pb-2.5 mr-5 text-xs font-semibold transition-colors ${
|
||||||
active
|
active
|
||||||
? 'text-base-content'
|
? 'text-base-content'
|
||||||
: 'text-base-content/40 hover:text-base-content/70'
|
: 'text-base-content/40 hover:text-base-content/70'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{label}
|
{label}
|
||||||
<span className="ml-1 text-[10px] tabular-nums text-base-content/30">
|
<span className="ml-1 text-xs tabular-nums text-base-content/30">
|
||||||
{count}
|
{count}
|
||||||
</span>
|
</span>
|
||||||
{active ? (
|
{active ? (
|
||||||
@@ -1430,12 +1363,12 @@ function PoolListItem({
|
|||||||
className="w-7 h-7 shrink-0 rounded-sm border border-base-content/10 object-cover"
|
className="w-7 h-7 shrink-0 rounded-sm border border-base-content/10 object-cover"
|
||||||
/>
|
/>
|
||||||
<div className="min-w-0 flex-1 flex items-center gap-1.5">
|
<div className="min-w-0 flex-1 flex items-center gap-1.5">
|
||||||
<span className="truncate text-[12px] font-semibold text-base-content">
|
<span className="truncate text-xs font-semibold text-base-content">
|
||||||
{player.summonerName}
|
{player.summonerName}
|
||||||
</span>
|
</span>
|
||||||
<RankBadge tier={player.tier} />
|
<RankBadge tier={player.tier} />
|
||||||
{showPassCount && player.passCount > 0 ? (
|
{showPassCount && player.passCount > 0 ? (
|
||||||
<span className="inline-flex items-center text-[10px] font-medium px-1.5 py-0.5 border border-amber-500/30 text-amber-500 bg-amber-500/5">
|
<span className="inline-flex items-center text-xs font-medium px-1.5 py-0.5 border border-amber-500/30 text-amber-500 bg-amber-500/5">
|
||||||
{player.passCount}회 유찰
|
{player.passCount}회 유찰
|
||||||
</span>
|
</span>
|
||||||
) : null}
|
) : null}
|
||||||
@@ -1494,11 +1427,11 @@ function ChatPanel({
|
|||||||
className={`border border-base-content/10 bg-base-100 flex min-h-0 flex-col ${className}`}
|
className={`border border-base-content/10 bg-base-100 flex min-h-0 flex-col ${className}`}
|
||||||
>
|
>
|
||||||
<div className="border-b border-base-content/10 px-3 py-2.5 flex items-center justify-between">
|
<div className="border-b border-base-content/10 px-3 py-2.5 flex items-center justify-between">
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
|
<div className="text-xs font-bold uppercase tracking-wider text-base-content/35">
|
||||||
채팅
|
채팅
|
||||||
</div>
|
</div>
|
||||||
<span
|
<span
|
||||||
className={`text-[10px] ${
|
className={`text-xs ${
|
||||||
isConnected ? 'text-green-500' : 'text-base-content/30'
|
isConnected ? 'text-green-500' : 'text-base-content/30'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
@@ -1508,7 +1441,7 @@ function ChatPanel({
|
|||||||
|
|
||||||
<div className="flex-1 min-h-0 overflow-y-auto px-3 py-3">
|
<div className="flex-1 min-h-0 overflow-y-auto px-3 py-3">
|
||||||
{messages.length === 0 ? (
|
{messages.length === 0 ? (
|
||||||
<div className="flex h-full items-center justify-center text-center text-[11px] text-base-content/25">
|
<div className="flex h-full items-center justify-center text-center text-xs text-base-content/25">
|
||||||
아직 메시지가 없습니다
|
아직 메시지가 없습니다
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
@@ -1516,14 +1449,14 @@ function ChatPanel({
|
|||||||
{messages.map((message) => (
|
{messages.map((message) => (
|
||||||
<li key={message.id} className="space-y-1">
|
<li key={message.id} className="space-y-1">
|
||||||
<div className="flex items-center justify-between gap-2">
|
<div className="flex items-center justify-between gap-2">
|
||||||
<span className="min-w-0 truncate text-[11px] font-bold text-base-content/70">
|
<span className="min-w-0 truncate text-xs font-bold text-base-content/70">
|
||||||
{message.displayName}
|
{message.displayName}
|
||||||
</span>
|
</span>
|
||||||
<time className="shrink-0 text-[10px] tabular-nums text-base-content/25">
|
<time className="shrink-0 text-xs tabular-nums text-base-content/25">
|
||||||
{formatChatTime(message.sentAt)}
|
{formatChatTime(message.sentAt)}
|
||||||
</time>
|
</time>
|
||||||
</div>
|
</div>
|
||||||
<p className="whitespace-pre-wrap break-words border border-base-content/8 bg-base-content/[0.03] px-2.5 py-2 text-[12px] leading-relaxed text-base-content/75">
|
<p className="whitespace-pre-wrap break-words border border-base-content/8 bg-base-content/[0.03] px-2.5 py-2 text-xs leading-relaxed text-base-content/75">
|
||||||
{message.message}
|
{message.message}
|
||||||
</p>
|
</p>
|
||||||
</li>
|
</li>
|
||||||
@@ -1534,7 +1467,7 @@ function ChatPanel({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<form onSubmit={handleSubmit} className="border-t border-base-content/10 p-2 space-y-2">
|
<form onSubmit={handleSubmit} className="border-t border-base-content/10 p-2 space-y-2">
|
||||||
<div className="flex items-center justify-between gap-2 px-0.5 text-[10px] text-base-content/30">
|
<div className="flex items-center justify-between gap-2 px-0.5 text-xs text-base-content/30">
|
||||||
<span className="truncate">{senderLabel}</span>
|
<span className="truncate">{senderLabel}</span>
|
||||||
<span className="tabular-nums">{draft.length}/300</span>
|
<span className="tabular-nums">{draft.length}/300</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -1545,14 +1478,14 @@ function ChatPanel({
|
|||||||
disabled={!isConnected}
|
disabled={!isConnected}
|
||||||
maxLength={300}
|
maxLength={300}
|
||||||
placeholder="메시지를 입력하세요"
|
placeholder="메시지를 입력하세요"
|
||||||
className="w-full resize-none border border-base-content/10 bg-base-content/5 px-2 py-1.5 text-[12px] text-base-content/80 placeholder:text-base-content/25 focus:border-primary/40 focus:outline-none disabled:cursor-not-allowed disabled:text-base-content/30"
|
className="w-full resize-none border border-base-content/10 bg-base-content/5 px-2 py-1.5 text-xs text-base-content/80 placeholder:text-base-content/25 focus:border-primary/40 focus:outline-none disabled:cursor-not-allowed disabled:text-base-content/30"
|
||||||
rows={2}
|
rows={2}
|
||||||
aria-label="경매 채팅 메시지"
|
aria-label="경매 채팅 메시지"
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
type="submit"
|
type="submit"
|
||||||
disabled={!canSend}
|
disabled={!canSend}
|
||||||
className="btn btn-primary btn-sm w-full text-[11px]"
|
className="btn btn-primary btn-sm w-full text-xs"
|
||||||
>
|
>
|
||||||
<SendHorizontal className="h-3.5 w-3.5" aria-hidden="true" />
|
<SendHorizontal className="h-3.5 w-3.5" aria-hidden="true" />
|
||||||
전송
|
전송
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ function MatchCard({
|
|||||||
<article className="border border-base-content/10 bg-base-100 hover:border-primary/25 transition-colors">
|
<article className="border border-base-content/10 bg-base-100 hover:border-primary/25 transition-colors">
|
||||||
<div className="p-4 grid lg:grid-cols-[1fr_auto_1fr] gap-4 items-center">
|
<div className="p-4 grid lg:grid-cols-[1fr_auto_1fr] gap-4 items-center">
|
||||||
<div className="min-w-0">
|
<div className="min-w-0">
|
||||||
<div className="text-[11px] text-base-content/35">
|
<div className="text-xs text-base-content/35">
|
||||||
{formatDateTime(match.scheduledAt)}
|
{formatDateTime(match.scheduledAt)}
|
||||||
</div>
|
</div>
|
||||||
<h3 className="mt-1 text-base font-black text-base-content truncate group-hover:text-primary">
|
<h3 className="mt-1 text-base font-black text-base-content truncate group-hover:text-primary">
|
||||||
@@ -96,7 +96,7 @@ function MatchCard({
|
|||||||
{match.games.map((game) => (
|
{match.games.map((game) => (
|
||||||
<span
|
<span
|
||||||
key={game.gameNumber}
|
key={game.gameNumber}
|
||||||
className="inline-flex items-center gap-1 border border-base-content/10 px-2 py-1 text-[10px] text-base-content/45"
|
className="inline-flex items-center gap-1 border border-base-content/10 px-2 py-1 text-xs text-base-content/45"
|
||||||
>
|
>
|
||||||
{game.gameNumber}경기
|
{game.gameNumber}경기
|
||||||
{game.winnerSide && game.winnerTeamIndex ? (
|
{game.winnerSide && game.winnerTeamIndex ? (
|
||||||
@@ -117,14 +117,14 @@ function MatchCard({
|
|||||||
<div className="flex items-center justify-center gap-5">
|
<div className="flex items-center justify-center gap-5">
|
||||||
<div className={primarySeries.winnerTeamIndex === primarySeries.teamAIndex ? teamIndexColorClasses(primarySeries.teamAIndex).text : 'text-base-content/30'}>
|
<div className={primarySeries.winnerTeamIndex === primarySeries.teamAIndex ? teamIndexColorClasses(primarySeries.teamAIndex).text : 'text-base-content/30'}>
|
||||||
<div className="text-4xl font-black tabular-nums">{primarySeries.teamAWins}</div>
|
<div className="text-4xl font-black tabular-nums">{primarySeries.teamAWins}</div>
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider">
|
<div className="text-xs font-bold uppercase tracking-wider">
|
||||||
{teamName(primarySeries.teamAIndex)}
|
{teamName(primarySeries.teamAIndex)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="text-base-content/15 text-xs font-black">VS</div>
|
<div className="text-base-content/15 text-xs font-black">VS</div>
|
||||||
<div className={primarySeries.winnerTeamIndex === primarySeries.teamBIndex ? teamIndexColorClasses(primarySeries.teamBIndex).text : 'text-base-content/30'}>
|
<div className={primarySeries.winnerTeamIndex === primarySeries.teamBIndex ? teamIndexColorClasses(primarySeries.teamBIndex).text : 'text-base-content/30'}>
|
||||||
<div className="text-4xl font-black tabular-nums">{primarySeries.teamBWins}</div>
|
<div className="text-4xl font-black tabular-nums">{primarySeries.teamBWins}</div>
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider">
|
<div className="text-xs font-bold uppercase tracking-wider">
|
||||||
{teamName(primarySeries.teamBIndex)}
|
{teamName(primarySeries.teamBIndex)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -138,7 +138,7 @@ function MatchCard({
|
|||||||
key={team.teamIndex}
|
key={team.teamIndex}
|
||||||
className={`border ${teamIndexColorClasses(team.teamIndex).border} p-2`}
|
className={`border ${teamIndexColorClasses(team.teamIndex).border} p-2`}
|
||||||
>
|
>
|
||||||
<div className={`text-[10px] font-black uppercase tracking-wider ${teamIndexColorClasses(team.teamIndex).text}`}>
|
<div className={`text-xs font-black uppercase tracking-wider ${teamIndexColorClasses(team.teamIndex).text}`}>
|
||||||
{team.name}
|
{team.name}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2 space-y-1">
|
<div className="mt-2 space-y-1">
|
||||||
@@ -152,7 +152,7 @@ function MatchCard({
|
|||||||
loading="lazy"
|
loading="lazy"
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<span className="text-[11px] truncate text-base-content/65">
|
<span className="text-xs truncate text-base-content/65">
|
||||||
{member.summonerName}
|
{member.summonerName}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -178,13 +178,13 @@ function HighlightCard({
|
|||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<div className="border border-base-content/10 bg-base-100 p-4">
|
<div className="border border-base-content/10 bg-base-100 p-4">
|
||||||
<div className="text-[10px] font-black uppercase tracking-wider text-base-content/30">
|
<div className="text-xs font-black uppercase tracking-wider text-base-content/30">
|
||||||
{title}
|
{title}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2 text-xl font-black text-base-content tabular-nums">
|
<div className="mt-2 text-xl font-black text-base-content tabular-nums">
|
||||||
{highlight ? `${highlight.metric}${suffix}` : '-'}
|
{highlight ? `${highlight.metric}${suffix}` : '-'}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-1 text-[12px] text-base-content/45">
|
<div className="mt-1 text-xs text-base-content/45">
|
||||||
{highlight?.summonerName ?? '기록 없음'}
|
{highlight?.summonerName ?? '기록 없음'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -206,7 +206,7 @@ function LeaderboardTable({
|
|||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<table className="w-full text-left min-w-[920px]">
|
<table className="w-full text-left min-w-[920px]">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="border-b border-base-content/10 bg-base-200/50 text-[11px] uppercase tracking-wider text-base-content/35">
|
<tr className="border-b border-base-content/10 bg-base-200/50 text-xs uppercase tracking-wider text-base-content/35">
|
||||||
<th className="px-3 py-2.5">#</th>
|
<th className="px-3 py-2.5">#</th>
|
||||||
<th className="px-3 py-2.5">소환사</th>
|
<th className="px-3 py-2.5">소환사</th>
|
||||||
<th className="px-3 py-2.5 text-center">승률</th>
|
<th className="px-3 py-2.5 text-center">승률</th>
|
||||||
@@ -221,7 +221,7 @@ function LeaderboardTable({
|
|||||||
<tbody>
|
<tbody>
|
||||||
{rows.map((row, index) => (
|
{rows.map((row, index) => (
|
||||||
<tr key={row.userId} className="border-b border-base-content/5 last:border-b-0">
|
<tr key={row.userId} className="border-b border-base-content/5 last:border-b-0">
|
||||||
<td className="px-3 py-2.5 text-[11px] text-base-content/30">
|
<td className="px-3 py-2.5 text-xs text-base-content/30">
|
||||||
{index + 1}
|
{index + 1}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5">
|
<td className="px-3 py-2.5">
|
||||||
@@ -238,31 +238,31 @@ function LeaderboardTable({
|
|||||||
loading="lazy"
|
loading="lazy"
|
||||||
/>
|
/>
|
||||||
</span>
|
</span>
|
||||||
<span className="font-bold text-[13px] group-hover:text-primary">
|
<span className="font-bold text-sm group-hover:text-primary">
|
||||||
{row.summonerName}
|
{row.summonerName}
|
||||||
</span>
|
</span>
|
||||||
</Link>
|
</Link>
|
||||||
</td>
|
</td>
|
||||||
<td className={`px-3 py-2.5 text-center text-[13px] font-black ${ratioClass(row.winRate)}`}>
|
<td className={`px-3 py-2.5 text-center text-sm font-black ${ratioClass(row.winRate)}`}>
|
||||||
{row.winRate}%
|
{row.winRate}%
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
|
||||||
{row.games}
|
{row.games}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] font-bold tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs font-bold tabular-nums">
|
||||||
{row.kda}
|
{row.kda}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
|
||||||
{row.avgGoldPerMin}
|
{row.avgGoldPerMin}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
|
||||||
{row.avgKillParticipation}%
|
{row.avgKillParticipation}%
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
|
||||||
{row.avgCsPerMin}
|
{row.avgCsPerMin}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5">
|
<td className="px-3 py-2.5">
|
||||||
<div className="flex flex-wrap gap-2 text-[11px] text-base-content/55">
|
<div className="flex flex-wrap gap-2 text-xs text-base-content/55">
|
||||||
{row.topChampions.map((champion) => (
|
{row.topChampions.map((champion) => (
|
||||||
<ChampionChip
|
<ChampionChip
|
||||||
key={champion.championId}
|
key={champion.championId}
|
||||||
@@ -326,7 +326,7 @@ export default function CommunityInternalStatsPage() {
|
|||||||
<section className="mt-5 mb-6 border border-base-content/10 bg-base-100 p-5">
|
<section className="mt-5 mb-6 border border-base-content/10 bg-base-100 p-5">
|
||||||
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4">
|
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4">
|
||||||
<div>
|
<div>
|
||||||
<p className="text-[11px] font-black uppercase tracking-[0.24em] text-primary">
|
<p className="text-xs font-black uppercase tracking-[0.24em] text-primary">
|
||||||
Community Records
|
Community Records
|
||||||
</p>
|
</p>
|
||||||
<h1 className="mt-2 text-3xl font-black text-base-content">
|
<h1 className="mt-2 text-3xl font-black text-base-content">
|
||||||
@@ -337,7 +337,7 @@ export default function CommunityInternalStatsPage() {
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<div className="border border-base-content/10 px-4 py-3 text-sm text-base-content/55">
|
<div className="border border-base-content/10 px-4 py-3 text-sm text-base-content/55">
|
||||||
<div className="text-[10px] uppercase tracking-wider text-base-content/30">
|
<div className="text-xs uppercase tracking-wider text-base-content/30">
|
||||||
시즌
|
시즌
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-1 font-bold">{season?.label ?? '현재 시즌'}</div>
|
<div className="mt-1 font-bold">{season?.label ?? '현재 시즌'}</div>
|
||||||
@@ -356,7 +356,7 @@ export default function CommunityInternalStatsPage() {
|
|||||||
<section className="mb-8">
|
<section className="mb-8">
|
||||||
<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-sm font-black text-base-content">최근 내전</h2>
|
<h2 className="text-sm font-black text-base-content">최근 내전</h2>
|
||||||
<div className="text-[11px] text-base-content/35">
|
<div className="text-xs text-base-content/35">
|
||||||
블루 승률 {insightsQuery.data?.sideWinRate.blue ?? 0}% · 레드 승률{' '}
|
블루 승률 {insightsQuery.data?.sideWinRate.blue ?? 0}% · 레드 승률{' '}
|
||||||
{insightsQuery.data?.sideWinRate.red ?? 0}%
|
{insightsQuery.data?.sideWinRate.red ?? 0}%
|
||||||
</div>
|
</div>
|
||||||
@@ -392,7 +392,7 @@ export default function CommunityInternalStatsPage() {
|
|||||||
<section>
|
<section>
|
||||||
<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-sm font-black text-base-content">선수 순위</h2>
|
<h2 className="text-sm font-black text-base-content">선수 순위</h2>
|
||||||
<div className="text-[11px] text-base-content/35">
|
<div className="text-xs text-base-content/35">
|
||||||
포지션은 Riot Match의 라인 정보를 기준으로 합니다.
|
포지션은 Riot Match의 라인 정보를 기준으로 합니다.
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+464
-44
@@ -1,10 +1,243 @@
|
|||||||
|
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 = '예정된 매치가 없습니다.';
|
||||||
|
const HISTORY_TABLE_ROW_CLASS =
|
||||||
|
'h-10 border-b border-base-content/5 last:border-b-0';
|
||||||
|
|
||||||
|
function SkeletonBlock({ className }: { className: string }) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
className={`animate-pulse bg-base-content/10 ${className}`}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function SkeletonText({
|
||||||
|
children,
|
||||||
|
className = '',
|
||||||
|
skeletonClassName,
|
||||||
|
}: {
|
||||||
|
children: string;
|
||||||
|
className?: string;
|
||||||
|
skeletonClassName: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<span className={`relative block ${className}`}>
|
||||||
|
<span className="invisible">{children}</span>
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
className={`absolute left-0 top-1/2 -translate-y-1/2 animate-pulse bg-base-content/10 ${skeletonClassName}`}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function SkeletonBadge({
|
||||||
|
children,
|
||||||
|
className,
|
||||||
|
}: {
|
||||||
|
children: string;
|
||||||
|
className: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<span className={`relative ${className}`}>
|
||||||
|
<span className="invisible">{children}</span>
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
className="absolute inset-0 animate-pulse bg-base-content/10"
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryTableColGroup() {
|
||||||
|
return (
|
||||||
|
<colgroup>
|
||||||
|
<col className="w-[156px]" />
|
||||||
|
<col />
|
||||||
|
<col className="w-[88px]" />
|
||||||
|
<col className="w-[132px]" />
|
||||||
|
<col className="w-[72px]" />
|
||||||
|
<col className="w-[116px]" />
|
||||||
|
</colgroup>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryTableHeader() {
|
||||||
|
return (
|
||||||
|
<thead>
|
||||||
|
<tr className="bg-base-200/60 border-b border-base-content/10 text-xs 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>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryRecordsSkeleton({ rows = 5 }: { rows?: number }) {
|
||||||
|
const historySkeletons = Array.from({ length: rows });
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||||
|
<table className="w-full table-fixed text-left">
|
||||||
|
<HistoryTableColGroup />
|
||||||
|
<HistoryTableHeader />
|
||||||
|
<tbody>
|
||||||
|
{historySkeletons.map((_, index) => (
|
||||||
|
<tr
|
||||||
|
key={index}
|
||||||
|
className={HISTORY_TABLE_ROW_CLASS}
|
||||||
|
>
|
||||||
|
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
|
||||||
|
<SkeletonText
|
||||||
|
skeletonClassName="h-[1em] w-20"
|
||||||
|
>
|
||||||
|
2026년 6월 8일 월
|
||||||
|
</SkeletonText>
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonText
|
||||||
|
className="truncate text-sm font-medium"
|
||||||
|
skeletonClassName="h-[1em] w-36 max-w-full"
|
||||||
|
>
|
||||||
|
정기 내전
|
||||||
|
</SkeletonText>
|
||||||
|
</td>
|
||||||
|
<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>
|
||||||
|
</td>
|
||||||
|
<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>
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
|
<SkeletonText
|
||||||
|
skeletonClassName="h-[1em] w-8"
|
||||||
|
>
|
||||||
|
10명
|
||||||
|
</SkeletonText>
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
|
<SkeletonText
|
||||||
|
className="truncate"
|
||||||
|
skeletonClassName="h-[1em] w-14"
|
||||||
|
>
|
||||||
|
1팀 승리
|
||||||
|
</SkeletonText>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div className="md:hidden border border-base-content/10">
|
||||||
|
{historySkeletons.map((_, index) => (
|
||||||
|
<div
|
||||||
|
key={index}
|
||||||
|
className="border-b border-base-content/5 last:border-b-0 p-3"
|
||||||
|
>
|
||||||
|
<div className="flex items-start justify-between gap-3">
|
||||||
|
<div className="min-w-0 flex-1 space-y-2">
|
||||||
|
<SkeletonBlock className="h-3 w-28" />
|
||||||
|
<SkeletonBlock className="h-4 w-32" />
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="h-5 w-12 shrink-0" />
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="mt-2 h-3 w-40" />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function HomePageSkeleton() {
|
||||||
|
const upcomingSkeletons = Array.from({ length: UPCOMING_GRID_MATCH_LIMIT });
|
||||||
|
|
||||||
|
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" />
|
||||||
|
<HistoryRecordsSkeleton />
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function StatusBadge({ status }: { status: string }) {
|
function StatusBadge({ status }: { status: string }) {
|
||||||
const styles: Record<string, string> = {
|
const styles: Record<string, string> = {
|
||||||
@@ -16,7 +249,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-xs 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 +258,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-xs px-1.5 py-0.5 border border-base-content/10 text-base-content/50">
|
||||||
{map}
|
{map}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
@@ -46,13 +279,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-xs 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 +397,11 @@ export default function HomePage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (upcomingMatchesQuery.isLoading || finishedMatchesQuery.isLoading) {
|
if (upcomingMatchesQuery.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) {
|
||||||
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 +413,26 @@ 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 historyPageCount = Math.max(
|
||||||
|
1,
|
||||||
|
Math.ceil(historyTotal / historyLimit),
|
||||||
|
);
|
||||||
|
const isHistoryPageLoading =
|
||||||
|
historyMatchesQuery.isLoading ||
|
||||||
|
(historyMatchesQuery.isFetching && historyMatchesQuery.isPlaceholderData);
|
||||||
|
const hasHistoryError =
|
||||||
|
Boolean(historyMatchesQuery.error) && !historyMatchesQuery.data;
|
||||||
|
const goToPreviousHistoryPage = () =>
|
||||||
|
setHistoryPage((page) => Math.max(1, page - 1));
|
||||||
|
const goToNextHistoryPage = () => setHistoryPage((page) => page + 1);
|
||||||
const nextMatch = upcomingMatches[0];
|
const nextMatch = upcomingMatches[0];
|
||||||
const upcomingCards = (nextMatch
|
const upcomingCards = (nextMatch
|
||||||
? upcomingMatches.slice(1)
|
? upcomingMatches.slice(1)
|
||||||
@@ -128,7 +472,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">
|
||||||
@@ -143,7 +487,7 @@ export default function HomePage() {
|
|||||||
<div className="flex items-center gap-3 text-xs text-base-content/40 flex-wrap">
|
<div className="flex items-center gap-3 text-xs text-base-content/40 flex-wrap">
|
||||||
<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>
|
<span className="bg-accent text-accent-content px-1.5 py-0.5 font-semibold">
|
||||||
{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>
|
||||||
@@ -151,7 +495,7 @@ export default function HomePage() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="sm:shrink-0">
|
<div className="sm:shrink-0">
|
||||||
<span className="btn btn-primary btn-sm px-6 text-xs font-semibold">
|
<span className="btn btn-secondary btn-sm px-6 text-xs font-semibold">
|
||||||
상세 보기
|
상세 보기
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -160,8 +504,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 +520,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,34 +540,40 @@ 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>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section className="pb-12">
|
<section
|
||||||
|
className="pb-12"
|
||||||
|
aria-busy={isHistoryPageLoading}
|
||||||
|
aria-live="polite"
|
||||||
|
>
|
||||||
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
|
<h2 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">
|
{isHistoryPageLoading ? (
|
||||||
<table className="w-full text-left">
|
<HistoryRecordsSkeleton rows={HISTORY_MATCH_PAGE_SIZE} />
|
||||||
<thead>
|
) : hasHistoryError ? (
|
||||||
<tr className="bg-base-200/60 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/40">
|
<div className="border border-base-content/10 px-4 py-8 text-center text-sm text-red-500">
|
||||||
<th className="py-2.5 px-4 font-semibold">날짜</th>
|
지난 내전 기록을 불러오지 못했습니다.
|
||||||
<th className="py-2.5 px-4 font-semibold">내전</th>
|
</div>
|
||||||
<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>
|
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||||
</thead>
|
<table className="w-full table-fixed text-left">
|
||||||
|
<HistoryTableColGroup />
|
||||||
|
<HistoryTableHeader />
|
||||||
<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={`${HISTORY_TABLE_ROW_CLASS} hover:bg-base-content/[0.02] transition-colors`}
|
||||||
>
|
>
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
|
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
|
||||||
{match.date}
|
{match.date}
|
||||||
@@ -229,35 +581,103 @@ export default function HomePage() {
|
|||||||
<td className="py-2.5 px-4">
|
<td className="py-2.5 px-4">
|
||||||
<Link
|
<Link
|
||||||
to={`/match/${match.id}`}
|
to={`/match/${match.id}`}
|
||||||
className="text-sm font-medium text-base-content hover:text-primary transition-colors"
|
className="block truncate text-sm font-medium text-base-content hover:text-primary transition-colors"
|
||||||
>
|
>
|
||||||
{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} 승리` : '-'}
|
<span className="block truncate">
|
||||||
|
{match.result?.winner
|
||||||
|
? `${match.result.winner} 승리`
|
||||||
|
: '-'}
|
||||||
|
</span>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
))
|
))
|
||||||
) : (
|
) : (
|
||||||
<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-xs font-medium text-base-content/40">
|
||||||
|
{match.compactDateTime ||
|
||||||
|
`${match.date} ${match.time}`}
|
||||||
|
</div>
|
||||||
|
<div className="mt-1 text-sm font-semibold leading-snug text-base-content break-words">
|
||||||
|
{match.title}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="shrink-0">
|
||||||
|
<StatusBadge
|
||||||
|
status={getStatusLabel(match.status)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="mt-2">
|
||||||
|
<HistoryMetaText
|
||||||
|
map={match.map}
|
||||||
|
participants={match.participants.length}
|
||||||
|
result={resultLabel}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
})
|
||||||
|
) : (
|
||||||
|
<div className="py-6 px-4 text-sm text-base-content/35 text-center">
|
||||||
|
아직 내전 기록이 없습니다.
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
{!hasHistoryError && historyTotal > 0 && (
|
||||||
|
<div className="mt-3 flex justify-end">
|
||||||
|
<HistoryPagination
|
||||||
|
page={historyPage}
|
||||||
|
pageCount={historyPageCount}
|
||||||
|
total={historyTotal}
|
||||||
|
isFetching={historyMatchesQuery.isFetching}
|
||||||
|
onPrevious={goToPreviousHistoryPage}
|
||||||
|
onNext={goToNextHistoryPage}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,24 +1,32 @@
|
|||||||
import { Link, useLocation, useParams } from 'react-router';
|
import { Link, useLocation, useParams } from "react-router";
|
||||||
import { useDdragonManifest, useInternalMatchDetail } from '../api/hooks';
|
import { useDdragonManifest, useInternalMatchDetail } from "../api/hooks";
|
||||||
import type { ApiInternalMatchDetailResponse, TeamSide } from '../api/types';
|
import type { ApiInternalMatchDetailResponse, TeamSide } from "../api/types";
|
||||||
import { DEFAULT_COMMUNITY_ID } from '../config';
|
import { DEFAULT_COMMUNITY_ID } from "../config";
|
||||||
import { championDisplayName, championIconUrl, itemIconUrl } from '../lib/ddragon';
|
import {
|
||||||
import { sideShortLabel, teamIndexColorClasses, teamIndexLabel } from '../lib/league';
|
championDisplayName,
|
||||||
import { LANE_LABELS } from '../lib/riot-history';
|
championIconUrl,
|
||||||
|
itemIconUrl,
|
||||||
|
} from "../lib/ddragon";
|
||||||
|
import {
|
||||||
|
sideShortLabel,
|
||||||
|
teamIndexColorClasses,
|
||||||
|
teamIndexLabel,
|
||||||
|
} from "../lib/league";
|
||||||
|
import { LANE_LABELS } from "../lib/riot-history";
|
||||||
|
|
||||||
function formatDateTime(value: string | number) {
|
function formatDateTime(value: string | number) {
|
||||||
return new Intl.DateTimeFormat('ko-KR', {
|
return new Intl.DateTimeFormat("ko-KR", {
|
||||||
month: 'long',
|
month: "long",
|
||||||
day: 'numeric',
|
day: "numeric",
|
||||||
hour: '2-digit',
|
hour: "2-digit",
|
||||||
minute: '2-digit',
|
minute: "2-digit",
|
||||||
}).format(new Date(value));
|
}).format(new Date(value));
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatDuration(seconds: number) {
|
function formatDuration(seconds: number) {
|
||||||
const minutes = Math.floor(seconds / 60);
|
const minutes = Math.floor(seconds / 60);
|
||||||
const rest = seconds % 60;
|
const rest = seconds % 60;
|
||||||
return `${minutes}:${String(rest).padStart(2, '0')}`;
|
return `${minutes}:${String(rest).padStart(2, "0")}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function sideLabel(side: TeamSide) {
|
function sideLabel(side: TeamSide) {
|
||||||
@@ -26,7 +34,9 @@ function sideLabel(side: TeamSide) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function sideClass(side: TeamSide) {
|
function sideClass(side: TeamSide) {
|
||||||
return side === 'blue' ? 'text-blue-400 border-blue-500/20' : 'text-red-400 border-red-500/20';
|
return side === "blue"
|
||||||
|
? "text-blue-400 border-blue-500/20"
|
||||||
|
: "text-red-400 border-red-500/20";
|
||||||
}
|
}
|
||||||
|
|
||||||
function ChampionCell({
|
function ChampionCell({
|
||||||
@@ -34,16 +44,18 @@ function ChampionCell({
|
|||||||
manifest,
|
manifest,
|
||||||
}: {
|
}: {
|
||||||
championId: number;
|
championId: number;
|
||||||
manifest: ReturnType<typeof useDdragonManifest>['data'];
|
manifest: ReturnType<typeof useDdragonManifest>["data"];
|
||||||
}) {
|
}) {
|
||||||
const icon = championIconUrl(manifest, championId);
|
const icon = championIconUrl(manifest, championId);
|
||||||
const name = championDisplayName(manifest, championId) ?? String(championId);
|
const name = championDisplayName(manifest, championId) ?? String(championId);
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center gap-2 min-w-0">
|
<div className="flex items-center gap-2 min-w-0">
|
||||||
<span className="w-8 h-8 bg-base-content/10 overflow-hidden shrink-0">
|
<span className="w-8 h-8 bg-base-content/10 overflow-hidden shrink-0">
|
||||||
{icon ? <img src={icon} alt="" className="w-full h-full object-cover" /> : null}
|
{icon ? (
|
||||||
|
<img src={icon} alt="" className="w-full h-full object-cover" />
|
||||||
|
) : null}
|
||||||
</span>
|
</span>
|
||||||
<span className="font-bold text-[13px] truncate">{name}</span>
|
<span className="font-bold text-sm truncate">{name}</span>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -55,7 +67,7 @@ function ItemStrip({
|
|||||||
}: {
|
}: {
|
||||||
items: number[];
|
items: number[];
|
||||||
trinket: number;
|
trinket: number;
|
||||||
manifest: ReturnType<typeof useDdragonManifest>['data'];
|
manifest: ReturnType<typeof useDdragonManifest>["data"];
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-wrap gap-1">
|
<div className="flex flex-wrap gap-1">
|
||||||
@@ -66,7 +78,9 @@ function ItemStrip({
|
|||||||
key={`${itemId}-${index}`}
|
key={`${itemId}-${index}`}
|
||||||
className="w-5 h-5 bg-base-content/10 border border-base-content/5 overflow-hidden"
|
className="w-5 h-5 bg-base-content/10 border border-base-content/5 overflow-hidden"
|
||||||
>
|
>
|
||||||
{icon ? <img src={icon} alt="" className="w-full h-full object-cover" /> : null}
|
{icon ? (
|
||||||
|
<img src={icon} alt="" className="w-full h-full object-cover" />
|
||||||
|
) : null}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
@@ -78,8 +92,8 @@ function GamePanel({
|
|||||||
game,
|
game,
|
||||||
manifest,
|
manifest,
|
||||||
}: {
|
}: {
|
||||||
game: ApiInternalMatchDetailResponse['games'][number];
|
game: ApiInternalMatchDetailResponse["games"][number];
|
||||||
manifest: ReturnType<typeof useDdragonManifest>['data'];
|
manifest: ReturnType<typeof useDdragonManifest>["data"];
|
||||||
}) {
|
}) {
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
||||||
@@ -91,8 +105,9 @@ function GamePanel({
|
|||||||
<h2 className="text-sm font-black text-base-content">
|
<h2 className="text-sm font-black text-base-content">
|
||||||
{game.gameNumber}경기
|
{game.gameNumber}경기
|
||||||
</h2>
|
</h2>
|
||||||
<p className="mt-1 text-[11px] text-base-content/35">
|
<p className="mt-1 text-xs text-base-content/35">
|
||||||
{formatDateTime(game.gameCreation)} · {formatDuration(game.gameDuration)} ·{' '}
|
{formatDateTime(game.gameCreation)} ·{" "}
|
||||||
|
{formatDuration(game.gameDuration)} ·{" "}
|
||||||
<span className="font-mono">{game.riotMatchId}</span>
|
<span className="font-mono">{game.riotMatchId}</span>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -100,27 +115,33 @@ function GamePanel({
|
|||||||
{game.teams.map((team) => (
|
{game.teams.map((team) => (
|
||||||
<span
|
<span
|
||||||
key={team.side}
|
key={team.side}
|
||||||
className={`border px-2 py-1 text-[11px] font-black ${sideClass(team.side)} ${
|
className={`border px-2 py-1 text-xs font-black ${sideClass(team.side)} ${
|
||||||
team.win ? 'bg-base-content/5' : 'opacity-40'
|
team.win ? "bg-base-content/5" : "opacity-40"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}){' '}
|
{teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}){" "}
|
||||||
{team.win ? '승' : '패'}
|
{team.win ? "승" : "패"}
|
||||||
</span>
|
</span>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{game.teams.map((team) => (
|
{game.teams.map((team) => (
|
||||||
<div key={team.side} className="border-b border-base-content/8 last:border-b-0">
|
<div
|
||||||
<div className={`px-4 py-2 text-[11px] font-black uppercase tracking-wider ${sideClass(team.side)}`}>
|
key={team.side}
|
||||||
{teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}) · 바론 {team.objectives.baron} · 드래곤{' '}
|
className="border-b border-base-content/8 last:border-b-0"
|
||||||
{team.objectives.dragon} · 타워 {team.objectives.tower}
|
>
|
||||||
|
<div
|
||||||
|
className={`px-4 py-2 text-xs font-black uppercase tracking-wider ${sideClass(team.side)}`}
|
||||||
|
>
|
||||||
|
{teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}) · 바론{" "}
|
||||||
|
{team.objectives.baron} · 드래곤 {team.objectives.dragon} · 타워{" "}
|
||||||
|
{team.objectives.tower}
|
||||||
</div>
|
</div>
|
||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<table className="w-full text-left min-w-[980px]">
|
<table className="w-full text-left min-w-[980px]">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="bg-base-content/[0.02] text-[11px] text-base-content/35 uppercase tracking-wider">
|
<tr className="bg-base-content/[0.02] text-xs text-base-content/35 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2">소환사</th>
|
<th className="px-3 py-2">소환사</th>
|
||||||
<th className="px-3 py-2">챔피언</th>
|
<th className="px-3 py-2">챔피언</th>
|
||||||
<th className="px-3 py-2 text-center">포지션</th>
|
<th className="px-3 py-2 text-center">포지션</th>
|
||||||
@@ -143,39 +164,44 @@ function GamePanel({
|
|||||||
<Link
|
<Link
|
||||||
to={`/users/${participant.userId}/history?queueGroup=internal`}
|
to={`/users/${participant.userId}/history?queueGroup=internal`}
|
||||||
state={{ backTo: historyBackTo }}
|
state={{ backTo: historyBackTo }}
|
||||||
className="font-bold text-[13px] hover:text-primary"
|
className="font-bold text-sm hover:text-primary"
|
||||||
>
|
>
|
||||||
{participant.summonerName}
|
{participant.summonerName}
|
||||||
</Link>
|
</Link>
|
||||||
) : (
|
) : (
|
||||||
<span className="font-bold text-[13px]">
|
<span className="font-bold text-sm">
|
||||||
{participant.summonerName}
|
{participant.summonerName}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2">
|
<td className="px-3 py-2">
|
||||||
<ChampionCell championId={participant.championId} manifest={manifest} />
|
<ChampionCell
|
||||||
|
championId={participant.championId}
|
||||||
|
manifest={manifest}
|
||||||
|
/>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-center text-[12px]">
|
<td className="px-3 py-2 text-center text-xs">
|
||||||
{LANE_LABELS[participant.teamPosition] ?? participant.teamPosition ?? '-'}
|
{LANE_LABELS[participant.teamPosition] ??
|
||||||
|
participant.teamPosition ??
|
||||||
|
"-"}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-center text-[13px] font-black tabular-nums">
|
<td className="px-3 py-2 text-center text-sm font-black tabular-nums">
|
||||||
{participant.kills}
|
{participant.kills}
|
||||||
<span className="text-base-content/25"> / </span>
|
<span className="text-base-content/25"> / </span>
|
||||||
<span className="text-red-400">{participant.deaths}</span>
|
<span className="text-red-400">{participant.deaths}</span>
|
||||||
<span className="text-base-content/25"> / </span>
|
<span className="text-base-content/25"> / </span>
|
||||||
{participant.assists}
|
{participant.assists}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2 text-center text-xs tabular-nums">
|
||||||
{participant.cs} ({participant.csPerMin}/m)
|
{participant.cs} ({participant.csPerMin}/m)
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2 text-center text-xs tabular-nums">
|
||||||
{participant.gpm}
|
{participant.gpm}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2 text-center text-xs tabular-nums">
|
||||||
{participant.killParticipation}%
|
{participant.killParticipation}%
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2 text-center text-xs tabular-nums">
|
||||||
{participant.damageShare}%
|
{participant.damageShare}%
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2">
|
<td className="px-3 py-2">
|
||||||
@@ -248,21 +274,38 @@ export default function InternalMatchDetailPage() {
|
|||||||
{detail.match.title}
|
{detail.match.title}
|
||||||
</h1>
|
</h1>
|
||||||
<p className="mt-2 text-sm text-base-content/45">
|
<p className="mt-2 text-sm text-base-content/45">
|
||||||
{formatDateTime(detail.match.scheduledAt)} · {detail.match.gameCount}전제
|
{formatDateTime(detail.match.scheduledAt)} ·{" "}
|
||||||
|
{detail.match.gameCount}전제
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
{primarySeries && (
|
{primarySeries && (
|
||||||
<div className="flex items-center gap-6">
|
<div className="flex items-center gap-6">
|
||||||
<div className={primarySeries.winnerTeamIndex === primarySeries.teamAIndex ? teamIndexColorClasses(primarySeries.teamAIndex).text : 'text-base-content/30'}>
|
<div
|
||||||
<div className="text-4xl font-black tabular-nums">{primarySeries.teamAWins}</div>
|
className={
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider">
|
primarySeries.winnerTeamIndex === primarySeries.teamAIndex
|
||||||
|
? teamIndexColorClasses(primarySeries.teamAIndex).text
|
||||||
|
: "text-base-content/30"
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<div className="text-4xl font-black tabular-nums">
|
||||||
|
{primarySeries.teamAWins}
|
||||||
|
</div>
|
||||||
|
<div className="text-xs font-bold uppercase tracking-wider">
|
||||||
{teamName(primarySeries.teamAIndex)}
|
{teamName(primarySeries.teamAIndex)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="text-base-content/15 text-xs font-black">VS</div>
|
<div className="text-base-content/15 text-xs font-black">VS</div>
|
||||||
<div className={primarySeries.winnerTeamIndex === primarySeries.teamBIndex ? teamIndexColorClasses(primarySeries.teamBIndex).text : 'text-base-content/30'}>
|
<div
|
||||||
<div className="text-4xl font-black tabular-nums">{primarySeries.teamBWins}</div>
|
className={
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider">
|
primarySeries.winnerTeamIndex === primarySeries.teamBIndex
|
||||||
|
? teamIndexColorClasses(primarySeries.teamBIndex).text
|
||||||
|
: "text-base-content/30"
|
||||||
|
}
|
||||||
|
>
|
||||||
|
<div className="text-4xl font-black tabular-nums">
|
||||||
|
{primarySeries.teamBWins}
|
||||||
|
</div>
|
||||||
|
<div className="text-xs font-bold uppercase tracking-wider">
|
||||||
{teamName(primarySeries.teamBIndex)}
|
{teamName(primarySeries.teamBIndex)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -14,18 +14,17 @@ import {
|
|||||||
} from "../api/hooks";
|
} from "../api/hooks";
|
||||||
import {
|
import {
|
||||||
buildDefaultPreferredPositions,
|
buildDefaultPreferredPositions,
|
||||||
formatTierLabel,
|
|
||||||
mapApiMatchToMatchDetail,
|
mapApiMatchToMatchDetail,
|
||||||
type MatchDetailView,
|
type MatchDetailView,
|
||||||
type ParticipantView,
|
type ParticipantView,
|
||||||
type TeamView,
|
type TeamView,
|
||||||
} from "../api/mappers";
|
} from "../api/mappers";
|
||||||
|
import { RankBadge } from "../components/RankBadge";
|
||||||
import { DEFAULT_COMMUNITY_ID, useAuthUserId } from "../config";
|
import { DEFAULT_COMMUNITY_ID, useAuthUserId } from "../config";
|
||||||
import { apiFetch, ApiError } from "../lib/api";
|
import { apiFetch, ApiError } from "../lib/api";
|
||||||
import { profileIconUrl } from "../lib/ddragon";
|
import { profileIconUrl } from "../lib/ddragon";
|
||||||
import {
|
import {
|
||||||
POSITION_ORDER,
|
POSITION_ORDER,
|
||||||
positionIcon,
|
|
||||||
positionLabel,
|
positionLabel,
|
||||||
sideShortLabel,
|
sideShortLabel,
|
||||||
teamIndexColorClasses,
|
teamIndexColorClasses,
|
||||||
@@ -88,6 +87,9 @@ const PARTICIPANT_TIER_LABELS: Record<string, string> = {
|
|||||||
UNRANKED: "언랭크",
|
UNRANKED: "언랭크",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const PARTICIPANT_TABLE_ROW_CLASS =
|
||||||
|
"h-12 border-b border-base-content/5 last:border-b-0";
|
||||||
|
|
||||||
function captainSlotKey(slot: CaptainSelectionSlot) {
|
function captainSlotKey(slot: CaptainSelectionSlot) {
|
||||||
return String(slot.teamIndex);
|
return String(slot.teamIndex);
|
||||||
}
|
}
|
||||||
@@ -153,107 +155,10 @@ function buildCaptainSlots(
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
function PosBadge({ pos, sub }: { pos: Position; sub?: boolean }) {
|
|
||||||
return (
|
|
||||||
<span
|
|
||||||
className={`inline-flex items-center gap-1.5 text-[11px] font-medium px-1.5 py-0.5 border ${
|
|
||||||
sub
|
|
||||||
? "border-base-content/8 text-base-content/35 bg-transparent"
|
|
||||||
: "border-primary/20 text-primary bg-primary/5"
|
|
||||||
}`}
|
|
||||||
>
|
|
||||||
<img
|
|
||||||
src={positionIcon[pos]}
|
|
||||||
alt=""
|
|
||||||
className="w-3.5 h-3.5 object-contain mr-4px"
|
|
||||||
/>
|
|
||||||
<span>{positionLabel[pos]}</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function tierByQueue(tiers: ApiTierInfo[], queueType: string) {
|
function tierByQueue(tiers: ApiTierInfo[], queueType: string) {
|
||||||
return tiers.find((tier) => tier.queueType === queueType);
|
return tiers.find((tier) => tier.queueType === queueType);
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeRank(rank: string | undefined) {
|
|
||||||
switch (rank) {
|
|
||||||
case "I":
|
|
||||||
return "1";
|
|
||||||
case "II":
|
|
||||||
return "2";
|
|
||||||
case "III":
|
|
||||||
return "3";
|
|
||||||
case "IV":
|
|
||||||
return "4";
|
|
||||||
default:
|
|
||||||
return rank;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatRankTooltip(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return "언랭크";
|
|
||||||
const highTier = ["MASTER", "GRANDMASTER", "CHALLENGER"].includes(tier.tier);
|
|
||||||
const normalizedTier = {
|
|
||||||
...tier,
|
|
||||||
rank: normalizeRank(tier.rank) ?? tier.rank,
|
|
||||||
};
|
|
||||||
const label = highTier
|
|
||||||
? formatTierLabel({ ...normalizedTier, leaguePoints: 0 })
|
|
||||||
: formatTierLabel(normalizedTier);
|
|
||||||
return `${label} - ${tier.leaguePoints}LP`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatRankBadge(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return "U";
|
|
||||||
const tierInitial =
|
|
||||||
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
|
|
||||||
const rank = normalizeRank(tier.rank);
|
|
||||||
return rank ? `${tierInitial}${rank}` : tierInitial;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
|
||||||
switch (tier?.tier) {
|
|
||||||
case "CHALLENGER":
|
|
||||||
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
|
|
||||||
case "GRANDMASTER":
|
|
||||||
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
|
|
||||||
case "MASTER":
|
|
||||||
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
|
|
||||||
case "DIAMOND":
|
|
||||||
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
|
|
||||||
case "EMERALD":
|
|
||||||
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
|
|
||||||
case "PLATINUM":
|
|
||||||
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
|
|
||||||
case "GOLD":
|
|
||||||
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
|
|
||||||
case "SILVER":
|
|
||||||
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
|
|
||||||
case "BRONZE":
|
|
||||||
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
|
|
||||||
case "IRON":
|
|
||||||
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
|
|
||||||
default:
|
|
||||||
return "border-base-content/30 bg-transparent text-base-content/50";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
const tooltip = formatRankTooltip(tier);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<span className="tooltip tooltip-left" data-tip={tooltip}>
|
|
||||||
<span
|
|
||||||
className={`inline-flex h-[17px] min-w-[18px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
|
|
||||||
aria-label={tooltip}
|
|
||||||
>
|
|
||||||
{formatRankBadge(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function QueueRankCell({
|
function QueueRankCell({
|
||||||
label,
|
label,
|
||||||
tier,
|
tier,
|
||||||
@@ -262,18 +167,36 @@ function QueueRankCell({
|
|||||||
tier?: ApiTierInfo;
|
tier?: ApiTierInfo;
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex items-center gap-1">
|
<span className="grid grid-cols-[27px_auto] items-center gap-1">
|
||||||
<span>{label}</span>
|
<span className="text-xs font-medium text-base-content/50">
|
||||||
<RankBadge tier={tier} />
|
{label}
|
||||||
|
</span>
|
||||||
|
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function PreferredPositionText({
|
||||||
|
mainPosition,
|
||||||
|
subPosition,
|
||||||
|
}: {
|
||||||
|
mainPosition: Position;
|
||||||
|
subPosition: Position;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<span className="inline-flex flex-col gap-0.5 text-xs 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>
|
</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-xs font-black text-base-content/35">
|
||||||
{/* <span>SOLO</span> */}
|
{/* <span>SOLO</span> */}
|
||||||
<RankBadge tier={tier} />
|
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -292,7 +215,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.5 text-xs font-black text-base-content/35 whitespace-nowrap sm:flex-row sm:items-center sm:gap-4">
|
||||||
<QueueRankCell label="SOLO" tier={soloTier} />
|
<QueueRankCell label="SOLO" tier={soloTier} />
|
||||||
<QueueRankCell label="FLEX" tier={flexTier} />
|
<QueueRankCell label="FLEX" tier={flexTier} />
|
||||||
</div>
|
</div>
|
||||||
@@ -364,7 +287,7 @@ function PositionSelect({
|
|||||||
value={value}
|
value={value}
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
onChange={(event) => onChange(event.target.value as Position)}
|
onChange={(event) => onChange(event.target.value as Position)}
|
||||||
className={`h-7 border bg-base-100 pl-1.5 pr-1 text-[11px] font-medium focus:border-primary/30 focus:outline-none disabled:opacity-50 ${
|
className={`h-7 w-16 border bg-base-100 pl-1.5 pr-1 text-xs font-medium focus:border-primary/30 focus:outline-none disabled:opacity-50 ${
|
||||||
sub
|
sub
|
||||||
? "border-base-content/10 text-base-content/45"
|
? "border-base-content/10 text-base-content/45"
|
||||||
: "border-primary/20 text-primary"
|
: "border-primary/20 text-primary"
|
||||||
@@ -412,17 +335,18 @@ 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
|
||||||
<td className="py-2 px-3 text-center text-[11px] text-base-content/30 w-8">
|
className={`${PARTICIPANT_TABLE_ROW_CLASS} hover:bg-base-content/[0.02] transition-colors`}
|
||||||
|
>
|
||||||
|
<td className="hidden py-2 px-3 text-center text-xs 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
|
||||||
@@ -433,13 +357,13 @@ 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-sm 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-xs text-base-content/25 leading-tight">
|
||||||
#{participant.tag}
|
#{participant.tag}
|
||||||
{participant.excluded && (
|
{participant.excluded && (
|
||||||
<span className="border border-amber-500/20 bg-amber-500/10 px-1 text-[9px] font-bold text-amber-500">
|
<span className="border border-amber-500/20 bg-amber-500/10 px-1 text-xs font-bold text-amber-500">
|
||||||
제외
|
제외
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
@@ -452,24 +376,28 @@ 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 ? (
|
||||||
<>
|
<>
|
||||||
<td className="py-2 px-3">
|
<td className="py-2 px-3">
|
||||||
|
<span className="inline-flex items-center gap-1 whitespace-nowrap">
|
||||||
<PositionSelect
|
<PositionSelect
|
||||||
value={participant.mainPosition}
|
value={participant.mainPosition}
|
||||||
disabled={admin.isUpdating}
|
disabled={admin.isUpdating}
|
||||||
onChange={handleMainChange}
|
onChange={handleMainChange}
|
||||||
/>
|
/>
|
||||||
</td>
|
<span className="text-xs text-base-content/35">/</span>
|
||||||
<td className="py-2 px-3">
|
|
||||||
<PositionSelect
|
<PositionSelect
|
||||||
value={participant.subPosition}
|
value={participant.subPosition}
|
||||||
sub
|
sub
|
||||||
disabled={admin.isUpdating}
|
disabled={admin.isUpdating}
|
||||||
onChange={handleSubChange}
|
onChange={handleSubChange}
|
||||||
/>
|
/>
|
||||||
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2 px-3 w-20 min-w-[5rem] whitespace-nowrap text-right">
|
<td className="py-2 px-3 w-20 min-w-[5rem] whitespace-nowrap text-right">
|
||||||
{confirmingRemove ? (
|
{confirmingRemove ? (
|
||||||
@@ -478,14 +406,14 @@ function ParticipantRow({
|
|||||||
type="button"
|
type="button"
|
||||||
disabled={admin.isRemoving}
|
disabled={admin.isRemoving}
|
||||||
onClick={() => admin.onRemove(participant.userId)}
|
onClick={() => admin.onRemove(participant.userId)}
|
||||||
className="text-[10px] font-bold text-red-400 hover:text-red-300 disabled:opacity-50"
|
className="text-xs font-bold text-red-400 hover:text-red-300 disabled:opacity-50"
|
||||||
>
|
>
|
||||||
{admin.isRemoving ? "제외 중..." : "확인"}
|
{admin.isRemoving ? "제외 중..." : "확인"}
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setConfirmingRemove(false)}
|
onClick={() => setConfirmingRemove(false)}
|
||||||
className="text-[10px] text-base-content/35 hover:text-base-content/60"
|
className="text-xs text-base-content/35 hover:text-base-content/60"
|
||||||
>
|
>
|
||||||
취소
|
취소
|
||||||
</button>
|
</button>
|
||||||
@@ -517,19 +445,178 @@ function ParticipantRow({
|
|||||||
</td>
|
</td>
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<>
|
|
||||||
<td className="py-2 px-3">
|
<td className="py-2 px-3">
|
||||||
<PosBadge pos={participant.mainPosition} />
|
<PreferredPositionText
|
||||||
|
mainPosition={participant.mainPosition}
|
||||||
|
subPosition={participant.subPosition}
|
||||||
|
/>
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2 px-3">
|
|
||||||
<PosBadge pos={participant.subPosition} sub />
|
|
||||||
</td>
|
|
||||||
</>
|
|
||||||
)}
|
)}
|
||||||
</tr>
|
</tr>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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-sm 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-xs leading-tight text-base-content/25">
|
||||||
|
#{participant.tag}
|
||||||
|
{participant.excluded && (
|
||||||
|
<span className="border border-amber-500/20 bg-amber-500/10 px-1 text-xs font-bold text-amber-500">
|
||||||
|
제외
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
<TierCell participant={participant} />
|
||||||
|
<PreferredPositionText
|
||||||
|
mainPosition={participant.mainPosition}
|
||||||
|
subPosition={participant.subPosition}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function ParticipantMobileRow({
|
||||||
|
participant,
|
||||||
|
admin,
|
||||||
|
}: {
|
||||||
|
participant: ParticipantView;
|
||||||
|
admin?: ParticipantRowAdmin;
|
||||||
|
}) {
|
||||||
|
const { data: ddragon } = useDdragonManifest();
|
||||||
|
const location = useLocation();
|
||||||
|
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
||||||
|
const [confirmingRemove, setConfirmingRemove] = useState(false);
|
||||||
|
|
||||||
|
const handleMainChange = (next: Position) => {
|
||||||
|
if (!admin) return;
|
||||||
|
const sub =
|
||||||
|
next === participant.subPosition
|
||||||
|
? participant.mainPosition
|
||||||
|
: participant.subPosition;
|
||||||
|
admin.onChangePositions(participant.userId, next, sub);
|
||||||
|
};
|
||||||
|
const handleSubChange = (next: Position) => {
|
||||||
|
if (!admin) return;
|
||||||
|
const main =
|
||||||
|
next === participant.mainPosition
|
||||||
|
? participant.subPosition
|
||||||
|
: participant.mainPosition;
|
||||||
|
admin.onChangePositions(participant.userId, main, next);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="border-b border-base-content/5 px-3 py-2 last:border-b-0">
|
||||||
|
<div className="grid grid-cols-[minmax(0,1fr)_64px_58px] items-center gap-x-2">
|
||||||
|
<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-sm 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-xs leading-tight text-base-content/25">
|
||||||
|
#{participant.tag}
|
||||||
|
{participant.excluded && (
|
||||||
|
<span className="border border-amber-500/20 bg-amber-500/10 px-1 text-xs font-bold text-amber-500">
|
||||||
|
제외
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
<TierCell participant={participant} />
|
||||||
|
<PreferredPositionText
|
||||||
|
mainPosition={participant.mainPosition}
|
||||||
|
subPosition={participant.subPosition}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
{admin && (
|
||||||
|
<div className="mt-2 flex flex-wrap items-center justify-between gap-x-3 gap-y-2 border-t border-base-content/5 pt-2">
|
||||||
|
<span className="inline-flex items-center gap-1 whitespace-nowrap">
|
||||||
|
<PositionSelect
|
||||||
|
value={participant.mainPosition}
|
||||||
|
disabled={admin.isUpdating}
|
||||||
|
onChange={handleMainChange}
|
||||||
|
/>
|
||||||
|
<span className="text-xs text-base-content/35">/</span>
|
||||||
|
<PositionSelect
|
||||||
|
value={participant.subPosition}
|
||||||
|
sub
|
||||||
|
disabled={admin.isUpdating}
|
||||||
|
onChange={handleSubChange}
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
{confirmingRemove ? (
|
||||||
|
<span className="inline-flex items-center gap-2 whitespace-nowrap">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
disabled={admin.isRemoving}
|
||||||
|
onClick={() => admin.onRemove(participant.userId)}
|
||||||
|
className="text-xs font-bold text-red-400 hover:text-red-300 disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{admin.isRemoving ? "제외 중..." : "확인"}
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setConfirmingRemove(false)}
|
||||||
|
className="text-xs text-base-content/35 hover:text-base-content/60"
|
||||||
|
>
|
||||||
|
취소
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
) : (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={() => setConfirmingRemove(true)}
|
||||||
|
className="text-xs font-bold text-base-content/35 hover:text-red-400"
|
||||||
|
>
|
||||||
|
제외
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function ParticipantTable({
|
function ParticipantTable({
|
||||||
participants,
|
participants,
|
||||||
maxParticipants,
|
maxParticipants,
|
||||||
@@ -611,31 +698,31 @@ function ParticipantTable({
|
|||||||
return (
|
return (
|
||||||
<div className="border border-base-content/10 bg-base-100 overflow-hidden">
|
<div className="border border-base-content/10 bg-base-100 overflow-hidden">
|
||||||
<div className="px-4 py-2.5 border-b border-base-content/10 bg-base-200/40 flex items-center justify-between gap-3">
|
<div className="px-4 py-2.5 border-b border-base-content/10 bg-base-200/40 flex items-center justify-between gap-3">
|
||||||
<h3 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
<h3 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
|
||||||
참가자 ({participants.length}/{maxParticipants})
|
참가자 ({participants.length}/{maxParticipants})
|
||||||
</h3>
|
</h3>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={onJoin}
|
onClick={onJoin}
|
||||||
disabled={!canJoin || joined || isJoining}
|
disabled={!canJoin || joined || isJoining}
|
||||||
className="btn btn-primary btn-xs px-4 text-[11px] font-semibold disabled:opacity-40"
|
className="btn btn-primary btn-xs px-4 text-xs font-semibold disabled:opacity-40"
|
||||||
>
|
>
|
||||||
{joined ? "참가 완료" : isJoining ? "신청 중..." : "참가 신청"}
|
{joined ? "참가 완료" : isJoining ? "신청 중..." : "참가 신청"}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div className="border-b border-base-content/10 bg-base-100 px-4 py-2.5">
|
<div className="border-b border-base-content/10 bg-base-100 px-4 py-2.5">
|
||||||
<div className="flex flex-wrap items-center gap-x-3 gap-y-2">
|
<div className="flex flex-wrap items-center gap-x-2 gap-y-2">
|
||||||
<div className="inline-flex items-center gap-1">
|
<div className="inline-flex items-center gap-1">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={() => setPositionFilter(ALL_PARTICIPANT_FILTER)}
|
onClick={() => setPositionFilter(ALL_PARTICIPANT_FILTER)}
|
||||||
className={`inline-flex h-8 items-center px-2.5 text-[11px] font-semibold border transition-colors ${
|
className={`inline-flex h-8 w-[3.75rem] items-center justify-center px-1 text-xs font-semibold border transition-colors ${
|
||||||
positionFilter === ALL_PARTICIPANT_FILTER
|
positionFilter === ALL_PARTICIPANT_FILTER
|
||||||
? "border-primary/30 bg-primary/5 text-primary"
|
? "border-primary/30 bg-primary/5 text-primary"
|
||||||
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
전체 ({participants.length})
|
전체<span className="tabular-nums">({participants.length})</span>
|
||||||
</button>
|
</button>
|
||||||
{POSITION_ORDER.map((position) => {
|
{POSITION_ORDER.map((position) => {
|
||||||
const active = positionFilter === position;
|
const active = positionFilter === position;
|
||||||
@@ -652,27 +739,20 @@ function ParticipantTable({
|
|||||||
active ? ALL_PARTICIPANT_FILTER : position,
|
active ? ALL_PARTICIPANT_FILTER : position,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
className={`inline-flex h-8 items-center gap-1 px-2 text-[11px] font-semibold border transition-colors ${
|
className={`inline-flex h-8 w-[3.75rem] items-center justify-center px-1 text-xs font-semibold border transition-colors ${
|
||||||
active
|
active
|
||||||
? "border-primary/30 bg-primary/5 text-primary"
|
? "border-primary/30 bg-primary/5 text-primary"
|
||||||
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<img
|
|
||||||
src={positionIcon[position]}
|
|
||||||
alt=""
|
|
||||||
className="h-3.5 w-3.5 object-contain"
|
|
||||||
/>
|
|
||||||
<span className="hidden sm:inline">
|
|
||||||
{positionLabel[position]}
|
{positionLabel[position]}
|
||||||
</span>
|
|
||||||
<span className="tabular-nums">({count})</span>
|
<span className="tabular-nums">({count})</span>
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
<select
|
<select
|
||||||
className="h-8 border border-base-content/10 bg-base-100 px-2 text-xs text-base-content focus:border-primary/30 focus:outline-none"
|
className="h-8 w-32 shrink-0 border border-base-content/10 bg-base-100 px-2 text-xs text-base-content focus:border-primary/30 focus:outline-none"
|
||||||
value={tierFilter}
|
value={tierFilter}
|
||||||
onChange={(event) => setTierFilter(event.target.value)}
|
onChange={(event) => setTierFilter(event.target.value)}
|
||||||
>
|
>
|
||||||
@@ -684,14 +764,11 @@ function ParticipantTable({
|
|||||||
</option>
|
</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
<div className="ml-auto flex items-center gap-2 text-[11px] text-base-content/35">
|
<div className="ml-auto flex min-w-[6.5rem] shrink-0 items-center justify-end gap-1 whitespace-nowrap text-xs text-base-content/35">
|
||||||
<span>
|
|
||||||
{filteredParticipants.length}/{participants.length}명
|
|
||||||
</span>
|
|
||||||
{isFiltered && (
|
{isFiltered && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="btn btn-ghost btn-xs h-8 min-h-8 px-2 text-[11px] text-base-content/40"
|
className="btn btn-ghost btn-xs h-8 min-h-8 shrink-0 px-1 text-xs text-base-content/40"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setPositionFilter(ALL_PARTICIPANT_FILTER);
|
setPositionFilter(ALL_PARTICIPANT_FILTER);
|
||||||
setTierFilter(ALL_PARTICIPANT_FILTER);
|
setTierFilter(ALL_PARTICIPANT_FILTER);
|
||||||
@@ -700,20 +777,78 @@ function ParticipantTable({
|
|||||||
초기화
|
초기화
|
||||||
</button>
|
</button>
|
||||||
)}
|
)}
|
||||||
|
<span className="w-10 shrink-0 text-right tabular-nums">
|
||||||
|
{filteredParticipants.length}/{participants.length}명
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="overflow-x-auto">
|
<div className="sm:hidden">
|
||||||
<table className="w-full text-left">
|
<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-xs font-semibold uppercase tracking-wider text-base-content/35">
|
||||||
|
<span>소환사</span>
|
||||||
|
<span>현재 티어</span>
|
||||||
|
<span>포지션</span>
|
||||||
|
</div>
|
||||||
|
{filteredParticipants.length > 0 ? (
|
||||||
|
filteredParticipants.map((participant) => (
|
||||||
|
<ParticipantMobileRow
|
||||||
|
key={participant.id}
|
||||||
|
participant={participant}
|
||||||
|
admin={
|
||||||
|
canManage
|
||||||
|
? {
|
||||||
|
onRemove: onRemoveParticipant,
|
||||||
|
onChangePositions: onUpdatePositions,
|
||||||
|
isRemoving: removingUserId === participant.userId,
|
||||||
|
isUpdating: updatingUserId === participant.userId,
|
||||||
|
}
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
))
|
||||||
|
) : (
|
||||||
|
<div className="px-3 py-8 text-center text-sm text-base-content/35">
|
||||||
|
조건에 맞는 참가자가 없습니다.
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div className="hidden overflow-x-auto sm:block">
|
||||||
|
<table className="w-full min-w-[40rem] table-fixed text-left">
|
||||||
|
<colgroup>
|
||||||
|
<col className="w-0 sm:w-[5%]" />
|
||||||
|
<col className={canManage ? "w-[27%]" : "w-[38%]"} />
|
||||||
|
<col className={canManage ? "w-[34%]" : "w-[34%]"} />
|
||||||
|
<col className={canManage ? "w-[22%]" : "w-[23%]"} />
|
||||||
|
{canManage && <col className="w-[12%]" />}
|
||||||
|
</colgroup>
|
||||||
<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-xs 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-0 sm:table-cell sm:w-[5%]">
|
||||||
<th className="py-2 px-3">소환사</th>
|
#
|
||||||
<th className="py-2 px-3">현재 티어</th>
|
</th>
|
||||||
<th className="py-2 px-3">주 포지션</th>
|
<th
|
||||||
<th className="py-2 px-3">부 포지션</th>
|
className={
|
||||||
|
canManage ? "py-2 px-3 w-[27%]" : "py-2 px-3 w-[38%]"
|
||||||
|
}
|
||||||
|
>
|
||||||
|
소환사
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
className={
|
||||||
|
canManage ? "py-2 px-3 w-[34%]" : "py-2 px-3 w-[34%]"
|
||||||
|
}
|
||||||
|
>
|
||||||
|
현재 티어
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
className={
|
||||||
|
canManage ? "py-2 px-3 w-[22%]" : "py-2 px-3 w-[23%]"
|
||||||
|
}
|
||||||
|
>
|
||||||
|
포지션
|
||||||
|
</th>
|
||||||
{canManage && (
|
{canManage && (
|
||||||
<th className="py-2 px-3 w-20 min-w-[5rem] whitespace-nowrap text-right">
|
<th className="py-2 px-3 w-[12%] min-w-[5rem] whitespace-nowrap text-right">
|
||||||
관리
|
관리
|
||||||
</th>
|
</th>
|
||||||
)}
|
)}
|
||||||
@@ -741,7 +876,7 @@ function ParticipantTable({
|
|||||||
) : (
|
) : (
|
||||||
<tr>
|
<tr>
|
||||||
<td
|
<td
|
||||||
colSpan={canManage ? 6 : 5}
|
colSpan={canManage ? 5 : 4}
|
||||||
className="px-3 py-8 text-center text-sm text-base-content/35"
|
className="px-3 py-8 text-center text-sm text-base-content/35"
|
||||||
>
|
>
|
||||||
조건에 맞는 참가자가 없습니다.
|
조건에 맞는 참가자가 없습니다.
|
||||||
@@ -753,7 +888,7 @@ function ParticipantTable({
|
|||||||
</div>
|
</div>
|
||||||
{participants.length < maxParticipants && (
|
{participants.length < maxParticipants && (
|
||||||
<div className="px-4 py-2.5 border-t border-base-content/5 text-center bg-base-200/20">
|
<div className="px-4 py-2.5 border-t border-base-content/5 text-center bg-base-200/20">
|
||||||
<span className="text-[11px] text-base-content/25">
|
<span className="text-xs text-base-content/25">
|
||||||
{maxParticipants - participants.length}자리 남음
|
{maxParticipants - participants.length}자리 남음
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -788,22 +923,41 @@ function TeamCard({
|
|||||||
{team.name}
|
{team.name}
|
||||||
</span>
|
</span>
|
||||||
{isWinner && (
|
{isWinner && (
|
||||||
<span className="inline-flex items-center text-[10px] font-bold px-1.5 py-0.5 bg-amber-500/15 text-amber-400 border border-amber-500/20">
|
<span className="inline-flex items-center text-xs font-bold px-1.5 py-0.5 bg-amber-500/15 text-amber-400 border border-amber-500/20">
|
||||||
WIN
|
WIN
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<Link
|
<Link
|
||||||
to={`/match/${matchId}/team/${team.teamIndex}`}
|
to={`/match/${matchId}/team/${team.teamIndex}`}
|
||||||
className="text-[10px] font-bold text-base-content/35 hover:text-primary"
|
className="text-xs font-bold text-base-content/35 hover:text-primary"
|
||||||
>
|
>
|
||||||
진행 페이지
|
진행 페이지
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
<table className="w-full 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-xs 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>
|
||||||
|
<col className="w-11" />
|
||||||
|
<col />
|
||||||
|
<col className="w-56" />
|
||||||
|
<col className="w-32" />
|
||||||
|
</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-xs 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>
|
||||||
@@ -834,7 +988,7 @@ function SideCard({
|
|||||||
return (
|
return (
|
||||||
<div className="border border-base-content/10 bg-base-100 overflow-hidden">
|
<div className="border border-base-content/10 bg-base-100 overflow-hidden">
|
||||||
<div className="px-4 py-2 border-b border-base-content/10 bg-base-200/40">
|
<div className="px-4 py-2 border-b border-base-content/10 bg-base-200/40">
|
||||||
<h3 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
<h3 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
|
||||||
{title}
|
{title}
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
@@ -883,13 +1037,13 @@ function TournamentCodeDisplay({ slot }: { slot: TournamentCodeSlotView }) {
|
|||||||
: "border-primary/20 bg-primary/5 text-base-content"
|
: "border-primary/20 bg-primary/5 text-base-content"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
<code className="font-mono text-[12px] font-bold truncate">
|
<code className="font-mono text-xs font-bold truncate">
|
||||||
{expired ? "코드 만료" : slot.code}
|
{expired ? "코드 만료" : slot.code}
|
||||||
</code>
|
</code>
|
||||||
{slot.code && !expired && (
|
{slot.code && !expired && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="ml-auto text-[10px] px-1.5 py-0.5 border border-base-content/10 text-base-content/45 hover:text-primary"
|
className="ml-auto text-xs px-1.5 py-0.5 border border-base-content/10 text-base-content/45 hover:text-primary"
|
||||||
onClick={copyCode}
|
onClick={copyCode}
|
||||||
>
|
>
|
||||||
{copied ? "복사됨" : "복사"}
|
{copied ? "복사됨" : "복사"}
|
||||||
@@ -897,7 +1051,7 @@ function TournamentCodeDisplay({ slot }: { slot: TournamentCodeSlotView }) {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
className={`mt-1 text-[10px] ${
|
className={`mt-1 text-xs ${
|
||||||
expired || expiringSoon ? "text-amber-500" : "text-base-content/30"
|
expired || expiringSoon ? "text-amber-500" : "text-base-content/30"
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
@@ -914,7 +1068,7 @@ function TournamentCodeDisplay({ slot }: { slot: TournamentCodeSlotView }) {
|
|||||||
function TournamentCodeList({ slots }: { slots: TournamentCodeSlotView[] }) {
|
function TournamentCodeList({ slots }: { slots: TournamentCodeSlotView[] }) {
|
||||||
if (slots.length === 0) {
|
if (slots.length === 0) {
|
||||||
return (
|
return (
|
||||||
<div className="border border-dashed border-base-content/10 px-3 py-3 text-[11px] text-base-content/30">
|
<div className="border border-dashed border-base-content/10 px-3 py-3 text-xs text-base-content/30">
|
||||||
아직 배정된 코드가 없습니다.
|
아직 배정된 코드가 없습니다.
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -924,10 +1078,10 @@ function TournamentCodeList({ slots }: { slots: TournamentCodeSlotView[] }) {
|
|||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
{slots.map((slot) => (
|
{slots.map((slot) => (
|
||||||
<div key={slot.gameNumber} className="flex items-start gap-2">
|
<div key={slot.gameNumber} className="flex items-start gap-2">
|
||||||
<span className="text-[11px] font-bold text-base-content/40 w-20 shrink-0 pt-1.5">
|
<span className="text-xs font-bold text-base-content/40 w-20 shrink-0 pt-1.5">
|
||||||
{slot.gameNumber}경기
|
{slot.gameNumber}경기
|
||||||
{(slot.teamAIndex > 1 || slot.teamBIndex > 2) && (
|
{(slot.teamAIndex > 1 || slot.teamBIndex > 2) && (
|
||||||
<span className="block text-[10px] font-normal text-base-content/25">
|
<span className="block text-xs font-normal text-base-content/25">
|
||||||
{teamIndexLabel(slot.teamAIndex)} vs{" "}
|
{teamIndexLabel(slot.teamAIndex)} vs{" "}
|
||||||
{teamIndexLabel(slot.teamBIndex)}
|
{teamIndexLabel(slot.teamBIndex)}
|
||||||
</span>
|
</span>
|
||||||
@@ -936,7 +1090,7 @@ function TournamentCodeList({ slots }: { slots: TournamentCodeSlotView[] }) {
|
|||||||
{slot.code ? (
|
{slot.code ? (
|
||||||
<TournamentCodeDisplay slot={slot} />
|
<TournamentCodeDisplay slot={slot} />
|
||||||
) : (
|
) : (
|
||||||
<span className="text-[11px] text-base-content/30 border border-dashed border-base-content/10 px-2 py-2 flex-1">
|
<span className="text-xs text-base-content/30 border border-dashed border-base-content/10 px-2 py-2 flex-1">
|
||||||
발급 대기 중... 운영자가 코드를 채우면 자동으로 붙습니다.
|
발급 대기 중... 운영자가 코드를 채우면 자동으로 붙습니다.
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
@@ -970,7 +1124,7 @@ function PoolStatsHint({ enabled }: { enabled: boolean }) {
|
|||||||
const expiringSoon = statsQuery.data?.expiringSoon ?? 0;
|
const expiringSoon = statsQuery.data?.expiringSoon ?? 0;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mt-3 border-t border-base-content/8 pt-3 text-[11px]">
|
<div className="mt-3 border-t border-base-content/8 pt-3 text-xs">
|
||||||
<div className={available < 5 ? "text-red-400" : "text-base-content/35"}>
|
<div className={available < 5 ? "text-red-400" : "text-base-content/35"}>
|
||||||
풀 잔여 {available}개
|
풀 잔여 {available}개
|
||||||
{expiringSoon > 0 ? ` · 만료 임박 ${expiringSoon}개` : ""}
|
{expiringSoon > 0 ? ` · 만료 임박 ${expiringSoon}개` : ""}
|
||||||
@@ -1145,13 +1299,13 @@ function RoundRobinStandingsTable({ match }: { match: MatchDetailView }) {
|
|||||||
<h3 className="text-xs font-black text-base-content/65">
|
<h3 className="text-xs font-black text-base-content/65">
|
||||||
라운드로빈 순위
|
라운드로빈 순위
|
||||||
</h3>
|
</h3>
|
||||||
<p className="mt-0.5 text-[11px] text-base-content/35">
|
<p className="mt-0.5 text-xs text-base-content/35">
|
||||||
{standings.length}팀 · {match.result?.games.length ?? 0}경기 완료
|
{standings.length}팀 · {match.result?.games.length ?? 0}경기 완료
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
{match.result?.winner && (
|
{match.result?.winner && (
|
||||||
<div className="text-right">
|
<div className="text-right">
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
|
<div className="text-xs font-bold uppercase tracking-wider text-base-content/35">
|
||||||
1위
|
1위
|
||||||
</div>
|
</div>
|
||||||
<div className="text-sm font-black text-amber-400">
|
<div className="text-sm font-black text-amber-400">
|
||||||
@@ -1162,7 +1316,7 @@ function RoundRobinStandingsTable({ match }: { match: MatchDetailView }) {
|
|||||||
</div>
|
</div>
|
||||||
<div className="mt-4 overflow-x-auto border border-base-content/8">
|
<div className="mt-4 overflow-x-auto border border-base-content/8">
|
||||||
<table className="min-w-[760px] w-full text-xs">
|
<table className="min-w-[760px] w-full text-xs">
|
||||||
<thead className="bg-base-100 text-[11px] text-base-content/45">
|
<thead className="bg-base-100 text-xs text-base-content/45">
|
||||||
<tr className="border-b border-base-content/8">
|
<tr className="border-b border-base-content/8">
|
||||||
<th className="h-9 px-3 text-left font-semibold">팀 순위</th>
|
<th className="h-9 px-3 text-left font-semibold">팀 순위</th>
|
||||||
<th className="h-9 px-3 text-center font-semibold bg-primary/5 text-primary">
|
<th className="h-9 px-3 text-center font-semibold bg-primary/5 text-primary">
|
||||||
@@ -1270,7 +1424,7 @@ function MatchResultPanel({ match }: { match: MatchDetailView }) {
|
|||||||
<div className="text-3xl font-black tabular-nums">
|
<div className="text-3xl font-black tabular-nums">
|
||||||
{primarySeries.teamAWins}
|
{primarySeries.teamAWins}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[10px] uppercase tracking-wider mt-0.5 font-semibold">
|
<div className="text-xs uppercase tracking-wider mt-0.5 font-semibold">
|
||||||
{resolveMatchTeamName(match, primarySeries.teamAIndex)}
|
{resolveMatchTeamName(match, primarySeries.teamAIndex)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -1283,13 +1437,13 @@ function MatchResultPanel({ match }: { match: MatchDetailView }) {
|
|||||||
<div className="text-3xl font-black tabular-nums">
|
<div className="text-3xl font-black tabular-nums">
|
||||||
{primarySeries.teamBWins}
|
{primarySeries.teamBWins}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[10px] uppercase tracking-wider mt-0.5 font-semibold">
|
<div className="text-xs uppercase tracking-wider mt-0.5 font-semibold">
|
||||||
{resolveMatchTeamName(match, primarySeries.teamBIndex)}
|
{resolveMatchTeamName(match, primarySeries.teamBIndex)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="text-center mt-3 text-[11px] font-bold text-amber-400 uppercase tracking-wide">
|
<div className="text-center mt-3 text-xs font-bold text-amber-400 uppercase tracking-wide">
|
||||||
{match.result.winner
|
{match.result.winner
|
||||||
? `${match.result.winner} 승리`
|
? `${match.result.winner} 승리`
|
||||||
: `결과 수집 중 · ${match.result.games.length}/${maxGameNumber}경기`}
|
: `결과 수집 중 · ${match.result.games.length}/${maxGameNumber}경기`}
|
||||||
@@ -1395,9 +1549,8 @@ export default function MatchDetailPage() {
|
|||||||
const [manualRiotMatchId, setManualRiotMatchId] = useState("");
|
const [manualRiotMatchId, setManualRiotMatchId] = useState("");
|
||||||
const pollTournamentResultMutation =
|
const pollTournamentResultMutation =
|
||||||
usePollTournamentResult(DEFAULT_COMMUNITY_ID);
|
usePollTournamentResult(DEFAULT_COMMUNITY_ID);
|
||||||
const collectResultByWindowMutation = useCollectTournamentResultByWindow(
|
const collectResultByWindowMutation =
|
||||||
DEFAULT_COMMUNITY_ID,
|
useCollectTournamentResultByWindow(DEFAULT_COMMUNITY_ID);
|
||||||
);
|
|
||||||
const collectResultByRiotMatchMutation =
|
const collectResultByRiotMatchMutation =
|
||||||
useCollectTournamentResultByRiotMatch(DEFAULT_COMMUNITY_ID);
|
useCollectTournamentResultByRiotMatch(DEFAULT_COMMUNITY_ID);
|
||||||
|
|
||||||
@@ -1744,7 +1897,7 @@ export default function MatchDetailPage() {
|
|||||||
{match.title}
|
{match.title}
|
||||||
</h1>
|
</h1>
|
||||||
<span
|
<span
|
||||||
className={`inline-flex items-center text-[11px] font-semibold px-1.5 py-0.5 border ${si.cls}`}
|
className={`inline-flex items-center text-xs font-semibold px-1.5 py-0.5 border ${si.cls}`}
|
||||||
>
|
>
|
||||||
{si.label}
|
{si.label}
|
||||||
</span>
|
</span>
|
||||||
@@ -1761,7 +1914,7 @@ export default function MatchDetailPage() {
|
|||||||
{match.participants.length}/{match.maxParticipants}명
|
{match.participants.length}/{match.maxParticipants}명
|
||||||
</span>
|
</span>
|
||||||
<span className="text-base-content/15">|</span>
|
<span className="text-base-content/15">|</span>
|
||||||
<span className="inline-flex items-center text-[11px] px-1.5 py-0.5 border border-base-content/10 text-base-content/40">
|
<span className="inline-flex items-center text-xs px-1.5 py-0.5 border border-base-content/10 text-base-content/40">
|
||||||
{match.map}
|
{match.map}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -1847,7 +2000,7 @@ export default function MatchDetailPage() {
|
|||||||
|
|
||||||
{isCheckingPermissions ? (
|
{isCheckingPermissions ? (
|
||||||
<div className="border border-base-content/10 bg-base-100 p-4">
|
<div className="border border-base-content/10 bg-base-100 p-4">
|
||||||
<h3 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
<h3 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
|
||||||
권한 확인 중
|
권한 확인 중
|
||||||
</h3>
|
</h3>
|
||||||
<p className="mt-1 text-xs text-base-content/40">
|
<p className="mt-1 text-xs text-base-content/40">
|
||||||
@@ -1857,7 +2010,7 @@ export default function MatchDetailPage() {
|
|||||||
) : canManageAuction ? (
|
) : canManageAuction ? (
|
||||||
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
|
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
|
||||||
<div>
|
<div>
|
||||||
<h3 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
<h3 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
|
||||||
경매 시작
|
경매 시작
|
||||||
</h3>
|
</h3>
|
||||||
<p className="mt-1 text-xs text-base-content/40">
|
<p className="mt-1 text-xs text-base-content/40">
|
||||||
@@ -1865,7 +2018,7 @@ export default function MatchDetailPage() {
|
|||||||
팀장을 지정합니다.
|
팀장을 지정합니다.
|
||||||
</p>
|
</p>
|
||||||
{waitingParticipantCount > 0 && (
|
{waitingParticipantCount > 0 && (
|
||||||
<p className="mt-1 text-[11px] text-amber-500">
|
<p className="mt-1 text-xs text-amber-500">
|
||||||
{waitingParticipantCount}명은 10명 단위에 맞지 않아 이번
|
{waitingParticipantCount}명은 10명 단위에 맞지 않아 이번
|
||||||
경매에서 제외됩니다.
|
경매에서 제외됩니다.
|
||||||
</p>
|
</p>
|
||||||
@@ -2002,7 +2155,7 @@ export default function MatchDetailPage() {
|
|||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<span className="shrink-0 px-2 text-[11px] text-base-content/30">
|
<span className="shrink-0 px-2 text-xs text-base-content/30">
|
||||||
초
|
초
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -2034,11 +2187,11 @@ export default function MatchDetailPage() {
|
|||||||
);
|
);
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
<span className="shrink-0 px-2 text-[11px] text-base-content/30">
|
<span className="shrink-0 px-2 text-xs text-base-content/30">
|
||||||
초
|
초
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<span className="mt-1 block text-[11px] text-base-content/30">
|
<span className="mt-1 block text-xs text-base-content/30">
|
||||||
남은 시간이 이 값보다 적을 때 입찰하면 이 시간까지
|
남은 시간이 이 값보다 적을 때 입찰하면 이 시간까지
|
||||||
늘어납니다.
|
늘어납니다.
|
||||||
</span>
|
</span>
|
||||||
@@ -2064,7 +2217,7 @@ export default function MatchDetailPage() {
|
|||||||
</div>
|
</div>
|
||||||
{topTierThreshold === "MANUAL" && (
|
{topTierThreshold === "MANUAL" && (
|
||||||
<div className="border border-base-content/10 bg-base-200/20 p-3">
|
<div className="border border-base-content/10 bg-base-200/20 p-3">
|
||||||
<div className="mb-2 text-[11px] font-bold uppercase tracking-wider text-base-content/35">
|
<div className="mb-2 text-xs font-bold uppercase tracking-wider text-base-content/35">
|
||||||
우선 등장 선수
|
우선 등장 선수
|
||||||
</div>
|
</div>
|
||||||
<div className="max-h-48 overflow-y-auto space-y-1">
|
<div className="max-h-48 overflow-y-auto space-y-1">
|
||||||
@@ -2184,9 +2337,9 @@ export default function MatchDetailPage() {
|
|||||||
{match.schedule.map((item, index) => (
|
{match.schedule.map((item, index) => (
|
||||||
<li
|
<li
|
||||||
key={index}
|
key={index}
|
||||||
className="flex items-start gap-2.5 text-[13px]"
|
className="flex items-start gap-2.5 text-sm"
|
||||||
>
|
>
|
||||||
<span className="font-mono text-[11px] text-base-content/30 w-11 shrink-0 pt-px">
|
<span className="font-mono text-xs text-base-content/30 w-11 shrink-0 pt-px">
|
||||||
{item.time}
|
{item.time}
|
||||||
</span>
|
</span>
|
||||||
<span className="text-base-content/60">{item.label}</span>
|
<span className="text-base-content/60">{item.label}</span>
|
||||||
@@ -2210,7 +2363,7 @@ export default function MatchDetailPage() {
|
|||||||
<SideCard title="결과 수집">
|
<SideCard title="결과 수집">
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<div>
|
<div>
|
||||||
<div className="mb-2 text-[11px] font-bold text-base-content/45">
|
<div className="mb-2 text-xs font-bold text-base-content/45">
|
||||||
토너먼트 코드
|
토너먼트 코드
|
||||||
</div>
|
</div>
|
||||||
<button
|
<button
|
||||||
@@ -2226,11 +2379,11 @@ export default function MatchDetailPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="border-t border-base-content/8 pt-4">
|
<div className="border-t border-base-content/8 pt-4">
|
||||||
<div className="mb-2 text-[11px] font-bold text-base-content/45">
|
<div className="mb-2 text-xs font-bold text-base-content/45">
|
||||||
시간 범위
|
시간 범위
|
||||||
</div>
|
</div>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
<label className="block text-[10px] text-base-content/35">
|
<label className="block text-xs text-base-content/35">
|
||||||
시작
|
시작
|
||||||
<input
|
<input
|
||||||
type="datetime-local"
|
type="datetime-local"
|
||||||
@@ -2239,10 +2392,10 @@ export default function MatchDetailPage() {
|
|||||||
onChange={(event) =>
|
onChange={(event) =>
|
||||||
setManualResultStartTime(event.target.value)
|
setManualResultStartTime(event.target.value)
|
||||||
}
|
}
|
||||||
className="mt-1 w-full border border-base-content/10 bg-transparent px-2 py-2 text-[11px] text-base-content focus:outline-none focus:border-primary/30"
|
className="mt-1 w-full border border-base-content/10 bg-transparent px-2 py-2 text-xs text-base-content focus:outline-none focus:border-primary/30"
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<label className="block text-[10px] text-base-content/35">
|
<label className="block text-xs text-base-content/35">
|
||||||
종료
|
종료
|
||||||
<input
|
<input
|
||||||
type="datetime-local"
|
type="datetime-local"
|
||||||
@@ -2251,7 +2404,7 @@ export default function MatchDetailPage() {
|
|||||||
onChange={(event) =>
|
onChange={(event) =>
|
||||||
setManualResultEndTime(event.target.value)
|
setManualResultEndTime(event.target.value)
|
||||||
}
|
}
|
||||||
className="mt-1 w-full border border-base-content/10 bg-transparent px-2 py-2 text-[11px] text-base-content focus:outline-none focus:border-primary/30"
|
className="mt-1 w-full border border-base-content/10 bg-transparent px-2 py-2 text-xs text-base-content focus:outline-none focus:border-primary/30"
|
||||||
/>
|
/>
|
||||||
</label>
|
</label>
|
||||||
<button
|
<button
|
||||||
@@ -2271,7 +2424,7 @@ export default function MatchDetailPage() {
|
|||||||
{formatManualCollectSummary(
|
{formatManualCollectSummary(
|
||||||
collectResultByWindowMutation.data,
|
collectResultByWindowMutation.data,
|
||||||
) && (
|
) && (
|
||||||
<div className="text-[10px] text-base-content/35">
|
<div className="text-xs text-base-content/35">
|
||||||
{formatManualCollectSummary(
|
{formatManualCollectSummary(
|
||||||
collectResultByWindowMutation.data,
|
collectResultByWindowMutation.data,
|
||||||
)}
|
)}
|
||||||
@@ -2281,7 +2434,7 @@ export default function MatchDetailPage() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="border-t border-base-content/8 pt-4">
|
<div className="border-t border-base-content/8 pt-4">
|
||||||
<div className="mb-2 text-[11px] font-bold text-base-content/45">
|
<div className="mb-2 text-xs font-bold text-base-content/45">
|
||||||
Riot Match ID
|
Riot Match ID
|
||||||
</div>
|
</div>
|
||||||
<div className="space-y-2">
|
<div className="space-y-2">
|
||||||
@@ -2292,7 +2445,7 @@ export default function MatchDetailPage() {
|
|||||||
setManualRiotMatchId(event.target.value)
|
setManualRiotMatchId(event.target.value)
|
||||||
}
|
}
|
||||||
placeholder="KR_1234567890"
|
placeholder="KR_1234567890"
|
||||||
className="w-full border border-base-content/10 bg-transparent px-2 py-2 text-[11px] text-base-content focus:outline-none focus:border-primary/30"
|
className="w-full border border-base-content/10 bg-transparent px-2 py-2 text-xs text-base-content focus:outline-none focus:border-primary/30"
|
||||||
/>
|
/>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
@@ -2310,7 +2463,7 @@ export default function MatchDetailPage() {
|
|||||||
{formatManualCollectSummary(
|
{formatManualCollectSummary(
|
||||||
collectResultByRiotMatchMutation.data,
|
collectResultByRiotMatchMutation.data,
|
||||||
) && (
|
) && (
|
||||||
<div className="text-[10px] text-base-content/35">
|
<div className="text-xs text-base-content/35">
|
||||||
{formatManualCollectSummary(
|
{formatManualCollectSummary(
|
||||||
collectResultByRiotMatchMutation.data,
|
collectResultByRiotMatchMutation.data,
|
||||||
)}
|
)}
|
||||||
@@ -2328,9 +2481,9 @@ export default function MatchDetailPage() {
|
|||||||
{match.prizes.map((prize, index) => (
|
{match.prizes.map((prize, index) => (
|
||||||
<li
|
<li
|
||||||
key={index}
|
key={index}
|
||||||
className="flex items-start gap-2 text-[13px] text-base-content/60"
|
className="flex items-start gap-2 text-sm text-base-content/60"
|
||||||
>
|
>
|
||||||
<span className="text-amber-400 shrink-0 text-xs">▸</span>
|
<span className="text-accent shrink-0 text-xs">▸</span>
|
||||||
<span>{prize}</span>
|
<span>{prize}</span>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
@@ -2344,9 +2497,9 @@ export default function MatchDetailPage() {
|
|||||||
{match.notices.map((notice, index) => (
|
{match.notices.map((notice, index) => (
|
||||||
<li
|
<li
|
||||||
key={index}
|
key={index}
|
||||||
className="flex items-start gap-2 text-[13px] text-base-content/60"
|
className="flex items-start gap-2 text-sm text-base-content/60"
|
||||||
>
|
>
|
||||||
<span className="text-base-content/20 shrink-0">•</span>
|
<span className="text-info shrink-0 font-bold">•</span>
|
||||||
<span>{notice}</span>
|
<span>{notice}</span>
|
||||||
</li>
|
</li>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ import {
|
|||||||
useMatch,
|
useMatch,
|
||||||
useUserHistoryProfile,
|
useUserHistoryProfile,
|
||||||
} from "../api/hooks";
|
} from "../api/hooks";
|
||||||
import { formatKoreanDate, formatTierLabel } from "../api/mappers";
|
import { formatKoreanDate } from "../api/mappers";
|
||||||
|
import { RankBadge } from "../components/RankBadge";
|
||||||
import type {
|
import type {
|
||||||
ApiMatch,
|
ApiMatch,
|
||||||
ApiMatchGameResult,
|
ApiMatchGameResult,
|
||||||
@@ -45,94 +46,6 @@ function tierByQueue(tiers: ApiTierInfo[], queueType: string) {
|
|||||||
return tiers.find((tier) => tier.queueType === queueType);
|
return tiers.find((tier) => tier.queueType === queueType);
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeRank(rank: string | undefined) {
|
|
||||||
switch (rank) {
|
|
||||||
case "I":
|
|
||||||
return "1";
|
|
||||||
case "II":
|
|
||||||
return "2";
|
|
||||||
case "III":
|
|
||||||
return "3";
|
|
||||||
case "IV":
|
|
||||||
return "4";
|
|
||||||
default:
|
|
||||||
return rank;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatRankTooltip(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return "언랭크";
|
|
||||||
const highTier = ["MASTER", "GRANDMASTER", "CHALLENGER"].includes(tier.tier);
|
|
||||||
const normalizedTier = {
|
|
||||||
...tier,
|
|
||||||
rank: normalizeRank(tier.rank) ?? tier.rank,
|
|
||||||
};
|
|
||||||
const label = highTier
|
|
||||||
? formatTierLabel({ ...normalizedTier, leaguePoints: 0 })
|
|
||||||
: formatTierLabel(normalizedTier);
|
|
||||||
return `${label} - ${tier.leaguePoints}LP`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatRankBadge(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return "U";
|
|
||||||
const tierInitial =
|
|
||||||
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
|
|
||||||
const rank = normalizeRank(tier.rank);
|
|
||||||
return rank ? `${tierInitial}${rank}` : tierInitial;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
|
||||||
switch (tier?.tier) {
|
|
||||||
case "CHALLENGER":
|
|
||||||
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
|
|
||||||
|
|
||||||
case "GRANDMASTER":
|
|
||||||
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
|
|
||||||
|
|
||||||
case "MASTER":
|
|
||||||
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
|
|
||||||
|
|
||||||
case "DIAMOND":
|
|
||||||
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
|
|
||||||
|
|
||||||
case "EMERALD":
|
|
||||||
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
|
|
||||||
|
|
||||||
case "PLATINUM":
|
|
||||||
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
|
|
||||||
|
|
||||||
case "GOLD":
|
|
||||||
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
|
|
||||||
|
|
||||||
case "SILVER":
|
|
||||||
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
|
|
||||||
|
|
||||||
case "BRONZE":
|
|
||||||
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
|
|
||||||
|
|
||||||
case "IRON":
|
|
||||||
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
|
|
||||||
|
|
||||||
default:
|
|
||||||
return "border-base-content/30 bg-transparent text-base-content/50";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
const tooltip = formatRankTooltip(tier);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<span className="tooltip tooltip-left" data-tip={tooltip}>
|
|
||||||
<span
|
|
||||||
className={`inline-flex h-[17px] min-w-[18px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
|
|
||||||
aria-label={tooltip}
|
|
||||||
>
|
|
||||||
{formatRankBadge(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function SummonerStatsSummary({
|
function SummonerStatsSummary({
|
||||||
assignedPosition,
|
assignedPosition,
|
||||||
fallbackTier,
|
fallbackTier,
|
||||||
@@ -151,17 +64,17 @@ function SummonerStatsSummary({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="ml-auto flex min-w-[148px] shrink-0 flex-col items-end text-right leading-tight">
|
<div className="ml-auto flex min-w-[148px] shrink-0 flex-col items-end text-right leading-tight">
|
||||||
<div className="text-[11px] font-black text-primary">
|
<div className="text-xs font-black text-primary">
|
||||||
{assignedPosition ? positionLabel[assignedPosition] : "-"}
|
{assignedPosition ? positionLabel[assignedPosition] : "-"}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-1 flex items-center justify-end gap-2 text-[10px] font-black text-base-content/35">
|
<div className="mt-1 flex items-center justify-end gap-2 text-xs font-black text-base-content/35">
|
||||||
<span className="inline-flex items-center gap-1">
|
<span className="inline-flex items-center gap-1">
|
||||||
<span>SOLO</span>
|
<span>SOLO</span>
|
||||||
<RankBadge tier={soloTier} />
|
<RankBadge tier={soloTier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
<span className="inline-flex items-center gap-1">
|
<span className="inline-flex items-center gap-1">
|
||||||
<span>FLEX</span>
|
<span>FLEX</span>
|
||||||
<RankBadge tier={flexTier} />
|
<RankBadge tier={flexTier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -216,12 +129,12 @@ function ParticipantLine({
|
|||||||
{name}
|
{name}
|
||||||
</span>
|
</span>
|
||||||
{isCaptain && (
|
{isCaptain && (
|
||||||
<span className="shrink-0 border border-amber-500/20 bg-amber-500/10 px-1.5 py-0.5 text-[10px] font-bold text-amber-500">
|
<span className="shrink-0 border border-amber-500/20 bg-amber-500/10 px-1.5 py-0.5 text-xs font-bold text-amber-500">
|
||||||
팀장
|
팀장
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[11px] text-base-content/30">#{tag}</div>
|
<div className="text-xs text-base-content/30">#{tag}</div>
|
||||||
</div>
|
</div>
|
||||||
<SummonerStatsSummary
|
<SummonerStatsSummary
|
||||||
assignedPosition={assignedPosition}
|
assignedPosition={assignedPosition}
|
||||||
@@ -305,7 +218,7 @@ function UpcomingGameCard({
|
|||||||
<div className="flex items-center justify-between gap-2">
|
<div className="flex items-center justify-between gap-2">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<span
|
<span
|
||||||
className={`border px-2 py-1 text-[11px] font-black ${
|
className={`border px-2 py-1 text-xs font-black ${
|
||||||
isNext
|
isNext
|
||||||
? "border-primary/25 bg-primary/10 text-primary"
|
? "border-primary/25 bg-primary/10 text-primary"
|
||||||
: "border-base-content/10 bg-base-content/5 text-base-content/55"
|
: "border-base-content/10 bg-base-content/5 text-base-content/55"
|
||||||
@@ -313,14 +226,14 @@ function UpcomingGameCard({
|
|||||||
>
|
>
|
||||||
{isNext ? "다음 경기" : `${slot.gameNumber}경기`}
|
{isNext ? "다음 경기" : `${slot.gameNumber}경기`}
|
||||||
</span>
|
</span>
|
||||||
<span className="text-[11px] font-semibold text-base-content/35">
|
<span className="text-xs font-semibold text-base-content/35">
|
||||||
{sideShortLabel(ourSide)}
|
{sideShortLabel(ourSide)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
{finished ? (
|
{finished ? (
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<span
|
<span
|
||||||
className={`border px-2 py-1 text-[11px] font-black ${resultBadgeClass(won)}`}
|
className={`border px-2 py-1 text-xs font-black ${resultBadgeClass(won)}`}
|
||||||
>
|
>
|
||||||
{won ? "승리" : "패배"}
|
{won ? "승리" : "패배"}
|
||||||
</span>
|
</span>
|
||||||
@@ -361,12 +274,12 @@ function UpcomingGameCard({
|
|||||||
{ourTeamName}
|
{ourTeamName}
|
||||||
</div>
|
</div>
|
||||||
{ourCaptainName && (
|
{ourCaptainName && (
|
||||||
<div className="mt-1 truncate text-[11px] text-base-content/35">
|
<div className="mt-1 truncate text-xs text-base-content/35">
|
||||||
팀장 {ourCaptainName}
|
팀장 {ourCaptainName}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
<div className="pt-0.5 text-[10px] font-black uppercase tracking-wider text-base-content/25">
|
<div className="pt-0.5 text-xs font-black uppercase tracking-wider text-base-content/25">
|
||||||
vs
|
vs
|
||||||
</div>
|
</div>
|
||||||
<div className="min-w-0 text-right">
|
<div className="min-w-0 text-right">
|
||||||
@@ -374,7 +287,7 @@ function UpcomingGameCard({
|
|||||||
{opponentTeamName}
|
{opponentTeamName}
|
||||||
</div>
|
</div>
|
||||||
{opponentCaptainName && (
|
{opponentCaptainName && (
|
||||||
<div className="mt-1 truncate text-[11px] text-base-content/35">
|
<div className="mt-1 truncate text-xs text-base-content/35">
|
||||||
팀장 {opponentCaptainName}
|
팀장 {opponentCaptainName}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -382,25 +295,25 @@ function UpcomingGameCard({
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="mt-4 border border-base-content/8 bg-base-content/[0.02] px-3 py-2">
|
<div className="mt-4 border border-base-content/8 bg-base-content/[0.02] px-3 py-2">
|
||||||
<div className="text-[10px] font-black uppercase tracking-wider text-base-content/35">
|
<div className="text-xs font-black uppercase tracking-wider text-base-content/35">
|
||||||
토너먼트 코드
|
토너먼트 코드
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-1 flex items-center gap-2">
|
<div className="mt-1 flex items-center gap-2">
|
||||||
{slot.code ? (
|
{slot.code ? (
|
||||||
<>
|
<>
|
||||||
<code className="min-w-0 flex-1 truncate font-mono text-[12px] font-black text-primary">
|
<code className="min-w-0 flex-1 truncate font-mono text-xs font-black text-primary">
|
||||||
{slot.code}
|
{slot.code}
|
||||||
</code>
|
</code>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="border border-base-content/10 px-2 py-1 text-[10px] font-bold text-base-content/45 hover:text-primary"
|
className="border border-base-content/10 px-2 py-1 text-xs font-bold text-base-content/45 hover:text-primary"
|
||||||
onClick={handleCopy}
|
onClick={handleCopy}
|
||||||
>
|
>
|
||||||
{copied ? "복사됨" : "복사"}
|
{copied ? "복사됨" : "복사"}
|
||||||
</button>
|
</button>
|
||||||
</>
|
</>
|
||||||
) : (
|
) : (
|
||||||
<span className="text-[12px] font-semibold text-base-content/30">
|
<span className="text-xs font-semibold text-base-content/30">
|
||||||
발급 대기
|
발급 대기
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
@@ -411,14 +324,14 @@ function UpcomingGameCard({
|
|||||||
<div className="mt-3 border border-base-content/8 bg-base-content/[0.015]">
|
<div className="mt-3 border border-base-content/8 bg-base-content/[0.015]">
|
||||||
<div className="flex items-center justify-between gap-2 border-b border-base-content/8 px-3 py-2">
|
<div className="flex items-center justify-between gap-2 border-b border-base-content/8 px-3 py-2">
|
||||||
<div>
|
<div>
|
||||||
<div className="text-[11px] font-black text-base-content/55">
|
<div className="text-xs font-black text-base-content/55">
|
||||||
상대팀 멤버
|
상대팀 멤버
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-0.5 text-[10px] text-base-content/30">
|
<div className="mt-0.5 text-xs text-base-content/30">
|
||||||
라인 · 티어
|
라인 · 티어
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="truncate text-right text-[11px] font-bold text-base-content/45">
|
<div className="truncate text-right text-xs font-bold text-base-content/45">
|
||||||
{opponentTeamName}
|
{opponentTeamName}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -442,7 +355,7 @@ function UpcomingGameCard({
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{finished && game?.riotMatchId && (
|
{finished && game?.riotMatchId && (
|
||||||
<div className="mt-2 truncate font-mono text-[10px] text-base-content/25">
|
<div className="mt-2 truncate font-mono text-xs text-base-content/25">
|
||||||
{game.riotMatchId}
|
{game.riotMatchId}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -482,14 +395,14 @@ function TeamGameCardsSection({
|
|||||||
return (
|
return (
|
||||||
<section className="mb-4 border border-base-content/10 bg-base-100">
|
<section className="mb-4 border border-base-content/10 bg-base-100">
|
||||||
<div className="flex flex-col gap-1 border-b border-base-content/10 bg-base-200/40 px-4 py-3 sm:flex-row sm:items-center sm:justify-between">
|
<div className="flex flex-col gap-1 border-b border-base-content/10 bg-base-200/40 px-4 py-3 sm:flex-row sm:items-center sm:justify-between">
|
||||||
<h2 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
<h2 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
|
||||||
{title}
|
{title}
|
||||||
</h2>
|
</h2>
|
||||||
<div className="sm:text-right">
|
<div className="sm:text-right">
|
||||||
<div className="text-sm font-black text-base-content/70">
|
<div className="text-sm font-black text-base-content/70">
|
||||||
{formatted.date} {formatted.time}
|
{formatted.date} {formatted.time}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-0.5 text-[11px] font-semibold text-base-content/35">
|
<div className="mt-0.5 text-xs font-semibold text-base-content/35">
|
||||||
{GAME_MODE_LABEL[match.gameMode]}
|
{GAME_MODE_LABEL[match.gameMode]}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -685,7 +598,7 @@ export default function MatchTeamProgressPage() {
|
|||||||
|
|
||||||
<section className="border border-base-content/10 bg-base-100">
|
<section className="border border-base-content/10 bg-base-100">
|
||||||
<div className="border-b border-base-content/10 bg-base-200/40 px-4 py-2">
|
<div className="border-b border-base-content/10 bg-base-200/40 px-4 py-2">
|
||||||
<h2 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
<h2 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
|
||||||
팀 구성
|
팀 구성
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ import { useRiotRefreshSocket } from "../api/useRiotRefreshSocket";
|
|||||||
import type {
|
import type {
|
||||||
ApiChampionStatsRow,
|
ApiChampionStatsRow,
|
||||||
ApiEnqueueRefreshResult,
|
ApiEnqueueRefreshResult,
|
||||||
ApiTierInfo,
|
|
||||||
ApiRiotRefreshEvent,
|
ApiRiotRefreshEvent,
|
||||||
ApiRecentMatchTeam,
|
ApiRecentMatchTeam,
|
||||||
ApiRecentMatchTeamParticipant,
|
ApiRecentMatchTeamParticipant,
|
||||||
@@ -43,6 +42,7 @@ import {
|
|||||||
QUEUE_GROUP_TABS,
|
QUEUE_GROUP_TABS,
|
||||||
RANK_FILTER_TABS,
|
RANK_FILTER_TABS,
|
||||||
} from "../lib/riot-history";
|
} from "../lib/riot-history";
|
||||||
|
import { ResponsiveTierLabel } from "../components/RankBadge";
|
||||||
// recharts가 무거워 메인 번들에서 분리한다 (전적 페이지에서만 로드).
|
// recharts가 무거워 메인 번들에서 분리한다 (전적 페이지에서만 로드).
|
||||||
const TierHistoryChart = lazy(() => import("../components/TierHistoryChart"));
|
const TierHistoryChart = lazy(() => import("../components/TierHistoryChart"));
|
||||||
|
|
||||||
@@ -59,19 +59,6 @@ const SORT_LABELS: Record<ChampionSortKey, string> = {
|
|||||||
avgCsPerMin: "분당 CS",
|
avgCsPerMin: "분당 CS",
|
||||||
};
|
};
|
||||||
|
|
||||||
const TIER_NAMES: Record<string, string> = {
|
|
||||||
IRON: "아이언",
|
|
||||||
BRONZE: "브론즈",
|
|
||||||
SILVER: "실버",
|
|
||||||
GOLD: "골드",
|
|
||||||
PLATINUM: "플래티넘",
|
|
||||||
EMERALD: "에메랄드",
|
|
||||||
DIAMOND: "다이아몬드",
|
|
||||||
MASTER: "마스터",
|
|
||||||
GRANDMASTER: "그랜드마스터",
|
|
||||||
CHALLENGER: "챌린저",
|
|
||||||
};
|
|
||||||
|
|
||||||
function resolveBackTo(state: unknown) {
|
function resolveBackTo(state: unknown) {
|
||||||
if (!state || typeof state !== "object") return "/";
|
if (!state || typeof state !== "object") return "/";
|
||||||
const backTo = (state as HistoryLocationState).backTo;
|
const backTo = (state as HistoryLocationState).backTo;
|
||||||
@@ -85,90 +72,6 @@ function resolveBackTo(state: unknown) {
|
|||||||
return backTo;
|
return backTo;
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeRank(rank: string | undefined) {
|
|
||||||
switch (rank) {
|
|
||||||
case "I":
|
|
||||||
return "1";
|
|
||||||
case "II":
|
|
||||||
return "2";
|
|
||||||
case "III":
|
|
||||||
return "3";
|
|
||||||
case "IV":
|
|
||||||
return "4";
|
|
||||||
default:
|
|
||||||
return rank;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatRankBadge(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return "U";
|
|
||||||
const tierInitial =
|
|
||||||
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
|
|
||||||
const rank = normalizeRank(tier.rank);
|
|
||||||
return rank ? `${tierInitial}${rank}` : tierInitial;
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatRankDetail(tier: ApiTierInfo | undefined) {
|
|
||||||
if (!tier) return "랭크 정보 없음";
|
|
||||||
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
|
|
||||||
const rank = normalizeRank(tier.rank);
|
|
||||||
const label = rank ? `${tierName} ${rank}` : tierName;
|
|
||||||
return `${label} - ${tier.leaguePoints} LP`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function rankBadgeClass(tier: ApiTierInfo | undefined) {
|
|
||||||
switch (tier?.tier) {
|
|
||||||
case "CHALLENGER":
|
|
||||||
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
|
|
||||||
case "GRANDMASTER":
|
|
||||||
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
|
|
||||||
case "MASTER":
|
|
||||||
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
|
|
||||||
case "DIAMOND":
|
|
||||||
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
|
|
||||||
case "EMERALD":
|
|
||||||
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
|
|
||||||
case "PLATINUM":
|
|
||||||
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
|
|
||||||
case "GOLD":
|
|
||||||
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
|
|
||||||
case "SILVER":
|
|
||||||
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
|
|
||||||
case "BRONZE":
|
|
||||||
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
|
|
||||||
case "IRON":
|
|
||||||
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
|
|
||||||
default:
|
|
||||||
return "border-base-content/30 bg-transparent text-base-content/50";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
const tooltip = formatRankDetail(tier);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<span className="tooltip tooltip-bottom" data-tip={tooltip}>
|
|
||||||
<span
|
|
||||||
className={`inline-flex h-[18px] min-w-[20px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
|
|
||||||
aria-label={tooltip}
|
|
||||||
>
|
|
||||||
{formatRankBadge(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) {
|
|
||||||
return (
|
|
||||||
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
|
|
||||||
<RankBadge tier={tier} />
|
|
||||||
<span className="hidden font-bold text-base-content/55 sm:inline">
|
|
||||||
{formatRankDetail(tier)}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function formatDuration(seconds: number) {
|
function formatDuration(seconds: number) {
|
||||||
const minutes = Math.floor(seconds / 60);
|
const minutes = Math.floor(seconds / 60);
|
||||||
const rest = seconds % 60;
|
const rest = seconds % 60;
|
||||||
@@ -240,7 +143,7 @@ function FilterButton({
|
|||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
onClick={onClick}
|
onClick={onClick}
|
||||||
className={`px-3 py-2 text-[12px] font-semibold border-b-2 transition-colors ${
|
className={`px-3 py-2 text-xs font-semibold border-b-2 transition-colors ${
|
||||||
active
|
active
|
||||||
? "border-primary text-primary bg-primary/5"
|
? "border-primary text-primary bg-primary/5"
|
||||||
: "border-transparent text-base-content/45 hover:text-base-content"
|
: "border-transparent text-base-content/45 hover:text-base-content"
|
||||||
@@ -291,14 +194,14 @@ function SummaryCard({
|
|||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<div className="border border-base-content/8 bg-base-100 p-4">
|
<div className="border border-base-content/8 bg-base-100 p-4">
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/30">
|
<div className="text-xs font-bold uppercase tracking-wider text-base-content/30">
|
||||||
{label}
|
{label}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2 text-2xl font-black text-base-content tabular-nums">
|
<div className="mt-2 text-2xl font-black text-base-content tabular-nums">
|
||||||
{value}
|
{value}
|
||||||
</div>
|
</div>
|
||||||
{sub && (
|
{sub && (
|
||||||
<div className="mt-1 text-[11px] text-base-content/40">{sub}</div>
|
<div className="mt-1 text-xs text-base-content/40">{sub}</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -328,7 +231,7 @@ function ChampionStatsTable({
|
|||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<table className="w-full text-left min-w-[860px]">
|
<table className="w-full text-left min-w-[860px]">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="bg-base-200/50 border-b border-base-content/10 text-[11px] text-base-content/35 uppercase tracking-wider">
|
<tr className="bg-base-200/50 border-b border-base-content/10 text-xs text-base-content/35 uppercase tracking-wider">
|
||||||
<th className="px-3 py-2.5">챔피언</th>
|
<th className="px-3 py-2.5">챔피언</th>
|
||||||
<th className="px-3 py-2.5 text-center">승률</th>
|
<th className="px-3 py-2.5 text-center">승률</th>
|
||||||
<th className="px-3 py-2.5 text-center">게임</th>
|
<th className="px-3 py-2.5 text-center">게임</th>
|
||||||
@@ -359,48 +262,48 @@ function ChampionStatsTable({
|
|||||||
championId={row.championId}
|
championId={row.championId}
|
||||||
manifest={manifest}
|
manifest={manifest}
|
||||||
/>
|
/>
|
||||||
<span className="text-[13px] font-bold text-base-content">
|
<span className="text-sm font-bold text-base-content">
|
||||||
{displayName}
|
{displayName}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
className={`px-3 py-2.5 text-center text-[13px] font-bold ${ratioClass(row.winRate)}`}
|
className={`px-3 py-2.5 text-center text-sm font-bold ${ratioClass(row.winRate)}`}
|
||||||
>
|
>
|
||||||
{row.winRate}%
|
{row.winRate}%
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
|
||||||
{row.games}
|
{row.games}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums text-base-content/55">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums text-base-content/55">
|
||||||
<span className="text-blue-400">{row.wins}</span> /{" "}
|
<span className="text-blue-400">{row.wins}</span> /{" "}
|
||||||
<span className="text-red-400">{row.losses}</span>
|
<span className="text-red-400">{row.losses}</span>
|
||||||
</td>
|
</td>
|
||||||
<td
|
<td
|
||||||
className={`px-3 py-2.5 text-center text-[13px] font-bold tabular-nums ${kdaClass(row.kda)}`}
|
className={`px-3 py-2.5 text-center text-sm font-bold tabular-nums ${kdaClass(row.kda)}`}
|
||||||
>
|
>
|
||||||
{row.kda}
|
{row.kda}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
|
||||||
{row.totalKills}
|
{row.totalKills}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
|
||||||
{row.totalDeaths}
|
{row.totalDeaths}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
|
||||||
{row.totalAssists}
|
{row.totalAssists}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums text-base-content/55">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums text-base-content/55">
|
||||||
{row.doubleKills}/{row.tripleKills}/{row.quadraKills}/
|
{row.doubleKills}/{row.tripleKills}/{row.quadraKills}/
|
||||||
{row.pentaKills}
|
{row.pentaKills}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
|
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
|
||||||
{row.avgCs} · {row.avgCsPerMin}/m
|
{row.avgCs} · {row.avgCsPerMin}/m
|
||||||
</td>
|
</td>
|
||||||
<td className="px-3 py-2.5 text-center">
|
<td className="px-3 py-2.5 text-center">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className={`text-[11px] px-2 py-1 border ${
|
className={`text-xs px-2 py-1 border ${
|
||||||
selected
|
selected
|
||||||
? "border-primary/40 bg-primary/10 text-primary"
|
? "border-primary/40 bg-primary/10 text-primary"
|
||||||
: "border-base-content/10 text-base-content/40 hover:text-base-content"
|
: "border-base-content/10 text-base-content/40 hover:text-base-content"
|
||||||
@@ -471,7 +374,7 @@ function TeamMini({
|
|||||||
manifest: DdragonManifest | null | undefined;
|
manifest: DdragonManifest | null | undefined;
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<div className="grid sm:grid-cols-2 gap-2 text-[11px]">
|
<div className="grid sm:grid-cols-2 gap-2 text-xs">
|
||||||
{match.teams.map((team) => (
|
{match.teams.map((team) => (
|
||||||
<div
|
<div
|
||||||
key={`${match.matchId}-${team.side}`}
|
key={`${match.matchId}-${team.side}`}
|
||||||
@@ -596,7 +499,7 @@ function DetailStatBar({
|
|||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<div className="flex items-center justify-between gap-2 text-[10px] text-base-content/45">
|
<div className="flex items-center justify-between gap-2 text-xs text-base-content/45">
|
||||||
<span>{label}</span>
|
<span>{label}</span>
|
||||||
<span className="font-bold text-base-content/70 tabular-nums">
|
<span className="font-bold text-base-content/70 tabular-nums">
|
||||||
{formatCompactNumber(value)}
|
{formatCompactNumber(value)}
|
||||||
@@ -621,15 +524,15 @@ function TeamHeader({ team }: { team: ApiRecentMatchTeam }) {
|
|||||||
<div className="px-3 py-2 flex flex-wrap items-center justify-between gap-2 border-b border-base-content/10">
|
<div className="px-3 py-2 flex flex-wrap items-center justify-between gap-2 border-b border-base-content/10">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
<span
|
<span
|
||||||
className={`text-[11px] font-black uppercase tracking-wider ${sideClass}`}
|
className={`text-xs font-black uppercase tracking-wider ${sideClass}`}
|
||||||
>
|
>
|
||||||
{sideLabel}
|
{sideLabel}
|
||||||
</span>
|
</span>
|
||||||
<span className={`text-[11px] font-black ${resultClass}`}>
|
<span className={`text-xs font-black ${resultClass}`}>
|
||||||
{team.win ? "승리" : "패배"}
|
{team.win ? "승리" : "패배"}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex items-center gap-3 text-[11px] text-base-content/45">
|
<div className="flex items-center gap-3 text-xs text-base-content/45">
|
||||||
<span>드래곤 {team.objectives?.dragon ?? 0}</span>
|
<span>드래곤 {team.objectives?.dragon ?? 0}</span>
|
||||||
<span>바론 {team.objectives?.baron ?? 0}</span>
|
<span>바론 {team.objectives?.baron ?? 0}</span>
|
||||||
<span>타워 {team.objectives?.tower ?? 0}</span>
|
<span>타워 {team.objectives?.tower ?? 0}</span>
|
||||||
@@ -662,7 +565,7 @@ function ParticipantRow({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={`grid min-w-[920px] grid-cols-[260px_86px_132px_220px_164px] gap-3 items-center border-b border-base-content/5 border-l-2 px-3 py-2 text-[11px] last:border-b-0 ${
|
className={`grid min-w-[920px] grid-cols-[260px_86px_132px_220px_164px] gap-3 items-center border-b border-base-content/5 border-l-2 px-3 py-2 text-xs last:border-b-0 ${
|
||||||
isOwner
|
isOwner
|
||||||
? "border-l-primary bg-primary/[0.05]"
|
? "border-l-primary bg-primary/[0.05]"
|
||||||
: "border-l-transparent hover:bg-base-content/[0.02]"
|
: "border-l-transparent hover:bg-base-content/[0.02]"
|
||||||
@@ -679,7 +582,7 @@ function ParticipantRow({
|
|||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
{participant.championLevel > 0 && (
|
{participant.championLevel > 0 && (
|
||||||
<span className="absolute bottom-0 right-0 min-w-4 bg-base-300 px-1 text-center text-[9px] font-black leading-4 text-base-content">
|
<span className="absolute bottom-0 right-0 min-w-4 bg-base-300 px-1 text-center text-xs font-black leading-4 text-base-content">
|
||||||
{participant.championLevel}
|
{participant.championLevel}
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
@@ -713,7 +616,7 @@ function ParticipantRow({
|
|||||||
>
|
>
|
||||||
{participantName}
|
{participantName}
|
||||||
</div>
|
</div>
|
||||||
<div className="truncate text-[10px] text-base-content/35">
|
<div className="truncate text-xs text-base-content/35">
|
||||||
{participant.tagLine ? `#${participant.tagLine} · ` : ""}
|
{participant.tagLine ? `#${participant.tagLine} · ` : ""}
|
||||||
{(LANE_LABELS[participant.teamPosition] ?? participant.teamPosition) ||
|
{(LANE_LABELS[participant.teamPosition] ?? participant.teamPosition) ||
|
||||||
"포지션 없음"}
|
"포지션 없음"}
|
||||||
@@ -729,13 +632,13 @@ function ParticipantRow({
|
|||||||
<span className="text-base-content/25"> / </span>
|
<span className="text-base-content/25"> / </span>
|
||||||
{participant.assists}
|
{participant.assists}
|
||||||
</div>
|
</div>
|
||||||
<div className={`mt-0.5 text-[10px] font-bold ${kdaClass(kda)}`}>
|
<div className={`mt-0.5 text-xs font-bold ${kdaClass(kda)}`}>
|
||||||
{participant.deaths === 0 ? "Perfect" : `${kda} KDA`}
|
{participant.deaths === 0 ? "Perfect" : `${kda} KDA`}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="space-y-2 tabular-nums">
|
<div className="space-y-2 tabular-nums">
|
||||||
<div className="flex items-center justify-between gap-2 text-[10px] text-base-content/45">
|
<div className="flex items-center justify-between gap-2 text-xs text-base-content/45">
|
||||||
<span>CS</span>
|
<span>CS</span>
|
||||||
<span className="font-bold text-base-content/70">
|
<span className="font-bold text-base-content/70">
|
||||||
{participant.totalCs} ({participant.csPerMin}/m)
|
{participant.totalCs} ({participant.csPerMin}/m)
|
||||||
@@ -764,7 +667,7 @@ function ParticipantRow({
|
|||||||
fillClass="bg-base-content/35"
|
fillClass="bg-base-content/35"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[10px] text-base-content/40">
|
<div className="text-xs text-base-content/40">
|
||||||
시야 {participant.visionScore} · 와드 {participant.wardsPlaced}/
|
시야 {participant.visionScore} · 와드 {participant.wardsPlaced}/
|
||||||
{participant.wardsKilled} · 제어 {participant.controlWardsBought}
|
{participant.wardsKilled} · 제어 {participant.controlWardsBought}
|
||||||
</div>
|
</div>
|
||||||
@@ -803,7 +706,7 @@ function MatchDetailPanel({
|
|||||||
|
|
||||||
if (participants.length === 0) {
|
if (participants.length === 0) {
|
||||||
return (
|
return (
|
||||||
<div className="p-4 text-center text-[12px] text-base-content/35">
|
<div className="p-4 text-center text-xs text-base-content/35">
|
||||||
이 경기의 상세 팀 데이터가 아직 없습니다.
|
이 경기의 상세 팀 데이터가 아직 없습니다.
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
@@ -818,7 +721,7 @@ function MatchDetailPanel({
|
|||||||
>
|
>
|
||||||
<TeamHeader team={team} />
|
<TeamHeader team={team} />
|
||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<div className="grid min-w-[920px] grid-cols-[260px_86px_132px_220px_164px] gap-3 border-b border-base-content/10 bg-base-200/40 px-3 py-2 text-[10px] font-black uppercase tracking-wider text-base-content/35">
|
<div className="grid min-w-[920px] grid-cols-[260px_86px_132px_220px_164px] gap-3 border-b border-base-content/10 bg-base-200/40 px-3 py-2 text-xs font-black uppercase tracking-wider text-base-content/35">
|
||||||
<div>소환사</div>
|
<div>소환사</div>
|
||||||
<div className="text-center">KDA</div>
|
<div className="text-center">KDA</div>
|
||||||
<div>CS · 골드</div>
|
<div>CS · 골드</div>
|
||||||
@@ -863,16 +766,16 @@ function RecentMatchCard({
|
|||||||
>
|
>
|
||||||
<div className="p-4 grid lg:grid-cols-[120px_1fr_120px_1.5fr_40px] gap-4 items-center">
|
<div className="p-4 grid lg:grid-cols-[120px_1fr_120px_1.5fr_40px] gap-4 items-center">
|
||||||
<div className="text-center lg:text-left">
|
<div className="text-center lg:text-left">
|
||||||
<div className={`text-[12px] font-black ${resultClass}`}>
|
<div className={`text-xs font-black ${resultClass}`}>
|
||||||
{match.remake ? "다시하기" : match.win ? "승리" : "패배"}
|
{match.remake ? "다시하기" : match.win ? "승리" : "패배"}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[11px] text-base-content/35 mt-1">
|
<div className="text-xs text-base-content/35 mt-1">
|
||||||
{match.queueLabel}
|
{match.queueLabel}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[11px] text-base-content/25">
|
<div className="text-xs text-base-content/25">
|
||||||
{formatDate(match.gameCreation)}
|
{formatDate(match.gameCreation)}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[11px] text-base-content/25">
|
<div className="text-xs text-base-content/25">
|
||||||
{formatDuration(match.gameDuration)}
|
{formatDuration(match.gameDuration)}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -887,7 +790,7 @@ function RecentMatchCard({
|
|||||||
<div className="font-bold text-base-content truncate">
|
<div className="font-bold text-base-content truncate">
|
||||||
{championName}
|
{championName}
|
||||||
</div>
|
</div>
|
||||||
<div className="text-[11px] text-base-content/35">
|
<div className="text-xs text-base-content/35">
|
||||||
Lv.{match.championLevel} ·{" "}
|
Lv.{match.championLevel} ·{" "}
|
||||||
{(LANE_LABELS[match.teamPosition] ?? match.teamPosition) ||
|
{(LANE_LABELS[match.teamPosition] ?? match.teamPosition) ||
|
||||||
"포지션 없음"}
|
"포지션 없음"}
|
||||||
@@ -911,17 +814,17 @@ function RecentMatchCard({
|
|||||||
<span>{match.assists}</span>
|
<span>{match.assists}</span>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
className={`text-[12px] font-bold tabular-nums ${kdaClass(match.kda)}`}
|
className={`text-xs font-bold tabular-nums ${kdaClass(match.kda)}`}
|
||||||
>
|
>
|
||||||
{match.deaths === 0 ? "Perfect" : `${match.kda} 평점`}
|
{match.deaths === 0 ? "Perfect" : `${match.kda} 평점`}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-1 text-[11px] text-base-content/35">
|
<div className="mt-1 text-xs text-base-content/35">
|
||||||
킬 관여 {match.killParticipation}%
|
킬 관여 {match.killParticipation}%
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="grid sm:grid-cols-[100px_1fr] gap-4 items-center">
|
<div className="grid sm:grid-cols-[100px_1fr] gap-4 items-center">
|
||||||
<div className="space-y-1 text-[11px] text-base-content/45">
|
<div className="space-y-1 text-xs text-base-content/45">
|
||||||
<div>
|
<div>
|
||||||
CS{" "}
|
CS{" "}
|
||||||
<span className="font-bold text-base-content/70">
|
<span className="font-bold text-base-content/70">
|
||||||
@@ -962,7 +865,7 @@ function RecentMatchCard({
|
|||||||
aria-expanded={expanded}
|
aria-expanded={expanded}
|
||||||
aria-label={expanded ? "상세 전적 접기" : "상세 전적 펼치기"}
|
aria-label={expanded ? "상세 전적 접기" : "상세 전적 펼치기"}
|
||||||
>
|
>
|
||||||
<span className="text-[11px] font-bold lg:hidden">
|
<span className="text-xs font-bold lg:hidden">
|
||||||
{expanded ? "상세 접기" : "상세 보기"}
|
{expanded ? "상세 접기" : "상세 보기"}
|
||||||
</span>
|
</span>
|
||||||
{expanded ? (
|
{expanded ? (
|
||||||
@@ -1253,7 +1156,7 @@ export default function UserHistoryPage() {
|
|||||||
<span>최근 저장: {formatLastFetched(profile.lastFetchedAt)}</span>
|
<span>최근 저장: {formatLastFetched(profile.lastFetchedAt)}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="border border-dashed border-base-content/10 px-3 py-2 text-[11px] text-base-content/35 sm:text-right space-y-2">
|
<div className="border border-dashed border-base-content/10 px-3 py-2 text-xs text-base-content/35 sm:text-right space-y-2">
|
||||||
<div>
|
<div>
|
||||||
{isInternalQueue ? (
|
{isInternalQueue ? (
|
||||||
<>
|
<>
|
||||||
@@ -1283,7 +1186,7 @@ export default function UserHistoryPage() {
|
|||||||
: "정보 갱신"}
|
: "정보 갱신"}
|
||||||
</button>
|
</button>
|
||||||
{!isInternalQueue && (
|
{!isInternalQueue && (
|
||||||
<div className="text-[10px] text-base-content/25">
|
<div className="text-xs text-base-content/25">
|
||||||
갱신 소켓: {refreshSocket.connectionStatus}
|
갱신 소켓: {refreshSocket.connectionStatus}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
@@ -1336,14 +1239,14 @@ export default function UserHistoryPage() {
|
|||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
) : (
|
) : (
|
||||||
<div className="px-3 py-2 text-[11px] text-base-content/40">
|
<div className="px-3 py-2 text-xs text-base-content/40">
|
||||||
내전 탭은 토너먼트 코드 결과 수집 데이터를 기준으로 집계합니다.
|
내전 탭은 토너먼트 코드 결과 수집 데이터를 기준으로 집계합니다.
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{selectedChampionName && (
|
{selectedChampionName && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="text-[11px] px-2.5 py-1 border border-primary/30 text-primary bg-primary/5"
|
className="text-xs px-2.5 py-1 border border-primary/30 text-primary bg-primary/5"
|
||||||
onClick={() => updateSearch({ championId: null })}
|
onClick={() => updateSearch({ championId: null })}
|
||||||
>
|
>
|
||||||
{selectedChampionName} 필터 해제
|
{selectedChampionName} 필터 해제
|
||||||
@@ -1401,7 +1304,7 @@ export default function UserHistoryPage() {
|
|||||||
sub="가장 최근 경기 기준"
|
sub="가장 최근 경기 기준"
|
||||||
/>
|
/>
|
||||||
<div className="border border-base-content/8 bg-base-100 p-4">
|
<div className="border border-base-content/8 bg-base-100 p-4">
|
||||||
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/30">
|
<div className="text-xs font-bold uppercase tracking-wider text-base-content/30">
|
||||||
자주 플레이한 챔피언
|
자주 플레이한 챔피언
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-3 flex items-center gap-3">
|
<div className="mt-3 flex items-center gap-3">
|
||||||
@@ -1418,13 +1321,13 @@ export default function UserHistoryPage() {
|
|||||||
championId={champion.championId}
|
championId={champion.championId}
|
||||||
manifest={ddragon}
|
manifest={ddragon}
|
||||||
/>
|
/>
|
||||||
<div className="mt-1 text-[10px] text-base-content/40 group-hover:text-primary">
|
<div className="mt-1 text-xs text-base-content/40 group-hover:text-primary">
|
||||||
{champion.winRate}%
|
{champion.winRate}%
|
||||||
</div>
|
</div>
|
||||||
</button>
|
</button>
|
||||||
))}
|
))}
|
||||||
{(summary?.topChampions ?? []).length === 0 && (
|
{(summary?.topChampions ?? []).length === 0 && (
|
||||||
<span className="text-[11px] text-base-content/25">
|
<span className="text-xs text-base-content/25">
|
||||||
기록 없음
|
기록 없음
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
@@ -1437,7 +1340,7 @@ export default function UserHistoryPage() {
|
|||||||
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-3 mb-3">
|
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-3 mb-3">
|
||||||
<div>
|
<div>
|
||||||
<h2 className="text-sm font-bold text-base-content">챔피언 통계</h2>
|
<h2 className="text-sm font-bold text-base-content">챔피언 통계</h2>
|
||||||
<p className="mt-1 text-[11px] text-base-content/35">
|
<p className="mt-1 text-xs text-base-content/35">
|
||||||
저장된 데이터를 기준으로 집계합니다. 최신 데이터가 반영되지 않을
|
저장된 데이터를 기준으로 집계합니다. 최신 데이터가 반영되지 않을
|
||||||
수 있습니다.
|
수 있습니다.
|
||||||
</p>
|
</p>
|
||||||
@@ -1477,7 +1380,7 @@ export default function UserHistoryPage() {
|
|||||||
<section>
|
<section>
|
||||||
<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-sm font-bold text-base-content">매치 히스토리</h2>
|
<h2 className="text-sm font-bold text-base-content">매치 히스토리</h2>
|
||||||
<span className="text-[11px] text-base-content/35">
|
<span className="text-xs text-base-content/35">
|
||||||
최근 저장: {formatLastFetched(historyLastFetchedAt)}
|
최근 저장: {formatLastFetched(historyLastFetchedAt)}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ function JobCard({
|
|||||||
<div className="border border-base-content/10 bg-base-100 p-4">
|
<div className="border border-base-content/10 bg-base-100 p-4">
|
||||||
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-3">
|
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-3">
|
||||||
<div>
|
<div>
|
||||||
<div className="text-[11px] font-mono text-base-content/35">
|
<div className="text-xs font-mono text-base-content/35">
|
||||||
{job.jobId}
|
{job.jobId}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-1 flex flex-wrap items-center gap-2">
|
<div className="mt-1 flex flex-wrap items-center gap-2">
|
||||||
@@ -92,7 +92,7 @@ function JobCard({
|
|||||||
style={{ width: `${progress(job)}%` }}
|
style={{ width: `${progress(job)}%` }}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2 flex flex-wrap justify-between gap-2 text-[11px] text-base-content/35">
|
<div className="mt-2 flex flex-wrap justify-between gap-2 text-xs text-base-content/35">
|
||||||
<span>
|
<span>
|
||||||
{formatDate(job.windowStart)} ~ {formatDate(job.windowEnd)}
|
{formatDate(job.windowStart)} ~ {formatDate(job.windowEnd)}
|
||||||
</span>
|
</span>
|
||||||
@@ -306,7 +306,7 @@ export default function LegacyImportPage() {
|
|||||||
<section className="border border-base-content/10 bg-base-100 overflow-hidden mb-6">
|
<section className="border border-base-content/10 bg-base-100 overflow-hidden mb-6">
|
||||||
<div className="px-4 py-3 border-b border-base-content/10">
|
<div className="px-4 py-3 border-b border-base-content/10">
|
||||||
<h2 className="text-sm font-bold">멤버별 윈도우</h2>
|
<h2 className="text-sm font-bold">멤버별 윈도우</h2>
|
||||||
<p className="mt-1 text-[11px] text-base-content/35">
|
<p className="mt-1 text-xs text-base-content/35">
|
||||||
기본 시작일은 2024-05-01이며, 필요하면 멤버별 시작/종료 시간을 조정할 수 있습니다.
|
기본 시작일은 2024-05-01이며, 필요하면 멤버별 시작/종료 시간을 조정할 수 있습니다.
|
||||||
비활성 멤버는 종료일이 마지막 업데이트 시각으로 잡힙니다.
|
비활성 멤버는 종료일이 마지막 업데이트 시각으로 잡힙니다.
|
||||||
</p>
|
</p>
|
||||||
@@ -314,7 +314,7 @@ export default function LegacyImportPage() {
|
|||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<table className="w-full min-w-[900px] text-left">
|
<table className="w-full min-w-[900px] text-left">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="bg-base-200/40 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/35">
|
<tr className="bg-base-200/40 border-b border-base-content/10 text-xs uppercase tracking-wider text-base-content/35">
|
||||||
<th className="px-3 py-2">멤버</th>
|
<th className="px-3 py-2">멤버</th>
|
||||||
<th className="px-3 py-2">Riot ID</th>
|
<th className="px-3 py-2">Riot ID</th>
|
||||||
<th className="px-3 py-2">상태</th>
|
<th className="px-3 py-2">상태</th>
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ export default function LegacyMatchesPage() {
|
|||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<table className="w-full min-w-[900px] text-left">
|
<table className="w-full min-w-[900px] text-left">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="bg-base-200/40 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/35">
|
<tr className="bg-base-200/40 border-b border-base-content/10 text-xs uppercase tracking-wider text-base-content/35">
|
||||||
<th className="px-3 py-2 w-8">
|
<th className="px-3 py-2 w-8">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
@@ -218,7 +218,7 @@ export default function LegacyMatchesPage() {
|
|||||||
<td className="px-3 py-2 text-right">
|
<td className="px-3 py-2 text-right">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="text-[11px] px-2 py-1 border border-red-500/20 text-red-400 hover:bg-red-500/10"
|
className="text-xs px-2 py-1 border border-red-500/20 text-red-400 hover:bg-red-500/10"
|
||||||
disabled={deleteMutation.isPending}
|
disabled={deleteMutation.isPending}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (!window.confirm('이 매치를 삭제할까요?')) return;
|
if (!window.confirm('이 매치를 삭제할까요?')) return;
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ const GAME_MODE_LABEL: Record<MatchGameMode, string> = {
|
|||||||
|
|
||||||
function RequiredBadge() {
|
function RequiredBadge() {
|
||||||
return (
|
return (
|
||||||
<span className="ml-1 inline-flex items-center border border-primary/20 bg-primary/5 px-1.5 py-0.5 text-[10px] font-bold text-primary">
|
<span className="ml-1 inline-flex items-center border border-primary/20 bg-primary/5 px-1.5 py-0.5 text-xs font-bold text-primary">
|
||||||
필수
|
필수
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
@@ -267,7 +267,7 @@ export default function MatchAdminPage() {
|
|||||||
</label>
|
</label>
|
||||||
<label className="text-xs text-base-content/45 md:col-span-2">
|
<label className="text-xs text-base-content/45 md:col-span-2">
|
||||||
설명
|
설명
|
||||||
<span className="ml-1 text-[10px] text-base-content/25">선택</span>
|
<span className="ml-1 text-xs text-base-content/25">선택</span>
|
||||||
<textarea
|
<textarea
|
||||||
value={form.description}
|
value={form.description}
|
||||||
onChange={(event) => setForm((current) => ({ ...current, description: event.target.value }))}
|
onChange={(event) => setForm((current) => ({ ...current, description: event.target.value }))}
|
||||||
@@ -319,7 +319,7 @@ export default function MatchAdminPage() {
|
|||||||
<option key={value} value={value}>{label}</option>
|
<option key={value} value={value}>{label}</option>
|
||||||
))}
|
))}
|
||||||
</select>
|
</select>
|
||||||
<span className="mt-1 block text-[10px] text-amber-500/80">
|
<span className="mt-1 block text-xs text-amber-500/80">
|
||||||
현재 경매/코드 연결은 페어 방식 기준으로 동작합니다.
|
현재 경매/코드 연결은 페어 방식 기준으로 동작합니다.
|
||||||
</span>
|
</span>
|
||||||
</label>
|
</label>
|
||||||
@@ -377,7 +377,7 @@ export default function MatchAdminPage() {
|
|||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<table className="w-full min-w-[900px] text-left">
|
<table className="w-full min-w-[900px] text-left">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="bg-base-200/40 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/35">
|
<tr className="bg-base-200/40 border-b border-base-content/10 text-xs uppercase tracking-wider text-base-content/35">
|
||||||
<th className="px-3 py-2">시간</th>
|
<th className="px-3 py-2">시간</th>
|
||||||
<th className="px-3 py-2">내전</th>
|
<th className="px-3 py-2">내전</th>
|
||||||
<th className="px-3 py-2">상태</th>
|
<th className="px-3 py-2">상태</th>
|
||||||
@@ -396,7 +396,7 @@ export default function MatchAdminPage() {
|
|||||||
<Link to={`/match/${match._id}`} className="text-sm font-bold hover:text-primary">
|
<Link to={`/match/${match._id}`} className="text-sm font-bold hover:text-primary">
|
||||||
{match.title}
|
{match.title}
|
||||||
</Link>
|
</Link>
|
||||||
<div className="mt-0.5 text-[11px] text-base-content/30">
|
<div className="mt-0.5 text-xs text-base-content/30">
|
||||||
{match.description || '-'}
|
{match.description || '-'}
|
||||||
</div>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
@@ -411,14 +411,14 @@ export default function MatchAdminPage() {
|
|||||||
<div className="inline-flex gap-2">
|
<div className="inline-flex gap-2">
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="text-[11px] px-2 py-1 border border-base-content/10 text-base-content/50 hover:text-primary"
|
className="text-xs px-2 py-1 border border-base-content/10 text-base-content/50 hover:text-primary"
|
||||||
onClick={() => openEdit(match)}
|
onClick={() => openEdit(match)}
|
||||||
>
|
>
|
||||||
수정
|
수정
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="text-[11px] px-2 py-1 border border-red-500/20 text-red-400 hover:bg-red-500/10"
|
className="text-xs px-2 py-1 border border-red-500/20 text-red-400 hover:bg-red-500/10"
|
||||||
disabled={deleteMutation.isPending}
|
disabled={deleteMutation.isPending}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
if (!window.confirm('이 내전을 삭제할까요?')) return;
|
if (!window.confirm('이 내전을 삭제할까요?')) return;
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ export default function TournamentCodesPage() {
|
|||||||
<section className="grid sm:grid-cols-5 gap-3 mb-6">
|
<section className="grid sm:grid-cols-5 gap-3 mb-6">
|
||||||
{STATES.map((state) => (
|
{STATES.map((state) => (
|
||||||
<div key={state} className="border border-base-content/10 bg-base-100 p-4">
|
<div key={state} className="border border-base-content/10 bg-base-100 p-4">
|
||||||
<div className="text-[10px] uppercase tracking-wider text-base-content/30">
|
<div className="text-xs uppercase tracking-wider text-base-content/30">
|
||||||
{state}
|
{state}
|
||||||
</div>
|
</div>
|
||||||
<div className="mt-2 text-2xl font-black tabular-nums">
|
<div className="mt-2 text-2xl font-black tabular-nums">
|
||||||
@@ -273,7 +273,7 @@ export default function TournamentCodesPage() {
|
|||||||
<div className="overflow-x-auto">
|
<div className="overflow-x-auto">
|
||||||
<table className="w-full min-w-[900px] text-left">
|
<table className="w-full min-w-[900px] text-left">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="bg-base-200/40 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/35">
|
<tr className="bg-base-200/40 border-b border-base-content/10 text-xs uppercase tracking-wider text-base-content/35">
|
||||||
<th className="px-3 py-2">코드</th>
|
<th className="px-3 py-2">코드</th>
|
||||||
<th className="px-3 py-2">상태</th>
|
<th className="px-3 py-2">상태</th>
|
||||||
<th className="px-3 py-2">만료</th>
|
<th className="px-3 py-2">만료</th>
|
||||||
@@ -309,7 +309,7 @@ export default function TournamentCodesPage() {
|
|||||||
{(code.state === 'released' || code.state === 'reserved') && (
|
{(code.state === 'released' || code.state === 'reserved') && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="text-[11px] px-2 py-1 border border-base-content/10 text-base-content/50 hover:text-primary"
|
className="text-xs px-2 py-1 border border-base-content/10 text-base-content/50 hover:text-primary"
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
restoreMutation.mutate(code._id, {
|
restoreMutation.mutate(code._id, {
|
||||||
onSuccess: invalidate,
|
onSuccess: invalidate,
|
||||||
@@ -322,7 +322,7 @@ export default function TournamentCodesPage() {
|
|||||||
{code.state === 'available' && (
|
{code.state === 'available' && (
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="text-[11px] px-2 py-1 border border-red-500/20 text-red-400"
|
className="text-xs px-2 py-1 border border-red-500/20 text-red-400"
|
||||||
onClick={() =>
|
onClick={() =>
|
||||||
deleteMutation.mutate(code._id, {
|
deleteMutation.mutate(code._id, {
|
||||||
onSuccess: invalidate,
|
onSuccess: invalidate,
|
||||||
|
|||||||
Reference in new issue
Block a user