aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormat <github@matdoes.dev>2022-04-09 18:55:52 -0500
committermat <github@matdoes.dev>2022-04-09 18:55:52 -0500
commit29dbeba95d7f9d5ffd95509e74d5b3ad5ba0545a (patch)
tree45f56806f359b2ccdd5f16898b282c1f39585e97
parentebaa625ff385caa813f7eed38a97a9cf879656d0 (diff)
downloadskyblock-stats-29dbeba95d7f9d5ffd95509e74d5b3ad5ba0545a.tar.gz
skyblock-stats-29dbeba95d7f9d5ffd95509e74d5b3ad5ba0545a.tar.bz2
skyblock-stats-29dbeba95d7f9d5ffd95509e74d5b3ad5ba0545a.zip
Don't show redundant unit in leaderboard section
Also bump sveltekit version
-rw-r--r--package.json4
-rw-r--r--src/lib/sections/FarmingContests.svelte11
-rw-r--r--src/lib/sections/Leaderboards.svelte2
-rw-r--r--yarn.lock2
4 files changed, 12 insertions, 7 deletions
diff --git a/package.json b/package.json
index ff1fc96..fc98f51 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
"devDependencies": {
"@squoosh/lib": "^0.4.0",
"@sveltejs/adapter-auto": "^1.0.0-next.24",
- "@sveltejs/kit": "^1.0.0-next.269",
+ "@sveltejs/kit": "^1.0.0-next.310",
"@types/cookie": "^0.4.1",
"@typescript-eslint/eslint-plugin": "^5.10.1",
"@typescript-eslint/parser": "^5.10.1",
@@ -45,4 +45,4 @@
"typed-hypixel-api": "^0.3.4"
},
"packageManager": "yarn@3.1.1"
-} \ No newline at end of file
+}
diff --git a/src/lib/sections/FarmingContests.svelte b/src/lib/sections/FarmingContests.svelte
index ca4f1a7..8eef53d 100644
--- a/src/lib/sections/FarmingContests.svelte
+++ b/src/lib/sections/FarmingContests.svelte
@@ -3,10 +3,15 @@
import Emoji from '$lib/Emoji.svelte'
import ListItemWithIcon from '$lib/ListItemWithIcon.svelte'
import { skyblockItemToUrl } from '$lib/minecraft/inventory'
- import Item from '$lib/minecraft/Item.svelte'
- import { cleanId, millisecondsToTime, skyblockTime, toTitleCase } from '$lib/utils'
+ import { skyblockTime } from '$lib/utils'
export let data: CleanMemberProfile
+
+ let cachedItemUrls: Record<string, string> = {}
+ function cachedSkyblockItemToUrl(item: string) {
+ if (!cachedItemUrls[item]) cachedItemUrls[item] = skyblockItemToUrl(item)
+ return cachedItemUrls[item]
+ }
</script>
<div class="info-text primary-info-text">
@@ -22,7 +27,7 @@
</p>
<ul>
{#each farmingContest.crops as crop}
- <ListItemWithIcon src={skyblockItemToUrl(crop.item)}>
+ <ListItemWithIcon src={cachedSkyblockItemToUrl(crop.item)}>
<b>{crop.amount.toLocaleString()}</b> collected
{#if crop.position}
<span class="farming-contest-item-placement">
diff --git a/src/lib/sections/Leaderboards.svelte b/src/lib/sections/Leaderboards.svelte
index a0fa4dc..7cbea23 100644
--- a/src/lib/sections/Leaderboards.svelte
+++ b/src/lib/sections/Leaderboards.svelte
@@ -16,7 +16,7 @@
<a href="/leaderboard/{leaderboard.name}" class="leaderboard-item-anchor">
{leaderboard.positionIndex + 1}) <b>{cleanId(leaderboard.name)}</b>: {formatNumberFromUnit(
leaderboard.value,
- leaderboard.unit ?? cleanId(leaderboard.name).toLowerCase()
+ leaderboard.unit ?? null
)}
</a>
</li>
diff --git a/yarn.lock b/yarn.lock
index 4f3f817..b02da21 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -153,7 +153,7 @@
dependencies:
esbuild "^0.14.21"
-"@sveltejs/kit@^1.0.0-next.269":
+"@sveltejs/kit@^1.0.0-next.310":
version "1.0.0-next.310"
resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.310.tgz#d4085327e536a8ab54165e64f0fe14a5ac4afa8f"
integrity sha512-pTyMyaoyHS+V5cQZIQMfQXmLkhw1VaRwT9avOSgwDc0QBpnNw2LdzwoPYsUr96ca5B6cfT3SMUNolxErTNHmPQ==