From a00411919de913375e7fc5fe6729976d0023d8c7 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 15 May 2026 18:43:08 -0500 Subject: [PATCH] patch da code --- packages/website-ue/src/api/server.ts | 6 +++--- .../website-ue/src/components/ApiEntry.astro | 2 +- .../src/components/ApiMacroType.astro | 2 +- .../src/components/AvatarCard/index.tsx | 2 +- .../src/components/AvatarsList/index.tsx | 2 +- .../website-ue/src/components/Badge/index.tsx | 4 ++-- .../src/components/Button/index.tsx | 4 ++-- .../components/ClientUnmountedWarning.astro | 2 +- .../website-ue/src/components/Code/index.tsx | 2 +- .../src/components/ColorAlias.astro | 2 +- .../src/components/ColorScale.astro | 2 +- .../website-ue/src/components/Footer.astro | 2 +- .../src/components/Heading/index.tsx | 2 +- .../src/components/HomeCosmetics.astro | 4 ++-- .../website-ue/src/components/HomeGames.astro | 4 ++-- .../website-ue/src/components/HomeHero.astro | 2 +- .../src/components/HomePlayers.astro | 4 ++-- .../website-ue/src/components/HomeTanks.astro | 4 ++-- .../src/components/HomeTanksPopular/index.tsx | 2 +- .../src/components/HomeTechnical.astro | 4 ++-- .../src/components/IconButton/index.tsx | 2 +- .../src/components/InlineSkeleton/index.tsx | 2 +- .../website-ue/src/components/Link/index.tsx | 4 ++-- .../src/components/MarkdownCustom/index.tsx | 2 +- .../website-ue/src/components/Price/index.tsx | 2 +- .../src/components/Scroller/index.tsx | 2 +- .../src/components/Section/index.tsx | 2 +- .../src/components/Skeleton/index.tsx | 2 +- .../src/components/TankCard/index.tsx | 4 ++-- .../components/TankopediaCharacteristic.tsx | 4 ++-- .../components/TankopediaLoadout/index.tsx | 19 ++++++++++++++----- .../website-ue/src/components/Text/index.tsx | 4 ++-- .../src/components/TextField/index.tsx | 2 +- .../src/components/ToolBanner.astro | 4 ++-- .../website-ue/src/components/ToolCard.astro | 4 ++-- .../website-ue/src/config/alternativeLines.ts | 10 ++++++++++ .../src/hooks/useCharacteristicRenderer.ts | 4 ++-- .../website-ue/src/hooks/useGameStrings.ts | 2 +- .../website-ue/src/hooks/useProtagonist.ts | 2 +- .../src/hooks/useSearchableTanks.ts | 2 +- packages/website-ue/src/hooks/useStrings.ts | 2 +- .../website-ue/src/hooks/useTierCompare.ts | 2 +- .../website-ue/src/hooks/useUpgradePreset.ts | 2 +- .../website-ue/src/layouts/BaseLayout.astro | 2 +- .../src/pages/[...locale]/api/index.astro | 2 +- .../src/pages/[...locale]/avatars/index.astro | 2 +- .../pages/[...locale]/backgrounds/index.astro | 2 +- .../src/pages/[...locale]/index.astro | 4 ++-- .../pages/[...locale]/tanks/[slug]/_index.tsx | 6 +++--- .../[...locale]/tanks/[slug]/index.astro | 4 ++-- .../src/pages/[...locale]/tanks/_index.tsx | 2 +- .../src/pages/[...locale]/tanks/index.astro | 2 +- .../src/pages/api/avatars/[id].json.ts | 2 +- .../src/pages/api/avatars/[id].webp.ts | 4 ++-- .../src/pages/api/avatars/all.json.ts | 2 +- .../src/pages/api/avatars/all.pb.ts | 2 +- .../src/pages/api/avatars/list.json.ts | 2 +- .../src/pages/api/backgrounds/[id].json.ts | 2 +- .../src/pages/api/backgrounds/[id].webp.ts | 4 ++-- .../src/pages/api/backgrounds/all.json.ts | 2 +- .../src/pages/api/backgrounds/list.json.ts | 2 +- .../src/pages/api/currencies/[id].webp.ts | 4 ++-- .../src/pages/api/enums/[enum].json.ts | 2 +- .../api/game-strings/[locale]/[group].json.ts | 2 +- .../src/pages/api/nations/[id]/card.webp.ts | 6 +++--- .../src/pages/api/strings/[locale].json.ts | 2 +- .../src/pages/api/tanks/[id].json.ts | 2 +- .../src/pages/api/tanks/[id].webp.ts | 8 ++++---- .../src/pages/api/tanks/all.json.ts | 2 +- .../website-ue/src/pages/api/tanks/all.pb.ts | 2 +- .../pages/api/tanks/characteristics.json.ts | 2 +- .../src/pages/api/tanks/list.json.ts | 2 +- .../website-ue/src/pages/api/tanks/list.pb.ts | 2 +- .../src/pages/api/tanks/popular.json.ts | 2 +- .../src/pages/api/tanks/popular.pb.ts | 2 +- .../api/tanks/presets/upgrade/[id].pb.ts | 2 +- .../website-ue/src/pages/api/tiers.json.ts | 2 +- packages/website-ue/src/pages/api/tiers.pb.ts | 2 +- packages/website-ue/src/stores/tankopedia.ts | 4 ++-- .../src/tankopedia/characteristicsOrder.tsx | 2 +- 80 files changed, 131 insertions(+), 112 deletions(-) diff --git a/packages/website-ue/src/api/server.ts b/packages/website-ue/src/api/server.ts index f825bd0cd..d8b4d1a59 100644 --- a/packages/website-ue/src/api/server.ts +++ b/packages/website-ue/src/api/server.ts @@ -21,7 +21,7 @@ if (typeof window !== "undefined") { throw new Error("ServerAPI is being evaluated in the browser"); } -const globbedStrings = import.meta.glob("../../../../i18n/strings/*.json", { +const globbedStrings = import.meta.glob("../../../i18n/strings/*.json", { import: "default", }); const tankSlugPattern = /^(\/\w+)?\/tanks\/([a-z0-9-]+)\/$/; @@ -229,10 +229,10 @@ export class ServerAPI extends AbstractAPI { @Cache(true) async strings(locale: string) { const localized = (await globbedStrings[ - `../../../../i18n/strings/${locale}.json` + `../../../i18n/strings/${locale}.json` ]()) as DeepPartial; const defaults = (await globbedStrings[ - `../../../../i18n/strings/${locales.default}.json` + `../../../i18n/strings/${locales.default}.json` ]()) as Strings; const strings = merge({}, defaults, localized); diff --git a/packages/website-ue/src/components/ApiEntry.astro b/packages/website-ue/src/components/ApiEntry.astro index 81e88b3f6..1232c8c0c 100644 --- a/packages/website-ue/src/components/ApiEntry.astro +++ b/packages/website-ue/src/components/ApiEntry.astro @@ -1,6 +1,6 @@ --- import type { CollectionEntry } from "astro:content"; -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import ApiDescription from "./ApiDescription.astro"; import { ApiTester } from "./ApiTester"; diff --git a/packages/website-ue/src/components/ApiMacroType.astro b/packages/website-ue/src/components/ApiMacroType.astro index c3273f93d..11ed5ed2e 100644 --- a/packages/website-ue/src/components/ApiMacroType.astro +++ b/packages/website-ue/src/components/ApiMacroType.astro @@ -14,7 +14,7 @@ import { type Symbol, type TypeNode, } from "typescript"; -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { Code } from "./Code"; import HighlightedCodeBlock from "./HighlightedCodeBlock.astro"; import { Link } from "./Link"; diff --git a/packages/website-ue/src/components/AvatarCard/index.tsx b/packages/website-ue/src/components/AvatarCard/index.tsx index 1290434d4..4506b53e0 100644 --- a/packages/website-ue/src/components/AvatarCard/index.tsx +++ b/packages/website-ue/src/components/AvatarCard/index.tsx @@ -2,10 +2,10 @@ import { literals } from "@blitzkit/i18n"; import type { Avatar } from "@protos/blitzkit/avatar"; import { Grade } from "@protos/game/proto/legacy/blitz_static_standard_grades_enum"; import { DownloadIcon, StarFilledIcon } from "@radix-ui/react-icons"; -import type { Color } from "../../core/ui/color"; import { useGameStrings } from "../../hooks/useGameStrings"; import { useStrings } from "../../hooks/useStrings"; import type { PropsWithSkeleton } from "../../types/propsWithSkeleton"; +import type { Color } from "../../ui/color"; import { Badge } from "../Badge"; import { Button } from "../Button"; import { Dialog } from "../Dialog"; diff --git a/packages/website-ue/src/components/AvatarsList/index.tsx b/packages/website-ue/src/components/AvatarsList/index.tsx index 1197abaae..1265f27ff 100644 --- a/packages/website-ue/src/components/AvatarsList/index.tsx +++ b/packages/website-ue/src/components/AvatarsList/index.tsx @@ -1,6 +1,6 @@ import fuzzysort from "fuzzysort"; import { useMemo } from "react"; -import { api } from "../../core/api/dynamic"; +import { api } from "../../api/dynamic"; import { useAwait } from "../../hooks/useAwait"; import { useGameStrings } from "../../hooks/useGameStrings"; import { useLocale } from "../../hooks/useLocale"; diff --git a/packages/website-ue/src/components/Badge/index.tsx b/packages/website-ue/src/components/Badge/index.tsx index 756715dc2..64eadd861 100644 --- a/packages/website-ue/src/components/Badge/index.tsx +++ b/packages/website-ue/src/components/Badge/index.tsx @@ -1,6 +1,6 @@ import type { ComponentProps } from "react"; -import { classNames } from "../../core/ui/classNames"; -import type { Color } from "../../core/ui/color"; +import { classNames } from "../../ui/classNames"; +import type { Color } from "../../ui/color"; import { LIGHT_TEXT_COLORS } from "../Button"; import styles from "./index.module.css"; diff --git a/packages/website-ue/src/components/Button/index.tsx b/packages/website-ue/src/components/Button/index.tsx index 6c3b154e7..565b7657e 100644 --- a/packages/website-ue/src/components/Button/index.tsx +++ b/packages/website-ue/src/components/Button/index.tsx @@ -1,6 +1,6 @@ import type { ComponentProps } from "react"; -import { classNames } from "../../core/ui/classNames"; -import type { Color } from "../../core/ui/color"; +import { classNames } from "../../ui/classNames"; +import type { Color } from "../../ui/color"; import styles from "./index.module.css"; export interface ButtonProps extends ComponentProps<"button"> { diff --git a/packages/website-ue/src/components/ClientUnmountedWarning.astro b/packages/website-ue/src/components/ClientUnmountedWarning.astro index 188fc4c44..747ea3007 100644 --- a/packages/website-ue/src/components/ClientUnmountedWarning.astro +++ b/packages/website-ue/src/components/ClientUnmountedWarning.astro @@ -1,6 +1,6 @@ --- import { ExclamationTriangleIcon } from "@radix-ui/react-icons"; -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { Heading } from "./Heading"; import { Section } from "./Section"; import { Text } from "./Text"; diff --git a/packages/website-ue/src/components/Code/index.tsx b/packages/website-ue/src/components/Code/index.tsx index 89bbacfe2..8811704e3 100644 --- a/packages/website-ue/src/components/Code/index.tsx +++ b/packages/website-ue/src/components/Code/index.tsx @@ -1,5 +1,5 @@ import type { ComponentProps } from "react"; -import { classNames } from "../../core/ui/classNames"; +import { classNames } from "../../ui/classNames"; import styles from "./index.module.css"; export interface CodeProps extends ComponentProps<"code"> { diff --git a/packages/website-ue/src/components/ColorAlias.astro b/packages/website-ue/src/components/ColorAlias.astro index 5cd90b6a2..fd73eb69e 100644 --- a/packages/website-ue/src/components/ColorAlias.astro +++ b/packages/website-ue/src/components/ColorAlias.astro @@ -1,5 +1,5 @@ --- -import type { Color } from "../core/ui/color"; +import type { Color } from "../ui/color"; interface Props { color: Color; diff --git a/packages/website-ue/src/components/ColorScale.astro b/packages/website-ue/src/components/ColorScale.astro index 93a93632d..0e9833191 100644 --- a/packages/website-ue/src/components/ColorScale.astro +++ b/packages/website-ue/src/components/ColorScale.astro @@ -1,6 +1,6 @@ --- import * as colors from "@radix-ui/colors"; -import type { Color } from "../core/ui/color"; +import type { Color } from "../ui/color"; interface Props { color: Color | AlphaOnlyColor; diff --git a/packages/website-ue/src/components/Footer.astro b/packages/website-ue/src/components/Footer.astro index cd3d1a178..ede22290e 100644 --- a/packages/website-ue/src/components/Footer.astro +++ b/packages/website-ue/src/components/Footer.astro @@ -1,7 +1,7 @@ --- import { DiscordLogoIcon, GitHubLogoIcon } from "@radix-ui/react-icons"; import packageJson from "../../../../package.json"; -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { BlitzKitIcon } from "../icons/BlitzKit"; import { Code } from "./Code"; import { Link } from "./Link"; diff --git a/packages/website-ue/src/components/Heading/index.tsx b/packages/website-ue/src/components/Heading/index.tsx index 487f92987..820d88745 100644 --- a/packages/website-ue/src/components/Heading/index.tsx +++ b/packages/website-ue/src/components/Heading/index.tsx @@ -1,4 +1,4 @@ -import { classNames } from "../../core/ui/classNames"; +import { classNames } from "../../ui/classNames"; import { Text, type TextProps } from "../Text"; import "./index.css"; diff --git a/packages/website-ue/src/components/HomeCosmetics.astro b/packages/website-ue/src/components/HomeCosmetics.astro index fe334dd10..04effb6c4 100644 --- a/packages/website-ue/src/components/HomeCosmetics.astro +++ b/packages/website-ue/src/components/HomeCosmetics.astro @@ -1,6 +1,6 @@ --- -import { api } from "../core/api/dynamic"; -import { tools } from "../core/tools/tools"; +import { api } from "../api/dynamic"; +import { tools } from "../config/tools"; import { Heading } from "./Heading"; import { Section } from "./Section"; import ToolCard from "./ToolCard.astro"; diff --git a/packages/website-ue/src/components/HomeGames.astro b/packages/website-ue/src/components/HomeGames.astro index bc0bb2718..1123103a9 100644 --- a/packages/website-ue/src/components/HomeGames.astro +++ b/packages/website-ue/src/components/HomeGames.astro @@ -1,6 +1,6 @@ --- -import { api } from "../core/api/dynamic"; -import { tools } from "../core/tools/tools"; +import { api } from "../api/dynamic"; +import { tools } from "../config/tools"; import { Heading } from "./Heading"; import { Section } from "./Section"; import ToolCard from "./ToolCard.astro"; diff --git a/packages/website-ue/src/components/HomeHero.astro b/packages/website-ue/src/components/HomeHero.astro index 4fcd81e1e..dd67530a4 100644 --- a/packages/website-ue/src/components/HomeHero.astro +++ b/packages/website-ue/src/components/HomeHero.astro @@ -1,6 +1,6 @@ --- import { MagnifyingGlassIcon } from "@radix-ui/react-icons"; -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { BlitzKitIcon } from "../icons/BlitzKit"; import { Code } from "./Code"; import { Text } from "./Text"; diff --git a/packages/website-ue/src/components/HomePlayers.astro b/packages/website-ue/src/components/HomePlayers.astro index a08d240dd..406775f73 100644 --- a/packages/website-ue/src/components/HomePlayers.astro +++ b/packages/website-ue/src/components/HomePlayers.astro @@ -1,6 +1,6 @@ --- -import { api } from "../core/api/dynamic"; -import { tools } from "../core/tools/tools"; +import { api } from "../api/dynamic"; +import { tools } from "../config/tools"; import { Heading } from "./Heading"; import { Section } from "./Section"; import ToolCard from "./ToolCard.astro"; diff --git a/packages/website-ue/src/components/HomeTanks.astro b/packages/website-ue/src/components/HomeTanks.astro index dc99f7d8c..edc37b8d9 100644 --- a/packages/website-ue/src/components/HomeTanks.astro +++ b/packages/website-ue/src/components/HomeTanks.astro @@ -1,6 +1,6 @@ --- -import { api } from "../core/api/dynamic"; -import { tools } from "../core/tools/tools"; +import { api } from "../api/dynamic"; +import { tools } from "../config/tools"; import { Heading } from "./Heading"; import { HomeTanksPopular } from "./HomeTanksPopular"; import { Section } from "./Section"; diff --git a/packages/website-ue/src/components/HomeTanksPopular/index.tsx b/packages/website-ue/src/components/HomeTanksPopular/index.tsx index 0d67b8dbe..96f3c7bc3 100644 --- a/packages/website-ue/src/components/HomeTanksPopular/index.tsx +++ b/packages/website-ue/src/components/HomeTanksPopular/index.tsx @@ -1,4 +1,4 @@ -import { api } from "../../core/api/dynamic"; +import { api } from "../../api/dynamic"; import { useAwait } from "../../hooks/useAwait"; import { LocaleProvider, diff --git a/packages/website-ue/src/components/HomeTechnical.astro b/packages/website-ue/src/components/HomeTechnical.astro index 9ac8179bc..6932b5d58 100644 --- a/packages/website-ue/src/components/HomeTechnical.astro +++ b/packages/website-ue/src/components/HomeTechnical.astro @@ -1,6 +1,6 @@ --- -import { api } from "../core/api/dynamic"; -import { tools } from "../core/tools/tools"; +import { api } from "../api/dynamic"; +import { tools } from "../config/tools"; import { Heading } from "./Heading"; import { Section } from "./Section"; import ToolCard from "./ToolCard.astro"; diff --git a/packages/website-ue/src/components/IconButton/index.tsx b/packages/website-ue/src/components/IconButton/index.tsx index d3d6190ad..130c50df9 100644 --- a/packages/website-ue/src/components/IconButton/index.tsx +++ b/packages/website-ue/src/components/IconButton/index.tsx @@ -1,4 +1,4 @@ -import { classNames } from "../../core/ui/classNames"; +import { classNames } from "../../ui/classNames"; import { Button, type ButtonProps } from "../Button"; import styles from "./index.module.css"; diff --git a/packages/website-ue/src/components/InlineSkeleton/index.tsx b/packages/website-ue/src/components/InlineSkeleton/index.tsx index d911b170d..082c16c67 100644 --- a/packages/website-ue/src/components/InlineSkeleton/index.tsx +++ b/packages/website-ue/src/components/InlineSkeleton/index.tsx @@ -1,4 +1,4 @@ -import { classNames } from "../../core/ui/classNames"; +import { classNames } from "../../ui/classNames"; import { Skeleton, type SkeletonProps } from "../Skeleton"; import "./index.css"; diff --git a/packages/website-ue/src/components/Link/index.tsx b/packages/website-ue/src/components/Link/index.tsx index 95f2e4112..78961cc0e 100644 --- a/packages/website-ue/src/components/Link/index.tsx +++ b/packages/website-ue/src/components/Link/index.tsx @@ -1,6 +1,6 @@ import type { ComponentProps } from "react"; -import { classNames } from "../../core/ui/classNames"; -import type { Color } from "../../core/ui/color"; +import { classNames } from "../../ui/classNames"; +import type { Color } from "../../ui/color"; import styles from "./index.module.css"; export interface LinkProps extends ComponentProps<"a"> { diff --git a/packages/website-ue/src/components/MarkdownCustom/index.tsx b/packages/website-ue/src/components/MarkdownCustom/index.tsx index 29b2d20f8..9b3380750 100644 --- a/packages/website-ue/src/components/MarkdownCustom/index.tsx +++ b/packages/website-ue/src/components/MarkdownCustom/index.tsx @@ -1,6 +1,6 @@ import type { ComponentProps, FunctionComponent } from "react"; import Markdown from "react-markdown"; -import { classNames } from "../../core/ui/classNames"; +import { classNames } from "../../ui/classNames"; import { Code } from "../Code"; import { Text } from "../Text"; import styles from "./index.module.css"; diff --git a/packages/website-ue/src/components/Price/index.tsx b/packages/website-ue/src/components/Price/index.tsx index a2f262204..2ee8feb0d 100644 --- a/packages/website-ue/src/components/Price/index.tsx +++ b/packages/website-ue/src/components/Price/index.tsx @@ -2,8 +2,8 @@ import { formatCompact } from "@blitzkit/core"; import type { StandardPrice } from "@protos/game/proto/legacy/blitz_static_standard_price"; import type { StandardSinglePrice } from "@protos/game/proto/legacy/blitz_static_standard_single_price"; import type { ComponentProps } from "react"; -import { classNames } from "../../core/ui/classNames"; import { useLocale } from "../../hooks/useLocale"; +import { classNames } from "../../ui/classNames"; import { Text } from "../Text"; import styles from "./index.module.css"; diff --git a/packages/website-ue/src/components/Scroller/index.tsx b/packages/website-ue/src/components/Scroller/index.tsx index a6a3e4938..fdab6bebc 100644 --- a/packages/website-ue/src/components/Scroller/index.tsx +++ b/packages/website-ue/src/components/Scroller/index.tsx @@ -1,6 +1,6 @@ import { useEffect, useRef, type ComponentProps } from "react"; import { clamp } from "three/src/math/MathUtils.js"; -import { classNames } from "../../core/ui/classNames"; +import { classNames } from "../../ui/classNames"; import styles from "./index.module.css"; interface ScrollerProps extends ComponentProps<"div"> {} diff --git a/packages/website-ue/src/components/Section/index.tsx b/packages/website-ue/src/components/Section/index.tsx index 4566a535c..b5653d9a8 100644 --- a/packages/website-ue/src/components/Section/index.tsx +++ b/packages/website-ue/src/components/Section/index.tsx @@ -1,6 +1,6 @@ import type { ComponentProps } from "react"; -import { classNames } from "../../core/ui/classNames"; import type { Space } from "../../types/space"; +import { classNames } from "../../ui/classNames"; import styles from "./index.module.css"; export interface SectionProps extends ComponentProps<"div"> { diff --git a/packages/website-ue/src/components/Skeleton/index.tsx b/packages/website-ue/src/components/Skeleton/index.tsx index 3106c6f36..1a36b09b5 100644 --- a/packages/website-ue/src/components/Skeleton/index.tsx +++ b/packages/website-ue/src/components/Skeleton/index.tsx @@ -1,5 +1,5 @@ import type { ComponentProps } from "react"; -import { classNames } from "../../core/ui/classNames"; +import { classNames } from "../../ui/classNames"; import styles from "./index.module.css"; export interface SkeletonProps extends ComponentProps<"div"> {} diff --git a/packages/website-ue/src/components/TankCard/index.tsx b/packages/website-ue/src/components/TankCard/index.tsx index 35b232886..e9e741180 100644 --- a/packages/website-ue/src/components/TankCard/index.tsx +++ b/packages/website-ue/src/components/TankCard/index.tsx @@ -1,5 +1,5 @@ -import { api } from "../../core/api/dynamic"; -import { clientUnmounted } from "../../core/game/unmounted"; +import { api } from "../../api/dynamic"; +import { clientUnmounted } from "../../game/unmounted"; import { useAwait } from "../../hooks/useAwait"; import { useGameStrings } from "../../hooks/useGameStrings"; import { useLocale } from "../../hooks/useLocale"; diff --git a/packages/website-ue/src/components/TankopediaCharacteristic.tsx b/packages/website-ue/src/components/TankopediaCharacteristic.tsx index d40ea3099..052189a2e 100644 --- a/packages/website-ue/src/components/TankopediaCharacteristic.tsx +++ b/packages/website-ue/src/components/TankopediaCharacteristic.tsx @@ -1,6 +1,6 @@ -import type { CharacteristicOutput } from "../core/tankopedia/characteristics"; -import type { CharacteristicRenderConfig } from "../core/tankopedia/characteristicsOrder"; import { renderCharacteristic } from "../hooks/useCharacteristicRenderer"; +import type { CharacteristicOutput } from "../tankopedia/characteristics"; +import type { CharacteristicRenderConfig } from "../tankopedia/characteristicsOrder"; interface Props { characteristic: CharacteristicOutput; diff --git a/packages/website-ue/src/components/TankopediaLoadout/index.tsx b/packages/website-ue/src/components/TankopediaLoadout/index.tsx index 2e73c51a7..108433f55 100644 --- a/packages/website-ue/src/components/TankopediaLoadout/index.tsx +++ b/packages/website-ue/src/components/TankopediaLoadout/index.tsx @@ -4,6 +4,10 @@ import type { StandardPrice } from "@protos/game/proto/legacy/blitz_static_stand import type { UpgradeLine } from "@protos/game/proto/legacy/blitz_static_tank_upgrade_line"; import type { StageParameters } from "@protos/game/proto/legacy/blitz_static_tank_upgrade_single_stage"; import { useMemo } from "react"; +import { + alternativeLines, + isAlternativeLine, +} from "../../config/alternativeLines"; import { useProtagonist } from "../../hooks/useProtagonist"; import { useStrings } from "../../hooks/useStrings"; import { useUpgradePreset } from "../../hooks/useUpgradePreset"; @@ -46,9 +50,14 @@ function Line({ name, lines }: LineProps) { const combinedLines = useMemo(() => { const names: string[] = [name]; - for (const key in mergeLines) { - if (mergeLines[key] === name && lines.some((line) => line.name === key)) { - names.push(key); + for (const originalLine in alternativeLines) { + const alternativeLine = alternativeLines[originalLine]; + + if ( + originalLine === name && + lines.some((line) => line.name === alternativeLine) + ) { + names.push(alternativeLine); } } @@ -57,7 +66,7 @@ function Line({ name, lines }: LineProps) { return (
- {!(name in mergeLines) && + {!isAlternativeLine(name) && combinedLines.map((name) => ( ))} @@ -173,7 +182,7 @@ function LineElement({ index, lineName, stage }: LineElementProps) { {/* {stage.display_name} */} - {lineName in mergeLines + {isAlternativeLine(lineName) ? strings.tanks.loadout.alternative : romanize(stage.number)} diff --git a/packages/website-ue/src/components/Text/index.tsx b/packages/website-ue/src/components/Text/index.tsx index 0f7608eac..6adeefc03 100644 --- a/packages/website-ue/src/components/Text/index.tsx +++ b/packages/website-ue/src/components/Text/index.tsx @@ -1,6 +1,6 @@ import type { ComponentProps } from "react"; -import { classNames } from "../../core/ui/classNames"; -import type { ColorWithBW } from "../../core/ui/color"; +import { classNames } from "../../ui/classNames"; +import type { ColorWithBW } from "../../ui/color"; import styles from "./index.module.css"; export interface TextProps extends ComponentProps<"span"> { diff --git a/packages/website-ue/src/components/TextField/index.tsx b/packages/website-ue/src/components/TextField/index.tsx index 1db3546ab..6b7c40451 100644 --- a/packages/website-ue/src/components/TextField/index.tsx +++ b/packages/website-ue/src/components/TextField/index.tsx @@ -7,7 +7,7 @@ import { type ComponentProps, type ReactNode, } from "react"; -import { classNames } from "../../core/ui/classNames"; +import { classNames } from "../../ui/classNames"; import styles from "./index.module.css"; export interface TextFieldProps extends ComponentProps<"input"> { diff --git a/packages/website-ue/src/components/ToolBanner.astro b/packages/website-ue/src/components/ToolBanner.astro index 7d07b7d76..93653f57b 100644 --- a/packages/website-ue/src/components/ToolBanner.astro +++ b/packages/website-ue/src/components/ToolBanner.astro @@ -1,6 +1,6 @@ --- -import { api } from "../core/api/dynamic"; -import type { Tool } from "../core/tools/tools"; +import { api } from "../api/dynamic"; +import type { Tool } from "../config/tools"; import { Heading } from "./Heading"; import { Text } from "./Text"; diff --git a/packages/website-ue/src/components/ToolCard.astro b/packages/website-ue/src/components/ToolCard.astro index 6e16a5aac..8a27dd193 100644 --- a/packages/website-ue/src/components/ToolCard.astro +++ b/packages/website-ue/src/components/ToolCard.astro @@ -1,7 +1,7 @@ --- import { CaretRightIcon } from "@radix-ui/react-icons"; -import { api } from "../core/api/dynamic"; -import { type Tool } from "../core/tools/tools"; +import { api } from "../api/dynamic"; +import { type Tool } from "../config/tools"; import { Button } from "./Button"; import { LinkI18n } from "./LinkI18n"; import { Text } from "./Text"; diff --git a/packages/website-ue/src/config/alternativeLines.ts b/packages/website-ue/src/config/alternativeLines.ts index ecfc88f77..fb12955d3 100644 --- a/packages/website-ue/src/config/alternativeLines.ts +++ b/packages/website-ue/src/config/alternativeLines.ts @@ -1,3 +1,13 @@ export const alternativeLines: Record = { guns: "alternative_guns", }; + +export function isAlternativeLine(line: string) { + for (const key in alternativeLines) { + if (alternativeLines[key] === line) { + return true; + } + } + + return false; +} diff --git a/packages/website-ue/src/hooks/useCharacteristicRenderer.ts b/packages/website-ue/src/hooks/useCharacteristicRenderer.ts index 436627a94..2de76505f 100644 --- a/packages/website-ue/src/hooks/useCharacteristicRenderer.ts +++ b/packages/website-ue/src/hooks/useCharacteristicRenderer.ts @@ -1,9 +1,9 @@ import { useMemo, type ReactNode } from "react"; -import type { CharacteristicOutput } from "../core/tankopedia/characteristics"; +import type { CharacteristicOutput } from "../tankopedia/characteristics"; import { characteristicsOrder, type CharacteristicRenderConfig, -} from "../core/tankopedia/characteristicsOrder"; +} from "../tankopedia/characteristicsOrder"; import { useGameStrings } from "./useGameStrings"; import { useStrings } from "./useStrings"; diff --git a/packages/website-ue/src/hooks/useGameStrings.ts b/packages/website-ue/src/hooks/useGameStrings.ts index b17f7d61b..f5a20a152 100644 --- a/packages/website-ue/src/hooks/useGameStrings.ts +++ b/packages/website-ue/src/hooks/useGameStrings.ts @@ -1,4 +1,4 @@ -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { useAwait } from "./useAwait"; import { useLocale } from "./useLocale"; diff --git a/packages/website-ue/src/hooks/useProtagonist.ts b/packages/website-ue/src/hooks/useProtagonist.ts index 57a5a1f2d..c77d13ab1 100644 --- a/packages/website-ue/src/hooks/useProtagonist.ts +++ b/packages/website-ue/src/hooks/useProtagonist.ts @@ -1,4 +1,4 @@ -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { Tankopedia } from "../stores/tankopedia"; import { useAwait } from "./useAwait"; diff --git a/packages/website-ue/src/hooks/useSearchableTanks.ts b/packages/website-ue/src/hooks/useSearchableTanks.ts index df956522d..b0793139a 100644 --- a/packages/website-ue/src/hooks/useSearchableTanks.ts +++ b/packages/website-ue/src/hooks/useSearchableTanks.ts @@ -1,5 +1,5 @@ import { deburr } from "lodash-es"; -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { useAwait } from "./useAwait"; import { useGameStrings } from "./useGameStrings"; diff --git a/packages/website-ue/src/hooks/useStrings.ts b/packages/website-ue/src/hooks/useStrings.ts index 39db5b38c..4e2dd1520 100644 --- a/packages/website-ue/src/hooks/useStrings.ts +++ b/packages/website-ue/src/hooks/useStrings.ts @@ -1,4 +1,4 @@ -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { useAwait } from "./useAwait"; import { useLocale } from "./useLocale"; diff --git a/packages/website-ue/src/hooks/useTierCompare.ts b/packages/website-ue/src/hooks/useTierCompare.ts index 7e8e7169a..fb5926b2b 100644 --- a/packages/website-ue/src/hooks/useTierCompare.ts +++ b/packages/website-ue/src/hooks/useTierCompare.ts @@ -1,4 +1,4 @@ -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { useAwait } from "./useAwait"; export function useTierCompare() { diff --git a/packages/website-ue/src/hooks/useUpgradePreset.ts b/packages/website-ue/src/hooks/useUpgradePreset.ts index 202500728..4732492d6 100644 --- a/packages/website-ue/src/hooks/useUpgradePreset.ts +++ b/packages/website-ue/src/hooks/useUpgradePreset.ts @@ -1,4 +1,4 @@ -import { api } from "../core/api/dynamic"; +import { api } from "../api/dynamic"; import { useAwait } from "./useAwait"; export function useUpgradePreset(name: string) { diff --git a/packages/website-ue/src/layouts/BaseLayout.astro b/packages/website-ue/src/layouts/BaseLayout.astro index 636c8a213..b9ef18230 100644 --- a/packages/website-ue/src/layouts/BaseLayout.astro +++ b/packages/website-ue/src/layouts/BaseLayout.astro @@ -5,7 +5,7 @@ import ColorAlias from "../components/ColorAlias.astro"; import ColorScale from "../components/ColorScale.astro"; import Footer from "../components/Footer.astro"; import Navbar from "../components/Navbar.astro"; -import type { Color } from "../core/ui/color"; +import type { Color } from "../ui/color"; interface Props { locale: string; diff --git a/packages/website-ue/src/pages/[...locale]/api/index.astro b/packages/website-ue/src/pages/[...locale]/api/index.astro index 677ff1416..ed4b871f7 100644 --- a/packages/website-ue/src/pages/[...locale]/api/index.astro +++ b/packages/website-ue/src/pages/[...locale]/api/index.astro @@ -6,7 +6,7 @@ import ColorScale from "../../../components/ColorScale.astro"; import { Section } from "../../../components/Section"; import SyntaxStyles from "../../../components/SyntaxStyles.astro"; import ToolBanner from "../../../components/ToolBanner.astro"; -import { tools } from "../../../core/tools/tools"; +import { tools } from "../../../config/tools"; import BaseLayout from "../../../layouts/BaseLayout.astro"; export { getStaticPaths } from "../index.astro"; diff --git a/packages/website-ue/src/pages/[...locale]/avatars/index.astro b/packages/website-ue/src/pages/[...locale]/avatars/index.astro index 62e9ac8b4..cad4288dd 100644 --- a/packages/website-ue/src/pages/[...locale]/avatars/index.astro +++ b/packages/website-ue/src/pages/[...locale]/avatars/index.astro @@ -1,7 +1,7 @@ --- import ColorScale from "../../../components/ColorScale.astro"; import ToolBanner from "../../../components/ToolBanner.astro"; -import { tools } from "../../../core/tools/tools"; +import { tools } from "../../../config/tools"; import BaseLayout from "../../../layouts/BaseLayout.astro"; import { Page } from "./_index"; diff --git a/packages/website-ue/src/pages/[...locale]/backgrounds/index.astro b/packages/website-ue/src/pages/[...locale]/backgrounds/index.astro index 6fef03adc..f58c46c27 100644 --- a/packages/website-ue/src/pages/[...locale]/backgrounds/index.astro +++ b/packages/website-ue/src/pages/[...locale]/backgrounds/index.astro @@ -1,6 +1,6 @@ --- import { Grade } from "@protos/blitz_static_standard_grades_enum"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; import BaseLayout from "../../../layouts/BaseLayout.astro"; export { getStaticPaths } from "../index.astro"; diff --git a/packages/website-ue/src/pages/[...locale]/index.astro b/packages/website-ue/src/pages/[...locale]/index.astro index 977557f9f..752dee042 100644 --- a/packages/website-ue/src/pages/[...locale]/index.astro +++ b/packages/website-ue/src/pages/[...locale]/index.astro @@ -9,8 +9,8 @@ import HomeHero from "../../components/HomeHero.astro"; import HomePlayers from "../../components/HomePlayers.astro"; import HomeTanks from "../../components/HomeTanks.astro"; import HomeTechnical from "../../components/HomeTechnical.astro"; -import { clientUnmounted } from "../../core/game/unmounted"; -import { tools } from "../../core/tools/tools"; +import { tools } from "../../config/tools"; +import { clientUnmounted } from "../../game/unmounted"; import BaseLayout from "../../layouts/BaseLayout.astro"; export const getStaticPaths = (() => { diff --git a/packages/website-ue/src/pages/[...locale]/tanks/[slug]/_index.tsx b/packages/website-ue/src/pages/[...locale]/tanks/[slug]/_index.tsx index 7536a398f..3e966b3b3 100644 --- a/packages/website-ue/src/pages/[...locale]/tanks/[slug]/_index.tsx +++ b/packages/website-ue/src/pages/[...locale]/tanks/[slug]/_index.tsx @@ -1,13 +1,13 @@ import { Fragment, useMemo } from "react"; +import { api } from "../../../../api/dynamic"; import { TankopediaLoadout } from "../../../../components/TankopediaLoadout"; -import { api } from "../../../../core/api/dynamic"; -import { characteristicsOrder } from "../../../../core/tankopedia/characteristicsOrder"; -import { computeCharacteristics } from "../../../../core/tankopedia/computeCharacteristics"; import { useAwait } from "../../../../hooks/useAwait"; import { useCharacteristicRenderer } from "../../../../hooks/useCharacteristicRenderer"; import { useGameStrings } from "../../../../hooks/useGameStrings"; import { LocaleProvider } from "../../../../hooks/useLocale"; import { Tankopedia } from "../../../../stores/tankopedia"; +import { characteristicsOrder } from "../../../../tankopedia/characteristicsOrder"; +import { computeCharacteristics } from "../../../../tankopedia/computeCharacteristics"; interface PageProps { id: string; diff --git a/packages/website-ue/src/pages/[...locale]/tanks/[slug]/index.astro b/packages/website-ue/src/pages/[...locale]/tanks/[slug]/index.astro index 7bd293a23..bc3db8c20 100644 --- a/packages/website-ue/src/pages/[...locale]/tanks/[slug]/index.astro +++ b/packages/website-ue/src/pages/[...locale]/tanks/[slug]/index.astro @@ -1,7 +1,7 @@ --- import "@radix-ui/colors/violet-dark.css"; -import { api } from "../../../../core/api/dynamic"; -import { mixStaticPaths } from "../../../../core/astro/mixStaticPaths"; +import { api } from "../../../../api/dynamic"; +import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import BaseLayout from "../../../../layouts/BaseLayout.astro"; import { getStaticPaths as _getStaticPaths } from "../index.astro"; import { Page } from "./_index"; diff --git a/packages/website-ue/src/pages/[...locale]/tanks/_index.tsx b/packages/website-ue/src/pages/[...locale]/tanks/_index.tsx index 70d04d200..f1ead407a 100644 --- a/packages/website-ue/src/pages/[...locale]/tanks/_index.tsx +++ b/packages/website-ue/src/pages/[...locale]/tanks/_index.tsx @@ -1,10 +1,10 @@ import fuzzysort from "fuzzysort"; import { useMemo } from "react"; +import { api } from "../../../api/dynamic"; import { IncrementalLoader } from "../../../components/IncrementalLoader"; import { TankCard } from "../../../components/TankCard"; import { TankCards } from "../../../components/TankCards"; import { TankSearch } from "../../../components/TankSearch"; -import { api } from "../../../core/api/dynamic"; import { useAwait } from "../../../hooks/useAwait"; import { LocaleProvider } from "../../../hooks/useLocale"; import { useSearchableTanks } from "../../../hooks/useSearchableTanks"; diff --git a/packages/website-ue/src/pages/[...locale]/tanks/index.astro b/packages/website-ue/src/pages/[...locale]/tanks/index.astro index 287debb7c..b259ca966 100644 --- a/packages/website-ue/src/pages/[...locale]/tanks/index.astro +++ b/packages/website-ue/src/pages/[...locale]/tanks/index.astro @@ -2,7 +2,7 @@ import "@radix-ui/colors/violet-dark.css"; import { Section } from "../../../components/Section"; import ToolBanner from "../../../components/ToolBanner.astro"; -import { tools } from "../../../core/tools/tools"; +import { tools } from "../../../config/tools"; import BaseLayout from "../../../layouts/BaseLayout.astro"; import { Page } from "./_index"; diff --git a/packages/website-ue/src/pages/api/avatars/[id].json.ts b/packages/website-ue/src/pages/api/avatars/[id].json.ts index 095860b43..455f8a1da 100644 --- a/packages/website-ue/src/pages/api/avatars/[id].json.ts +++ b/packages/website-ue/src/pages/api/avatars/[id].json.ts @@ -1,5 +1,5 @@ import type { APIContext, GetStaticPaths } from "astro"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; export const getStaticPaths = (async () => { const { avatars } = await api.avatars(); diff --git a/packages/website-ue/src/pages/api/avatars/[id].webp.ts b/packages/website-ue/src/pages/api/avatars/[id].webp.ts index 17be5413e..d8f5a6fbc 100644 --- a/packages/website-ue/src/pages/api/avatars/[id].webp.ts +++ b/packages/website-ue/src/pages/api/avatars/[id].webp.ts @@ -1,6 +1,6 @@ import type { APIContext } from "astro"; -import { api } from "../../../core/api/dynamic"; -import { imageProxy } from "../../../core/api/imageProxy"; +import { api } from "../../../api/dynamic"; +import { imageProxy } from "../../../api/imageProxy"; export { getStaticPaths } from "./[id].json"; diff --git a/packages/website-ue/src/pages/api/avatars/all.json.ts b/packages/website-ue/src/pages/api/avatars/all.json.ts index 1a22d92fe..c142e554f 100644 --- a/packages/website-ue/src/pages/api/avatars/all.json.ts +++ b/packages/website-ue/src/pages/api/avatars/all.json.ts @@ -1,4 +1,4 @@ -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; /** * Identical to `avatars/[id].json`, but returns data on all avatars at once, diff --git a/packages/website-ue/src/pages/api/avatars/all.pb.ts b/packages/website-ue/src/pages/api/avatars/all.pb.ts index 615bb59f4..f5dedf6b7 100644 --- a/packages/website-ue/src/pages/api/avatars/all.pb.ts +++ b/packages/website-ue/src/pages/api/avatars/all.pb.ts @@ -1,5 +1,5 @@ import { Avatars } from "@protos/blitzkit/avatars"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; export async function GET() { const avatars = await api.avatars(); diff --git a/packages/website-ue/src/pages/api/avatars/list.json.ts b/packages/website-ue/src/pages/api/avatars/list.json.ts index b8b948d94..dde938027 100644 --- a/packages/website-ue/src/pages/api/avatars/list.json.ts +++ b/packages/website-ue/src/pages/api/avatars/list.json.ts @@ -1,4 +1,4 @@ -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; /** * Returns a list of all avatars ids. diff --git a/packages/website-ue/src/pages/api/backgrounds/[id].json.ts b/packages/website-ue/src/pages/api/backgrounds/[id].json.ts index 73c6cefb1..4916a4bb1 100644 --- a/packages/website-ue/src/pages/api/backgrounds/[id].json.ts +++ b/packages/website-ue/src/pages/api/backgrounds/[id].json.ts @@ -1,5 +1,5 @@ import type { APIContext, GetStaticPaths } from "astro"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; export const getStaticPaths = (async () => { const { backgrounds } = await api.backgrounds(); diff --git a/packages/website-ue/src/pages/api/backgrounds/[id].webp.ts b/packages/website-ue/src/pages/api/backgrounds/[id].webp.ts index d601c7be3..5c572857e 100644 --- a/packages/website-ue/src/pages/api/backgrounds/[id].webp.ts +++ b/packages/website-ue/src/pages/api/backgrounds/[id].webp.ts @@ -1,6 +1,6 @@ import type { APIContext } from "astro"; -import { api } from "../../../core/api/dynamic"; -import { imageProxy } from "../../../core/api/imageProxy"; +import { api } from "../../../api/dynamic"; +import { imageProxy } from "../../../api/imageProxy"; export { getStaticPaths } from "./[id].json"; diff --git a/packages/website-ue/src/pages/api/backgrounds/all.json.ts b/packages/website-ue/src/pages/api/backgrounds/all.json.ts index 30e9cf3f1..88b2f69e2 100644 --- a/packages/website-ue/src/pages/api/backgrounds/all.json.ts +++ b/packages/website-ue/src/pages/api/backgrounds/all.json.ts @@ -1,4 +1,4 @@ -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; export async function GET() { const { backgrounds } = await api.backgrounds(); diff --git a/packages/website-ue/src/pages/api/backgrounds/list.json.ts b/packages/website-ue/src/pages/api/backgrounds/list.json.ts index d12d7de4c..298f4d8d8 100644 --- a/packages/website-ue/src/pages/api/backgrounds/list.json.ts +++ b/packages/website-ue/src/pages/api/backgrounds/list.json.ts @@ -1,4 +1,4 @@ -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; export async function GET() { const { backgrounds } = await api.backgrounds(); diff --git a/packages/website-ue/src/pages/api/currencies/[id].webp.ts b/packages/website-ue/src/pages/api/currencies/[id].webp.ts index 71d8c3ef9..0dd1b4cdf 100644 --- a/packages/website-ue/src/pages/api/currencies/[id].webp.ts +++ b/packages/website-ue/src/pages/api/currencies/[id].webp.ts @@ -1,6 +1,6 @@ import type { GetStaticPaths } from "astro"; -import { api } from "../../../core/api/dynamic"; -import { imageProxy } from "../../../core/api/imageProxy"; +import { api } from "../../../api/dynamic"; +import { imageProxy } from "../../../api/imageProxy"; export const getStaticPaths = (async () => { const group = api.metadata.group("CurrencyEntity"); diff --git a/packages/website-ue/src/pages/api/enums/[enum].json.ts b/packages/website-ue/src/pages/api/enums/[enum].json.ts index 29e582754..22ac7e20a 100644 --- a/packages/website-ue/src/pages/api/enums/[enum].json.ts +++ b/packages/website-ue/src/pages/api/enums/[enum].json.ts @@ -1,7 +1,7 @@ import { TankClass, TankType } from "@blitzkit/core"; import { Nation } from "@protos/blitz_static_tank_component"; import type { APIContext, GetStaticPaths } from "astro"; -import { GunType } from "../../../core/tankopedia/characteristics"; +import { GunType } from "../../../tankopedia/characteristics"; import { GET as _GET } from "./all.json"; export const ENUMS = { diff --git a/packages/website-ue/src/pages/api/game-strings/[locale]/[group].json.ts b/packages/website-ue/src/pages/api/game-strings/[locale]/[group].json.ts index 21e33d17e..7ad77c418 100644 --- a/packages/website-ue/src/pages/api/game-strings/[locale]/[group].json.ts +++ b/packages/website-ue/src/pages/api/game-strings/[locale]/[group].json.ts @@ -1,6 +1,6 @@ import locales from "@blitzkit/i18n/locales.json"; import type { GetStaticPaths, GetStaticPathsResult } from "astro"; -import { api } from "../../../../core/api/dynamic"; +import { api } from "../../../../api/dynamic"; export const getStaticPaths = (async () => { const paths: GetStaticPathsResult = []; diff --git a/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts b/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts index d5e7f939e..72dafce15 100644 --- a/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts +++ b/packages/website-ue/src/pages/api/nations/[id]/card.webp.ts @@ -1,8 +1,8 @@ import { Nation } from "@protos/game/proto/legacy/blitz_static_tank_component"; import type { APIContext, GetStaticPaths } from "astro"; -import { clientUnmountedResponse } from "../../../../core/api/responses"; -import { game } from "../../../../core/game/game"; -import { clientUnmounted } from "../../../../core/game/unmounted"; +import { clientUnmountedResponse } from "../../../../api/responses"; +import { game } from "../../../../game/game"; +import { clientUnmounted } from "../../../../game/unmounted"; export const getStaticPaths = (async () => { return Object.values(Nation) diff --git a/packages/website-ue/src/pages/api/strings/[locale].json.ts b/packages/website-ue/src/pages/api/strings/[locale].json.ts index ba1981bfe..429f32312 100644 --- a/packages/website-ue/src/pages/api/strings/[locale].json.ts +++ b/packages/website-ue/src/pages/api/strings/[locale].json.ts @@ -1,6 +1,6 @@ import locales from "@blitzkit/i18n/locales.json"; import type { APIContext, GetStaticPaths } from "astro"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; export const getStaticPaths = (() => { return locales.supported.map(({ locale }) => ({ params: { locale } })); diff --git a/packages/website-ue/src/pages/api/tanks/[id].json.ts b/packages/website-ue/src/pages/api/tanks/[id].json.ts index 60c66a943..5e286a972 100644 --- a/packages/website-ue/src/pages/api/tanks/[id].json.ts +++ b/packages/website-ue/src/pages/api/tanks/[id].json.ts @@ -1,5 +1,5 @@ import type { APIContext, GetStaticPaths } from "astro"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; export const getStaticPaths = (async () => { const { list } = await api.tankList(); diff --git a/packages/website-ue/src/pages/api/tanks/[id].webp.ts b/packages/website-ue/src/pages/api/tanks/[id].webp.ts index 3cec07f9a..d02922e0d 100644 --- a/packages/website-ue/src/pages/api/tanks/[id].webp.ts +++ b/packages/website-ue/src/pages/api/tanks/[id].webp.ts @@ -1,11 +1,11 @@ import type { APIContext } from "astro"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; import { clientUnmountedResponse, notFoundResponse, -} from "../../../core/api/responses"; -import { game } from "../../../core/game/game"; -import { clientUnmounted } from "../../../core/game/unmounted"; +} from "../../../api/responses"; +import { game } from "../../../game/game"; +import { clientUnmounted } from "../../../game/unmounted"; export { getStaticPaths } from "./[id].json"; diff --git a/packages/website-ue/src/pages/api/tanks/all.json.ts b/packages/website-ue/src/pages/api/tanks/all.json.ts index 482f98ed2..279271096 100644 --- a/packages/website-ue/src/pages/api/tanks/all.json.ts +++ b/packages/website-ue/src/pages/api/tanks/all.json.ts @@ -1,4 +1,4 @@ -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; /** * Literally all the tanks in one place lmao. diff --git a/packages/website-ue/src/pages/api/tanks/all.pb.ts b/packages/website-ue/src/pages/api/tanks/all.pb.ts index 99a2df802..a45501d89 100644 --- a/packages/website-ue/src/pages/api/tanks/all.pb.ts +++ b/packages/website-ue/src/pages/api/tanks/all.pb.ts @@ -1,5 +1,5 @@ import { Tanks } from "@protos/blitzkit/tanks"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; /** * Literally all the tanks in one place lmao. diff --git a/packages/website-ue/src/pages/api/tanks/characteristics.json.ts b/packages/website-ue/src/pages/api/tanks/characteristics.json.ts index d8d06b0ed..972c26605 100644 --- a/packages/website-ue/src/pages/api/tanks/characteristics.json.ts +++ b/packages/website-ue/src/pages/api/tanks/characteristics.json.ts @@ -1,4 +1,4 @@ -import { characteristicsOrder } from "../../../core/tankopedia/characteristicsOrder"; +import { characteristicsOrder } from "../../../tankopedia/characteristicsOrder"; /** * The naked man fears no pickpocket. diff --git a/packages/website-ue/src/pages/api/tanks/list.json.ts b/packages/website-ue/src/pages/api/tanks/list.json.ts index cb0b266d5..1a07401b3 100644 --- a/packages/website-ue/src/pages/api/tanks/list.json.ts +++ b/packages/website-ue/src/pages/api/tanks/list.json.ts @@ -1,4 +1,4 @@ -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; /** * List! diff --git a/packages/website-ue/src/pages/api/tanks/list.pb.ts b/packages/website-ue/src/pages/api/tanks/list.pb.ts index 3809ac717..de12cc011 100644 --- a/packages/website-ue/src/pages/api/tanks/list.pb.ts +++ b/packages/website-ue/src/pages/api/tanks/list.pb.ts @@ -1,5 +1,5 @@ import { TankList } from "@protos/blitzkit/tank_list"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; /** * List!! diff --git a/packages/website-ue/src/pages/api/tanks/popular.json.ts b/packages/website-ue/src/pages/api/tanks/popular.json.ts index d21ca735a..0a7bec9fc 100644 --- a/packages/website-ue/src/pages/api/tanks/popular.json.ts +++ b/packages/website-ue/src/pages/api/tanks/popular.json.ts @@ -1,4 +1,4 @@ -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; export async function GET() { const popular = await api.popularTanks(); diff --git a/packages/website-ue/src/pages/api/tanks/popular.pb.ts b/packages/website-ue/src/pages/api/tanks/popular.pb.ts index acd72e297..1955f61af 100644 --- a/packages/website-ue/src/pages/api/tanks/popular.pb.ts +++ b/packages/website-ue/src/pages/api/tanks/popular.pb.ts @@ -1,5 +1,5 @@ import { PopularTanks } from "@protos/blitzkit/popular_tanks"; -import { api } from "../../../core/api/dynamic"; +import { api } from "../../../api/dynamic"; export async function GET() { const popular = await api.popularTanks(); diff --git a/packages/website-ue/src/pages/api/tanks/presets/upgrade/[id].pb.ts b/packages/website-ue/src/pages/api/tanks/presets/upgrade/[id].pb.ts index 096600790..81a1ddc86 100644 --- a/packages/website-ue/src/pages/api/tanks/presets/upgrade/[id].pb.ts +++ b/packages/website-ue/src/pages/api/tanks/presets/upgrade/[id].pb.ts @@ -1,6 +1,6 @@ import { TankUpgradePricePresetComponent } from "@protos/game/proto/legacy/blitz_static_tank_upgrade_price_preset_component"; import type { APIContext, GetStaticPaths } from "astro"; -import { api } from "../../../../../core/api/dynamic"; +import { api } from "../../../../../api/dynamic"; export const getStaticPaths = (async () => { return api.metadata diff --git a/packages/website-ue/src/pages/api/tiers.json.ts b/packages/website-ue/src/pages/api/tiers.json.ts index 222ca33a5..2a0e3100b 100644 --- a/packages/website-ue/src/pages/api/tiers.json.ts +++ b/packages/website-ue/src/pages/api/tiers.json.ts @@ -1,4 +1,4 @@ -import { api } from "../../core/api/dynamic"; +import { api } from "../../api/dynamic"; /** * Woah! test. diff --git a/packages/website-ue/src/pages/api/tiers.pb.ts b/packages/website-ue/src/pages/api/tiers.pb.ts index 407a797e4..b7558280e 100644 --- a/packages/website-ue/src/pages/api/tiers.pb.ts +++ b/packages/website-ue/src/pages/api/tiers.pb.ts @@ -1,5 +1,5 @@ import { Tiers } from "@protos/blitzkit/tiers"; -import { api } from "../../core/api/dynamic"; +import { api } from "../../api/dynamic"; /** * Woah! diff --git a/packages/website-ue/src/stores/tankopedia.ts b/packages/website-ue/src/stores/tankopedia.ts index e005a0da1..6d9aa035b 100644 --- a/packages/website-ue/src/stores/tankopedia.ts +++ b/packages/website-ue/src/stores/tankopedia.ts @@ -1,7 +1,7 @@ import type { Tank } from "@protos/blitzkit/tank"; import { Varuna } from "varuna"; -import { createTankState } from "../core/tankopedia/createTankState"; -import { type TankState } from "../core/tankopedia/tankState"; +import { createTankState } from "../tankopedia/createTankState"; +import { type TankState } from "../tankopedia/tankState"; interface Tankopedia { compare: TankopediaCompare; diff --git a/packages/website-ue/src/tankopedia/characteristicsOrder.tsx b/packages/website-ue/src/tankopedia/characteristicsOrder.tsx index e7dcf1890..49bc74c63 100644 --- a/packages/website-ue/src/tankopedia/characteristicsOrder.tsx +++ b/packages/website-ue/src/tankopedia/characteristicsOrder.tsx @@ -5,7 +5,7 @@ import { TankType, } from "@protos/game/proto/legacy/blitz_static_tank_component"; import type { ReactNode } from "react"; -import { VintageIcon } from "../../icons/Vintage"; +import { VintageIcon } from "../icons/Vintage"; import { GunType, type CharacteristicName,