diff --git a/projects/website/src/app/(pages)/leaderboard/[...slug]/page.tsx b/projects/website/src/app/(pages)/leaderboard/[...slug]/page.tsx index 0efa0db..67070e4 100644 --- a/projects/website/src/app/(pages)/leaderboard/[...slug]/page.tsx +++ b/projects/website/src/app/(pages)/leaderboard/[...slug]/page.tsx @@ -6,7 +6,7 @@ import { LeaderboardData } from "@/components/leaderboard/leaderboard-data"; import { Config } from "@ssr/common/config"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; import { LeaderboardResponse } from "@ssr/common/response/leaderboard-response"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { fetchLeaderboard } from "@ssr/common/utils/leaderboard.util"; import { fetchLeaderboardScores } from "@ssr/common/utils/score-utils"; import LeaderboardScoresResponse from "@ssr/common/response/leaderboard-scores-response"; diff --git a/projects/website/src/app/(pages)/player/[...slug]/page.tsx b/projects/website/src/app/(pages)/player/[...slug]/page.tsx index c17ed59..24b67a4 100644 --- a/projects/website/src/app/(pages)/player/[...slug]/page.tsx +++ b/projects/website/src/app/(pages)/player/[...slug]/page.tsx @@ -9,7 +9,7 @@ import { Config } from "@ssr/common/config"; import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player"; import { ScoreSort } from "@ssr/common/score/score-sort"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { fetchPlayerScores } from "@ssr/common/utils/score-utils"; import PlayerScoresResponse from "@ssr/common/response/player-scores-response"; import { SSRCache } from "@ssr/common/cache"; diff --git a/projects/website/src/components/leaderboard/chart/leaderboard-pp-chart.tsx b/projects/website/src/components/leaderboard/chart/leaderboard-pp-chart.tsx index bc4000f..4ec09f5 100644 --- a/projects/website/src/components/leaderboard/chart/leaderboard-pp-chart.tsx +++ b/projects/website/src/components/leaderboard/chart/leaderboard-pp-chart.tsx @@ -6,7 +6,7 @@ import Card from "@/components/card"; import { DualRangeSlider } from "@/components/ui/dual-range-slider"; import { useDebounce } from "@uidotdev/usehooks"; import { scoresaberService } from "@ssr/common/service/impl/scoresaber"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; type Props = { /** diff --git a/projects/website/src/components/leaderboard/leaderboard-data.tsx b/projects/website/src/components/leaderboard/leaderboard-data.tsx index 9538aa9..b25a92c 100644 --- a/projects/website/src/components/leaderboard/leaderboard-data.tsx +++ b/projects/website/src/components/leaderboard/leaderboard-data.tsx @@ -3,7 +3,7 @@ import LeaderboardScores from "@/components/leaderboard/leaderboard-scores"; import { LeaderboardInfo } from "@/components/leaderboard/leaderboard-info"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { LeaderboardResponse } from "@ssr/common/response/leaderboard-response"; import { useQuery } from "@tanstack/react-query"; import { useEffect, useState } from "react"; diff --git a/projects/website/src/components/leaderboard/leaderboard-info.tsx b/projects/website/src/components/leaderboard/leaderboard-info.tsx index 7bdbb36..2334bf0 100644 --- a/projects/website/src/components/leaderboard/leaderboard-info.tsx +++ b/projects/website/src/components/leaderboard/leaderboard-info.tsx @@ -2,7 +2,7 @@ import Card from "@/components/card"; import Image from "next/image"; import { LeaderboardSongStarCount } from "@/components/leaderboard/leaderboard-song-star-count"; import ScoreButtons from "@/components/score/score-buttons"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { BeatSaverMap } from "@ssr/common/model/beatsaver/map"; import { getBeatSaverMapperProfileUrl } from "@ssr/common/utils/beatsaver.util"; import FallbackLink from "@/components/fallback-link"; diff --git a/projects/website/src/components/leaderboard/leaderboard-score.tsx b/projects/website/src/components/leaderboard/leaderboard-score.tsx index bd76cea..afb5d09 100644 --- a/projects/website/src/components/leaderboard/leaderboard-score.tsx +++ b/projects/website/src/components/leaderboard/leaderboard-score.tsx @@ -5,7 +5,7 @@ import { clsx } from "clsx"; import Tooltip from "@/components/tooltip"; import { ScoreTimeSet } from "@/components/score/score-time-set"; import { ScoreModifiers } from "@/components/score/score-modifiers"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import ScoreMissesBadge from "@/components/score/badges/score-misses"; import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player"; diff --git a/projects/website/src/components/leaderboard/leaderboard-scores.tsx b/projects/website/src/components/leaderboard/leaderboard-scores.tsx index 7a001a5..e0d9708 100644 --- a/projects/website/src/components/leaderboard/leaderboard-scores.tsx +++ b/projects/website/src/components/leaderboard/leaderboard-scores.tsx @@ -11,7 +11,7 @@ import { Button } from "@/components/ui/button"; import { getDifficulty } from "@/common/song-utils"; import { fetchLeaderboardScores } from "@ssr/common/utils/score-utils"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import LeaderboardScoresResponse from "@ssr/common/response/leaderboard-scores-response"; import LeaderboardScoresSkeleton from "@/components/leaderboard/skeleton/leaderboard-scores-skeleton"; import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player"; diff --git a/projects/website/src/components/leaderboard/leaderboard-song-star-count.tsx b/projects/website/src/components/leaderboard/leaderboard-song-star-count.tsx index edd854e..a57ebc9 100644 --- a/projects/website/src/components/leaderboard/leaderboard-song-star-count.tsx +++ b/projects/website/src/components/leaderboard/leaderboard-song-star-count.tsx @@ -1,6 +1,6 @@ import { getDifficulty } from "@/common/song-utils"; import { StarIcon } from "@heroicons/react/24/solid"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; type LeaderboardSongStarCountProps = { /** diff --git a/projects/website/src/components/player/player-data.tsx b/projects/website/src/components/player/player-data.tsx index 7ac6763..b80c6d6 100644 --- a/projects/website/src/components/player/player-data.tsx +++ b/projects/website/src/components/player/player-data.tsx @@ -16,7 +16,7 @@ import { useLiveQuery } from "dexie-react-hooks"; import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player"; import { ScoreSort } from "@ssr/common/score/score-sort"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import PlayerScoresResponse from "@ssr/common/response/player-scores-response"; import { getScoreSaberPlayerFromToken } from "@ssr/common/token-creators"; diff --git a/projects/website/src/components/player/player-scores.tsx b/projects/website/src/components/player/player-scores.tsx index e68bab1..0b4476c 100644 --- a/projects/website/src/components/player/player-scores.tsx +++ b/projects/website/src/components/player/player-scores.tsx @@ -16,7 +16,7 @@ import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player"; import { ScoreSort } from "@ssr/common/score/score-sort"; import { setCookieValue } from "@ssr/common/utils/cookie-utils"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { fetchPlayerScores } from "@ssr/common/utils/score-utils"; import PlayerScoresResponse from "@ssr/common/response/player-scores-response"; diff --git a/projects/website/src/components/score/badges/score-accuracy.tsx b/projects/website/src/components/score/badges/score-accuracy.tsx index 20ddcc5..48c9ed7 100644 --- a/projects/website/src/components/score/badges/score-accuracy.tsx +++ b/projects/website/src/components/score/badges/score-accuracy.tsx @@ -4,7 +4,7 @@ import Tooltip from "@/components/tooltip"; import { ScoreModifiers } from "@/components/score/score-modifiers"; import { Change } from "@/common/change"; import { ScoreBadgeProps } from "@/components/score/badges/badge-props"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; type ScoreAccuracyProps = ScoreBadgeProps & { /** diff --git a/projects/website/src/components/score/badges/score-pp.tsx b/projects/website/src/components/score/badges/score-pp.tsx index 18789df..674414b 100644 --- a/projects/website/src/components/score/badges/score-pp.tsx +++ b/projects/website/src/components/score/badges/score-pp.tsx @@ -1,5 +1,5 @@ import { ScoreBadgeProps } from "@/components/score/badges/badge-props"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import Tooltip from "@/components/tooltip"; import { ensurePositiveNumber, formatPp } from "@ssr/common/utils/number-utils"; import { scoresaberService } from "@ssr/common/service/impl/scoresaber"; diff --git a/projects/website/src/components/score/map-stats.tsx b/projects/website/src/components/score/map-stats.tsx index 9ac6c8a..bc20104 100644 --- a/projects/website/src/components/score/map-stats.tsx +++ b/projects/website/src/components/score/map-stats.tsx @@ -1,7 +1,7 @@ import { BeatSaverMap } from "@ssr/common/model/beatsaver/map"; import StatValue from "@/components/stat-value"; import { getBeatSaverDifficulty } from "@ssr/common/utils/beatsaver.util"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { formatTime } from "@ssr/common/utils/time-utils"; import { formatNumberWithCommas } from "@ssr/common/utils/number-utils"; import { BombIcon, BrickWallIcon, DrumIcon, MusicIcon, TimerIcon } from "lucide-react"; diff --git a/projects/website/src/components/score/score-badge.tsx b/projects/website/src/components/score/score-badge.tsx index 2f7851c..c278f5e 100644 --- a/projects/website/src/components/score/score-badge.tsx +++ b/projects/website/src/components/score/score-badge.tsx @@ -1,6 +1,6 @@ import StatValue from "@/components/stat-value"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; /** * A badge to display in the score stats. diff --git a/projects/website/src/components/score/score-buttons.tsx b/projects/website/src/components/score/score-buttons.tsx index 4d6d470..d97c7c2 100644 --- a/projects/website/src/components/score/score-buttons.tsx +++ b/projects/website/src/components/score/score-buttons.tsx @@ -12,7 +12,7 @@ import { ArrowDownIcon, ArrowPathIcon } from "@heroicons/react/24/solid"; import clsx from "clsx"; import ScoreEditorButton from "@/components/score/score-editor-button"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { BeatSaverMap } from "@ssr/common/model/beatsaver/map"; import BeatSaberPepeLogo from "@/components/logos/beatsaber-pepe-logo"; diff --git a/projects/website/src/components/score/score-editor-button.tsx b/projects/website/src/components/score/score-editor-button.tsx index d784d25..1d1dac8 100644 --- a/projects/website/src/components/score/score-editor-button.tsx +++ b/projects/website/src/components/score/score-editor-button.tsx @@ -7,7 +7,7 @@ import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover import { ResetIcon } from "@radix-ui/react-icons"; import Tooltip from "@/components/tooltip"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; type ScoreEditorButtonProps = { score: ScoreSaberScore; diff --git a/projects/website/src/components/score/score-rank-info.tsx b/projects/website/src/components/score/score-rank-info.tsx index 97bd291..9d3ae68 100644 --- a/projects/website/src/components/score/score-rank-info.tsx +++ b/projects/website/src/components/score/score-rank-info.tsx @@ -3,7 +3,7 @@ import { GlobeAmericasIcon } from "@heroicons/react/24/solid"; import Link from "next/link"; import { getPageFromRank } from "@ssr/common/utils/utils"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { ScoreTimeSet } from "@/components/score/score-time-set"; type Props = { diff --git a/projects/website/src/components/score/score-song-info.tsx b/projects/website/src/components/score/score-song-info.tsx index 0556e0a..6450700 100644 --- a/projects/website/src/components/score/score-song-info.tsx +++ b/projects/website/src/components/score/score-song-info.tsx @@ -3,7 +3,7 @@ import Tooltip from "@/components/tooltip"; import { StarIcon } from "@heroicons/react/24/solid"; import Image from "next/image"; import Link from "next/link"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { BeatSaverMap } from "@ssr/common/model/beatsaver/map"; import { getDifficulty } from "@/common/song-utils"; diff --git a/projects/website/src/components/score/score-stats.tsx b/projects/website/src/components/score/score-stats.tsx index 8020412..c1ee0ea 100644 --- a/projects/website/src/components/score/score-stats.tsx +++ b/projects/website/src/components/score/score-stats.tsx @@ -1,7 +1,7 @@ import { getScoreBadgeFromAccuracy } from "@/common/song-utils"; import { ScoreBadge, ScoreBadges } from "@/components/score/score-badge"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import ScoreMissesBadge from "@/components/score/badges/score-misses"; import { HandAccuracyBadge } from "@/components/score/badges/hand-accuracy"; import { ScoreAccuracyBadge } from "@/components/score/badges/score-accuracy"; diff --git a/projects/website/src/components/score/score-views/score-history.tsx b/projects/website/src/components/score/score-views/score-history.tsx index 45cc4f8..966a4b5 100644 --- a/projects/website/src/components/score/score-views/score-history.tsx +++ b/projects/website/src/components/score/score-views/score-history.tsx @@ -1,6 +1,6 @@ "use client"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import Score from "@/components/score/score"; import { fetchPlayerScoresHistory } from "@ssr/common/utils/score-utils"; import { useQuery } from "@tanstack/react-query"; diff --git a/projects/website/src/components/score/score-views/score-overview.tsx b/projects/website/src/components/score/score-views/score-overview.tsx index 0e28184..053bd48 100644 --- a/projects/website/src/components/score/score-views/score-overview.tsx +++ b/projects/website/src/components/score/score-views/score-overview.tsx @@ -1,7 +1,7 @@ import PlayerScoreAccuracyChart from "@/components/leaderboard/chart/player-score-accuracy-chart"; import LeaderboardScores from "@/components/leaderboard/leaderboard-scores"; import { ScoreStatsToken } from "@ssr/common/types/token/beatleader/score-stats/score-stats"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import LeaderboardScoresResponse from "@ssr/common/response/leaderboard-scores-response"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; import ScoreSaberPlayer from "@ssr/common/player/impl/scoresaber-player"; diff --git a/projects/website/src/components/score/score.tsx b/projects/website/src/components/score/score.tsx index 8bc0d51..c44f00e 100644 --- a/projects/website/src/components/score/score.tsx +++ b/projects/website/src/components/score/score.tsx @@ -22,7 +22,7 @@ import { beatLeaderService } from "@ssr/common/service/impl/beatleader"; import { useIsMobile } from "@/hooks/use-is-mobile"; import { ScoreSaberScore } from "@ssr/common/model/score/impl/scoresaber-score"; -import ScoreSaberLeaderboard from "@ssr/common/leaderboard/impl/scoresaber-leaderboard"; +import ScoreSaberLeaderboard from "@ssr/common/model/leaderboard/impl/scoresaber-leaderboard"; import { BeatSaverMap } from "@ssr/common/model/beatsaver/map"; import LeaderboardScoresResponse from "@ssr/common/response/leaderboard-scores-response"; import { ScoreStatsToken } from "@ssr/common/types/token/beatleader/score-stats/score-stats";