From fb38ac69dff0a97f3140be0f5170a70b97701df0 Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Wed, 8 Nov 2023 08:40:49 +0000
Subject: [PATCH] fix(ssr): fix pagination being broken on inital player page
 load

---
 package.json                               | 2 +-
 src/app/player/[id]/[sort]/[page]/page.tsx | 9 +++------
 src/components/player/Scores.tsx           | 8 +++++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 3925635..53e1328 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "dev": "next dev --turbo",
+    "dev": "next dev",
     "build": "next build",
     "generate-sitemap": "next-sitemap",
     "start": "next start",
diff --git a/src/app/player/[id]/[sort]/[page]/page.tsx b/src/app/player/[id]/[sort]/[page]/page.tsx
index 0458c24..3ee6b44 100644
--- a/src/app/player/[id]/[sort]/[page]/page.tsx
+++ b/src/app/player/[id]/[sort]/[page]/page.tsx
@@ -1,6 +1,5 @@
 import Card from "@/components/Card";
 import Container from "@/components/Container";
-import Spinner from "@/components/Spinner";
 import PlayerChart from "@/components/player/PlayerChart";
 import PlayerInfo from "@/components/player/PlayerInfo";
 import Scores from "@/components/player/Scores";
@@ -17,7 +16,6 @@ import { normalizedRegionName } from "@/utils/utils";
 import clsx from "clsx";
 import { Metadata } from "next";
 import Image from "next/image";
-import { Suspense } from "react";
 
 const DEFAULT_SORT_TYPE = SortTypes.top;
 
@@ -131,16 +129,15 @@ export default async function Player({ params: { id, sort, page } }: Props) {
             })}
           </div>
           <div className="h-[320px] w-full">
-            <Suspense fallback={<Spinner />}>
-              <PlayerChart scoresaber={player} />
-            </Suspense>
+            <PlayerChart scoresaber={player} />
           </div>
         </Card>
         <Scores
           initalScores={playerScores?.scores}
           initalPage={Number(page)}
-          playerData={player}
           initalSortType={sortType}
+          initalTotalPages={playerScores?.pageInfo.totalPages}
+          playerData={player}
         />
       </Container>
     </main>
diff --git a/src/components/player/Scores.tsx b/src/components/player/Scores.tsx
index d4d44b4..89699e5 100644
--- a/src/components/player/Scores.tsx
+++ b/src/components/player/Scores.tsx
@@ -22,15 +22,17 @@ type PageInfo = {
 type ScoresProps = {
   initalScores: ScoresaberPlayerScore[] | undefined;
   initalPage: number;
-  playerData: ScoresaberPlayer;
   initalSortType: SortType;
+  initalTotalPages?: number;
+  playerData: ScoresaberPlayer;
 };
 
 export default function Scores({
   initalScores,
-  playerData,
   initalPage,
   initalSortType,
+  initalTotalPages,
+  playerData,
 }: ScoresProps) {
   const settingsStore = useStore(useSettingsStore, (store) => store);
   const playerId = playerData.id;
@@ -41,7 +43,7 @@ export default function Scores({
 
   const [scores, setScores] = useState<PageInfo>({
     page: initalPage,
-    totalPages: 1,
+    totalPages: initalTotalPages || 1,
     sortType: initalSortType,
     scores: initalScores ? initalScores : [],
   });