From 16403a7d834bbe1f2f4dddf8791baa8a1163222b Mon Sep 17 00:00:00 2001
From: mat <github@matdoes.dev>
Date: Sat, 9 Apr 2022 15:20:37 -0500
Subject: Fixes

Fix leaderboards section not showing correct units & hyperlink directly to profile from leaderboards
---
 src/lib/minecraft/Username.svelte       | 4 +++-
 src/lib/sections/Coop.svelte            | 6 +-----
 src/lib/sections/Leaderboards.svelte    | 7 +++++--
 src/routes/player/[player]/index.svelte | 7 +------
 4 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/lib/minecraft/Username.svelte b/src/lib/minecraft/Username.svelte
index 6d45857..34e2155 100644
--- a/src/lib/minecraft/Username.svelte
+++ b/src/lib/minecraft/Username.svelte
@@ -16,7 +16,9 @@
 </script>
 
 <ConditionalLink
-	href="/player/{typeof hyperlinkToProfile === 'string' ? hyperlinkToProfile : player.username}"
+	href="/player/{typeof hyperlinkToProfile === 'string'
+		? `${player.username}/${hyperlinkToProfile}`
+		: player.username}"
 	isWrapped={!!hyperlinkToProfile}
 >
 	{#if headType == '3d'}
diff --git a/src/lib/sections/Coop.svelte b/src/lib/sections/Coop.svelte
index 867d878..d33ae27 100644
--- a/src/lib/sections/Coop.svelte
+++ b/src/lib/sections/Coop.svelte
@@ -50,11 +50,7 @@
 		<h3 class="previous-members-title">Previous members</h3>
 		{#each data.profile.members.filter(m => m.left) as player}
 			<span class="member">
-				<Username
-					{player}
-					headType="2d"
-					hyperlinkToProfile="{player.username}/{data.profile.uuid}"
-				/>
+				<Username {player} headType="2d" hyperlinkToProfile={data.profile.uuid} />
 			</span>
 		{/each}
 	{/if}
diff --git a/src/lib/sections/Leaderboards.svelte b/src/lib/sections/Leaderboards.svelte
index 2041733..a0fa4dc 100644
--- a/src/lib/sections/Leaderboards.svelte
+++ b/src/lib/sections/Leaderboards.svelte
@@ -2,7 +2,7 @@
 	import { API_URL } from '$lib/api'
 
 	import type { CleanMemberProfile } from '$lib/APITypes'
-	import { cleanId } from '$lib/utils'
+	import { cleanId, formatNumberFromUnit } from '$lib/utils'
 
 	export let data: CleanMemberProfile
 </script>
@@ -14,7 +14,10 @@
 		{#each leaderboards as leaderboard}
 			<li class="leaderboard-item">
 				<a href="/leaderboard/{leaderboard.name}" class="leaderboard-item-anchor">
-					{leaderboard.positionIndex + 1}) <b>{cleanId(leaderboard.name)}</b>: {leaderboard.value.toLocaleString()}
+					{leaderboard.positionIndex + 1}) <b>{cleanId(leaderboard.name)}</b>: {formatNumberFromUnit(
+						leaderboard.value,
+						leaderboard.unit ?? cleanId(leaderboard.name).toLowerCase()
+					)}
 				</a>
 			</li>
 		{/each}
diff --git a/src/routes/player/[player]/index.svelte b/src/routes/player/[player]/index.svelte
index ad02380..7964af1 100644
--- a/src/routes/player/[player]/index.svelte
+++ b/src/routes/player/[player]/index.svelte
@@ -106,12 +106,7 @@
 						{/each}
 						{#each profile.members?.filter(m => m.left) ?? [] as player}
 							<span class="member">
-								<Username
-									{player}
-									headType="2d"
-									hyperlinkToProfile="{player.username}/{profile.uuid}"
-									disabled
-								/>
+								<Username {player} headType="2d" hyperlinkToProfile={profile.uuid} disabled />
 							</span>
 						{/each}
 					{:else}
-- 
cgit