diff --git a/src-tauri/tauri.linux.conf.json b/src-tauri/tauri.linux.conf.json index 0dd83d1..28a007d 100644 --- a/src-tauri/tauri.linux.conf.json +++ b/src-tauri/tauri.linux.conf.json @@ -16,7 +16,7 @@ "url": "/update/checking", "width": 1000, "height": 600, - "minWidth": 875, + "minWidth": 900, "minHeight": 500 } ], diff --git a/src-tauri/tauri.macos.conf.json b/src-tauri/tauri.macos.conf.json index 2571dac..d6f0611 100644 --- a/src-tauri/tauri.macos.conf.json +++ b/src-tauri/tauri.macos.conf.json @@ -17,7 +17,7 @@ "url": "/update/checking", "width": 1000, "height": 600, - "minWidth": 875, + "minWidth": 900, "minHeight": 500, "titleBarStyle": "Overlay", "hiddenTitle": true diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json index 6e10967..567a6a4 100644 --- a/src-tauri/tauri.windows.conf.json +++ b/src-tauri/tauri.windows.conf.json @@ -17,7 +17,7 @@ "url": "/update/checking", "width": 1000, "height": 632, - "minWidth": 875, + "minWidth": 900, "minHeight": 532, "decorations": false, "shadow": true diff --git a/src/app/main/game/berrydash/leaderboards/page.tsx b/src/app/main/game/berrydash/leaderboards/page.tsx index e20fbae..bbdcc82 100644 --- a/src/app/main/game/berrydash/leaderboards/page.tsx +++ b/src/app/main/game/berrydash/leaderboards/page.tsx @@ -85,10 +85,12 @@ export default function BerryDashLeaderboards () { const [selected, setSelected] = useState(-1) const [selectedBerryOption, setSelectedBerryOption] = useState(0) const [entries, setEntries] = useState<(LeaderboardEntry | Account)[]>([]) + const [loading, setLoading] = useState(false) const router = useRouter() const Refresh = useCallback(async () => { + setLoading(true) try { if (selected == 3 || selected == 4) { const response = await fetch( @@ -145,6 +147,7 @@ export default function BerryDashLeaderboards () { } catch { setEntries([]) } + setLoading(false) }, [selected, selectedBerryOption]) useEffect(() => { @@ -160,6 +163,25 @@ export default function BerryDashLeaderboards () {

Berry Dash Leaderboards

+ {selected == 1 && ( +
+ +
+ )}
+ ) : loading ? ( +

+ Loading +

) : ( <>
- {selected == 1 && ( -
- -
- )} )}
diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx index dafa918..fbde5cd 100644 --- a/src/components/Sidebar.tsx +++ b/src/components/Sidebar.tsx @@ -59,10 +59,11 @@ export default function Sidebar () { }} >
{ if (platform() != 'macos') return if (e.buttons === 1) {