From bdea0287a520c7ed4536601797ff0373665080c8 Mon Sep 17 00:00:00 2001 From: dahyeon Date: Mon, 8 Jun 2026 02:20:34 -0700 Subject: [PATCH] refactor(web): centralize rank badge display --- apps/web/src/components/RankBadge.tsx | 122 +++++++++++++++++++ apps/web/src/pages/AuctionPage.tsx | 99 +-------------- apps/web/src/pages/MatchDetailPage.tsx | 84 +------------ apps/web/src/pages/MatchTeamProgressPage.tsx | 95 +-------------- apps/web/src/pages/UserHistoryPage.tsx | 99 +-------------- 5 files changed, 131 insertions(+), 368 deletions(-) create mode 100644 apps/web/src/components/RankBadge.tsx diff --git a/apps/web/src/components/RankBadge.tsx b/apps/web/src/components/RankBadge.tsx new file mode 100644 index 00000000..3885f2a5 --- /dev/null +++ b/apps/web/src/components/RankBadge.tsx @@ -0,0 +1,122 @@ +import type { ApiTierInfo } from "../api/types"; + +type RankBadgeSize = "sm" | "md"; +type RankBadgeTooltipPlacement = "left" | "bottom"; + +const TIER_NAMES: Record = { + IRON: "아이언", + BRONZE: "브론즈", + SILVER: "실버", + GOLD: "골드", + PLATINUM: "플래티넘", + EMERALD: "에메랄드", + DIAMOND: "다이아몬드", + MASTER: "마스터", + GRANDMASTER: "그랜드마스터", + CHALLENGER: "챌린저", +}; + +const SIZE_CLASSES: Record = { + sm: "h-[17px] min-w-[18px]", + md: "h-[18px] min-w-[20px]", +}; + +const TOOLTIP_CLASSES: Record = { + 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 ( + + + {formatRankBadge(tier)} + + + ); +} + +export function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) { + return ( + + + + {formatRankDetail(tier)} + + + ); +} diff --git a/apps/web/src/pages/AuctionPage.tsx b/apps/web/src/pages/AuctionPage.tsx index 1ce3477c..ed2a9fa5 100644 --- a/apps/web/src/pages/AuctionPage.tsx +++ b/apps/web/src/pages/AuctionPage.tsx @@ -44,11 +44,11 @@ import { teamIndexColorClasses, teamIndexLabel, } from '../lib/league'; +import { RankBadge, ResponsiveTierLabel } from '../components/RankBadge'; import type { ApiAuction, ApiAuctionChatMessage, ApiRiotLaneStats, - ApiTierInfo, ApiUser, Position, } from '../api/types'; @@ -59,19 +59,6 @@ type CaptainRole = { teamIndex: number; }; -const TIER_NAMES: Record = { - IRON: '아이언', - BRONZE: '브론즈', - SILVER: '실버', - GOLD: '골드', - PLATINUM: '플래티넘', - EMERALD: '에메랄드', - DIAMOND: '다이아몬드', - MASTER: '마스터', - GRANDMASTER: '그랜드마스터', - CHALLENGER: '챌린저', -}; - function formatPoints(value: number) { return value.toLocaleString(); } @@ -114,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 ( - - - {formatRankBadge(tier)} - - - ); -} - -function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) { - return ( - - - - {formatRankDetail(tier)} - - - ); -} - function isCurrentBidder( currentBidder: AuctionStateView['currentBidder'], team: Pick, diff --git a/apps/web/src/pages/MatchDetailPage.tsx b/apps/web/src/pages/MatchDetailPage.tsx index f9bf63d8..2e6e3dfc 100644 --- a/apps/web/src/pages/MatchDetailPage.tsx +++ b/apps/web/src/pages/MatchDetailPage.tsx @@ -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 ( - - - {formatRankBadge(tier)} - - - ); -} - function QueueRankCell({ label, tier, @@ -264,7 +186,7 @@ function QueueRankCell({ return ( {label} - + ); } @@ -273,7 +195,7 @@ function SoloRankPrefix({ tier }: { tier?: ApiTierInfo }) { return ( {/* SOLO */} - + ); } diff --git a/apps/web/src/pages/MatchTeamProgressPage.tsx b/apps/web/src/pages/MatchTeamProgressPage.tsx index 8e122332..fc8bb315 100644 --- a/apps/web/src/pages/MatchTeamProgressPage.tsx +++ b/apps/web/src/pages/MatchTeamProgressPage.tsx @@ -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 ( - - - {formatRankBadge(tier)} - - - ); -} - function SummonerStatsSummary({ assignedPosition, fallbackTier, @@ -157,11 +70,11 @@ function SummonerStatsSummary({
SOLO - + FLEX - +
diff --git a/apps/web/src/pages/UserHistoryPage.tsx b/apps/web/src/pages/UserHistoryPage.tsx index 9c6e4b93..1df0837f 100644 --- a/apps/web/src/pages/UserHistoryPage.tsx +++ b/apps/web/src/pages/UserHistoryPage.tsx @@ -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 = { avgCsPerMin: "분당 CS", }; -const TIER_NAMES: Record = { - 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 ( - - - {formatRankBadge(tier)} - - - ); -} - -function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) { - return ( - - - - {formatRankDetail(tier)} - - - ); -} - function formatDuration(seconds: number) { const minutes = Math.floor(seconds / 60); const rest = seconds % 60;