update score stat labels again

src/components/Score.tsx

@@ -2,6 +2,7 @@ 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 clsx from "clsx";
 import moment from "moment";
 import Image from "next/image";
 import ScoreStatLabel from "./ScoreStatLabel";
@@ -12,6 +13,8 @@ type ScoreProps = {
 };
 
 export default function Score({ score, leaderboard }: ScoreProps) {
+  const isFullCombo = score.missedNotes + score.badCuts === 0;
+
   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">
@@ -59,30 +62,42 @@ export default function Score({ score, leaderboard }: ScoreProps) {
         </div>
 
         {/* PP */}
-        <div className="grid w-fit grid-cols-2 grid-rows-1 justify-end gap-2">
+        <div className="flex flex-col justify-end gap-2">
-          {score.pp > 0 && (
+          <div className="flex justify-end gap-2">
+            {score.pp > 0 && (
+              <ScoreStatLabel
+                className="bg-blue-500 text-center"
+                value={formatNumber(score.pp.toFixed(2)) + "pp"}
+              />
+            )}
+
+            {/* Percentage score */}
             <ScoreStatLabel
-              className="bg-blue-500 text-center"
+              value={
-              value={formatNumber(score.pp.toFixed(2)) + "pp"}
+                !leaderboard.maxScore
+                  ? formatNumber(score.baseScore)
+                  : ((score.baseScore / leaderboard.maxScore) * 100).toFixed(
+                      2,
+                    ) + "%"
+              }
             />
-          )}
+          </div>
 
-          {/* Percentage score */}
+          <div className="flex justify-end gap-2">
-          <ScoreStatLabel
+            {/* Missed Notes */}
-            value={
+            <ScoreStatLabel
-              !leaderboard.maxScore
+              className={clsx(
-                ? formatNumber(score.baseScore)
+                "min-w-[2rem]",
-                : ((score.baseScore / leaderboard.maxScore) * 100).toFixed(2) +
+                isFullCombo ? "bg-green-500" : "bg-red-500",
-                  "%"
+              )}
-            }
+              title={`${score.missedNotes} missed notes. ${score.badCuts} bad cuts.`}
-          />
+              value={
-
+                isFullCombo
-          {/* Missed Notes */}
+                  ? "FC"
-          <ScoreStatLabel
+                  : formatNumber(score.missedNotes + score.badCuts) + "x"
-            className="min-w-[3rem] bg-red-500"
+              }
-            title={`${score.missedNotes} missed notes. ${score.badCuts} bad cuts.`}
+            />
-            value={formatNumber(score.missedNotes + score.badCuts) + "x"}
+          </div>
-          />
         </div>
       </div>
     </div>

src/components/ScoreStatLabel.tsx

@@ -3,24 +3,25 @@ import clsx from "clsx";
 type LabelProps = {
   value: string;
   title?: string;
+  icon?: JSX.Element;
   className?: string;
 };
 
 export default function ScoreStatLabel({
   value,
   title,
+  icon,
   className = "bg-neutral-700",
 }: LabelProps) {
   return (
-    <div
+    <div className={clsx("flex flex-col rounded-md", className)}>
-      className={clsx(
-        "flex min-w-[5rem] flex-col justify-center rounded-md",
-        className,
-      )}
-    >
       <div className="p4-[0.3rem] flex items-center gap-2 pb-[0.2rem] pl-[0.3rem] pr-[0.3rem] pt-[0.2rem]">
-        <p className="w-full text-center" title={title}>
+        <p
+          className="flex w-full items-center justify-center gap-1"
+          title={title}
+        >
           {value}
+          {icon}
         </p>
       </div>
     </div>