diff options
author | mat <github@matdoes.dev> | 2022-07-01 00:16:26 -0500 |
---|---|---|
committer | mat <github@matdoes.dev> | 2022-07-01 00:16:26 -0500 |
commit | f740562c791048393913fdf75b677fc49760c07c (patch) | |
tree | f4ba38fbefdf43531006bdbee2aa50abec6c9a0a | |
parent | a78b91ca5387fdfd1bb27b6b928154378819d9c6 (diff) | |
parent | 61c160b600026da4f9dcc43232281e397699f2f1 (diff) | |
download | skyblock-stats-f740562c791048393913fdf75b677fc49760c07c.tar.gz skyblock-stats-f740562c791048393913fdf75b677fc49760c07c.tar.bz2 skyblock-stats-f740562c791048393913fdf75b677fc49760c07c.zip |
Merge branch 'master' into faster-heads
-rw-r--r-- | src/lib/APITypes.d.ts | 1 | ||||
-rw-r--r-- | src/lib/minecraft/Item.svelte | 2 | ||||
-rw-r--r-- | src/routes/items.svelte | 6 | ||||
-rw-r--r-- | src/routes/player/[player]/[profile].svelte | 23 | ||||
-rw-r--r-- | src/routes/player/[player]/index.svelte | 3 |
5 files changed, 29 insertions, 6 deletions
diff --git a/src/lib/APITypes.d.ts b/src/lib/APITypes.d.ts index 236abc3..92153cf 100644 --- a/src/lib/APITypes.d.ts +++ b/src/lib/APITypes.d.ts @@ -421,6 +421,7 @@ export interface Skills { * warning to the user. */ apiEnabled: boolean + average: number } diff --git a/src/lib/minecraft/Item.svelte b/src/lib/minecraft/Item.svelte index 90d3aad..5abf5bc 100644 --- a/src/lib/minecraft/Item.svelte +++ b/src/lib/minecraft/Item.svelte @@ -22,7 +22,7 @@ item.requirements.slayer.level }` ) - extraLore.push(`§l§${TIER_COLORS[item.tier] ?? 'c'}${item.tier}`) + extraLore.push(`§l§${TIER_COLORS[item.tier] ?? 'c'}${item.tier.replace(/_/g, ' ')}`) } if (item?.id) { extraLore.push(`\n§8ID: ${item.id}`) diff --git a/src/routes/items.svelte b/src/routes/items.svelte index 01a2108..f836de0 100644 --- a/src/routes/items.svelte +++ b/src/routes/items.svelte @@ -71,9 +71,9 @@ <main> <div class="last-updated"> - Last updated: <time datetime="${data.lastUpdated}" - >{millisecondsToTime(now - data.lastUpdated)} ago - </time> + Last updated: <a href="https://github.com/mat-1/skyblock-items-history/commits/main"><time datetime="${data.lastUpdated}"> + {millisecondsToTime(now - data.lastUpdated)} ago + </time></a> </div> <h1>SkyBlock Item List</h1> <p class="results-count">{filteredItems.length.toLocaleString()} items</p> diff --git a/src/routes/player/[player]/[profile].svelte b/src/routes/player/[player]/[profile].svelte index 544d3c4..82d5471 100644 --- a/src/routes/player/[player]/[profile].svelte +++ b/src/routes/player/[player]/[profile].svelte @@ -159,7 +159,12 @@ {#if data.member.skills && data.member.skills.list.length > 0} <section id="skills" class="profile-skills"> - <h2>Skills</h2> + <div class="skill-heading-container"> + <h2 class="inline-heading">Skills</h2> + <span class="average-skill"> + {data.member.skills.average} avg. + </span> + </div> <Skills {data} /> </section> {/if} @@ -379,4 +384,20 @@ width: 100vw !important; } } + + .skill-heading-container { + display: flex; + align-items: center; + justify-content: center; + width: fit-content; + } + .skill-heading-container h2 { + display: inline-block; + margin-right: 0.4em; + margin-bottom: 0; + } + .average-skill { + color: var(--theme-darker-text); + font-size: 0.9rem; + } </style> diff --git a/src/routes/player/[player]/index.svelte b/src/routes/player/[player]/index.svelte index b95ef8a..5a51816 100644 --- a/src/routes/player/[player]/index.svelte +++ b/src/routes/player/[player]/index.svelte @@ -49,6 +49,7 @@ let isActiveProfileOnline: boolean function updateActiveProfile() { + activeProfileLastSave = 0 if (data.profiles) for (const profile of data.profiles) { if (profile.members) @@ -66,7 +67,7 @@ let backgroundUrl: string | null $: { - $navigating + data backgroundUrl = data.customization?.backgroundUrl ?? chooseDefaultBackground(data.player.uuid) updateActiveProfile() } |