From 4cbd26044046289ada09e5fe4ca4c3b35ca6b173 Mon Sep 17 00:00:00 2001 From: Pinapelz Date: Sun, 12 Oct 2025 01:17:06 -0700 Subject: implement diva score view --- frontend/src/assets/games/diva/easy.webp | Bin 0 -> 6944 bytes frontend/src/assets/games/diva/ex_extreme.webp | Bin 0 -> 7842 bytes frontend/src/assets/games/diva/excellent.webp | Bin 0 -> 8770 bytes frontend/src/assets/games/diva/extreme.webp | Bin 0 -> 6824 bytes frontend/src/assets/games/diva/great.webp | Bin 0 -> 6794 bytes frontend/src/assets/games/diva/hard.webp | Bin 0 -> 6280 bytes frontend/src/assets/games/diva/misstake.webp | Bin 0 -> 9984 bytes frontend/src/assets/games/diva/normal.webp | Bin 0 -> 6970 bytes frontend/src/assets/games/diva/perfect.webp | Bin 0 -> 7352 bytes frontend/src/assets/games/diva/standard.webp | Bin 0 -> 9786 bytes .../components/displays/DancerushScoreDisplay.tsx | 2 +- .../src/components/displays/DivaScoreDisplay.tsx | 517 +++++++++++++++++++++ frontend/src/pages/Chart.tsx | 13 + frontend/src/pages/Score.tsx | 12 + 14 files changed, 543 insertions(+), 1 deletion(-) create mode 100644 frontend/src/assets/games/diva/easy.webp create mode 100644 frontend/src/assets/games/diva/ex_extreme.webp create mode 100644 frontend/src/assets/games/diva/excellent.webp create mode 100644 frontend/src/assets/games/diva/extreme.webp create mode 100644 frontend/src/assets/games/diva/great.webp create mode 100644 frontend/src/assets/games/diva/hard.webp create mode 100644 frontend/src/assets/games/diva/misstake.webp create mode 100644 frontend/src/assets/games/diva/normal.webp create mode 100644 frontend/src/assets/games/diva/perfect.webp create mode 100644 frontend/src/assets/games/diva/standard.webp create mode 100644 frontend/src/components/displays/DivaScoreDisplay.tsx diff --git a/frontend/src/assets/games/diva/easy.webp b/frontend/src/assets/games/diva/easy.webp new file mode 100644 index 0000000..581105d Binary files /dev/null and b/frontend/src/assets/games/diva/easy.webp differ diff --git a/frontend/src/assets/games/diva/ex_extreme.webp b/frontend/src/assets/games/diva/ex_extreme.webp new file mode 100644 index 0000000..4a5895b Binary files /dev/null and b/frontend/src/assets/games/diva/ex_extreme.webp differ diff --git a/frontend/src/assets/games/diva/excellent.webp b/frontend/src/assets/games/diva/excellent.webp new file mode 100644 index 0000000..6318779 Binary files /dev/null and b/frontend/src/assets/games/diva/excellent.webp differ diff --git a/frontend/src/assets/games/diva/extreme.webp b/frontend/src/assets/games/diva/extreme.webp new file mode 100644 index 0000000..3b0d4ca Binary files /dev/null and b/frontend/src/assets/games/diva/extreme.webp differ diff --git a/frontend/src/assets/games/diva/great.webp b/frontend/src/assets/games/diva/great.webp new file mode 100644 index 0000000..545618b Binary files /dev/null and b/frontend/src/assets/games/diva/great.webp differ diff --git a/frontend/src/assets/games/diva/hard.webp b/frontend/src/assets/games/diva/hard.webp new file mode 100644 index 0000000..cf46895 Binary files /dev/null and b/frontend/src/assets/games/diva/hard.webp differ diff --git a/frontend/src/assets/games/diva/misstake.webp b/frontend/src/assets/games/diva/misstake.webp new file mode 100644 index 0000000..9732122 Binary files /dev/null and b/frontend/src/assets/games/diva/misstake.webp differ diff --git a/frontend/src/assets/games/diva/normal.webp b/frontend/src/assets/games/diva/normal.webp new file mode 100644 index 0000000..38f3180 Binary files /dev/null and b/frontend/src/assets/games/diva/normal.webp differ diff --git a/frontend/src/assets/games/diva/perfect.webp b/frontend/src/assets/games/diva/perfect.webp new file mode 100644 index 0000000..2c6831e Binary files /dev/null and b/frontend/src/assets/games/diva/perfect.webp differ diff --git a/frontend/src/assets/games/diva/standard.webp b/frontend/src/assets/games/diva/standard.webp new file mode 100644 index 0000000..052a3a8 Binary files /dev/null and b/frontend/src/assets/games/diva/standard.webp differ diff --git a/frontend/src/components/displays/DancerushScoreDisplay.tsx b/frontend/src/components/displays/DancerushScoreDisplay.tsx index 35a3968..fb31870 100644 --- a/frontend/src/components/displays/DancerushScoreDisplay.tsx +++ b/frontend/src/components/displays/DancerushScoreDisplay.tsx @@ -285,7 +285,7 @@ const DancerushScoreDisplay: React.FC = ({
{!hideTitleArtist && ( - +

{score.title || score.song || "Unknown Title"}

diff --git a/frontend/src/components/displays/DivaScoreDisplay.tsx b/frontend/src/components/displays/DivaScoreDisplay.tsx new file mode 100644 index 0000000..c16e55f --- /dev/null +++ b/frontend/src/components/displays/DivaScoreDisplay.tsx @@ -0,0 +1,517 @@ +import React from "react"; +import {Link} from "react-router"; +import { globalSkipKeys } from "../../types/constants"; +import SHA1 from "crypto-js/sha1"; +import easyImg from "../../assets/games/diva/easy.webp"; +import normalImg from "../../assets/games/diva/normal.webp"; +import hardImg from "../../assets/games/diva/hard.webp"; +import extremeImg from "../../assets/games/diva/extreme.webp"; +import ex_extremeImg from "../../assets/games/diva/ex_extreme.webp"; +import standardImg from "../../assets/games/diva/standard.webp"; +import misstakeImg from "../../assets/games/diva/misstake.webp"; +import perfectImg from "../../assets/games/diva/perfect.webp"; +import greatImg from "../../assets/games/diva/great.webp"; +import excellentImg from "../../assets/games/diva/excellent.webp"; + + +interface Score { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + [key: string]: any; + timestamp: string | number; + username?: string; +} + +interface ScoreDisplayProps { + scores: Score[]; + viewMode: "cards" | "table"; + sortField: string; + sortDirection: "asc" | "desc"; + onSort: (field: string) => void; + onDelete?: (scoreId: number) => void; + showUsername?: boolean; + hideTitleArtist?: boolean; +} + +const DivaScoreDisplay: React.FC = ({ + scores, + viewMode, + sortField, + sortDirection, + onSort, + onDelete, + showUsername = false, + hideTitleArtist = false, +}) => { + // Key mappings for better display names. Hit or miss + const keyDisplayNames: Record = { + title: "Title", + artist: "Artist", + score: "SCORE", + difficulty: "Difficulty Rating", + lamp: "CLEAR RANK", + diff_lamp: "Chart Difficulty", + timestamp: "Date", + judgements: "Judgements", + maxCombo: "Max Combo", + perfect: "Perfect", + great: "Great", + good: "Good", + bad: "Bad", + miss: "Miss", + username: "Username", + num_players: "Players" + }; + + const primaryKeys = ["title", "artist", "song"]; + const mainStatKeys = [ + "score", + "difficulty", + "lamp", + "diff_lamp", + ]; + const expandableKeys = ["judgements", "optional"]; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + const formatValue = (value: any, key: string): string => { + if (value === null || value === undefined) return "N/A"; + console.log("formatValue called with key:", key); + + // Handle timestamps + if (key === "timestamp" || key === "date") { + const date = new Date(typeof value === "number" ? value : value); + return date.toLocaleDateString(); + } + + if(key === "difficulty"){ + console.log("difficulty value:", value); + return "★ " + value.toString(); + } + + if(key === "achievement"){ + console.log("achievement value:", value); + return value.toString() + "%"; + } + + if (typeof value === "number") { + if (key === "score" || key === "maxCombo" || key === "combo") { + return value.toLocaleString(); + } + return value.toString(); + } + + return String(value); + }; + + const getDisplayName = (key: string): string => { + return keyDisplayNames[key] || key.charAt(0).toUpperCase() + key.slice(1); + }; + + const renderValue = ( + // eslint-disable-next-line @typescript-eslint/no-explicit-any + value: any, + key: string, + compact: boolean = false, + ): React.ReactElement => { + if (value === null || value === undefined) + return N/A; + + // Handle judgements specially + if (key === "judgements" && typeof value === "object") { + const judgementEntries = Object.entries(value); + + + if (compact) { + return ( +
+ {judgementEntries.map(([jKey, jValue]) => ( +
+ + {getDisplayName(jKey)}: + + {formatValue(jValue, jKey)} +
+ ))} +
+ ); + } + return ( +
+ {judgementEntries.map(([jKey, jValue]) => ( + + {getDisplayName(jKey)}:{" "} + {formatValue(jValue, jKey)} + + ))} +
+ ); + } + + if (typeof value === "object" && !Array.isArray(value)) { + return ( +
+ {Object.entries(value).map(([subKey, subValue]) => ( +
+ {getDisplayName(subKey)}: + + {formatValue(subValue, subKey)} + +
+ ))} +
+ ); + } + + if(key === "diff_lamp"){ + let imgSrc = null; + switch (value) { + case "EASY": + imgSrc = easyImg; + break; + case "NORMAL": + imgSrc = normalImg; + break; + case "HARD": + imgSrc = hardImg; + break; + case "EXTRME": + imgSrc = extremeImg; + break; + case "EX EXTRME": + imgSrc = ex_extremeImg; + break; + default: + imgSrc = standardImg; + break; + } + return + {value} + ; + } + + if(key === "lamp"){ + let imgSrc = null; + switch (value){ + case "NOT CLEAR": + imgSrc = misstakeImg; + break; + case "STANDARD": + imgSrc = standardImg; + break; + case "GREAT": + imgSrc = greatImg; + break; + case "PERFECT": + imgSrc = perfectImg; + break; + case "EXCELLENT": + imgSrc = excellentImg; + break; + default: + imgSrc = standardImg; + break; + } + return + {value} + ; + } + + + return {formatValue(value, key)}; + }; + + const getScoreEntries = (score: Score) => { + const entries = Object.entries(score).filter( + ([key]) => !globalSkipKeys.includes(key), + ); + + const primary = entries.filter(([key]) => primaryKeys.includes(key)); + const mainStats = entries.filter(([key]) => mainStatKeys.includes(key)); + const expandable = entries.filter(([key]) => expandableKeys.includes(key)); + const others = entries.filter( + ([key]) => + !primaryKeys.includes(key) && + !mainStatKeys.includes(key) && + !expandableKeys.includes(key) && + key !== "timestamp", + ); + + return { + primary, + mainStats, + expandable, + others, + timestamp: score.timestamp, + }; + }; + + const SortIcon = ({ field }: { field: string }) => { + if (sortField !== field) { + return ; + } + return sortDirection === "asc" ? ( + + ) : ( + + ); + }; + + const sortedScores = [...scores].sort((a, b) => { + const aVal = a[sortField]; + const bVal = b[sortField]; + + if (aVal === undefined || aVal === null) return 1; + if (bVal === undefined || bVal === null) return -1; + + let comparison = 0; + + if (typeof aVal === "string" && typeof bVal === "string") { + comparison = aVal.localeCompare(bVal); + } else if (typeof aVal === "number" && typeof bVal === "number") { + comparison = aVal - bVal; + } else if (aVal instanceof Date && bVal instanceof Date) { + comparison = aVal.getTime() - bVal.getTime(); + } else { + comparison = String(aVal).localeCompare(String(bVal)); + } + + return sortDirection === "asc" ? comparison : -comparison; + }); + + // Get all possible keys for table headers + const allKeys = Array.from( + new Set(scores.flatMap((score) => Object.keys(score))), + ).filter((key) => !globalSkipKeys.includes(key)); + + // Prioritize important keys for table display + const tableKeys = [ + ...(hideTitleArtist ? [] : ["title", "song", "artist"]), + ...(showUsername ? ["username"] : []), + "score", + "difficulty", + "lamp", + "diff_lamp", + "rating", + "percent", + "grade", + "judgements", + "maxCombo", + "combo", + "num_players", + "timestamp", + ].filter((key) => allKeys.includes(key)); + + // Add actions column if delete function is provided + const showActions = onDelete && viewMode === "table"; + + if (scores.length === 0) { + return ( +
+
+ 🎵 +
+

+ No scores found +

+

Import some score data to get started!

+
+ ); + } + + if (viewMode === "cards") { + return ( +
+ {sortedScores.map((score, index) => { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + const { primary, mainStats, expandable, others, timestamp } = + getScoreEntries(score); + const chartIdHash = SHA1(`diva${score.title}${score.artist}`).toString(); + return ( +
+ {/* Primary Info */} +
+
+ {!hideTitleArtist && ( + +

+ {score.title || score.song || "Unknown Title"} +

+ {score.artist && ( +

+ {score.artist} +

+ )} + + )} + {showUsername && score.username && ( +

+ by {score.username} +

+ )} +
+
+ + {/* Main Stats */} + {mainStats.length > 0 && ( +
+ {mainStats.slice(0, 5).map(([key, value]) => ( +
+

+ {getDisplayName(key)} +

+

+ {renderValue(value, key)} +

+
+ ))} +
+ )} + + {/* Expandable sections (judgements, optional) */} + {expandable.map(([key, value]) => ( +
+

+ {getDisplayName(key)} +

+ {renderValue(value, key)} +
+ ))} + + {/* Other fields */} + {others.length > 0 && ( +
+
+ {others.map(([key, value]) => ( +
+ + {getDisplayName(key)}: + + + {renderValue(value, key)} + +
+ ))} +
+
+ )} + + {/* Timestamp */} +
+

+ {new Date( + typeof timestamp === "number" ? timestamp : timestamp, + ).toLocaleDateString()}{" "} + •{" "} + {new Date( + typeof timestamp === "number" ? timestamp : timestamp, + ).toLocaleTimeString([], { + hour: "2-digit", + minute: "2-digit", + })} +

+
+
+ ); + })} +
+ ); + } + + // Table + return ( +
+
+ + + + {tableKeys.map((key) => ( + + ))} + {showActions && ( + + )} + + + + {sortedScores.map((score, index) => ( + + {tableKeys.map((key) => ( + + ))} + {showActions && ( + + )} + + ))} + +
+ {key === "judgements" ? ( + {getDisplayName(key)} + ) : ( + + )} + + Actions +
+ {key === "lamp" || key === "diff_lamp" ? ( +
+ + {score[key] || "No Clear"} + +
+ ) : key === "judgements" ? ( +
+ {renderValue(score[key], key, true)} +
+ ) : key === "timestamp" ? ( + + {new Date( + typeof score[key] === "number" + ? score[key] + : score[key], + ).toLocaleDateString()} + + ) : key === "username" ? ( + + {score[key] || "Unknown"} + + ) : ( + + {renderValue(score[key], key)} + + )} +
+ +
+
+
+ ); +}; + +export default DivaScoreDisplay; diff --git a/frontend/src/pages/Chart.tsx b/frontend/src/pages/Chart.tsx index 5e81044..a2d5807 100644 --- a/frontend/src/pages/Chart.tsx +++ b/frontend/src/pages/Chart.tsx @@ -5,6 +5,7 @@ import { NavBar } from "../components/NavBar"; import SessionExpiredPopup from "../components/SessionExpiredPopup"; import ScoreDisplay from "../components/displays/GenericScoreDisplay"; import DancerushScoreDisplay from "../components/displays/DancerushScoreDisplay"; +import DivaScoreDisplay from "../components/displays/DivaScoreDisplay"; import SongInfoDisplay from "../components/modals/SongInfoDisplay"; type SortField = string; type SortDirection = "asc" | "desc"; @@ -213,6 +214,18 @@ const Chart = () => { hideTitleArtist={true} /> ); + case "diva": + return ( + + ); default: return ( { onDelete={handleDeleteScore} /> ); + case "diva": + return ( + + ); default: return (