Compare commits
19
Commits
release/71
...
release/74
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cd5a82aa93 | ||
|
|
7a62e52d60 | ||
|
|
6fc58fec1d | ||
|
|
f586542dc3 | ||
|
|
6697cd8ea1 | ||
|
|
c435e8a6a5 | ||
|
|
15ae680ec7 | ||
|
|
bdea0287a5 | ||
|
|
b56728f843 | ||
|
|
7f2b34fd4b | ||
|
|
146349beb8 | ||
|
|
326e0c66b6 | ||
|
|
edfb960e97 | ||
|
|
b2d438785b | ||
|
|
b6dad78d02 | ||
|
|
42d4854f9c | ||
|
|
e9081d77c9 | ||
|
|
181beb85e5 | ||
|
|
ebca348723 |
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(),
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -15,6 +15,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';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [RiotModule, MatchModule],
|
imports: [RiotModule, MatchModule],
|
||||||
@@ -36,6 +37,7 @@ import { PreferredPositionRegisterHandler } from './handlers/preferred-position-
|
|||||||
MatchJoinHandler,
|
MatchJoinHandler,
|
||||||
MatchCancelHandler,
|
MatchCancelHandler,
|
||||||
PreferredPositionRegisterHandler,
|
PreferredPositionRegisterHandler,
|
||||||
|
PrimaryAccountChangeHandler,
|
||||||
],
|
],
|
||||||
exports: [DakaoPublisher],
|
exports: [DakaoPublisher],
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -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';
|
||||||
@@ -33,6 +34,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 +128,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 +267,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 ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 대표계정변경 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
||||||
case 'usage':
|
case 'usage':
|
||||||
return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 대표계정변경 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
||||||
case 'invalid_match_id':
|
case 'invalid_match_id':
|
||||||
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
||||||
case 'invalid_riot_id':
|
case 'invalid_riot_id':
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ export class MatchListHandler {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
kind: 'text',
|
kind: 'text',
|
||||||
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`,
|
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n대표계정변경: !내전 대표계정변경 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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(
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
+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>
|
||||||
|
|||||||
+114
-3
@@ -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
|
||||||
@@ -66,11 +138,13 @@ function App() {
|
|||||||
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,30 @@ export function useMatches(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function useMatchesPage(
|
||||||
|
options: MatchesQueryOptions,
|
||||||
|
communityId = DEFAULT_COMMUNITY_ID,
|
||||||
|
) {
|
||||||
|
return useQuery({
|
||||||
|
queryKey: [
|
||||||
|
'matches-page',
|
||||||
|
communityId,
|
||||||
|
options.status ?? null,
|
||||||
|
options.limit ?? null,
|
||||||
|
options.page ?? null,
|
||||||
|
options.offset ?? null,
|
||||||
|
options.scheduledFrom ?? null,
|
||||||
|
options.scheduledTo ?? null,
|
||||||
|
options.sort ?? null,
|
||||||
|
],
|
||||||
|
queryFn: () =>
|
||||||
|
apiFetch<MatchesResponse>(createMatchesPath(communityId, options), {
|
||||||
|
auth: 'none',
|
||||||
|
}),
|
||||||
|
enabled: Boolean(communityId),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export function useMatch(matchId: string | undefined, communityId = DEFAULT_COMMUNITY_ID) {
|
export function useMatch(matchId: string | undefined, communityId = DEFAULT_COMMUNITY_ID) {
|
||||||
return useQuery({
|
return useQuery({
|
||||||
queryKey: ['match', communityId, matchId ?? null],
|
queryKey: ['match', communityId, matchId ?? null],
|
||||||
@@ -225,6 +269,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 +278,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 {
|
||||||
|
|||||||
@@ -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-[10px] 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,
|
||||||
@@ -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,6 +372,18 @@ 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-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
||||||
@@ -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,7 +560,7 @@ 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-[11px]">
|
||||||
<span className="text-base-content/45">
|
<span className="text-base-content/45">
|
||||||
현재{" "}
|
현재{" "}
|
||||||
@@ -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',
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -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 {
|
||||||
|
|||||||
@@ -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'>,
|
||||||
@@ -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">
|
||||||
@@ -529,6 +446,22 @@ 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-[10px] font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
|
||||||
|
|||||||
+339
-28
@@ -1,10 +1,151 @@
|
|||||||
|
import { useState } from 'react';
|
||||||
|
import { ChevronLeft, ChevronRight } from 'lucide-react';
|
||||||
import { Link } from 'react-router';
|
import { Link } from 'react-router';
|
||||||
import { mapApiMatchToMatchDetail } from '../api/mappers';
|
import { mapApiMatchToMatchDetail } from '../api/mappers';
|
||||||
import { useMatches, useMe } from '../api/hooks';
|
import { useMatches, useMatchesPage, useMe } from '../api/hooks';
|
||||||
import { DEFAULT_COMMUNITY_ID } from '../config';
|
import { DEFAULT_COMMUNITY_ID } from '../config';
|
||||||
|
|
||||||
const UPCOMING_GRID_MATCH_LIMIT = 3;
|
const UPCOMING_GRID_MATCH_LIMIT = 3;
|
||||||
const UPCOMING_MATCH_LIST_LIMIT = UPCOMING_GRID_MATCH_LIMIT + 1;
|
const UPCOMING_MATCH_LIST_LIMIT = UPCOMING_GRID_MATCH_LIMIT + 1;
|
||||||
|
const HISTORY_MATCH_PAGE_SIZE = 10;
|
||||||
|
const EMPTY_SCHEDULE_TEXT = '예정된 매치가 없습니다.';
|
||||||
|
|
||||||
|
function SkeletonBlock({ className }: { className: string }) {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
className={`animate-pulse bg-base-content/10 ${className}`}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function HomePageSkeleton() {
|
||||||
|
const upcomingSkeletons = Array.from({ length: UPCOMING_GRID_MATCH_LIMIT });
|
||||||
|
const historySkeletons = Array.from({ length: 5 });
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main
|
||||||
|
className="max-w-5xl mx-auto px-4 sm:px-6"
|
||||||
|
aria-busy="true"
|
||||||
|
aria-live="polite"
|
||||||
|
>
|
||||||
|
<span className="sr-only">매치 목록을 불러오는 중...</span>
|
||||||
|
|
||||||
|
<section className="pt-8 pb-6">
|
||||||
|
<div className="flex items-center justify-between gap-3 mb-3">
|
||||||
|
<SkeletonBlock className="h-3 w-20" />
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<SkeletonBlock className="h-3 w-16" />
|
||||||
|
<SkeletonBlock className="h-3 w-20" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="border border-base-content/10 bg-base-200/50">
|
||||||
|
<div className="p-5 sm:p-6">
|
||||||
|
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
|
||||||
|
<div className="space-y-3 flex-1">
|
||||||
|
<div className="flex items-center gap-2.5 flex-wrap">
|
||||||
|
<SkeletonBlock className="h-7 w-52 sm:w-64" />
|
||||||
|
<SkeletonBlock className="h-5 w-12" />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<SkeletonBlock className="h-4 w-full max-w-xl" />
|
||||||
|
<SkeletonBlock className="h-4 w-4/5 max-w-lg" />
|
||||||
|
</div>
|
||||||
|
<div className="flex items-center gap-3 flex-wrap pt-1">
|
||||||
|
<SkeletonBlock className="h-3 w-24" />
|
||||||
|
<SkeletonBlock className="h-3 w-12" />
|
||||||
|
<SkeletonBlock className="h-5 w-16" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="h-8 w-24 sm:shrink-0" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="pb-6">
|
||||||
|
<SkeletonBlock className="h-3 w-24 mb-3" />
|
||||||
|
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-px bg-base-content/10 border border-base-content/10">
|
||||||
|
{upcomingSkeletons.map((_, index) => (
|
||||||
|
<div key={index} className="bg-base-100 h-full p-4 min-h-[122px]">
|
||||||
|
<div className="flex items-center justify-between mb-3 gap-3">
|
||||||
|
<SkeletonBlock className="h-4 w-28" />
|
||||||
|
<SkeletonBlock className="h-5 w-12 shrink-0" />
|
||||||
|
</div>
|
||||||
|
<div className="space-y-2">
|
||||||
|
<SkeletonBlock className="h-3 w-24" />
|
||||||
|
<SkeletonBlock className="h-3 w-12" />
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="h-5 w-16 mt-3" />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
|
<section className="pb-12">
|
||||||
|
<SkeletonBlock className="h-3 w-24 mb-3" />
|
||||||
|
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||||
|
<table className="w-full text-left">
|
||||||
|
<thead>
|
||||||
|
<tr className="bg-base-200/60 border-b border-base-content/10">
|
||||||
|
{['날짜', '내전', '상태', '맵', '참가', '결과'].map((label) => (
|
||||||
|
<th key={label} className="py-2.5 px-4">
|
||||||
|
<SkeletonBlock className="h-3 w-10" />
|
||||||
|
</th>
|
||||||
|
))}
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
{historySkeletons.map((_, index) => (
|
||||||
|
<tr
|
||||||
|
key={index}
|
||||||
|
className="border-b border-base-content/5 last:border-b-0"
|
||||||
|
>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonBlock className="h-3 w-16" />
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonBlock className="h-4 w-36" />
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonBlock className="h-5 w-12" />
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonBlock className="h-5 w-16" />
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonBlock className="h-3 w-10" />
|
||||||
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<SkeletonBlock className="h-3 w-14" />
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
))}
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<div className="md:hidden border border-base-content/10">
|
||||||
|
{historySkeletons.map((_, index) => (
|
||||||
|
<div
|
||||||
|
key={index}
|
||||||
|
className="border-b border-base-content/5 last:border-b-0 p-3"
|
||||||
|
>
|
||||||
|
<div className="flex items-start justify-between gap-3">
|
||||||
|
<div className="min-w-0 flex-1 space-y-2">
|
||||||
|
<SkeletonBlock className="h-3 w-28" />
|
||||||
|
<SkeletonBlock className="h-4 w-32" />
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="h-5 w-12 shrink-0" />
|
||||||
|
</div>
|
||||||
|
<SkeletonBlock className="mt-2 h-3 w-40" />
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function StatusBadge({ status }: { status: string }) {
|
function StatusBadge({ status }: { status: string }) {
|
||||||
const styles: Record<string, string> = {
|
const styles: Record<string, string> = {
|
||||||
@@ -16,7 +157,7 @@ function StatusBadge({ status }: { status: string }) {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
className={`inline-flex items-center text-[11px] font-semibold px-1.5 py-0.5 border ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`}
|
className={`inline-flex items-center whitespace-nowrap text-[11px] font-semibold px-1.5 py-0.5 border ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`}
|
||||||
>
|
>
|
||||||
{status}
|
{status}
|
||||||
</span>
|
</span>
|
||||||
@@ -25,7 +166,7 @@ function StatusBadge({ status }: { status: string }) {
|
|||||||
|
|
||||||
function MapBadge({ map }: { map: string }) {
|
function MapBadge({ map }: { map: string }) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex items-center text-[11px] px-1.5 py-0.5 border border-base-content/10 text-base-content/50">
|
<span className="inline-flex items-center whitespace-nowrap text-[11px] px-1.5 py-0.5 border border-base-content/10 text-base-content/50">
|
||||||
{map}
|
{map}
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
@@ -46,13 +187,110 @@ function getStatusLabel(status: string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function formatCompactDateTime(dateLike: string) {
|
||||||
|
const date = new Date(dateLike);
|
||||||
|
if (Number.isNaN(date.getTime())) return '';
|
||||||
|
|
||||||
|
const weekday = new Intl.DateTimeFormat('ko-KR', {
|
||||||
|
weekday: 'short',
|
||||||
|
}).format(date);
|
||||||
|
const hours = String(date.getHours()).padStart(2, '0');
|
||||||
|
const minutes = String(date.getMinutes()).padStart(2, '0');
|
||||||
|
|
||||||
|
return `${date.getMonth() + 1}/${date.getDate()} (${weekday}) ${hours}:${minutes}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryMetaText({
|
||||||
|
map,
|
||||||
|
participants,
|
||||||
|
result,
|
||||||
|
}: {
|
||||||
|
map: string;
|
||||||
|
participants: number;
|
||||||
|
result?: string;
|
||||||
|
}) {
|
||||||
|
return (
|
||||||
|
<div className="flex flex-wrap items-center gap-x-1.5 gap-y-1 text-[11px] text-base-content/45">
|
||||||
|
<span>{map}</span>
|
||||||
|
<span className="text-base-content/20">·</span>
|
||||||
|
<span>{participants}명</span>
|
||||||
|
{result && (
|
||||||
|
<>
|
||||||
|
<span className="text-base-content/20">·</span>
|
||||||
|
<span>{result}</span>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
interface HistoryPaginationProps {
|
||||||
|
page: number;
|
||||||
|
pageCount: number;
|
||||||
|
total: number;
|
||||||
|
isFetching: boolean;
|
||||||
|
onPrevious: () => void;
|
||||||
|
onNext: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
function HistoryPagination({
|
||||||
|
page,
|
||||||
|
pageCount,
|
||||||
|
total,
|
||||||
|
isFetching,
|
||||||
|
onPrevious,
|
||||||
|
onNext,
|
||||||
|
}: HistoryPaginationProps) {
|
||||||
|
const hasPrevious = page > 1;
|
||||||
|
const hasNext = page < pageCount;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex flex-wrap items-center gap-2 text-xs text-base-content/40">
|
||||||
|
<span className="font-medium whitespace-nowrap">
|
||||||
|
총 {total}개 · {page}/{pageCount}페이지
|
||||||
|
</span>
|
||||||
|
<div className="flex items-center gap-1">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn btn-ghost btn-xs px-2"
|
||||||
|
disabled={!hasPrevious || isFetching}
|
||||||
|
onClick={onPrevious}
|
||||||
|
>
|
||||||
|
<ChevronLeft className="h-3.5 w-3.5" aria-hidden="true" />
|
||||||
|
이전
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="btn btn-ghost btn-xs px-2"
|
||||||
|
disabled={!hasNext || isFetching}
|
||||||
|
onClick={onNext}
|
||||||
|
>
|
||||||
|
다음
|
||||||
|
<ChevronRight className="h-3.5 w-3.5" aria-hidden="true" />
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
export default function HomePage() {
|
export default function HomePage() {
|
||||||
|
const [timelineNow] = useState(() => new Date().toISOString());
|
||||||
|
const [historyPage, setHistoryPage] = useState(1);
|
||||||
const upcomingMatchesQuery = useMatches(
|
const upcomingMatchesQuery = useMatches(
|
||||||
{ limit: UPCOMING_MATCH_LIST_LIMIT },
|
{
|
||||||
|
limit: UPCOMING_MATCH_LIST_LIMIT,
|
||||||
|
scheduledFrom: timelineNow,
|
||||||
|
sort: 'asc',
|
||||||
|
},
|
||||||
DEFAULT_COMMUNITY_ID,
|
DEFAULT_COMMUNITY_ID,
|
||||||
);
|
);
|
||||||
const finishedMatchesQuery = useMatches(
|
const historyMatchesQuery = useMatchesPage(
|
||||||
{ status: 'finished', limit: 10 },
|
{
|
||||||
|
limit: HISTORY_MATCH_PAGE_SIZE,
|
||||||
|
page: historyPage,
|
||||||
|
scheduledTo: timelineNow,
|
||||||
|
sort: 'desc',
|
||||||
|
},
|
||||||
DEFAULT_COMMUNITY_ID,
|
DEFAULT_COMMUNITY_ID,
|
||||||
);
|
);
|
||||||
const meQuery = useMe();
|
const meQuery = useMe();
|
||||||
@@ -67,15 +305,11 @@ export default function HomePage() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (upcomingMatchesQuery.isLoading || finishedMatchesQuery.isLoading) {
|
if (upcomingMatchesQuery.isLoading || historyMatchesQuery.isLoading) {
|
||||||
return (
|
return <HomePageSkeleton />;
|
||||||
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
|
||||||
<span className="text-sm text-base-content/40">매치 목록을 불러오는 중...</span>
|
|
||||||
</main>
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (upcomingMatchesQuery.error || finishedMatchesQuery.error) {
|
if (upcomingMatchesQuery.error || historyMatchesQuery.error) {
|
||||||
return (
|
return (
|
||||||
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
|
||||||
<span className="text-sm text-red-500">
|
<span className="text-sm text-red-500">
|
||||||
@@ -87,8 +321,22 @@ export default function HomePage() {
|
|||||||
|
|
||||||
const upcomingMatches =
|
const upcomingMatches =
|
||||||
upcomingMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
upcomingMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
||||||
const finishedMatches =
|
const historyMatches =
|
||||||
finishedMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
|
historyMatchesQuery.data?.matches.map((match) => ({
|
||||||
|
...mapApiMatchToMatchDetail(match),
|
||||||
|
compactDateTime: formatCompactDateTime(match.scheduledAt),
|
||||||
|
})) ?? [];
|
||||||
|
const historyTotal = historyMatchesQuery.data?.total ?? 0;
|
||||||
|
const historyLimit =
|
||||||
|
historyMatchesQuery.data?.limit ?? HISTORY_MATCH_PAGE_SIZE;
|
||||||
|
const historyPageFromApi = historyMatchesQuery.data?.page ?? historyPage;
|
||||||
|
const historyPageCount = Math.max(
|
||||||
|
1,
|
||||||
|
Math.ceil(historyTotal / historyLimit),
|
||||||
|
);
|
||||||
|
const goToPreviousHistoryPage = () =>
|
||||||
|
setHistoryPage((page) => Math.max(1, page - 1));
|
||||||
|
const goToNextHistoryPage = () => setHistoryPage((page) => page + 1);
|
||||||
const nextMatch = upcomingMatches[0];
|
const nextMatch = upcomingMatches[0];
|
||||||
const upcomingCards = (nextMatch
|
const upcomingCards = (nextMatch
|
||||||
? upcomingMatches.slice(1)
|
? upcomingMatches.slice(1)
|
||||||
@@ -128,7 +376,7 @@ export default function HomePage() {
|
|||||||
{nextMatch ? (
|
{nextMatch ? (
|
||||||
<Link to={`/match/${nextMatch.id}`} className="block group">
|
<Link to={`/match/${nextMatch.id}`} className="block group">
|
||||||
<div className="border border-base-content/10 bg-base-200/50 hover:bg-base-200 transition-colors">
|
<div className="border border-base-content/10 bg-base-200/50 hover:bg-base-200 transition-colors">
|
||||||
<div className="p-5 sm:p-6">
|
<div className="p-5 sm:p-6 min-h-[150px]">
|
||||||
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
|
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
|
||||||
<div className="space-y-2.5">
|
<div className="space-y-2.5">
|
||||||
<div className="flex items-center gap-2.5 flex-wrap">
|
<div className="flex items-center gap-2.5 flex-wrap">
|
||||||
@@ -160,8 +408,10 @@ export default function HomePage() {
|
|||||||
</div>
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
) : (
|
) : (
|
||||||
<div className="border border-base-content/10 bg-base-100 px-5 py-10 text-center text-sm text-base-content/40">
|
<div className="border border-base-content/10 bg-base-200/50">
|
||||||
아직 등록된 내전이 없습니다.
|
<div className="p-5 sm:p-6 min-h-[150px] flex items-center justify-center text-center text-sm text-base-content/40">
|
||||||
|
{EMPTY_SCHEDULE_TEXT}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</section>
|
</section>
|
||||||
@@ -174,7 +424,7 @@ export default function HomePage() {
|
|||||||
{upcomingCards.length > 0 ? (
|
{upcomingCards.length > 0 ? (
|
||||||
upcomingCards.map((match) => (
|
upcomingCards.map((match) => (
|
||||||
<Link key={match.id} to={`/match/${match.id}`}>
|
<Link key={match.id} to={`/match/${match.id}`}>
|
||||||
<div className="bg-base-100 hover:bg-base-200/50 transition-colors cursor-pointer h-full p-4">
|
<div className="bg-base-100 hover:bg-base-200/50 transition-colors cursor-pointer h-full p-4 min-h-[122px]">
|
||||||
<div className="flex items-center justify-between mb-2.5">
|
<div className="flex items-center justify-between mb-2.5">
|
||||||
<h3 className="text-sm font-bold text-base-content truncate mr-2">
|
<h3 className="text-sm font-bold text-base-content truncate mr-2">
|
||||||
{match.title}
|
{match.title}
|
||||||
@@ -194,8 +444,8 @@ export default function HomePage() {
|
|||||||
</Link>
|
</Link>
|
||||||
))
|
))
|
||||||
) : (
|
) : (
|
||||||
<div className="bg-base-100 px-4 py-6 text-sm text-base-content/35 col-span-full">
|
<div className="bg-base-100 h-full p-4 min-h-[122px] flex items-center justify-center text-center text-sm text-base-content/35">
|
||||||
예정된 추가 매치가 없습니다.
|
{EMPTY_SCHEDULE_TEXT}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
@@ -205,20 +455,22 @@ export default function HomePage() {
|
|||||||
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
|
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
|
||||||
지난 내전 기록
|
지난 내전 기록
|
||||||
</h2>
|
</h2>
|
||||||
<div className="border border-base-content/10 overflow-x-auto">
|
{/* 데스크톱: 테이블 */}
|
||||||
|
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
|
||||||
<table className="w-full text-left">
|
<table className="w-full text-left">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="bg-base-200/60 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/40">
|
<tr className="bg-base-200/60 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/40">
|
||||||
<th className="py-2.5 px-4 font-semibold">날짜</th>
|
<th className="py-2.5 px-4 font-semibold">날짜</th>
|
||||||
<th className="py-2.5 px-4 font-semibold">내전</th>
|
<th className="py-2.5 px-4 font-semibold">내전</th>
|
||||||
|
<th className="py-2.5 px-4 font-semibold">상태</th>
|
||||||
<th className="py-2.5 px-4 font-semibold">맵</th>
|
<th className="py-2.5 px-4 font-semibold">맵</th>
|
||||||
<th className="py-2.5 px-4 font-semibold">참가</th>
|
<th className="py-2.5 px-4 font-semibold">참가</th>
|
||||||
<th className="py-2.5 px-4 font-semibold">결과</th>
|
<th className="py-2.5 px-4 font-semibold">결과</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{finishedMatches.length > 0 ? (
|
{historyMatches.length > 0 ? (
|
||||||
finishedMatches.map((match) => (
|
historyMatches.map((match) => (
|
||||||
<tr
|
<tr
|
||||||
key={match.id}
|
key={match.id}
|
||||||
className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors"
|
className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors"
|
||||||
@@ -234,13 +486,16 @@ export default function HomePage() {
|
|||||||
{match.title}
|
{match.title}
|
||||||
</Link>
|
</Link>
|
||||||
</td>
|
</td>
|
||||||
|
<td className="py-2.5 px-4">
|
||||||
|
<StatusBadge status={getStatusLabel(match.status)} />
|
||||||
|
</td>
|
||||||
<td className="py-2.5 px-4">
|
<td className="py-2.5 px-4">
|
||||||
<MapBadge map={match.map} />
|
<MapBadge map={match.map} />
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/50">
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
{match.participants.length}명
|
{match.participants.length}명
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2.5 px-4 text-xs text-base-content/50">
|
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
|
||||||
{match.result?.winner ? `${match.result.winner} 승리` : '-'}
|
{match.result?.winner ? `${match.result.winner} 승리` : '-'}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -248,16 +503,72 @@ export default function HomePage() {
|
|||||||
) : (
|
) : (
|
||||||
<tr>
|
<tr>
|
||||||
<td
|
<td
|
||||||
colSpan={5}
|
colSpan={6}
|
||||||
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
className="py-6 px-4 text-sm text-base-content/35 text-center"
|
||||||
>
|
>
|
||||||
아직 종료된 내전 기록이 없습니다.
|
아직 내전 기록이 없습니다.
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
)}
|
)}
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* 모바일: 카드 리스트 */}
|
||||||
|
<div className="md:hidden border border-base-content/10">
|
||||||
|
{historyMatches.length > 0 ? (
|
||||||
|
historyMatches.map((match) => {
|
||||||
|
const resultLabel = match.result?.winner
|
||||||
|
? `${match.result.winner} 승리`
|
||||||
|
: undefined;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Link
|
||||||
|
key={match.id}
|
||||||
|
to={`/match/${match.id}`}
|
||||||
|
className="block border-b border-base-content/5 last:border-b-0 p-3 hover:bg-base-content/[0.02] transition-colors"
|
||||||
|
>
|
||||||
|
<div className="flex items-start justify-between gap-3">
|
||||||
|
<div className="min-w-0 flex-1">
|
||||||
|
<div className="text-[11px] font-medium text-base-content/40">
|
||||||
|
{match.compactDateTime || `${match.date} ${match.time}`}
|
||||||
|
</div>
|
||||||
|
<div className="mt-1 text-sm font-semibold leading-snug text-base-content break-words">
|
||||||
|
{match.title}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="shrink-0">
|
||||||
|
<StatusBadge status={getStatusLabel(match.status)} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="mt-2">
|
||||||
|
<HistoryMetaText
|
||||||
|
map={match.map}
|
||||||
|
participants={match.participants.length}
|
||||||
|
result={resultLabel}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
);
|
||||||
|
})
|
||||||
|
) : (
|
||||||
|
<div className="py-6 px-4 text-sm text-base-content/35 text-center">
|
||||||
|
아직 내전 기록이 없습니다.
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{historyTotal > 0 && (
|
||||||
|
<div className="mt-3 flex justify-end">
|
||||||
|
<HistoryPagination
|
||||||
|
page={historyPageFromApi}
|
||||||
|
pageCount={historyPageCount}
|
||||||
|
total={historyTotal}
|
||||||
|
isFetching={historyMatchesQuery.isFetching}
|
||||||
|
onPrevious={goToPreviousHistoryPage}
|
||||||
|
onNext={goToNextHistoryPage}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -14,12 +14,12 @@ 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";
|
||||||
@@ -176,84 +176,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 QueueRankCell({
|
function QueueRankCell({
|
||||||
label,
|
label,
|
||||||
tier,
|
tier,
|
||||||
@@ -262,9 +184,25 @@ function QueueRankCell({
|
|||||||
tier?: ApiTierInfo;
|
tier?: ApiTierInfo;
|
||||||
}) {
|
}) {
|
||||||
return (
|
return (
|
||||||
<span className="inline-flex items-center gap-1">
|
<span className="grid grid-cols-[24px_auto] items-center gap-1">
|
||||||
<span>{label}</span>
|
<span>{label}</span>
|
||||||
<RankBadge tier={tier} />
|
<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-[11px] font-medium leading-tight text-base-content/55 whitespace-nowrap sm:flex-row sm:items-center sm:gap-1 sm:leading-normal">
|
||||||
|
<span>주 {positionLabel[mainPosition]}</span>
|
||||||
|
<span className="hidden sm:inline">/</span>
|
||||||
|
<span>부 {positionLabel[subPosition]}</span>
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -273,7 +211,7 @@ function SoloRankPrefix({ tier }: { tier?: ApiTierInfo }) {
|
|||||||
return (
|
return (
|
||||||
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] font-black text-base-content/35">
|
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] font-black text-base-content/35">
|
||||||
{/* <span>SOLO</span> */}
|
{/* <span>SOLO</span> */}
|
||||||
<RankBadge tier={tier} />
|
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
|
||||||
</span>
|
</span>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -292,7 +230,7 @@ function TierCell({ participant }: { participant: ParticipantView }) {
|
|||||||
const flexTier = tierByQueue(tiers, "RANKED_FLEX_SR");
|
const flexTier = tierByQueue(tiers, "RANKED_FLEX_SR");
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex items-center gap-2 text-[10px] font-black text-base-content/35 whitespace-nowrap">
|
<div className="flex flex-col items-start gap-1 text-[10px] font-black text-base-content/35 whitespace-nowrap sm:flex-row sm:items-center sm:gap-3">
|
||||||
<QueueRankCell label="SOLO" tier={soloTier} />
|
<QueueRankCell label="SOLO" tier={soloTier} />
|
||||||
<QueueRankCell label="FLEX" tier={flexTier} />
|
<QueueRankCell label="FLEX" tier={flexTier} />
|
||||||
</div>
|
</div>
|
||||||
@@ -412,17 +350,16 @@ function ParticipantRow({
|
|||||||
: participant.mainPosition;
|
: participant.mainPosition;
|
||||||
admin.onChangePositions(participant.userId, main, next);
|
admin.onChangePositions(participant.userId, main, next);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<tr className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors">
|
<tr className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors">
|
||||||
<td className="py-2 px-3 text-center text-[11px] text-base-content/30 w-8">
|
<td className="hidden py-2 px-3 text-center text-[11px] text-base-content/30 w-8 sm:table-cell">
|
||||||
{index + 1}
|
{index + 1}
|
||||||
</td>
|
</td>
|
||||||
<td className="py-2 px-3">
|
<td className="py-2 px-3">
|
||||||
<Link
|
<Link
|
||||||
to={`/users/${participant.userId}/history`}
|
to={`/users/${participant.userId}/history`}
|
||||||
state={{ backTo: historyBackTo }}
|
state={{ backTo: historyBackTo }}
|
||||||
className="flex items-center gap-2 group"
|
className="flex min-w-0 items-center gap-2 group"
|
||||||
>
|
>
|
||||||
<div className="w-7 h-7 bg-base-content/10 overflow-hidden shrink-0">
|
<div className="w-7 h-7 bg-base-content/10 overflow-hidden shrink-0">
|
||||||
<img
|
<img
|
||||||
@@ -433,7 +370,7 @@ function ParticipantRow({
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className="min-w-0">
|
<div className="min-w-0">
|
||||||
<span className="font-medium text-[13px] text-base-content truncate block leading-tight group-hover:text-primary transition-colors">
|
<span className="font-medium text-[13px] text-base-content block leading-tight break-words group-hover:text-primary transition-colors sm:truncate">
|
||||||
{participant.summonerName}
|
{participant.summonerName}
|
||||||
</span>
|
</span>
|
||||||
<span className="inline-flex items-center gap-1 text-[10px] text-base-content/25 leading-tight">
|
<span className="inline-flex items-center gap-1 text-[10px] text-base-content/25 leading-tight">
|
||||||
@@ -452,7 +389,10 @@ function ParticipantRow({
|
|||||||
</td>
|
</td>
|
||||||
{assignedPos ? (
|
{assignedPos ? (
|
||||||
<td className="py-2 px-3">
|
<td className="py-2 px-3">
|
||||||
<PosBadge pos={assignedPos} />
|
<PreferredPositionText
|
||||||
|
mainPosition={participant.mainPosition}
|
||||||
|
subPosition={participant.subPosition}
|
||||||
|
/>
|
||||||
</td>
|
</td>
|
||||||
) : admin ? (
|
) : admin ? (
|
||||||
<>
|
<>
|
||||||
@@ -530,6 +470,53 @@ function ParticipantRow({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function TeamParticipantMobileRow({
|
||||||
|
participant,
|
||||||
|
}: {
|
||||||
|
participant: ParticipantView;
|
||||||
|
}) {
|
||||||
|
const { data: ddragon } = useDdragonManifest();
|
||||||
|
const location = useLocation();
|
||||||
|
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="grid grid-cols-[minmax(0,1fr)_64px_58px] items-center gap-x-2 border-b border-base-content/5 px-3 py-2 last:border-b-0">
|
||||||
|
<Link
|
||||||
|
to={`/users/${participant.userId}/history`}
|
||||||
|
state={{ backTo: historyBackTo }}
|
||||||
|
className="flex min-w-0 items-center gap-2 group"
|
||||||
|
>
|
||||||
|
<div className="h-7 w-7 shrink-0 overflow-hidden bg-base-content/10">
|
||||||
|
<img
|
||||||
|
src={profileIconUrl(ddragon, participant.profileIconId)}
|
||||||
|
alt=""
|
||||||
|
className="h-full w-full object-cover"
|
||||||
|
loading="lazy"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="min-w-0">
|
||||||
|
<span className="block break-words text-[13px] font-medium leading-tight text-base-content transition-colors group-hover:text-primary">
|
||||||
|
{participant.summonerName}
|
||||||
|
</span>
|
||||||
|
<span className="inline-flex items-center gap-1 text-[10px] leading-tight text-base-content/25">
|
||||||
|
#{participant.tag}
|
||||||
|
{participant.excluded && (
|
||||||
|
<span className="border border-amber-500/20 bg-amber-500/10 px-1 text-[9px] font-bold text-amber-500">
|
||||||
|
제외
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</Link>
|
||||||
|
<TierCell participant={participant} />
|
||||||
|
<PreferredPositionText
|
||||||
|
mainPosition={participant.mainPosition}
|
||||||
|
subPosition={participant.subPosition}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function ParticipantTable({
|
function ParticipantTable({
|
||||||
participants,
|
participants,
|
||||||
maxParticipants,
|
maxParticipants,
|
||||||
@@ -707,7 +694,7 @@ function ParticipantTable({
|
|||||||
<table className="w-full text-left">
|
<table className="w-full text-left">
|
||||||
<thead>
|
<thead>
|
||||||
<tr className="border-b border-base-content/10 bg-base-200/40 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
<tr className="border-b border-base-content/10 bg-base-200/40 text-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
||||||
<th className="py-2 px-3 w-8">#</th>
|
<th className="hidden py-2 px-3 w-8 sm:table-cell">#</th>
|
||||||
<th className="py-2 px-3">소환사</th>
|
<th className="py-2 px-3">소환사</th>
|
||||||
<th className="py-2 px-3">현재 티어</th>
|
<th className="py-2 px-3">현재 티어</th>
|
||||||
<th className="py-2 px-3">주 포지션</th>
|
<th className="py-2 px-3">주 포지션</th>
|
||||||
@@ -800,10 +787,29 @@ function TeamCard({
|
|||||||
진행 페이지
|
진행 페이지
|
||||||
</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-[11px] font-semibold uppercase tracking-wider text-base-content/35">
|
||||||
|
<span>소환사</span>
|
||||||
|
<span>현재 티어</span>
|
||||||
|
<span>포지션</span>
|
||||||
|
</div>
|
||||||
|
{team.participants.map((participant) => (
|
||||||
|
<TeamParticipantMobileRow
|
||||||
|
key={participant.id}
|
||||||
|
participant={participant}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
<table className="hidden w-full table-fixed text-left sm:table">
|
||||||
|
<colgroup>
|
||||||
|
<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-[11px] uppercase tracking-wider text-base-content/35 font-semibold">
|
||||||
<th className="py-2 px-3 w-8">#</th>
|
<th className="hidden py-2 px-3 w-8 sm:table-cell">#</th>
|
||||||
<th className="py-2 px-3">소환사</th>
|
<th className="py-2 px-3">소환사</th>
|
||||||
<th className="py-2 px-3">현재 티어</th>
|
<th className="py-2 px-3">현재 티어</th>
|
||||||
<th className="py-2 px-3">포지션</th>
|
<th className="py-2 px-3">포지션</th>
|
||||||
|
|||||||
@@ -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,
|
||||||
@@ -157,11 +70,11 @@ function SummonerStatsSummary({
|
|||||||
<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-[10px] 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>
|
||||||
|
|||||||
@@ -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;
|
||||||
|
|||||||
Reference in new issue
Block a user