Compare commits

..
15 Commits
26 changed files with 973 additions and 417 deletions

No files matched your search

@@ -322,6 +322,119 @@ describe('AuctionService', () => {
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 () => {
const matchId = new mongoose.Types.ObjectId();
const auction = {
@@ -174,6 +174,7 @@ export class AuctionService {
profileIconId: primary.profileIconId,
preferredPositions: participant.preferredPositions,
tiers: primary.tiers,
tierHistory: primary.tierHistory ?? [],
masteries: primary.championMasteries,
recentStatsSummary: primary.recentStatsSummary,
passCount: 0,
@@ -919,6 +920,7 @@ export class AuctionService {
'order.$.tagLine': account.tagLine,
'order.$.profileIconId': account.profileIconId,
'order.$.tiers': account.tiers,
'order.$.tierHistory': account.tierHistory ?? [],
'order.$.masteries': account.championMasteries,
'order.$.recentStatsSummary': account.recentStatsSummary,
updatedAt: new Date(),
@@ -14,7 +14,7 @@ function makeQuery<T>(value: T) {
}
function makeService(params: {
user: Partial<UserDocument>;
user: Partial<UserDocument> | null;
community?: Record<string, unknown> | null;
riotAccountService?: Partial<RiotAccountService>;
enrichmentService?: Partial<RiotAccountEnrichmentService>;
@@ -22,6 +22,7 @@ function makeService(params: {
const findOneAndUpdate = jest
.fn()
.mockReturnValue(makeQuery(params.user as UserDocument));
const findOne = jest.fn().mockReturnValue(makeQuery(params.user));
const findById = jest.fn().mockReturnValue({
select: jest.fn().mockReturnValue({
lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})),
@@ -29,7 +30,7 @@ function makeService(params: {
});
const connectionService = {
getModel: jest.fn().mockImplementation(async (name: string) => {
if (name === 'user') return { findOneAndUpdate };
if (name === 'user') return { findOneAndUpdate, findOne };
if (name === 'community') return { findById };
throw new Error(`Unexpected model: ${name}`);
}),
@@ -51,6 +52,7 @@ function makeService(params: {
),
connectionService,
findOneAndUpdate,
findOne,
findById,
riotAccountService,
enrichmentService,
@@ -168,4 +170,78 @@ describe('DakaoUserService', () => {
expect(enrichmentService.enrichRiotAccount).not.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;
}
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[] {
return positions.map((position, index) => ({
position,
@@ -15,6 +15,7 @@ import { MatchCancelHandler } from './handlers/match-cancel.handler';
import { MatchJoinHandler } from './handlers/match-join.handler';
import { MatchListHandler } from './handlers/match-list.handler';
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
@Module({
imports: [RiotModule, MatchModule],
@@ -36,6 +37,7 @@ import { PreferredPositionRegisterHandler } from './handlers/preferred-position-
MatchJoinHandler,
MatchCancelHandler,
PreferredPositionRegisterHandler,
PrimaryAccountChangeHandler,
],
exports: [DakaoPublisher],
})
+13 -2
View File
@@ -11,6 +11,7 @@ import { MatchCancelHandler } from './handlers/match-cancel.handler';
import { MatchJoinHandler } from './handlers/match-join.handler';
import { MatchListHandler } from './handlers/match-list.handler';
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
import { resolveDakaoNatsNames } from './dakao.nats-names';
import { DakaoInboxService } from './dakao-inbox.service';
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
@@ -33,6 +34,7 @@ export class DakaoSubscriber implements OnModuleInit {
private readonly matchJoinHandler: MatchJoinHandler,
private readonly matchCancelHandler: MatchCancelHandler,
private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler,
private readonly primaryAccountChangeHandler: PrimaryAccountChangeHandler,
) {}
async onModuleInit() {
@@ -126,6 +128,15 @@ export class DakaoSubscriber implements OnModuleInit {
tagLine: command.tagLine,
});
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':
segments = await this.matchJoinHandler.handle({
communityId,
@@ -256,9 +267,9 @@ export class DakaoSubscriber implements OnModuleInit {
const text = ((): string => {
switch (err.code) {
case 'unknown_command':
return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 대표계정변경 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
case 'usage':
return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 대표계정변경 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
case 'invalid_match_id':
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
case 'invalid_riot_id':
@@ -48,7 +48,7 @@ export class MatchListHandler {
},
{
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', () => {
const decomposedGameName = '프리리'.normalize('NFD');
expect(
@@ -12,6 +12,11 @@ export type DakaoCommand =
gameName: string;
tagLine: string;
}
| {
kind: 'primary-account-change';
gameName: string;
tagLine: string;
}
| {
kind: 'match-join';
matchAndRiotId: string;
@@ -70,6 +75,8 @@ export function parseCommand(rawMessage: string): DakaoCommand {
return parseCancelArgs(args);
case '계정등록':
return parseAccountRegisterArgs(args);
case '대표계정변경':
return parsePrimaryAccountChangeArgs(args);
case '선호포지션등록':
case '포지션등록':
return parsePreferredPositionRegisterArgs(args);
@@ -79,6 +86,24 @@ export function parseCommand(rawMessage: 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) {
throw new CommandParseError('usage');
}
@@ -94,11 +119,7 @@ function parseAccountRegisterArgs(args: string): DakaoCommand {
throw new CommandParseError('invalid_riot_id', args);
}
return {
kind: 'account-register',
gameName,
tagLine,
};
return { gameName, tagLine };
}
function parseCancelArgs(args: string): DakaoCommand {
@@ -593,6 +593,7 @@ export interface AuctionPlayerSnapshot {
profileIconId: number;
preferredPositions: PositionPreference[];
tiers: TierInfo[];
tierHistory: TierHistoryEntry[];
masteries: ChampionMasteryEntry[];
recentStatsSummary?: RiotRecentStatsSummary;
passCount: number;
@@ -1531,6 +1532,11 @@ const AuctionPlayerSnapshotSubSchema = new Schema<AuctionPlayerSnapshot>(
default: [],
},
tiers: { type: [TierInfoSubSchema], required: true, default: [] },
tierHistory: {
type: [TierHistoryEntrySubSchema],
required: true,
default: [],
},
masteries: {
type: [ChampionMasteryEntrySubSchema],
required: true,
+16 -1
View File
@@ -1,5 +1,5 @@
<!doctype html>
<html lang="en">
<html lang="ko" data-theme="light">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
@@ -7,6 +7,21 @@
<title>롤림푸스 - 내전 관리</title>
</head>
<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>
<script type="module" src="/src/main.tsx"></script>
</body>
+27 -2
View File
@@ -1,7 +1,8 @@
import { BrowserRouter, Link, Route, Routes } from "react-router";
import { useMsal } from "@azure/msal-react";
import { Moon, Sun } from "lucide-react";
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 { isMsalConfigured } from "./lib/auth/msal.config";
import AuthCallbackPage from "./pages/AuthCallback";
@@ -24,7 +25,10 @@ function MsalHeaderActions() {
if (!account) {
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>
);
@@ -41,6 +45,26 @@ 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 App() {
const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID);
const communityLabel = communityQuery.data?.name ?? "LOLYMPUS";
@@ -66,6 +90,7 @@ function App() {
Set `VITE_DEFAULT_COMMUNITY_ID`
</span>
)} */}
<ThemeToggle />
{isMsalConfigured && <MsalHeaderActions />}
</div>
</div>
+2 -1
View File
@@ -225,6 +225,7 @@ function createUserHistoryPath(
export function useUserHistoryProfile(
userId: string | undefined,
communityId = DEFAULT_COMMUNITY_ID,
enabled = true,
) {
return useQuery({
queryKey: ['user-history-profile', communityId, userId ?? null],
@@ -233,7 +234,7 @@ export function useUserHistoryProfile(
`/communities/${communityId}/users/${userId}/history-profile`,
{ auth: 'none' },
),
enabled: Boolean(communityId && userId),
enabled: enabled && Boolean(communityId && userId),
retry: false,
});
}
+5
View File
@@ -7,6 +7,7 @@ import type {
ApiPositionPreference,
ApiRiotLaneStats,
ApiRiotRecentStatsSummary,
ApiTierHistoryEntry,
ApiTierInfo,
MatchStatus,
Position,
@@ -91,6 +92,7 @@ export interface AuctionPlayerView extends ParticipantView {
level: number;
points: number;
}[];
tierHistory: ApiTierHistoryEntry[];
recentStats: {
overall: ApiRiotLaneStats;
byLane: Partial<Record<RiotLane, ApiRiotLaneStats>>;
@@ -236,6 +238,7 @@ function mapAuctionPlayerToView(
summonerName: player.gameName,
tag: player.tagLine,
tier: selectPrimaryTier(player.tiers),
tierHistory: player.tierHistory ?? [],
mainPosition,
subPosition,
profileIconId: player.profileIconId,
@@ -288,12 +291,14 @@ function mapAuctionTeamToView(
...participant,
passCount: 0,
masteries: [],
tierHistory: [],
recentStats: createEmptyRecentStatsView(),
}
: {
...createFallbackParticipant(member.userId),
passCount: 0,
masteries: [],
tierHistory: [],
recentStats: createEmptyRecentStatsView(),
});
+2 -1
View File
@@ -78,7 +78,7 @@ export interface ApiRiotAccount {
summonerLevel: number;
isPrimary: boolean;
tiers: ApiTierInfo[];
tierHistory: unknown[];
tierHistory: ApiTierHistoryEntry[];
matchIds: string[];
championMasteries: ApiChampionMasteryEntry[];
championRecords: Record<string, Record<string, unknown>>;
@@ -247,6 +247,7 @@ export interface ApiAuctionPlayerSnapshot {
profileIconId: number;
preferredPositions: ApiPositionPreference[];
tiers: ApiTierInfo[];
tierHistory: ApiTierHistoryEntry[];
masteries: ApiChampionMasteryEntry[];
recentStatsSummary?: ApiRiotRecentStatsSummary;
passCount: number;
+122
View File
@@ -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>
);
}
+246 -31
View File
@@ -3,6 +3,7 @@ import {
CartesianGrid,
Line,
LineChart,
ReferenceDot,
ReferenceLine,
ResponsiveContainer,
Tooltip,
@@ -45,13 +46,29 @@ const TIER_SPAN = 400;
const RANK_SPAN = 100;
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> = {
RANKED_SOLO_5x5: "솔로랭크",
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 SummaryVariant = "footer" | "inline";
type SummaryDirection = "up" | "down" | "flat";
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`;
}
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) {
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) {
return new Intl.DateTimeFormat("ko-KR", {
month: "numeric",
@@ -129,6 +174,94 @@ type ChartPoint = {
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({
active,
payload,
@@ -159,8 +292,16 @@ function TierTooltip({
export default function TierHistoryChart({
entries,
className = "border border-base-content/10 bg-base-100 mb-5 overflow-hidden",
summaryVariant = "footer",
height = 220,
showHeader = true,
}: {
entries: ApiTierHistoryEntry[];
className?: string;
summaryVariant?: SummaryVariant;
height?: number;
showHeader?: boolean;
}) {
// 데이터에 존재하는 큐 목록 (솔로 우선)
const availableQueues = useMemo(() => {
@@ -211,6 +352,10 @@ export default function TierHistoryChart({
})).filter((line) => line.value >= min - TIER_SPAN && line.value <= max);
}, [points]);
const adaptiveYGuides = useMemo(() => {
return summaryVariant === "inline" ? buildAdaptiveYGuides(points) : [];
}, [points, summaryVariant]);
const summary = useMemo(() => {
if (points.length === 0) return null;
const first = points[0];
@@ -218,7 +363,7 @@ export default function TierHistoryChart({
const peak = points.reduce((best, point) =>
point.value > best.value ? point : best,
);
const direction =
const direction: SummaryDirection =
last.value > first.value
? "up"
: last.value < first.value
@@ -227,6 +372,18 @@ export default function TierHistoryChart({
return { first, last, peak, direction };
}, [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 = (
<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">
@@ -264,8 +421,8 @@ export default function TierHistoryChart({
);
return (
<section className="border border-base-content/10 bg-base-100 mb-5 overflow-hidden">
{header}
<section className={className}>
{showHeader && header}
{points.length < 2 ? (
<div className="px-4 py-10 text-center text-xs text-base-content/35">
티어 변동 기록이 아직 부족해요.
@@ -274,11 +431,16 @@ export default function TierHistoryChart({
</div>
) : (
<>
<div className="px-2 pt-4 pb-1">
<ResponsiveContainer width="100%" height={220}>
<div className="relative px-2 pt-4 pb-1">
<ResponsiveContainer width="100%" height={height}>
<LineChart
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
strokeDasharray="3 3"
@@ -286,27 +448,44 @@ export default function TierHistoryChart({
className="text-base-content/5"
vertical={false}
/>
{tierLines.map((line) => (
<ReferenceLine
key={line.tier}
y={line.value}
stroke="currentColor"
className="text-base-content/15"
strokeDasharray="2 4"
label={{
value: formatTierShort(line.tier),
position: "insideLeft",
fill: "currentColor",
fontSize: 10,
className: "text-base-content/35",
}}
/>
))}
{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
key={line.tier}
y={line.value}
stroke="currentColor"
className="text-base-content/15"
strokeDasharray="2 4"
label={{
value: formatTierShort(line.tier),
position: "insideLeft",
fill: "currentColor",
fontSize: 10,
className: "text-base-content/35",
}}
/>
))}
<XAxis
dataKey="ts"
type="number"
scale="time"
domain={["dataMin", "dataMax"]}
domain={xDomain}
tickFormatter={formatDate}
tick={{ fontSize: 10, fill: "currentColor" }}
className="text-base-content/40"
@@ -326,6 +505,48 @@ export default function TierHistoryChart({
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
type="monotone"
dataKey="value"
@@ -339,7 +560,7 @@ export default function TierHistoryChart({
</LineChart>
</ResponsiveContainer>
</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]">
<span className="text-base-content/45">
현재{" "}
@@ -364,13 +585,7 @@ export default function TierHistoryChart({
: "text-base-content/55"
}`}
>
{formatTierShort(summary.first.tier)}
{summary.direction === "up"
? " ▲ "
: summary.direction === "down"
? " ▼ "
: " · "}
{formatTierShort(summary.last.tier)}
{formatPeriodChange(summary)}
</span>
</span>
</div>
+46
View File
@@ -3,8 +3,12 @@ import { useSyncExternalStore } from 'react';
const AUTH_USER_ID_STORAGE_KEY = 'lolympus.authUserId';
const DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY = 'lolympus.devCaptainTeamIndex';
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 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 = (
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);
}
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 {
return useSyncExternalStore<string | null>(
(callback) => subscribeToWindowChanges(AUTH_USER_CHANGED_EVENT, callback),
@@ -95,3 +133,11 @@ export function useDevCaptainTeamIndex(): number | null {
() => null,
);
}
export function useTheme(): AppTheme {
return useSyncExternalStore<AppTheme>(
(callback) => subscribeToWindowChanges(THEME_CHANGED_EVENT, callback),
getTheme,
() => 'light',
);
}
+6 -1
View File
@@ -1,10 +1,15 @@
@import url("https://fonts.googleapis.com/css2?family=Asta+Sans:wght@300..800&family=Gamja+Flower&display=swap");
@import "tailwindcss";
@custom-variant dark (&:where([data-theme=dark], [data-theme=dark] *));
@plugin "daisyui" {
themes:
light --default,
dark --prefersdark;
dark;
}
html {
scrollbar-gutter: stable;
}
body {
+3
View File
@@ -4,6 +4,9 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import './index.css';
import App from './App.tsx';
import { MsalAppProvider } from './lib/auth/MsalAppProvider.tsx';
import { initializeTheme } from './config.ts';
initializeTheme();
const queryClient = new QueryClient({
defaultOptions: {
+31 -98
View File
@@ -1,4 +1,6 @@
import {
lazy,
Suspense,
useEffect,
useMemo,
useRef,
@@ -17,6 +19,7 @@ import {
useMe,
useResetAuction,
useUndoAuction,
useUserHistoryProfile,
} from '../api/hooks';
import {
mapApiAuctionToAuctionState,
@@ -41,32 +44,21 @@ import {
teamIndexColorClasses,
teamIndexLabel,
} from '../lib/league';
import { RankBadge, ResponsiveTierLabel } from '../components/RankBadge';
import type {
ApiAuction,
ApiAuctionChatMessage,
ApiRiotLaneStats,
ApiTierInfo,
ApiUser,
Position,
} from '../api/types';
const TierHistoryChart = lazy(() => import('../components/TierHistoryChart'));
type CaptainRole = {
teamIndex: number;
};
const TIER_NAMES: Record<string, string> = {
IRON: '아이언',
BRONZE: '브론즈',
SILVER: '실버',
GOLD: '골드',
PLATINUM: '플래티넘',
EMERALD: '에메랄드',
DIAMOND: '다이아몬드',
MASTER: '마스터',
GRANDMASTER: '그랜드마스터',
CHALLENGER: '챌린저',
};
function formatPoints(value: number) {
return value.toLocaleString();
}
@@ -109,90 +101,6 @@ function resolveChatSenderLabel(
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(
currentBidder: AuctionStateView['currentBidder'],
team: Pick<AuctionStateView['teams'][number], 'teamIndex'>,
@@ -481,7 +389,16 @@ function PlayerSpotlight({
}) {
const { data: ddragon } = useDdragonManifest();
const player = state.currentPlayer;
const historyProfileQuery = useUserHistoryProfile(
player?.userId,
DEFAULT_COMMUNITY_ID,
Boolean(player && player.tierHistory.length === 0),
);
if (!player) return null;
const tierHistory =
player.tierHistory.length > 0
? player.tierHistory
: (historyProfileQuery.data?.tierHistory ?? []);
return (
<div className="border border-base-content/10 bg-base-100">
@@ -529,6 +446,22 @@ function PlayerSpotlight({
</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="p-4">
<h4 className="text-[10px] font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
+11 -83
View File
@@ -14,12 +14,12 @@ import {
} from "../api/hooks";
import {
buildDefaultPreferredPositions,
formatTierLabel,
mapApiMatchToMatchDetail,
type MatchDetailView,
type ParticipantView,
type TeamView,
} from "../api/mappers";
import { RankBadge } from "../components/RankBadge";
import { DEFAULT_COMMUNITY_ID, useAuthUserId } from "../config";
import { apiFetch, ApiError } from "../lib/api";
import { profileIconUrl } from "../lib/ddragon";
@@ -176,84 +176,6 @@ function tierByQueue(tiers: ApiTierInfo[], queueType: string) {
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({
label,
tier,
@@ -262,9 +184,9 @@ function QueueRankCell({
tier?: ApiTierInfo;
}) {
return (
<span className="inline-flex items-center gap-1">
<span className="inline-flex w-[54px] items-center gap-1">
<span>{label}</span>
<RankBadge tier={tier} />
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
</span>
);
}
@@ -273,7 +195,7 @@ function SoloRankPrefix({ tier }: { tier?: ApiTierInfo }) {
return (
<span className="inline-flex shrink-0 items-center gap-1 text-[10px] font-black text-base-content/35">
{/* <span>SOLO</span> */}
<RankBadge tier={tier} />
<RankBadge tier={tier} size="sm" tooltipPlacement="left" />
</span>
);
}
@@ -800,7 +722,13 @@ function TeamCard({
진행 페이지
</Link>
</div>
<table className="w-full text-left">
<table className="w-full table-fixed text-left">
<colgroup>
<col className="w-11" />
<col />
<col className="w-56" />
<col className="w-32" />
</colgroup>
<thead>
<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>
+4 -91
View File
@@ -6,7 +6,8 @@ import {
useMatch,
useUserHistoryProfile,
} from "../api/hooks";
import { formatKoreanDate, formatTierLabel } from "../api/mappers";
import { formatKoreanDate } from "../api/mappers";
import { RankBadge } from "../components/RankBadge";
import type {
ApiMatch,
ApiMatchGameResult,
@@ -45,94 +46,6 @@ function tierByQueue(tiers: ApiTierInfo[], queueType: string) {
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({
assignedPosition,
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">
<span className="inline-flex items-center gap-1">
<span>SOLO</span>
<RankBadge tier={soloTier} />
<RankBadge tier={soloTier} size="sm" tooltipPlacement="left" />
</span>
<span className="inline-flex items-center gap-1">
<span>FLEX</span>
<RankBadge tier={flexTier} />
<RankBadge tier={flexTier} size="sm" tooltipPlacement="left" />
</span>
</div>
</div>
+1 -98
View File
@@ -16,7 +16,6 @@ import { useRiotRefreshSocket } from "../api/useRiotRefreshSocket";
import type {
ApiChampionStatsRow,
ApiEnqueueRefreshResult,
ApiTierInfo,
ApiRiotRefreshEvent,
ApiRecentMatchTeam,
ApiRecentMatchTeamParticipant,
@@ -43,6 +42,7 @@ import {
QUEUE_GROUP_TABS,
RANK_FILTER_TABS,
} from "../lib/riot-history";
import { ResponsiveTierLabel } from "../components/RankBadge";
// recharts가 무거워 메인 번들에서 분리한다 (전적 페이지에서만 로드).
const TierHistoryChart = lazy(() => import("../components/TierHistoryChart"));
@@ -59,19 +59,6 @@ const SORT_LABELS: Record<ChampionSortKey, string> = {
avgCsPerMin: "분당 CS",
};
const TIER_NAMES: Record<string, string> = {
IRON: "아이언",
BRONZE: "브론즈",
SILVER: "실버",
GOLD: "골드",
PLATINUM: "플래티넘",
EMERALD: "에메랄드",
DIAMOND: "다이아몬드",
MASTER: "마스터",
GRANDMASTER: "그랜드마스터",
CHALLENGER: "챌린저",
};
function resolveBackTo(state: unknown) {
if (!state || typeof state !== "object") return "/";
const backTo = (state as HistoryLocationState).backTo;
@@ -85,90 +72,6 @@ function resolveBackTo(state: unknown) {
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) {
const minutes = Math.floor(seconds / 60);
const rest = seconds % 60;