From c51ddbc72538db5095630ac2b82a94891a4200d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 8 Sep 2024 10:15:42 -0500 Subject: [PATCH] fix: more imports 2 --- .../rating/current/league/[league]/route.ts | 2 +- .../bot/src/commands/breakdown/render.tsx | 6 ++-- packages/bot/src/commands/evolution.tsx | 4 +-- packages/bot/src/commands/fullStats.tsx | 4 +-- packages/bot/src/commands/inactive.tsx | 8 ++--- packages/bot/src/commands/link.tsx | 4 +-- packages/bot/src/commands/ownedTanks.tsx | 4 +-- packages/bot/src/commands/playerInfo.ts | 2 +- packages/bot/src/commands/rating.tsx | 6 ++-- .../bot/src/commands/ratingLeaderboard.tsx | 8 ++--- packages/bot/src/commands/replay.tsx | 2 +- packages/bot/src/commands/research.tsx | 6 ++-- packages/bot/src/commands/searchPlayers.ts | 12 +++---- packages/bot/src/commands/stats.tsx | 34 ++++++++++--------- packages/bot/src/commands/today.ts | 16 ++++----- .../src/components/AllStatsOverview/index.tsx | 2 +- .../Breakdown/components/RowStat.tsx | 2 +- .../src/components/GenericAllStats/index.tsx | 2 +- .../bot/src/core/blitzkit/getPeriodStart.ts | 2 +- .../blitzstars/getBlitzStarsLinkButton.ts | 4 +-- .../src/core/blitzstars/getPlayerHistories.ts | 2 +- .../src/core/blitzstars/getTankHistories.ts | 2 +- .../interactionCreate/handlers/button.tsx | 2 +- .../core => core/src}/blitz/generateStats.ts | 2 +- .../src}/blitz/getAccountAchievements.ts | 2 +- .../core => core/src}/blitz/getAccountInfo.ts | 2 +- .../src}/blitz/getClanAccountInfo.ts | 2 +- .../core => core/src}/blitz/getClanInfo.ts | 2 +- .../src}/blitz/getRatingLeague.ts | 6 ++-- .../src}/blitz/getRatingNeighbors.ts | 6 ++-- .../core => core/src}/blitz/getTankStats.ts | 0 packages/core/src/blitz/index.ts | 8 +++++ .../src/statistics/deltaBkrlBlitzStats.ts | 2 +- packages/core/src/statistics/filterStats.ts | 6 ++-- packages/core/src/statistics/index.ts | 2 +- .../{sumStats.ts => sumAllStats.ts} | 2 +- packages/scripts/src/averages.ts | 3 +- .../scripts/src/buildRatingLeaderboard.ts | 3 +- .../scripts/src/core/github/commitAssets.ts | 2 +- packages/scripts/src/discoverIds.ts | 2 +- .../app/docs/[directory]/[document]/page.tsx | 2 +- packages/website/src/app/not-found.tsx | 2 +- packages/website/src/app/settings/page.tsx | 2 +- .../src/app/tools/embed/[embed]/host/page.tsx | 2 +- .../website/src/app/tools/rating/page.tsx | 14 ++++---- .../website/src/app/tools/session/page.tsx | 34 +++++++++---------- .../components/WargamingAccountName.tsx | 2 +- packages/website/src/stores/session.ts | 2 +- packages/website/tsconfig.json | 13 +++++-- 49 files changed, 138 insertions(+), 123 deletions(-) rename packages/{website/src/core => core/src}/blitz/generateStats.ts (95%) rename packages/{website/src/core => core/src}/blitz/getAccountAchievements.ts (91%) rename packages/{website/src/core => core/src}/blitz/getAccountInfo.ts (96%) rename packages/{website/src/core => core/src}/blitz/getClanAccountInfo.ts (93%) rename packages/{website/src/core => core/src}/blitz/getClanInfo.ts (94%) rename packages/{website/src/core => core/src}/blitz/getRatingLeague.ts (74%) rename packages/{website/src/core => core/src}/blitz/getRatingNeighbors.ts (70%) rename packages/{website/src/core => core/src}/blitz/getTankStats.ts (100%) rename packages/core/src/statistics/{sumStats.ts => sumAllStats.ts} (94%) diff --git a/packages/api/src/app/[region]/rating/current/league/[league]/route.ts b/packages/api/src/app/[region]/rating/current/league/[league]/route.ts index 232f696e7..b80eba10b 100644 --- a/packages/api/src/app/[region]/rating/current/league/[league]/route.ts +++ b/packages/api/src/app/[region]/rating/current/league/[league]/route.ts @@ -1,6 +1,6 @@ import { Region } from '@blitzkit/core'; +import { getRatingLeague } from '@blitzkit/core/src/blitz/getRatingLeague'; import { NextResponse } from 'next/server'; -import { getRatingLeague } from '../../../../../../../../website/src/core/blitz/getRatingLeague'; export async function GET( request: Request, diff --git a/packages/bot/src/commands/breakdown/render.tsx b/packages/bot/src/commands/breakdown/render.tsx index 231d2137f..c914129a5 100644 --- a/packages/bot/src/commands/breakdown/render.tsx +++ b/packages/bot/src/commands/breakdown/render.tsx @@ -8,11 +8,11 @@ import { TankDefinition, tankDefinitions, } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; +import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats'; import { Locale } from 'discord.js'; import { chunk } from 'lodash'; -import { getAccountInfo } from '../../../../website/src/core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../../../../website/src/core/blitz/getClanAccountInfo'; -import { getTankStats } from '../../../../website/src/core/blitz/getTankStats'; import { UserError } from '../../../../website/src/hooks/userError'; import * as Breakdown from '../../components/Breakdown'; import { CommandWrapper } from '../../components/CommandWrapper'; diff --git a/packages/bot/src/commands/evolution.tsx b/packages/bot/src/commands/evolution.tsx index 8d19cacf1..979f1bdee 100644 --- a/packages/bot/src/commands/evolution.tsx +++ b/packages/bot/src/commands/evolution.tsx @@ -1,6 +1,6 @@ +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; import { Locale, SlashCommandSubcommandGroupBuilder } from 'discord.js'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo'; import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL'; import { CommandWrapper } from '../components/CommandWrapper'; import * as Graph from '../components/Graph'; diff --git a/packages/bot/src/commands/fullStats.tsx b/packages/bot/src/commands/fullStats.tsx index cb40b7d62..7984b2ac2 100644 --- a/packages/bot/src/commands/fullStats.tsx +++ b/packages/bot/src/commands/fullStats.tsx @@ -1,7 +1,7 @@ import { StatFilters, filterStats, getTierWeights } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; import { Locale } from 'discord.js'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo'; import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL'; import { CommandWrapper } from '../components/CommandWrapper'; import { GenericAllStats } from '../components/GenericAllStats'; diff --git a/packages/bot/src/commands/inactive.tsx b/packages/bot/src/commands/inactive.tsx index 50bdc6ca4..f99a1ef7c 100644 --- a/packages/bot/src/commands/inactive.tsx +++ b/packages/bot/src/commands/inactive.tsx @@ -1,15 +1,15 @@ +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getClanInfo } from '@blitzkit/core/src/blitz/getClanInfo'; import { Locale } from 'discord.js'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; -import { getClanInfo } from '../../../website/src/core/blitz/getClanInfo'; import { CommandWrapper } from '../components/CommandWrapper'; import { GenericStats } from '../components/GenericStats'; import { NoData } from '../components/NoData'; import { TitleBar } from '../components/TitleBar'; import { addClanChoices } from '../core/discord/addClanChoices'; -import autocompleteClan from '../core/discord/autocompleteClan'; +import { autocompleteClan } from '../core/discord/autocompleteClan'; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand'; import { localizationObject } from '../core/discord/localizationObject'; -import resolveClanFromCommand from '../core/discord/resolveClanFromCommand'; +import { resolveClanFromCommand } from '../core/discord/resolveClanFromCommand'; import { translator } from '../core/localization/translator'; import { CommandRegistry } from '../events/interactionCreate'; diff --git a/packages/bot/src/commands/link.tsx b/packages/bot/src/commands/link.tsx index eb535fd64..fba057f9f 100644 --- a/packages/bot/src/commands/link.tsx +++ b/packages/bot/src/commands/link.tsx @@ -1,6 +1,6 @@ +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; import { teal } from '@radix-ui/colors'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo'; import { linkBlitzAndDiscord } from '../../../website/src/core/blitzkit/linkBlitzAndDiscord'; import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow'; import { CommandWrapper } from '../components/CommandWrapper'; diff --git a/packages/bot/src/commands/ownedTanks.tsx b/packages/bot/src/commands/ownedTanks.tsx index e0468ce9b..de259dbd4 100644 --- a/packages/bot/src/commands/ownedTanks.tsx +++ b/packages/bot/src/commands/ownedTanks.tsx @@ -7,10 +7,10 @@ import { gameDefinitions, tankDefinitions, } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats'; import { chunk } from 'lodash'; import markdownEscape from 'markdown-escape'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; -import { getTankStats } from '../../../website/src/core/blitz/getTankStats'; import { addTierChoices } from '../core/discord/addTierChoices'; import { addUsernameChoices } from '../core/discord/addUsernameChoices'; import { autocompleteUsername } from '../core/discord/autocompleteUsername'; diff --git a/packages/bot/src/commands/playerInfo.ts b/packages/bot/src/commands/playerInfo.ts index e412755b6..e6511f556 100644 --- a/packages/bot/src/commands/playerInfo.ts +++ b/packages/bot/src/commands/playerInfo.ts @@ -1,5 +1,5 @@ +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; import markdownEscape from 'markdown-escape'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; import { addUsernameChoices } from '../core/discord/addUsernameChoices'; import { autocompleteUsername } from '../core/discord/autocompleteUsername'; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand'; diff --git a/packages/bot/src/commands/rating.tsx b/packages/bot/src/commands/rating.tsx index 745655c9d..1e7de47f1 100644 --- a/packages/bot/src/commands/rating.tsx +++ b/packages/bot/src/commands/rating.tsx @@ -4,12 +4,12 @@ import { getLeagueFromScore, getRatingInfo, } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; +import { getRatingNeighbors } from '@blitzkit/core/src/blitz/getRatingNeighbors'; import { getArchivedRatingMidnightLeaderboard } from '@blitzkit/core/src/blitzkit/getArchivedRatingMidnightLeaderboard'; import { SlashCommandSubcommandBuilder } from 'discord.js'; import markdownEscape from 'markdown-escape'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo'; -import { getRatingNeighbors } from '../../../website/src/core/blitz/getRatingNeighbors'; import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL'; import { iconPng } from '../../../website/src/core/blitzkit/iconPng'; import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow'; diff --git a/packages/bot/src/commands/ratingLeaderboard.tsx b/packages/bot/src/commands/ratingLeaderboard.tsx index ef2b9852c..b0ffa98d6 100644 --- a/packages/bot/src/commands/ratingLeaderboard.tsx +++ b/packages/bot/src/commands/ratingLeaderboard.tsx @@ -9,6 +9,10 @@ import { RatingInfo, Region, } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; +import { getRatingLeague } from '@blitzkit/core/src/blitz/getRatingLeague'; +import { getRatingNeighbors } from '@blitzkit/core/src/blitz/getRatingNeighbors'; import { getArchivedRatingMidnightLeaderboard } from '@blitzkit/core/src/blitzkit/getArchivedRatingMidnightLeaderboard'; import { APIApplicationCommandOptionChoice, @@ -17,10 +21,6 @@ import { } from 'discord.js'; import { range } from 'lodash'; import markdownEscape from 'markdown-escape'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo'; -import { getRatingLeague } from '../../../website/src/core/blitz/getRatingLeague'; -import { getRatingNeighbors } from '../../../website/src/core/blitz/getRatingNeighbors'; import { isOnGoingRatingSeason } from '../../../website/src/core/blitz/isOnGoingRatingSeason'; import { UserError } from '../../../website/src/hooks/userError'; import { CommandWrapper } from '../components/CommandWrapper'; diff --git a/packages/bot/src/commands/replay.tsx b/packages/bot/src/commands/replay.tsx index fecbff38a..5b93d1cf1 100644 --- a/packages/bot/src/commands/replay.tsx +++ b/packages/bot/src/commands/replay.tsx @@ -6,8 +6,8 @@ import { tankIcon, TIER_ROMAN_NUMERALS, } from '@blitzkit/core'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; import { clamp } from 'lodash'; -import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo'; import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL'; import { iconPng } from '../../../website/src/core/blitzkit/iconPng'; import { mapDefinitions } from '../../../website/src/core/blitzkit/mapDefinitions'; diff --git a/packages/bot/src/commands/research.tsx b/packages/bot/src/commands/research.tsx index df27788f9..3f7534a47 100644 --- a/packages/bot/src/commands/research.tsx +++ b/packages/bot/src/commands/research.tsx @@ -5,10 +5,10 @@ import { tankDefinitions, TIER_ROMAN_NUMERALS, } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; +import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats'; import { escapeMarkdown, Locale } from 'discord.js'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo'; -import { getTankStats } from '../../../website/src/core/blitz/getTankStats'; import { buildTechTreeLine } from '../../../website/src/core/blitzkit/buildTechTreeLine'; import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL'; import { iconPng } from '../../../website/src/core/blitzkit/iconPng'; diff --git a/packages/bot/src/commands/searchPlayers.ts b/packages/bot/src/commands/searchPlayers.ts index 1a2251ac5..031967dd8 100644 --- a/packages/bot/src/commands/searchPlayers.ts +++ b/packages/bot/src/commands/searchPlayers.ts @@ -1,13 +1,11 @@ -import { Region } from '@blitzkit/core'; -import fetchBlitz from '@blitzkit/core/src/blitz/fetchBlitz'; +import { AccountList, fetchBlitz, Region } from '@blitzkit/core'; +import { usernamePattern } from '@blitzkit/core/src/blitz/searchPlayersAcrossRegions/constants'; import { Locale } from 'discord.js'; import markdownEscape from 'markdown-escape'; -import { AccountList } from '../../../website/src/core/blitz/searchPlayersAcrossRegions'; -import { usernamePattern } from '../../../website/src/core/blitz/searchPlayersAcrossRegions/constants'; -import addRegionChoices from '../core/discord/addRegionChoices'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; +import { addRegionChoices } from '../core/discord/addRegionChoices'; +import { addUsernameChoices } from '../core/discord/addUsernameChoices'; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand'; -import embedInfo from '../core/discord/embedInfo'; +import { embedInfo } from '../core/discord/embedInfo'; import { localizationObject } from '../core/discord/localizationObject'; import { translator } from '../core/localization/translator'; import { CommandRegistry } from '../events/interactionCreate'; diff --git a/packages/bot/src/commands/stats.tsx b/packages/bot/src/commands/stats.tsx index a9ea2db94..a66aaeb48 100644 --- a/packages/bot/src/commands/stats.tsx +++ b/packages/bot/src/commands/stats.tsx @@ -1,32 +1,34 @@ import { StatFilters, filterStats } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; import { Locale } from 'discord.js'; -import { getAccountInfo } from '../../../website/src/core/blitz/getAccountInfo'; -import { getClanAccountInfo } from '../../../website/src/core/blitz/getClanAccountInfo'; import { emblemURL } from '../../../website/src/core/blitzkit/emblemURL'; -import AllStatsOverview from '../components/AllStatsOverview'; -import CommandWrapper from '../components/CommandWrapper'; -import NoData from '../components/NoData'; -import TitleBar from '../components/TitleBar'; +import { AllStatsOverview } from '../components/AllStatsOverview'; +import { CommandWrapper } from '../components/CommandWrapper'; +import { NoData } from '../components/NoData'; +import { TitleBar } from '../components/TitleBar'; import { filtersToDescription } from '../core/blitzkit/filtersToDescription'; import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton'; -import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod'; -import addPeriodicFilterOptions from '../core/discord/addPeriodicFilterOptions'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteTanks from '../core/discord/autocompleteTanks'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; +import { getStatsInPeriod } from '../core/blitzstars/getStatsInPeriod'; +import { addPeriodicFilterOptions } from '../core/discord/addPeriodicFilterOptions'; +import { addUsernameChoices } from '../core/discord/addUsernameChoices'; +import { autocompleteTanks } from '../core/discord/autocompleteTanks'; +import { autocompleteUsername } from '../core/discord/autocompleteUsername'; import { buttonRefresh } from '../core/discord/buttonRefresh'; -import commandToURL from '../core/discord/commandToURL'; +import { commandToURL } from '../core/discord/commandToURL'; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand'; import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams'; import { getFiltersFromButton } from '../core/discord/getFiltersFromButton'; import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand'; -import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton'; -import resolvePeriodFromCommand, { +import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton'; +import { ResolvedPeriod, + resolvePeriodFromCommand, } from '../core/discord/resolvePeriodFromCommand'; -import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton'; -import resolvePlayerFromCommand, { +import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton'; +import { ResolvedPlayer, + resolvePlayerFromCommand, } from '../core/discord/resolvePlayerFromCommand'; import { CommandRegistry } from '../events/interactionCreate'; diff --git a/packages/bot/src/commands/today.ts b/packages/bot/src/commands/today.ts index 43efa2281..938c4a270 100644 --- a/packages/bot/src/commands/today.ts +++ b/packages/bot/src/commands/today.ts @@ -1,19 +1,19 @@ import { gameDefinitions } from '@blitzkit/core'; import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton'; import { addFilterOptions } from '../core/discord/addFilterOptions'; -import addUsernameChoices from '../core/discord/addUsernameChoices'; -import autocompleteTanks from '../core/discord/autocompleteTanks'; -import autocompleteUsername from '../core/discord/autocompleteUsername'; +import { addUsernameChoices } from '../core/discord/addUsernameChoices'; +import { autocompleteTanks } from '../core/discord/autocompleteTanks'; +import { autocompleteUsername } from '../core/discord/autocompleteUsername'; import { buttonRefresh } from '../core/discord/buttonRefresh'; -import commandToURL from '../core/discord/commandToURL'; +import { commandToURL } from '../core/discord/commandToURL'; import { createLocalizedCommand } from '../core/discord/createLocalizedCommand'; import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams'; import { getFiltersFromButton } from '../core/discord/getFiltersFromButton'; import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand'; -import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton'; -import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand'; -import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton'; -import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand'; +import { resolvePeriodFromButton } from '../core/discord/resolvePeriodFromButton'; +import { resolvePeriodFromCommand } from '../core/discord/resolvePeriodFromCommand'; +import { resolvePlayerFromButton } from '../core/discord/resolvePlayerFromButton'; +import { resolvePlayerFromCommand } from '../core/discord/resolvePlayerFromCommand'; import { CommandRegistry } from '../events/interactionCreate'; import { renderBreakdown } from './breakdown/render'; diff --git a/packages/bot/src/components/AllStatsOverview/index.tsx b/packages/bot/src/components/AllStatsOverview/index.tsx index 7233a8352..5d6f949be 100644 --- a/packages/bot/src/components/AllStatsOverview/index.tsx +++ b/packages/bot/src/components/AllStatsOverview/index.tsx @@ -1,6 +1,6 @@ import { getWN8Percentile, Percentile } from '@blitzkit/core'; +import { SupplementaryStats } from '@blitzkit/core/src/blitz/getAccountInfo'; import { Locale } from 'discord.js'; -import { SupplementaryStats } from '../../../../website/src/core/blitz/getAccountInfo'; import { translator } from '../../core/localization/translator'; import { PERCENTILE_COLORS } from '../PercentileIndicator/constants'; import { HeroStat } from './components/HeroStat'; diff --git a/packages/bot/src/components/Breakdown/components/RowStat.tsx b/packages/bot/src/components/Breakdown/components/RowStat.tsx index 452a0eaf2..8b93b9e75 100644 --- a/packages/bot/src/components/Breakdown/components/RowStat.tsx +++ b/packages/bot/src/components/Breakdown/components/RowStat.tsx @@ -5,7 +5,7 @@ import { GrayColor, PALETTES, } from '../../../core/radix/radixColors'; -import PercentileIndicator from '../../PercentileIndicator'; +import { PercentileIndicator } from '../../PercentileIndicator'; interface RowStatProps { name: string; diff --git a/packages/bot/src/components/GenericAllStats/index.tsx b/packages/bot/src/components/GenericAllStats/index.tsx index 1ed21139b..b8ac829e4 100644 --- a/packages/bot/src/components/GenericAllStats/index.tsx +++ b/packages/bot/src/components/GenericAllStats/index.tsx @@ -1,6 +1,6 @@ import { BlitzStats, getWN8Percentile, isNumber } from '@blitzkit/core'; +import { SupplementaryStats } from '@blitzkit/core/src/blitz/getAccountInfo'; import { Locale } from 'discord.js'; -import { SupplementaryStats } from '../../../../website/src/core/blitz/getAccountInfo'; import { translator } from '../../core/localization/translator'; import { Card } from './components/Card'; import { Root } from './components/Root'; diff --git a/packages/bot/src/core/blitzkit/getPeriodStart.ts b/packages/bot/src/core/blitzkit/getPeriodStart.ts index 907f5ccf7..cbd2febd1 100644 --- a/packages/bot/src/core/blitzkit/getPeriodStart.ts +++ b/packages/bot/src/core/blitzkit/getPeriodStart.ts @@ -1,5 +1,5 @@ import { Region } from '@blitzkit/core'; -import getTimeDaysAgo from '../../../../website/src/core/blitzkit/getTimeDaysAgo'; +import { getTimeDaysAgo } from '../../../../website/src/core/blitzkit/getTimeDaysAgo'; import { PeriodSize } from '../discord/addPeriodSubCommands'; export function getPeriodStart(region: Region, period: PeriodSize) { diff --git a/packages/bot/src/core/blitzstars/getBlitzStarsLinkButton.ts b/packages/bot/src/core/blitzstars/getBlitzStarsLinkButton.ts index 0623a105a..b4aa0afad 100644 --- a/packages/bot/src/core/blitzstars/getBlitzStarsLinkButton.ts +++ b/packages/bot/src/core/blitzstars/getBlitzStarsLinkButton.ts @@ -1,6 +1,6 @@ import { Region } from '@blitzkit/core'; -import { getAccountInfo } from '../../../../website/src/core/blitz/getAccountInfo'; -import buttonLink from '../discord/buttonLink'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; +import { buttonLink } from '../discord/buttonLink'; export async function getBlitzStarsLinkButton( region: Region, diff --git a/packages/bot/src/core/blitzstars/getPlayerHistories.ts b/packages/bot/src/core/blitzstars/getPlayerHistories.ts index eb596b2d0..6d41c9057 100644 --- a/packages/bot/src/core/blitzstars/getPlayerHistories.ts +++ b/packages/bot/src/core/blitzstars/getPlayerHistories.ts @@ -1,5 +1,5 @@ import { Region, emptyAllStats } from '@blitzkit/core'; -import { getAccountInfo } from '../../../../website/src/core/blitz/getAccountInfo'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; import { GetHistoriesOptions, Histories, diff --git a/packages/bot/src/core/blitzstars/getTankHistories.ts b/packages/bot/src/core/blitzstars/getTankHistories.ts index 649a11a8c..279435d82 100644 --- a/packages/bot/src/core/blitzstars/getTankHistories.ts +++ b/packages/bot/src/core/blitzstars/getTankHistories.ts @@ -1,6 +1,6 @@ import { Region, emptyAllStats } from '@blitzkit/core'; +import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats'; import { Locale } from 'discord.js'; -import { getTankStats } from '../../../../website/src/core/blitz/getTankStats'; import { UserError } from '../../../../website/src/hooks/userError'; import { GetHistoriesOptions, diff --git a/packages/bot/src/events/interactionCreate/handlers/button.tsx b/packages/bot/src/events/interactionCreate/handlers/button.tsx index 9f455344d..96b78e4a6 100644 --- a/packages/bot/src/events/interactionCreate/handlers/button.tsx +++ b/packages/bot/src/events/interactionCreate/handlers/button.tsx @@ -1,6 +1,6 @@ import { ButtonInteraction, CacheType } from 'discord.js'; import { commands } from '..'; -import normalizeInteractionReturnable from '../../../core/discord/normalizeInteractionReturnable'; +import { normalizeInteractionReturnable } from '../../../core/discord/normalizeInteractionReturnable'; export async function handleButton(interaction: ButtonInteraction) { await interaction.deferUpdate(); diff --git a/packages/website/src/core/blitz/generateStats.ts b/packages/core/src/blitz/generateStats.ts similarity index 95% rename from packages/website/src/core/blitz/generateStats.ts rename to packages/core/src/blitz/generateStats.ts index abd60b05b..84f8ea95e 100644 --- a/packages/website/src/core/blitz/generateStats.ts +++ b/packages/core/src/blitz/generateStats.ts @@ -35,7 +35,7 @@ export function prettifyStats(s: ReturnType) { } satisfies Record; } -export function sumStats(s: ReturnType[]) { +export function sumBlitzStarsStats(s: ReturnType[]) { function sum(slice: (stat: ReturnType) => number) { return s.reduce((a, b) => a + slice(b), 0); } diff --git a/packages/website/src/core/blitz/getAccountAchievements.ts b/packages/core/src/blitz/getAccountAchievements.ts similarity index 91% rename from packages/website/src/core/blitz/getAccountAchievements.ts rename to packages/core/src/blitz/getAccountAchievements.ts index 737c83407..47f579ef9 100644 --- a/packages/website/src/core/blitz/getAccountAchievements.ts +++ b/packages/core/src/blitz/getAccountAchievements.ts @@ -1,6 +1,6 @@ import { Region } from '@blitzkit/core'; import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz'; -import { normalizeIds } from './normalizeIds'; +import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds'; interface IndividualAccountAchievements { achievements: { diff --git a/packages/website/src/core/blitz/getAccountInfo.ts b/packages/core/src/blitz/getAccountInfo.ts similarity index 96% rename from packages/website/src/core/blitz/getAccountInfo.ts rename to packages/core/src/blitz/getAccountInfo.ts index 03db6a5d1..508f7a667 100644 --- a/packages/website/src/core/blitz/getAccountInfo.ts +++ b/packages/core/src/blitz/getAccountInfo.ts @@ -3,7 +3,7 @@ import { FetchBlitzParams, fetchBlitz, } from '@blitzkit/core/src/blitz/fetchBlitz'; -import { normalizeIds } from './normalizeIds'; +import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds'; export interface SupplementaryStats { WN8?: number; diff --git a/packages/website/src/core/blitz/getClanAccountInfo.ts b/packages/core/src/blitz/getClanAccountInfo.ts similarity index 93% rename from packages/website/src/core/blitz/getClanAccountInfo.ts rename to packages/core/src/blitz/getClanAccountInfo.ts index f5245c538..43d314136 100644 --- a/packages/website/src/core/blitz/getClanAccountInfo.ts +++ b/packages/core/src/blitz/getClanAccountInfo.ts @@ -1,6 +1,6 @@ import { Region } from '@blitzkit/core'; import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz'; -import { normalizeIds } from './normalizeIds'; +import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds'; type IndividualClanAccountInfo = { account_id: number; diff --git a/packages/website/src/core/blitz/getClanInfo.ts b/packages/core/src/blitz/getClanInfo.ts similarity index 94% rename from packages/website/src/core/blitz/getClanInfo.ts rename to packages/core/src/blitz/getClanInfo.ts index 7b229970f..0ebdf4391 100644 --- a/packages/website/src/core/blitz/getClanInfo.ts +++ b/packages/core/src/blitz/getClanInfo.ts @@ -1,6 +1,6 @@ import { Region } from '@blitzkit/core'; import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz'; -import { normalizeIds } from './normalizeIds'; +import { normalizeIds } from '../../../website/src/core/blitz/normalizeIds'; interface IndividualClanInfo { recruiting_options: { diff --git a/packages/website/src/core/blitz/getRatingLeague.ts b/packages/core/src/blitz/getRatingLeague.ts similarity index 74% rename from packages/website/src/core/blitz/getRatingLeague.ts rename to packages/core/src/blitz/getRatingLeague.ts index 9946586ca..fec5c9723 100644 --- a/packages/website/src/core/blitz/getRatingLeague.ts +++ b/packages/core/src/blitz/getRatingLeague.ts @@ -1,7 +1,7 @@ import { LeagueTop, RatingPlayer, Region } from '@blitzkit/core'; -import { context } from '../blitzkit/context'; -import { patientFetch } from '../blitzkit/patientFetch'; -import { regionToRegionSubdomain } from './regionToRegionSubdomain'; +import { regionToRegionSubdomain } from '../../../website/src/core/blitz/regionToRegionSubdomain'; +import { context } from '../../../website/src/core/blitzkit/context'; +import { patientFetch } from '../../../website/src/core/blitzkit/patientFetch'; export async function getRatingLeague( region: Region, diff --git a/packages/website/src/core/blitz/getRatingNeighbors.ts b/packages/core/src/blitz/getRatingNeighbors.ts similarity index 70% rename from packages/website/src/core/blitz/getRatingNeighbors.ts rename to packages/core/src/blitz/getRatingNeighbors.ts index 6a8e71962..489b4d9b3 100644 --- a/packages/website/src/core/blitz/getRatingNeighbors.ts +++ b/packages/core/src/blitz/getRatingNeighbors.ts @@ -1,7 +1,7 @@ import { RatingNeighbors, Region } from '@blitzkit/core'; -import { patientFetch } from '../blitzkit/patientFetch'; -import { withCORSProxy } from '../blitzkit/withCORSProxy'; -import { regionToRegionSubdomain } from './regionToRegionSubdomain'; +import { regionToRegionSubdomain } from '../../../website/src/core/blitz/regionToRegionSubdomain'; +import { patientFetch } from '../../../website/src/core/blitzkit/patientFetch'; +import { withCORSProxy } from '../../../website/src/core/blitzkit/withCORSProxy'; export async function getRatingNeighbors( region: Region, diff --git a/packages/website/src/core/blitz/getTankStats.ts b/packages/core/src/blitz/getTankStats.ts similarity index 100% rename from packages/website/src/core/blitz/getTankStats.ts rename to packages/core/src/blitz/getTankStats.ts diff --git a/packages/core/src/blitz/index.ts b/packages/core/src/blitz/index.ts index 2f9e5b065..0fef98ad8 100644 --- a/packages/core/src/blitz/index.ts +++ b/packages/core/src/blitz/index.ts @@ -2,8 +2,16 @@ export * from './clans'; export * from './constants'; export * from './equipmentPrice'; export * from './fetchBlitz'; +export * from './generateStats'; +export * from './getAccountAchievements'; +export * from './getAccountInfo'; +export * from './getClanAccountInfo'; +export * from './getClanInfo'; export * from './getLeagueFromScore'; export * from './getRatingInfo'; +export * from './getRatingLeague'; +export * from './getRatingNeighbors'; +export * from './getTankStats'; export * from './idToRegion'; export * from './nations'; export * from './permanentSkills'; diff --git a/packages/core/src/statistics/deltaBkrlBlitzStats.ts b/packages/core/src/statistics/deltaBkrlBlitzStats.ts index e223626c6..c33194292 100644 --- a/packages/core/src/statistics/deltaBkrlBlitzStats.ts +++ b/packages/core/src/statistics/deltaBkrlBlitzStats.ts @@ -1,4 +1,4 @@ -import { RatingStats } from '../../../website/src/core/blitz/getAccountInfo'; +import { RatingStats } from '../blitz/getAccountInfo'; import { BkrlSuperset1Entry } from '../streams/bkrl'; export function deltaBkrlBlitzStats( diff --git a/packages/core/src/statistics/filterStats.ts b/packages/core/src/statistics/filterStats.ts index 27632a522..8904d544e 100644 --- a/packages/core/src/statistics/filterStats.ts +++ b/packages/core/src/statistics/filterStats.ts @@ -1,9 +1,9 @@ -import { SupplementaryStats } from '../../../website/src/core/blitz/getAccountInfo'; +import { SupplementaryStats } from '../blitz/getAccountInfo'; import { tankDefinitions, TreeType } from '../blitzkit/tankDefinitions'; import { blitzStarsTankAverages } from '../blitzstars/tankAverages'; import { calculateWN8 } from './calculateWN8'; import { BlitzStats } from './compositeStats'; -import { sumStats } from './sumStats'; +import { sumAllStats } from './sumAllStats'; export interface StatFilters { nation?: string; @@ -38,7 +38,7 @@ export async function filterStats( (filters.tank === undefined || entry.id === filters.tank) ); }); - const stats = sumStats(filteredOrder.map((id) => diff[id])); + const stats = sumAllStats(filteredOrder.map((id) => diff[id])); const battlesOfTanksWithAverages = filteredOrder.reduce( (accumulator, id) => awaitedTankAverages[id] ? accumulator + diff[id].battles : accumulator, diff --git a/packages/core/src/statistics/index.ts b/packages/core/src/statistics/index.ts index 8a80f7e59..e12a978b1 100644 --- a/packages/core/src/statistics/index.ts +++ b/packages/core/src/statistics/index.ts @@ -7,4 +7,4 @@ export * from './getBkniPercentile'; export * from './getTierWeights'; export * from './getWN8Percentile'; export * from './percentiles'; -export * from './sumStats'; +export * from './sumAllStats'; diff --git a/packages/core/src/statistics/sumStats.ts b/packages/core/src/statistics/sumAllStats.ts similarity index 94% rename from packages/core/src/statistics/sumStats.ts rename to packages/core/src/statistics/sumAllStats.ts index 2439d682b..cbca0f41a 100644 --- a/packages/core/src/statistics/sumStats.ts +++ b/packages/core/src/statistics/sumAllStats.ts @@ -1,7 +1,7 @@ import { emptyAllStats } from '..'; import { BlitzStats } from './compositeStats/constants'; -export function sumStats(allStatsCollection: BlitzStats[]) { +export function sumAllStats(allStatsCollection: BlitzStats[]) { return allStatsCollection.reduce((accumulated, current) => { function sum(value: (allStats: BlitzStats) => number) { return value(accumulated) + value(current); diff --git a/packages/scripts/src/averages.ts b/packages/scripts/src/averages.ts index 8d68d3caf..8b3ad4ff2 100644 --- a/packages/scripts/src/averages.ts +++ b/packages/scripts/src/averages.ts @@ -10,10 +10,11 @@ import { averageDefinitionsAllStatsKeys, emptySamples, encodeProtobufToBase64, + getTankStats, idToRegion, } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; import { chunk, times } from 'lodash'; -import { getAccountInfo } from '../../website/src/core/blitz/getAccountInfo'; import { commitAssets } from './core/github/commitAssets'; import { fetchPreDiscoveredIds } from './core/github/fetchPreDiscoveredIds'; diff --git a/packages/scripts/src/buildRatingLeaderboard.ts b/packages/scripts/src/buildRatingLeaderboard.ts index ae545a4a1..3d6fc65ac 100644 --- a/packages/scripts/src/buildRatingLeaderboard.ts +++ b/packages/scripts/src/buildRatingLeaderboard.ts @@ -9,11 +9,12 @@ import { RatingNeighbors, RatingPlayer, RegionSubdomain, + regionSubdomainToRegion, superCompress, } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; import { chunk } from 'lodash'; import { argv } from 'process'; -import { getAccountInfo } from '../../website/src/core/blitz/getAccountInfo'; import { patientFetchJSON } from '../../website/src/core/blitzkit/patientFetchJSON'; import { commitAssets } from './core/github/commitAssets'; import { FileChange } from './core/github/commitMultipleFiles'; diff --git a/packages/scripts/src/core/github/commitAssets.ts b/packages/scripts/src/core/github/commitAssets.ts index 486f4fa51..6d0ee075d 100644 --- a/packages/scripts/src/core/github/commitAssets.ts +++ b/packages/scripts/src/core/github/commitAssets.ts @@ -1,5 +1,5 @@ import { assertSecret } from '@blitzkit/core'; -import commitMultipleFiles, { FileChange } from './commitMultipleFiles'; +import { commitMultipleFiles, FileChange } from './commitMultipleFiles'; export async function commitAssets(message: string, changes: FileChange[]) { console.log(`Committing ${message}...`); diff --git a/packages/scripts/src/discoverIds.ts b/packages/scripts/src/discoverIds.ts index 6a96dfa71..d3a10f81e 100644 --- a/packages/scripts/src/discoverIds.ts +++ b/packages/scripts/src/discoverIds.ts @@ -8,9 +8,9 @@ import { idToRegion, } from '@blitzkit/core'; import { retryAbleBlitzFetchEvent } from '@blitzkit/core/src/blitz/fetchBlitz'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; import { chunk, times, uniq } from 'lodash'; import { compress, decompress } from 'lz4js'; -import { getAccountInfo } from '../../website/src/core/blitz/getAccountInfo'; import { DiscoveredIdsDefinitions } from '../../website/src/core/blitzkit/discoveredIdDefinitions'; import { commitAssets } from './core/github/commitAssets'; diff --git a/packages/website/src/app/docs/[directory]/[document]/page.tsx b/packages/website/src/app/docs/[directory]/[document]/page.tsx index 11238377b..779eb7d31 100644 --- a/packages/website/src/app/docs/[directory]/[document]/page.tsx +++ b/packages/website/src/app/docs/[directory]/[document]/page.tsx @@ -3,7 +3,7 @@ import { Table } from '@radix-ui/themes'; import Markdown from 'markdown-to-jsx'; import { use } from 'react'; import { Link } from '../../../../components/Link'; -import PageWrapper from '../../../../components/PageWrapper'; +import { PageWrapper } from '../../../../components/PageWrapper'; export default function Page({ params, diff --git a/packages/website/src/app/not-found.tsx b/packages/website/src/app/not-found.tsx index 36ef4abd1..b9b9e6510 100644 --- a/packages/website/src/app/not-found.tsx +++ b/packages/website/src/app/not-found.tsx @@ -4,7 +4,7 @@ import { DiscordLogoIcon, HomeIcon } from '@radix-ui/react-icons'; import { Button, Flex, Heading, Text } from '@radix-ui/themes'; import Link from 'next/link'; import { redirect, usePathname } from 'next/navigation'; -import PageWrapper from '../components/PageWrapper'; +import { PageWrapper } from '../components/PageWrapper'; const redirects = new Map([ ['/tools/ratings', '/tools/rating'], diff --git a/packages/website/src/app/settings/page.tsx b/packages/website/src/app/settings/page.tsx index 8e3ff826e..35cb4902c 100644 --- a/packages/website/src/app/settings/page.tsx +++ b/packages/website/src/app/settings/page.tsx @@ -1,7 +1,7 @@ 'use client'; import { Flex, Heading, Switch, Text } from '@radix-ui/themes'; -import PageWrapper from '../../components/PageWrapper'; +import { PageWrapper } from '../../components/PageWrapper'; import * as App from '../../stores/app'; export default function Page() { diff --git a/packages/website/src/app/tools/embed/[embed]/host/page.tsx b/packages/website/src/app/tools/embed/[embed]/host/page.tsx index 78483421f..35eb18234 100644 --- a/packages/website/src/app/tools/embed/[embed]/host/page.tsx +++ b/packages/website/src/app/tools/embed/[embed]/host/page.tsx @@ -2,7 +2,7 @@ import { Code, Heading } from '@radix-ui/themes'; import { useMemo } from 'react'; -import PageWrapper from '../../../../../components/PageWrapper'; +import { PageWrapper } from '../../../../../components/PageWrapper'; import * as EmbedState from '../../../../../stores/embedState'; import { configurations } from '../../configurations'; import { extractEmbedConfigDefaults } from '../../utilities'; diff --git a/packages/website/src/app/tools/rating/page.tsx b/packages/website/src/app/tools/rating/page.tsx index 6120bfa8a..0723f025a 100644 --- a/packages/website/src/app/tools/rating/page.tsx +++ b/packages/website/src/app/tools/rating/page.tsx @@ -1,7 +1,10 @@ 'use client'; import { + AccountList, + AccountListItem, FIRST_MINIMAL_ARCHIVED_RATING_SEASON, + getArchivedLatestSeasonNumber, LEAGUES, RatingInfo, RatingPlayer, @@ -11,8 +14,10 @@ import { Var, } from '@blitzkit/core'; import { fetchBlitz } from '@blitzkit/core/src/blitz/fetchBlitz'; -import { getArchivedLatestSeasonNumber } from '@blitzkit/core/src/blitz/getArchivedLatestSeasonNumber'; +import { getClanAccountInfo } from '@blitzkit/core/src/blitz/getClanAccountInfo'; import { getRatingInfo } from '@blitzkit/core/src/blitz/getRatingInfo'; +import { getRatingLeague } from '@blitzkit/core/src/blitz/getRatingLeague'; +import { getRatingNeighbors } from '@blitzkit/core/src/blitz/getRatingNeighbors'; import { getArchivedRatingInfo } from '@blitzkit/core/src/blitzkit/getArchivedRatingInfo'; import { getArchivedRatingLeaderboard } from '@blitzkit/core/src/blitzkit/getArchivedRatingLeaderboard'; import { blackA, orangeDark } from '@radix-ui/colors'; @@ -32,14 +37,7 @@ import { debounce, range } from 'lodash'; import { ChangeEvent, useEffect, useRef, useState } from 'react'; import { create } from 'zustand'; import { PageWrapper } from '../../../components/PageWrapper'; -import { getClanAccountInfo } from '../../../core/blitz/getClanAccountInfo'; -import { getRatingLeague } from '../../../core/blitz/getRatingLeague'; -import { getRatingNeighbors } from '../../../core/blitz/getRatingNeighbors'; import { searchCurrentRatingPlayers } from '../../../core/blitz/searchCurrentRatingPlayers'; -import { - AccountList, - AccountListItem, -} from '../../../core/blitz/searchPlayersAcrossRegions'; import { PageTurner } from './components/PageTurner'; const ROWS_PER_PAGE = Math.floor(100 / 3); diff --git a/packages/website/src/app/tools/session/page.tsx b/packages/website/src/app/tools/session/page.tsx index b393f7c93..7dfb3aa14 100644 --- a/packages/website/src/app/tools/session/page.tsx +++ b/packages/website/src/app/tools/session/page.tsx @@ -1,13 +1,28 @@ 'use client'; import { + AccountListWithServer, IndividualTankStats, UNLOCALIZED_REGION_NAMES_SHORT, blitzStarsTankAverages, deltaTankStats, idToRegion, + searchPlayersAcrossRegions, tankDefinitions, } from '@blitzkit/core'; +import { + STAT_KEYS, + STAT_NAMES, + Stat, + generateStats, + prettifyStats, + sumBlitzStarsStats, +} from '@blitzkit/core/src/blitz/generateStats'; +import { + IndividualAccountInfo, + getAccountInfo, +} from '@blitzkit/core/src/blitz/getAccountInfo'; +import { getTankStats } from '@blitzkit/core/src/blitz/getTankStats'; import { ArrowDownIcon, MagnifyingGlassIcon, @@ -30,23 +45,6 @@ import { debounce } from 'lodash'; import { use, useEffect, useMemo, useRef, useState } from 'react'; import { PageWrapper } from '../../../components/PageWrapper'; import { TankRowHeaderCell } from '../../../components/TankRowHeaderCell'; -import { - STAT_KEYS, - STAT_NAMES, - Stat, - generateStats, - prettifyStats, - sumStats, -} from '../../../core/blitz/generateStats'; -import { - IndividualAccountInfo, - getAccountInfo, -} from '../../../core/blitz/getAccountInfo'; -import { getTankStats } from '../../../core/blitz/getTankStats'; -import { - AccountListWithServer, - searchPlayersAcrossRegions, -} from '../../../core/blitz/searchPlayersAcrossRegions'; import * as Session from '../../../stores/session'; export default function Page({ @@ -103,7 +101,7 @@ export default function Page({ const total = useMemo( () => delta - ? prettifyStats(sumStats(delta.map(({ stats }) => stats))) + ? prettifyStats(sumBlitzStarsStats(delta.map(({ stats }) => stats))) : undefined, [delta], ); diff --git a/packages/website/src/components/Navbar/components/WargamingAccountName.tsx b/packages/website/src/components/Navbar/components/WargamingAccountName.tsx index bc28e646a..ada5c5eef 100644 --- a/packages/website/src/components/Navbar/components/WargamingAccountName.tsx +++ b/packages/website/src/components/Navbar/components/WargamingAccountName.tsx @@ -1,7 +1,7 @@ import { idToRegion } from '@blitzkit/core'; +import { getAccountInfo } from '@blitzkit/core/src/blitz/getAccountInfo'; import { Text } from '@radix-ui/themes'; import { use, useMemo } from 'react'; -import { getAccountInfo } from '../../../core/blitz/getAccountInfo'; import * as App from '../../../stores/app'; export function WargamingAccountName() { diff --git a/packages/website/src/stores/session.ts b/packages/website/src/stores/session.ts index de1c6a7af..3ff807806 100644 --- a/packages/website/src/stores/session.ts +++ b/packages/website/src/stores/session.ts @@ -5,10 +5,10 @@ import { Region, createNextSafeStore, } from '@blitzkit/core'; +import { Stat } from '@blitzkit/core/src/blitz/generateStats'; import { merge } from 'lodash'; import { create } from 'zustand'; import { persist } from 'zustand/middleware'; -import { Stat } from '../core/blitz/generateStats'; interface SessionBase { columns: Stat[]; diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index a186fbb69..f199bfc9c 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -17,6 +17,15 @@ "../core/src/blitzkit/getArchivedRatingInfo.ts", "../core/src/blitzkit/getArchivedRatingLeaderboard.ts", "../core/src/blitzkit/getArchivedRatingMidnightLeaderboard.ts", - "../core/src/blitz/fetchBlitz.ts" -, "../core/src/blitz/regionSubdomainToRegion.ts" ] + "../core/src/blitz/fetchBlitz.ts", + "../core/src/blitz/regionSubdomainToRegion.ts", + "../core/src/blitz/generateStats.ts", + "../core/src/blitz/getAccountAchievements.ts", + "../core/src/blitz/getAccountInfo.ts", + "../core/src/blitz/getClanAccountInfo.ts", + "../core/src/blitz/getClanInfo.ts", + "../core/src/blitz/getRatingLeague.ts", + "../core/src/blitz/getRatingNeighbors.ts", + "../core/src/blitz/getTankStats.ts" + ] }