Switched to formatnumber func

This commit is contained in:
2025-09-01 12:21:58 +02:00
parent 32b4f2cebc
commit d58856ccd1
7 changed files with 72 additions and 62 deletions

View File

@@ -23,14 +23,14 @@ export default function Sidebar({ level, ign, player, guild, rank, specialRank,
const levelMultiplier = getCoinMultiplier(level, rank, specialRank, eulaCoins)
const levelMultiplierVal = levelMultiplier.value
const levelMultiplierText = levelMultiplier.level === true ? `(Level ${level.toFixed(1).split(".")[0]})` : `(${levelMultiplier.name})`
const levelMultiplierText = levelMultiplier.level === true ? `(Level ${level.toString().split(".")[0]})` : `(${levelMultiplier.name})`
function General() {
return (
<div className="flex justify-between px-8">
<div className="text-center">
<p>Hypixel level</p>
<p>{level.toFixed(2)}</p>
<p>{formatNumber(level)}</p>
</div>
<div className="text-center">
<p>Karma</p>
@@ -143,6 +143,52 @@ export default function Sidebar({ level, ign, player, guild, rank, specialRank,
)
}
function GuildInfo() {
if (!guild) return null
return (
<>
<div className="flex flex-col gap-8">
<div>
<Link href={`/guild/${ign}`}>
<h1 className="text-xl font-bold underline">Guild</h1>
</Link>
<p>
<span className="font-bold">{"Name: "}</span>
<span className={getColor(guild.tagColor, "text", "gray")}>{guild.name}</span>
</p>
<p>
<span className="font-bold">{"Members: "}</span>
<span>{guild.members.length}</span>
</p>
</div>
<div>
<p>
<span className="font-bold">{"Rank: "}</span>
<span>{`${getGuildMember(guild, player.uuid)?.rank} `}</span>
<span className={getColor(guild.tagColor, "text", "gray")}>
{getGuildRankTag(guild, player.uuid)}
</span>
</p>
<p>
<span className="font-bold">{"Daily GEXP: "}</span>
<span>{formatNumber(getMemberGEXP(guild, player.uuid, 0) ?? 0)}</span>
</p>
<p>
<span className="font-bold">{"Weekly GEXP: "}</span>
<span>{formatNumber(getMemberWeeklyGEXP(guild, player.uuid) ?? 0)}</span>
</p>
<p>
<span className="font-bold">{"Joined: "}</span>
<span>{formatDate(getGuildMember(guild, player.uuid)?.joined ?? 0)}</span>
</p>
</div>
</div>
<Separator className="my-4" />
</>
)
}
function SoicalLinks() {
return (
<div className="flex flex-col gap-2">
@@ -175,47 +221,7 @@ export default function Sidebar({ level, ign, player, guild, rank, specialRank,
<Separator className="my-4" />
<Logins />
<Separator className="my-4" />
{guild && (
<>
<div className="flex flex-col gap-8">
<div>
<Link href={`/guild/${ign}`}>
<h1 className="text-xl font-bold underline">Guild</h1>
</Link>
<p>
<span className="font-bold">{"Name: "}</span>
<span className={getColor(guild.tagColor, "text", "gray")}>{guild.name}</span>
</p>
<p>
<span className="font-bold">{"Members: "}</span>
<span>{guild.members.length}</span>
</p>
</div>
<div>
<p>
<span className="font-bold">{"Rank: "}</span>
<span>{`${getGuildMember(guild, player.uuid)?.rank} `}</span>
<span className={getColor(guild.tagColor, "text", "gray")}>
{getGuildRankTag(guild, player.uuid)}
</span>
</p>
<p>
<span className="font-bold">{"Daily GEXP: "}</span>
<span>{formatNumber(getMemberGEXP(guild, player.uuid, 0) ?? 0)}</span>
</p>
<p>
<span className="font-bold">{"Weekly GEXP: "}</span>
<span>{formatNumber(getMemberWeeklyGEXP(guild, player.uuid) ?? 0)}</span>
</p>
<p>
<span className="font-bold">{"Joined: "}</span>
<span>{formatDate(getGuildMember(guild, player.uuid)?.joined ?? 0)}</span>
</p>
</div>
</div>
<Separator className="my-4" />
</>
)}
<GuildInfo />
<SoicalLinks />
</CardContent>
</Card>

View File

@@ -3,6 +3,7 @@
import { AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion"
import { Card, CardContent } from "@/components/ui/card"
import { Separator } from "@/components/ui/separator"
import { formatNumber } from "@/lib/formatters"
import { getBWLevelForExp, getTotalExpForLevel } from "@/lib/hypixel/bedwars/level"
import { getProgress } from "@/lib/hypixel/general"
import { NonNullStats } from "@/lib/schema/player"
@@ -14,10 +15,10 @@ import BedwarsStatTable from "./table"
export default function BedwarsStats({ stats }: { stats: NonNullStats["Bedwars"] }) {
if (!stats) return null
const kd = (stats.kills_bedwars / stats.deaths_bedwars).toFixed(2)
const fkd = (stats.final_kills_bedwars / stats.final_deaths_bedwars).toFixed(2)
const wl = (stats.wins_bedwars / stats.losses_bedwars).toFixed(2)
const bbl = (stats.beds_broken_bedwars / stats.beds_lost_bedwars).toFixed(2)
const kd = formatNumber(stats.kills_bedwars / stats.deaths_bedwars)
const fkd = formatNumber(stats.final_kills_bedwars / stats.final_deaths_bedwars)
const wl = formatNumber(stats.wins_bedwars / stats.losses_bedwars)
const bbl = formatNumber(stats.beds_broken_bedwars / stats.beds_lost_bedwars)
const level = getBWLevelForExp(stats.Experience)
const current = getTotalExpForLevel(level)

View File

@@ -18,8 +18,8 @@ export default function SkyWarsStats(
if (!stats) return null
const level = getSkywarsLevel(stats.skywars_experience)
const kd = (stats.kills / stats.deaths).toFixed(2)
const wl = (stats.wins / stats.losses).toFixed(2)
const kd = formatNumber(stats.kills / stats.deaths)
const wl = formatNumber(stats.wins / stats.losses)
const current = getSkywarsXpForLevel(Math.floor(level))
const next = getSkywarsXpForLevel(Math.floor(level + 1))

View File

@@ -23,7 +23,7 @@ export default function SkyWarsGeneralStats({
return (
<div className="flex mb-10">
<div className="flex-1">
<BasicStat title="Level: " value={level.toFixed(2)} />
<BasicStat title="Level: " value={formatNumber(level)} />
<Stat title="Prestige: ">
<SkywarsPrestige level={Math.floor(level)} icon={stats.selected_prestige_icon} />
</Stat>
@@ -40,13 +40,13 @@ export default function SkyWarsGeneralStats({
<BasicStat title="Chests Opened: " value={formatNumber(stats.chests_opened)} />
<BasicStat title="Arrows Hit: " value={formatNumber(stats.arrows_hit)} />
<BasicStat title="Arrows Shot: " value={formatNumber(stats.arrows_shot)} />
<BasicStat title="Arrow Hit Accuracy: " value={`${((stats.arrows_hit / stats.arrows_shot) * 100).toFixed(2)}%`} />
<BasicStat title="Arrow Hit Accuracy: " value={`${formatNumber((stats.arrows_hit / stats.arrows_shot) * 100)}%`} />
</div>
<div className="flex-1">
<BasicStat title="Kills: " value={formatNumber(stats.kills)} />
<BasicStat title="Deaths: " value={formatNumber(stats.deaths)} />
<BasicStat title="Assists: " value={formatNumber(stats.assists)} />
<BasicStat title="Kill/Death Ratio: " value={(stats.kills / stats.deaths).toFixed(2)} />
<BasicStat title="Kill/Death Ratio: " value={formatNumber(stats.kills / stats.deaths)} />
<p>
<br />
</p>
@@ -64,8 +64,8 @@ export default function SkyWarsGeneralStats({
<BasicStat title="Wins: " value={formatNumber(stats.wins)} />
<BasicStat title="Lab Wins: " value={formatNumber(stats.wins_lab)} />
<BasicStat title="Losses: " value={formatNumber(stats.losses)} />
<BasicStat title="Win/Loss Ratio: " value={(stats.wins / stats.losses).toFixed(2)} />
<BasicStat title="Kill/Win Ratio: " value={(stats.kills / stats.wins).toFixed(2)} />
<BasicStat title="Win/Loss Ratio: " value={formatNumber(stats.wins / stats.losses)} />
<BasicStat title="Kill/Win Ratio: " value={formatNumber(stats.kills / stats.wins)} />
<p>
<br />
</p>