From 77d6d8b60abe2a8301533c983d6385c36d029ac1 Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Mon, 23 Oct 2023 11:01:36 +0100
Subject: [PATCH] cleanup

---
 src/components/player/Scores.tsx   | 24 +++++++++++++++++++++---
 src/store/scoresaberScoresStore.ts |  4 +---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/components/player/Scores.tsx b/src/components/player/Scores.tsx
index f549544..bce2f1f 100644
--- a/src/components/player/Scores.tsx
+++ b/src/components/player/Scores.tsx
@@ -8,6 +8,7 @@ import dynamic from "next/dynamic";
 import { useRouter } from "next/navigation";
 import { useCallback, useEffect, useState } from "react";
 import Card from "../Card";
+import Error from "../Error";
 import Pagination from "../Pagination";
 import Score from "./Score";
 
@@ -33,6 +34,7 @@ export default function Scores({ playerData, page, sortType }: ScoresProps) {
 
   const router = useRouter();
 
+  const [mounted, setMounted] = useState(false);
   const [error, setError] = useState(false);
   const [errorMessage, setErrorMessage] = useState("");
 
@@ -46,7 +48,6 @@ export default function Scores({ playerData, page, sortType }: ScoresProps) {
 
   const updateScoresPage = useCallback(
     (sortType: SortType, page: any) => {
-      console.log(`Switching page to ${page} with sort ${sortType.value}`);
       ScoreSaberAPI.fetchScores(playerId, page, sortType.value, 10).then(
         (scoresResponse) => {
           if (!scoresResponse) {
@@ -77,6 +78,8 @@ export default function Scores({ playerData, page, sortType }: ScoresProps) {
               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(() => {
-    if (!scores.loading || error) return;
+    if (mounted) return;
+    setMounted(true);
 
     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 (
     <Card className="mt-2 w-full items-center md:flex-col">
diff --git a/src/store/scoresaberScoresStore.ts b/src/store/scoresaberScoresStore.ts
index 7aa9bf7..e7958b7 100644
--- a/src/store/scoresaberScoresStore.ts
+++ b/src/store/scoresaberScoresStore.ts
@@ -132,7 +132,7 @@ export const useScoresaberScoresStore = create<ScoreSaberScoresStore>()(
         while (search) {
           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;
 
           for (const score of newScores.scores) {
@@ -194,8 +194,6 @@ export const useScoresaberScoresStore = create<ScoreSaberScoresStore>()(
           lastUpdated: Date.now(),
         });
 
-        console.log(oldScores);
-
         if (newScoresCount > 0) {
           console.log(`Found ${newScoresCount} new scores for ${playerId}`);
         }