projects/hypixel-stats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched to formatnumber func

Browse Source
This commit is contained in:
Taken
2025-09-01 12:21:58 +02:00
parent 32b4f2cebc
commit d58856ccd1
7 changed files with 72 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/app/(stats)/player/[ign]/_components/Sidebar.tsx
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,39 +143,10 @@ export default function Sidebar({ level, ign, player, guild, rank, specialRank,
)
}
function SoicalLinks() {
return (
<div className="flex flex-col gap-2">
<h1 className="text-xl font-bold underline">Social Links</h1>
<div className="flex gap-2">
<SocialIcons
discord={player?.socialMedia?.links?.DISCORD}
twitch={player?.socialMedia?.links?.TWITCH}
youtube={player?.socialMedia?.links?.YOUTUBE}
twitter={player?.socialMedia?.links?.TWITCH}
hypixel={player?.socialMedia?.links?.HYPIXEL}
/>
</div>
</div>
)
}
function GuildInfo() {
if (!guild) return null
return (
<Card className="w-1/4">
<CardContent>
<General />
<Separator className="my-4" />
<Coins />
<Separator className="my-4" />
<Other />
<Separator className="my-4" />
<DailyRewards />
<Separator className="my-4" />
<Gifting />
<Separator className="my-4" />
<Logins />
<Separator className="my-4" />
{guild && (
<>
<div className="flex flex-col gap-8">
<div>
@@ -215,7 +186,42 @@ export default function Sidebar({ level, ign, player, guild, rank, specialRank,
</div>
<Separator className="my-4" />
</>
)}
)
}
function SoicalLinks() {
return (
<div className="flex flex-col gap-2">
<h1 className="text-xl font-bold underline">Social Links</h1>
<div className="flex gap-2">
<SocialIcons
discord={player?.socialMedia?.links?.DISCORD}
twitch={player?.socialMedia?.links?.TWITCH}
youtube={player?.socialMedia?.links?.YOUTUBE}
twitter={player?.socialMedia?.links?.TWITCH}
hypixel={player?.socialMedia?.links?.HYPIXEL}
/>
</div>
</div>
)
}
return (
<Card className="w-1/4">
<CardContent>
<General />
<Separator className="my-4" />
<Coins />
<Separator className="my-4" />
<Other />
<Separator className="my-4" />
<DailyRewards />
<Separator className="my-4" />
<Gifting />
<Separator className="my-4" />
<Logins />
<Separator className="my-4" />
<GuildInfo />
<SoicalLinks />
</CardContent>
</Card>

9
src/app/(stats)/player/[ign]/_stats/bedwars/bedwars.tsx
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)

4
src/app/(stats)/player/[ign]/_stats/skywars/skywars.tsx
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))

10
src/app/(stats)/player/[ign]/_stats/skywars/stats.tsx
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>

5
src/lib/formatters.ts
View File

@@ -1,14 +1,15 @@
const numberFormatter = new Intl.NumberFormat(undefined, {
const numberFormatter = new Intl.NumberFormat("en-GB", {
maximumFractionDigits: 2,
minimumFractionDigits: 0
})
const dateFormatter = new Intl.DateTimeFormat(undefined, {
const dateFormatter = new Intl.DateTimeFormat("en-GB", {
year: "numeric",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
hour12: false
})

9
src/lib/hypixel/bedwars/bedwars.ts
View File

@@ -1,5 +1,6 @@
import { PRESTIGE_ICONS, PRESTIGES, SLUMBER_ROOMS, SLUMBER_WALLETS } from "@/data/hypixel/bedwars"
import { getColorFromCode } from "@/lib/colors"
import { formatNumber } from "@/lib/formatters"
import { concatStatsArray, devide, floorLevel } from "../general"
export function getBedwarsStar(level: number) {
@@ -245,16 +246,16 @@ function bedwarsModeStats(prefix: string, stats: _BedwarsStats, raw = false) {
return [
stats[`${prefix}_kills_bedwars`],
stats[`${prefix}_deaths_bedwars`],
devide(stats[`${prefix}_kills_bedwars`], stats[`${prefix}_deaths_bedwars`]).toFixed(2),
formatNumber(devide(stats[`${prefix}_kills_bedwars`], stats[`${prefix}_deaths_bedwars`])),
stats[`${prefix}_final_kills_bedwars`],
stats[`${prefix}_final_deaths_bedwars`],
devide(stats[`${prefix}_final_kills_bedwars`], stats[`${prefix}_final_deaths_bedwars`]).toFixed(2),
formatNumber(devide(stats[`${prefix}_final_kills_bedwars`], stats[`${prefix}_final_deaths_bedwars`])),
stats[`${prefix}_wins_bedwars`],
stats[`${prefix}_losses_bedwars`],
devide(stats[`${prefix}_wins_bedwars`], stats[`${prefix}_losses_bedwars`]).toFixed(2),
formatNumber(devide(stats[`${prefix}_wins_bedwars`], stats[`${prefix}_losses_bedwars`])),
stats[`${prefix}_winstreak`] ?? "?",
stats[`${prefix}_beds_broken_bedwars`],
stats[`${prefix}_beds_lost_bedwars`],
devide(stats[`${prefix}_beds_broken_bedwars`], stats[`${prefix}_beds_lost_bedwars`]).toFixed(2)
formatNumber(devide(stats[`${prefix}_beds_broken_bedwars`], stats[`${prefix}_beds_lost_bedwars`]))
]
}

5
src/lib/hypixel/skywars/skywars.ts
View File

@@ -1,4 +1,5 @@
import { HEADS, ICONS, PRESTIGES } from "@/data/hypixel/skywars"
import { formatNumber } from "@/lib/formatters"
import { concatStatsArray, devide, floorLevel } from "../general"
export function getHeads(key: string) {
@@ -151,9 +152,9 @@ function skywarsModeStats(suffix: string, stats: _SkywarsStats, raw = false) {
return [
stats[`kills_${suffix}`],
stats[`deaths_${suffix}`],
devide(stats[`kills_${suffix}`], stats[`deaths_${suffix}`]).toFixed(2),
formatNumber(devide(stats[`kills_${suffix}`], stats[`deaths_${suffix}`])),
stats[`wins_${suffix}`],
stats[`losses_${suffix}`],
devide(stats[`wins_${suffix}`], stats[`losses_${suffix}`]).toFixed(2)
formatNumber(devide(stats[`wins_${suffix}`], stats[`losses_${suffix}`]))
]
}