cleanup
All checks were successful
deploy / deploy (push) Successful in 55s

This commit is contained in:
Lee 2023-10-23 11:01:36 +01:00
parent 05e257f8be
commit 77d6d8b60a
2 changed files with 22 additions and 6 deletions

@ -8,6 +8,7 @@ import dynamic from "next/dynamic";
import { useRouter } from "next/navigation"; import { useRouter } from "next/navigation";
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";
import Card from "../Card"; import Card from "../Card";
import Error from "../Error";
import Pagination from "../Pagination"; import Pagination from "../Pagination";
import Score from "./Score"; import Score from "./Score";
@ -33,6 +34,7 @@ export default function Scores({ playerData, page, sortType }: ScoresProps) {
const router = useRouter(); const router = useRouter();
const [mounted, setMounted] = useState(false);
const [error, setError] = useState(false); const [error, setError] = useState(false);
const [errorMessage, setErrorMessage] = useState(""); const [errorMessage, setErrorMessage] = useState("");
@ -46,7 +48,6 @@ export default function Scores({ playerData, page, sortType }: ScoresProps) {
const updateScoresPage = useCallback( const updateScoresPage = useCallback(
(sortType: SortType, page: any) => { (sortType: SortType, page: any) => {
console.log(`Switching page to ${page} with sort ${sortType.value}`);
ScoreSaberAPI.fetchScores(playerId, page, sortType.value, 10).then( ScoreSaberAPI.fetchScores(playerId, page, sortType.value, 10).then(
(scoresResponse) => { (scoresResponse) => {
if (!scoresResponse) { if (!scoresResponse) {
@ -77,6 +78,8 @@ export default function Scores({ playerData, page, sortType }: ScoresProps) {
scroll: false, scroll: false,
}); });
} }
console.log(`Switched page to ${page} with sort ${sortType.value}`);
}, },
); );
}, },
@ -84,10 +87,25 @@ export default function Scores({ playerData, page, sortType }: ScoresProps) {
); );
useEffect(() => { useEffect(() => {
if (!scores.loading || error) return; if (mounted) return;
setMounted(true);
updateScoresPage(scores.sortType, scores.page); updateScoresPage(scores.sortType, scores.page);
}, [error, playerId, updateScoresPage, scores]); }, [mounted, updateScoresPage, scores.sortType, scores.page]);
if (error) {
return (
<Card className="mt-2">
<div className="p-3 text-center">
<div role="status">
<div className="flex flex-col items-center justify-center gap-2">
{error && <Error errorMessage={errorMessage} />}
</div>
</div>
</div>
</Card>
);
}
return ( return (
<Card className="mt-2 w-full items-center md:flex-col"> <Card className="mt-2 w-full items-center md:flex-col">

@ -132,7 +132,7 @@ export const useScoresaberScoresStore = create<ScoreSaberScoresStore>()(
while (search) { while (search) {
page++; page++;
const newScores = await ScoreSaberAPI.fetchScores(playerId, page); const newScores = await ScoreSaberAPI.fetchScores(playerId, page);
console.log("scanning page", page, "for", playerId); console.log("Scanning page", page, "for", playerId);
if (newScores?.scores.length == 0 || newScores == undefined) break; if (newScores?.scores.length == 0 || newScores == undefined) break;
for (const score of newScores.scores) { for (const score of newScores.scores) {
@ -194,8 +194,6 @@ export const useScoresaberScoresStore = create<ScoreSaberScoresStore>()(
lastUpdated: Date.now(), lastUpdated: Date.now(),
}); });
console.log(oldScores);
if (newScoresCount > 0) { if (newScoresCount > 0) {
console.log(`Found ${newScoresCount} new scores for ${playerId}`); console.log(`Found ${newScoresCount} new scores for ${playerId}`);
} }