From d08f81b25d403c7bd0d7b703f338da7ed6306ee8 Mon Sep 17 00:00:00 2001 From: Liam Date: Thu, 17 Oct 2024 15:47:20 +0100 Subject: [PATCH] 7? --- projects/common/src/response/leaderboard-scores-response.ts | 5 ++--- projects/common/src/utils/score-utils.ts | 3 ++- .../website/src/app/(pages)/leaderboard/[...slug]/page.tsx | 4 +--- .../website/src/components/leaderboard/leaderboard-data.tsx | 4 ++-- .../src/components/leaderboard/leaderboard-score.tsx | 2 +- .../src/components/leaderboard/leaderboard-scores.tsx | 6 +++--- 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/projects/common/src/response/leaderboard-scores-response.ts b/projects/common/src/response/leaderboard-scores-response.ts index 2812ffa..c396088 100644 --- a/projects/common/src/response/leaderboard-scores-response.ts +++ b/projects/common/src/response/leaderboard-scores-response.ts @@ -1,12 +1,11 @@ import { Metadata } from "../types/metadata"; import { BeatSaverMap } from "../model/beatsaver/beatsaver-map"; -import Score from "../score/score"; -export default interface LeaderboardScoresResponse { +export default interface LeaderboardScoresResponse { /** * The scores that were set. */ - readonly scores: Score[]; + readonly scores: S[]; /** * The leaderboard that was used. diff --git a/projects/common/src/utils/score-utils.ts b/projects/common/src/utils/score-utils.ts index 8af83b1..a5b351b 100644 --- a/projects/common/src/utils/score-utils.ts +++ b/projects/common/src/utils/score-utils.ts @@ -3,6 +3,7 @@ import { kyFetch } from "./utils"; import PlayerScoresResponse from "../response/player-scores-response"; import { Config } from "../config"; import { ScoreSort } from "../score/score-sort"; +import LeaderboardScoresResponse from "../response/leaderboard-scores-response"; /** * Fetches the player's scores @@ -33,5 +34,5 @@ export async function fetchPlayerScores( * @param page the page */ export async function fetchLeaderboardScores(leaderboard: Leaderboards, id: string, page: number) { - return kyFetch>(`${Config.apiUrl}/scores/leaderboard/${leaderboard}/${id}/${page}`); + return kyFetch>(`${Config.apiUrl}/scores/leaderboard/${leaderboard}/${id}/${page}`); } diff --git a/projects/website/src/app/(pages)/leaderboard/[...slug]/page.tsx b/projects/website/src/app/(pages)/leaderboard/[...slug]/page.tsx index aaa3525..5d54c31 100644 --- a/projects/website/src/app/(pages)/leaderboard/[...slug]/page.tsx +++ b/projects/website/src/app/(pages)/leaderboard/[...slug]/page.tsx @@ -121,7 +121,5 @@ export default async function LeaderboardPage(props: Props) { if (response == undefined) { return redirect("/"); } - const { leaderboardResponse, scores } = response; - - return ; + return ; } diff --git a/projects/website/src/components/leaderboard/leaderboard-data.tsx b/projects/website/src/components/leaderboard/leaderboard-data.tsx index fd051a2..6d4d7e7 100644 --- a/projects/website/src/components/leaderboard/leaderboard-data.tsx +++ b/projects/website/src/components/leaderboard/leaderboard-data.tsx @@ -8,7 +8,7 @@ import { LeaderboardResponse } from "@ssr/common/response/leaderboard-response"; import { useQuery } from "@tanstack/react-query"; import { useState } from "react"; import { fetchLeaderboard } from "@ssr/common/utils/leaderboard.util"; -import PlayerScoresResponse from "../../../../common/src/response/player-scores-response.ts"; +import LeaderboardScoresResponse from "@ssr/common/response/leaderboard-scores-response"; const REFRESH_INTERVAL = 1000 * 60 * 5; @@ -21,7 +21,7 @@ type LeaderboardDataProps = { /** * The initial score data. */ - initialScores: PlayerScoresResponse; + initialScores?: LeaderboardScoresResponse; }; export function LeaderboardData({ initialLeaderboard, initialScores }: LeaderboardDataProps) { diff --git a/projects/website/src/components/leaderboard/leaderboard-score.tsx b/projects/website/src/components/leaderboard/leaderboard-score.tsx index 21c013a..97208ad 100644 --- a/projects/website/src/components/leaderboard/leaderboard-score.tsx +++ b/projects/website/src/components/leaderboard/leaderboard-score.tsx @@ -2,8 +2,8 @@ import LeaderboardPlayer from "./leaderboard-player"; import LeaderboardScoreStats from "./leaderboard-score-stats"; import ScoreRankInfo from "@/components/score/score-rank-info"; import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player"; -import ScoreSaberScore from "@ssr/common/score/impl/scoresaber-score"; import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberScore from "@ssr/common/score/impl/scoresaber-score"; type Props = { /** diff --git a/projects/website/src/components/leaderboard/leaderboard-scores.tsx b/projects/website/src/components/leaderboard/leaderboard-scores.tsx index e2fc1e2..2ad5424 100644 --- a/projects/website/src/components/leaderboard/leaderboard-scores.tsx +++ b/projects/website/src/components/leaderboard/leaderboard-scores.tsx @@ -15,7 +15,7 @@ import { fetchLeaderboardScores } from "@ssr/common/utils/score-utils"; import ScoreSaberScore from "@ssr/common/score/impl/scoresaber-score"; import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player"; -import PlayerScoresResponse from "../../../../common/src/response/player-scores-response.ts"; +import LeaderboardScoresResponse from "@ssr/common/response/leaderboard-scores-response"; type LeaderboardScoresProps = { /** @@ -26,7 +26,7 @@ type LeaderboardScoresProps = { /** * The initial scores to show. */ - initialScores?: PlayerScoresResponse; + initialScores?: LeaderboardScoresResponse; /** * The leaderboard to display. @@ -75,7 +75,7 @@ export default function LeaderboardScores({ const [previousPage, setPreviousPage] = useState(initialPage); const [currentPage, setCurrentPage] = useState(initialPage); const [currentScores, setCurrentScores] = useState< - PlayerScoresResponse | undefined + LeaderboardScoresResponse | undefined >(initialScores); const topOfScoresRef = useRef(null); const [shouldFetch, setShouldFetch] = useState(true);