From 0a6ec532a635bb5e075acccead90f7f53f5f8275 Mon Sep 17 00:00:00 2001
From: Liam <liam@fascinated.cc>
Date: Fri, 20 Oct 2023 21:55:30 +0100
Subject: [PATCH] make score a component

---
 src/app/player/[id]/page.tsx | 60 ++------------------------------
 src/components/Score.tsx     | 66 ++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 58 deletions(-)
 create mode 100644 src/components/Score.tsx

diff --git a/src/app/player/[id]/page.tsx b/src/app/player/[id]/page.tsx
index 1b2c166..3741d0a 100644
--- a/src/app/player/[id]/page.tsx
+++ b/src/app/player/[id]/page.tsx
@@ -6,14 +6,13 @@ import Container from "@/components/Container";
 import Label from "@/components/Label";
 import Pagination from "@/components/Pagination";
 import PlayerChart from "@/components/PlayerChart";
-import ScoreStatLabel from "@/components/ScoreStatLabel";
+import Score from "@/components/Score";
 import { Spinner } from "@/components/Spinner";
 import { ScoresaberPlayer } from "@/schemas/scoresaber/player";
 import { ScoresaberPlayerScore } from "@/schemas/scoresaber/playerScore";
 import { formatNumber } from "@/utils/number";
 import { fetchScores, getPlayerInfo } from "@/utils/scoresaber/api";
 import { GlobeAsiaAustraliaIcon } from "@heroicons/react/20/solid";
-import moment from "moment";
 import Image from "next/image";
 import { useCallback, useEffect, useState } from "react";
 import ReactCountryFlag from "react-country-flag";
@@ -207,62 +206,7 @@ export default function Player({ params }: { params: { id: string } }) {
                     const { score, leaderboard } = scoreData;
 
                     return (
-                      <div
-                        className="grid grid-cols-1 pb-2 pt-2 first:pt-0 last:pb-0 md:grid-cols-[1.1fr_6fr_3fr] xl:xs:grid-cols-[.95fr_6fr_3fr]"
-                        key={id}
-                      >
-                        <div className="ml-3 flex flex-col items-start justify-center">
-                          <div className="hidden w-fit flex-row items-center justify-start gap-1 md:flex">
-                            <GlobeAsiaAustraliaIcon width={20} height={20} />
-                            <p>#{score.rank}</p>
-                          </div>
-                          <p className="absolute right-3 mt-4 block divide-y text-sm text-gray-300 md:relative md:right-auto md:mt-0">
-                            {moment(score.timeSet).fromNow()}
-                          </p>
-                        </div>
-                        <div className="flex w-full items-center gap-2">
-                          <Image
-                            src={leaderboard.coverImage}
-                            alt={leaderboard.songName}
-                            className="h-fit rounded-md"
-                            width={60}
-                            height={60}
-                          />
-                          <div className="w-fit truncate text-blue-500">
-                            <p>{leaderboard.songName}</p>
-                            <p>
-                              {leaderboard.songAuthorName}{" "}
-                              <span className="text-gray-200">
-                                {leaderboard.levelAuthorName}
-                              </span>
-                            </p>
-                          </div>
-                        </div>
-                        <div className="flex items-center justify-between p-1 md:items-start md:justify-end">
-                          <div className="flex items-center gap-1 md:hidden">
-                            <GlobeAsiaAustraliaIcon width={20} height={20} />
-                            <p>#{score.rank}</p>
-                          </div>
-                          <div className="flex items-end justify-end gap-2">
-                            {score.pp > 0 && (
-                              <ScoreStatLabel
-                                value={formatNumber(score.pp.toFixed(2)) + "pp"}
-                                className="bg-blue-500"
-                              />
-                            )}
-                            <ScoreStatLabel
-                              value={
-                                !leaderboard.maxScore
-                                  ? formatNumber(score.baseScore)
-                                  : (
-                                      (score.baseScore / leaderboard.maxScore) *
-                                      100
-                                    ).toFixed(2) + "%"
-                              }
-                            />
-                          </div>
-                        </div>
-                      </div>
+                      <Score key={id} score={score} leaderboard={leaderboard} />
                     );
                   })
                 )}
diff --git a/src/components/Score.tsx b/src/components/Score.tsx
new file mode 100644
index 0000000..2d0b2fc
--- /dev/null
+++ b/src/components/Score.tsx
@@ -0,0 +1,66 @@
+import { ScoresaberLeaderboardInfo } from "@/schemas/scoresaber/leaderboard";
+import { ScoresaberScore } from "@/schemas/scoresaber/score";
+import { formatNumber } from "@/utils/number";
+import { GlobeAsiaAustraliaIcon } from "@heroicons/react/20/solid";
+import moment from "moment";
+import Image from "next/image";
+import ScoreStatLabel from "./ScoreStatLabel";
+
+type ScoreProps = {
+  score: ScoresaberScore;
+  leaderboard: ScoresaberLeaderboardInfo;
+};
+
+export default function Score({ score, leaderboard }: ScoreProps) {
+  return (
+    <div className="grid grid-cols-1 pb-2 pt-2 first:pt-0 last:pb-0 md:grid-cols-[1.1fr_6fr_3fr] xl:xs:grid-cols-[.95fr_6fr_3fr]">
+      <div className="ml-3 flex flex-col items-start justify-center">
+        <div className="hidden w-fit flex-row items-center justify-start gap-1 md:flex">
+          <GlobeAsiaAustraliaIcon width={20} height={20} />
+          <p>#{score.rank}</p>
+        </div>
+        <p className="absolute right-3 mt-4 block divide-y text-sm text-gray-300 md:relative md:right-auto md:mt-0">
+          {moment(score.timeSet).fromNow()}
+        </p>
+      </div>
+      <div className="flex w-full items-center gap-2">
+        <Image
+          src={leaderboard.coverImage}
+          alt={leaderboard.songName}
+          className="h-fit rounded-md"
+          width={60}
+          height={60}
+        />
+        <div className="w-fit truncate text-blue-500">
+          <p>{leaderboard.songName}</p>
+          <p>
+            {leaderboard.songAuthorName}{" "}
+            <span className="text-gray-200">{leaderboard.levelAuthorName}</span>
+          </p>
+        </div>
+      </div>
+      <div className="flex items-center justify-between p-1 md:items-start md:justify-end">
+        <div className="flex items-center gap-1 md:hidden">
+          <GlobeAsiaAustraliaIcon width={20} height={20} />
+          <p>#{score.rank}</p>
+        </div>
+        <div className="flex items-end justify-end gap-2">
+          {score.pp > 0 && (
+            <ScoreStatLabel
+              value={formatNumber(score.pp.toFixed(2)) + "pp"}
+              className="bg-blue-500"
+            />
+          )}
+          <ScoreStatLabel
+            value={
+              !leaderboard.maxScore
+                ? formatNumber(score.baseScore)
+                : ((score.baseScore / leaderboard.maxScore) * 100).toFixed(2) +
+                  "%"
+            }
+          />
+        </div>
+      </div>
+    </div>
+  );
+}