Switched to formatnumber func

src/app/(stats)/player/[ign]/_components/Sidebar.tsx

@@ -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 && (
+                <GuildInfo />
-                    <>
-                        <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" />
-                    </>
-                )}
                 <SoicalLinks />
             </CardContent>
         </Card>

src/app/(stats)/player/[ign]/_stats/bedwars/bedwars.tsx

@@ -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 kd = formatNumber(stats.kills_bedwars / stats.deaths_bedwars)
-    const fkd = (stats.final_kills_bedwars / stats.final_deaths_bedwars).toFixed(2)
+    const fkd = formatNumber(stats.final_kills_bedwars / stats.final_deaths_bedwars)
-    const wl = (stats.wins_bedwars / stats.losses_bedwars).toFixed(2)
+    const wl = formatNumber(stats.wins_bedwars / stats.losses_bedwars)
-    const bbl = (stats.beds_broken_bedwars / stats.beds_lost_bedwars).toFixed(2)
+    const bbl = formatNumber(stats.beds_broken_bedwars / stats.beds_lost_bedwars)
     const level = getBWLevelForExp(stats.Experience)
 
     const current = getTotalExpForLevel(level)

src/app/(stats)/player/[ign]/_stats/skywars/skywars.tsx

@@ -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 kd = formatNumber(stats.kills / stats.deaths)
-    const wl = (stats.wins / stats.losses).toFixed(2)
+    const wl = formatNumber(stats.wins / stats.losses)
 
     const current = getSkywarsXpForLevel(Math.floor(level))
     const next = getSkywarsXpForLevel(Math.floor(level + 1))

src/app/(stats)/player/[ign]/_stats/skywars/stats.tsx

@@ -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="Win/Loss Ratio: " value={formatNumber(stats.wins / stats.losses)} />
-                <BasicStat title="Kill/Win Ratio: " value={(stats.kills / stats.wins).toFixed(2)} />
+                <BasicStat title="Kill/Win Ratio: " value={formatNumber(stats.kills / stats.wins)} />
                 <p>
                     <br />
                 </p>

src/lib/formatters.ts

@@ -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
 })
 

src/lib/hypixel/bedwars/bedwars.ts

@@ -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`]))
     ]
 }

src/lib/hypixel/skywars/skywars.ts

@@ -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}`]))
     ]
 }