diff --git a/public/icons/bird_-1.png b/public/icons/bird_-1.png deleted file mode 100644 index a0360a7..0000000 Binary files a/public/icons/bird_-1.png and /dev/null differ diff --git a/public/icons/bird_-2.png b/public/icons/bird_-2.png deleted file mode 100644 index b723d40..0000000 Binary files a/public/icons/bird_-2.png and /dev/null differ diff --git a/public/icons/bird_-3.png b/public/icons/bird_-3.png deleted file mode 100644 index ec65da0..0000000 Binary files a/public/icons/bird_-3.png and /dev/null differ diff --git a/public/icons/bird_-4.png b/public/icons/bird_-4.png deleted file mode 100644 index db4e597..0000000 Binary files a/public/icons/bird_-4.png and /dev/null differ diff --git a/public/icons/bird_1.png b/public/icons/bird_1.png deleted file mode 100644 index 3564832..0000000 Binary files a/public/icons/bird_1.png and /dev/null differ diff --git a/public/icons/bird_2.png b/public/icons/bird_2.png deleted file mode 100644 index d258f5e..0000000 Binary files a/public/icons/bird_2.png and /dev/null differ diff --git a/public/icons/bird_3.png b/public/icons/bird_3.png deleted file mode 100644 index 1e0e552..0000000 Binary files a/public/icons/bird_3.png and /dev/null differ diff --git a/public/icons/bird_4.png b/public/icons/bird_4.png deleted file mode 100644 index fd0017e..0000000 Binary files a/public/icons/bird_4.png and /dev/null differ diff --git a/public/icons/bird_5.png b/public/icons/bird_5.png deleted file mode 100644 index ff0cfd5..0000000 Binary files a/public/icons/bird_5.png and /dev/null differ diff --git a/public/icons/bird_6.png b/public/icons/bird_6.png deleted file mode 100644 index b639043..0000000 Binary files a/public/icons/bird_6.png and /dev/null differ diff --git a/public/icons/bird_7.png b/public/icons/bird_7.png deleted file mode 100644 index b454b2a..0000000 Binary files a/public/icons/bird_7.png and /dev/null differ diff --git a/public/icons/bird_8.png b/public/icons/bird_8.png deleted file mode 100644 index 5e6de7b..0000000 Binary files a/public/icons/bird_8.png and /dev/null differ diff --git a/public/overlays/overlay_1.png b/public/overlays/overlay_1.png deleted file mode 100644 index 5647013..0000000 Binary files a/public/overlays/overlay_1.png and /dev/null differ diff --git a/public/overlays/overlay_10.png b/public/overlays/overlay_10.png deleted file mode 100644 index 3667723..0000000 Binary files a/public/overlays/overlay_10.png and /dev/null differ diff --git a/public/overlays/overlay_11.png b/public/overlays/overlay_11.png deleted file mode 100644 index 0cbdf6b..0000000 Binary files a/public/overlays/overlay_11.png and /dev/null differ diff --git a/public/overlays/overlay_12.png b/public/overlays/overlay_12.png deleted file mode 100644 index 2ade0d9..0000000 Binary files a/public/overlays/overlay_12.png and /dev/null differ diff --git a/public/overlays/overlay_13.png b/public/overlays/overlay_13.png deleted file mode 100644 index 3783c2d..0000000 Binary files a/public/overlays/overlay_13.png and /dev/null differ diff --git a/public/overlays/overlay_14.png b/public/overlays/overlay_14.png deleted file mode 100644 index 8b760f7..0000000 Binary files a/public/overlays/overlay_14.png and /dev/null differ diff --git a/public/overlays/overlay_2.png b/public/overlays/overlay_2.png deleted file mode 100644 index 93df4f0..0000000 Binary files a/public/overlays/overlay_2.png and /dev/null differ diff --git a/public/overlays/overlay_3.png b/public/overlays/overlay_3.png deleted file mode 100644 index 2f2b985..0000000 Binary files a/public/overlays/overlay_3.png and /dev/null differ diff --git a/public/overlays/overlay_4.png b/public/overlays/overlay_4.png deleted file mode 100644 index 1b863be..0000000 Binary files a/public/overlays/overlay_4.png and /dev/null differ diff --git a/public/overlays/overlay_5.png b/public/overlays/overlay_5.png deleted file mode 100644 index 797988b..0000000 Binary files a/public/overlays/overlay_5.png and /dev/null differ diff --git a/public/overlays/overlay_6.png b/public/overlays/overlay_6.png deleted file mode 100644 index 15da6a2..0000000 Binary files a/public/overlays/overlay_6.png and /dev/null differ diff --git a/public/overlays/overlay_7.png b/public/overlays/overlay_7.png deleted file mode 100644 index 32652f3..0000000 Binary files a/public/overlays/overlay_7.png and /dev/null differ diff --git a/public/overlays/overlay_8.png b/public/overlays/overlay_8.png deleted file mode 100644 index 9742d82..0000000 Binary files a/public/overlays/overlay_8.png and /dev/null differ diff --git a/public/overlays/overlay_9.png b/public/overlays/overlay_9.png deleted file mode 100644 index 11ed0b8..0000000 Binary files a/public/overlays/overlay_9.png and /dev/null differ diff --git a/src/app/leaderboards/Leaderboards.css b/src/app/leaderboards/Leaderboards.css index 3a2cce3..dbfd06a 100644 --- a/src/app/leaderboards/Leaderboards.css +++ b/src/app/leaderboards/Leaderboards.css @@ -5,11 +5,11 @@ } .leaderboard-scroll { - @apply h-[510px] bg-[#161616] border border-[#242424] rounded-lg overflow-y-auto max-w-md w-full; + @apply h-[510px] bg-[#161616] border border-[#242424] rounded-lg overflow-y-auto w-[475px]; } .leaderboard-entry { - @apply flex justify-between items-center m-2 p-4 rounded-lg text-gray-200 text-lg transition-colors cursor-default bg-[#242424] hover:bg-[#323232] border border-[#484848] hover:border-[#565656]; + @apply flex items-center m-2 p-4 rounded-lg text-gray-200 text-lg transition-colors cursor-default bg-[#242424] hover:bg-[#323232] border border-[#484848] hover:border-[#565656]; } .leaderboard-entry p.score { diff --git a/src/app/leaderboards/page.tsx b/src/app/leaderboards/page.tsx index e9f94a0..875f0fb 100644 --- a/src/app/leaderboards/page.tsx +++ b/src/app/leaderboards/page.tsx @@ -3,20 +3,22 @@ import { useEffect, useState } from 'react' import './Leaderboards.css' import axios from 'axios' -import { LeaderboardEntry } from '../types/LeaderboardEntry' import { app } from '@tauri-apps/api' import { platform } from '@tauri-apps/plugin-os' import { decrypt } from '../util/Encryption' import { invoke } from '@tauri-apps/api/core' +import Image from 'next/image' +import { LeaderboardResponse } from '../types/LeaderboardResponse' export default function Leaderboards () { - const [leaderboardData, setLeaderboardData] = useState([]) + const [leaderboardData, setLeaderboardData] = + useState(null) const [loading, setLoading] = useState(true) const formatter = new Intl.NumberFormat('en-US') async function refresh () { setLoading(true) - setLeaderboardData([]) + setLeaderboardData(null) try { const launcherVersion = await app.getVersion() const response = await axios.get( @@ -40,7 +42,7 @@ export default function Leaderboards () { function downloadLeaderboard () { let content = '"Username","Score","ScoreFormatted"\n' - leaderboardData.forEach(entry => { + leaderboardData?.entries.forEach(entry => { content += `"${entry.username}","${entry.value}","${formatter.format( BigInt(entry.value) )}"\n` @@ -63,7 +65,7 @@ export default function Leaderboards () { @@ -78,13 +80,26 @@ export default function Leaderboards () {
- {leaderboardData.length ? ( - leaderboardData.map((entry, i) => ( -
-

- {entry.username} (#{i + 1}) -

-

{formatter.format(BigInt(entry.value))}

+ {leaderboardData?.entries.length ? ( + leaderboardData.entries.map((entry, i) => ( +
+
+ {/* */} +

+ {entry.username} (#{i + 1}) +

+
+
+

+ {formatter.format(BigInt(entry.value))} +

+
)) ) : loading ? ( diff --git a/src/app/types/LeaderboardEntry.ts b/src/app/types/LeaderboardEntry.ts index eb5245c..c464a57 100644 --- a/src/app/types/LeaderboardEntry.ts +++ b/src/app/types/LeaderboardEntry.ts @@ -6,4 +6,5 @@ export interface LeaderboardEntry { overlay: number birdColor: number[] overlayColor: number[] + customIcon: string | null } diff --git a/src/app/types/LeaderboardResponse.ts b/src/app/types/LeaderboardResponse.ts new file mode 100644 index 0000000..81f3e74 --- /dev/null +++ b/src/app/types/LeaderboardResponse.ts @@ -0,0 +1,6 @@ +import { LeaderboardEntry } from './LeaderboardEntry' + +export interface LeaderboardResponse { + entries: LeaderboardEntry[] + customIcons: Record +}