From 33bb8ead3c0de4157c4942a0c381b362d0392dcb Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Wed, 23 Sep 2026 10:25:47 -0500 Subject: [PATCH] reorganize --- .../src/{blitzkit/api.ts => api/dynamic.ts} | 0 .../src/components/AvatarsList/index.tsx | 2 +- .../src/components/Compare/CompareTable.tsx | 2 +- .../src/components/Compare/Controls.tsx | 2 +- .../src/components/Compare/TankControl.tsx | 2 +- .../src/components/CrewSkillManager.tsx | 2 +- .../src/components/Embeds/breakdown.tsx | 2 +- .../src/components/GuessBackground/index.tsx | 2 +- packages/website/src/components/Guesser.tsx | 2 +- .../src/components/HomePageHotTanks.tsx | 2 +- .../MixerScene/components/Model.tsx | 2 +- .../ModuleButtons/ConsumableButton.tsx | 2 +- .../ModuleButtons/EquipmentButton.tsx | 2 +- .../ModuleButtons/ProvisionButton.tsx | 2 +- .../src/components/Performance/Tanks.tsx | 2 +- .../src/components/PlaylistGenerator.tsx | 2 +- .../src/components/PlaylistTankEntry.tsx | 2 +- .../src/components/ProvisionsManager.tsx | 2 +- .../components/RecentlyViewedTanks/index.tsx | 2 +- .../website/src/components/TankCard/index.tsx | 2 +- .../components/TankSearch/components/Card.tsx | 2 +- .../src/components/TankSearch/index.tsx | 2 +- .../components/TankSearchFilters/index.tsx | 24 +++++++++---------- .../components/Tankopedia/CalloutsSection.tsx | 2 +- .../Characteristics/components/Crew.tsx | 2 +- .../components/CanvasContent.tsx | 2 +- .../components/ModelChunk.tsx | 2 +- .../GunFlexibilityVisualizer/index.tsx | 2 +- .../components/InfoWithDelta.tsx | 2 +- .../components/Characteristics/index.tsx | 2 +- .../components/Consumables.tsx | 2 +- .../components/Equipment.tsx | 2 +- .../components/Modules.tsx | 2 +- .../components/Provisions.tsx | 2 +- .../components/Tankopedia/GameModeSection.tsx | 2 +- .../TankSandbox/components/Control.tsx | 2 +- .../TankSandbox/components/InitialAligner.tsx | 2 +- .../Tankopedia/HeroSection/index.tsx | 2 +- .../TechTreeSection/components/Node.tsx | 2 +- .../Tankopedia/TechTreeSection/index.tsx | 2 +- .../components/TankopediaLoadout/index.tsx | 1 + .../src/components/TierList/Row/index.tsx | 2 +- .../website/src/components/TierList/Tiles.tsx | 2 +- .../src/components/TierList/URLManager.tsx | 2 +- .../website/src/core/awaitables/tankNames.ts | 2 +- .../website/src/core/blitzkit/curateMixer.ts | 2 +- .../website/src/core/blitzkit/filterTank.ts | 2 +- .../src/core/blitzkit/generatePlaylist.ts | 2 +- .../website/src/core/blitzkit/hasEquipment.ts | 2 +- packages/website/src/hooks/useConsumables.ts | 7 ++++++ packages/website/src/hooks/useEccentricity.ts | 2 +- packages/website/src/hooks/useEquipment.ts | 2 +- .../website/src/hooks/useEquipmentPreset.ts | 2 +- packages/website/src/hooks/useProtagonist.ts | 2 +- packages/website/src/hooks/useStrings.ts | 2 +- .../definitions/camouflage.pb.ts | 2 +- .../definitions/consumables.pb.ts | 2 +- .../definitions/equipment.pb.ts | 2 +- .../[...chunk_api]/definitions/gallery.pb.ts | 2 +- .../[...chunk_api]/definitions/game.pb.ts | 2 +- .../[...chunk_api]/definitions/maps.pb.ts | 2 +- .../[...chunk_api]/definitions/models.pb.ts | 2 +- .../definitions/provisions.pb.ts | 2 +- .../definitions/scripts.json.ts | 2 +- .../[...chunk_api]/definitions/skills.pb.ts | 2 +- .../[...chunk_api]/definitions/tanks.pb.ts | 2 +- .../[...chunk_api]/strings/[locale].json.ts | 2 +- .../pages/[...chunk_api]/tanks/[id]/_index.ts | 2 +- .../[...locale]/compare/_index.tsx | 2 +- .../[...locale]/guess/_index.tsx | 2 +- .../[...locale]/mixer/_index.tsx | 2 +- .../[...locale]/session/_index.tsx | 2 +- .../[...locale]/tanks/[slug]/_index.tsx | 4 ++-- .../[...locale]/tanks/[slug]/index.astro | 2 +- packages/website/src/stores/tankopedia.ts | 2 +- .../computeCharacteristics.ts | 0 .../website/src/tankopedia/createTankState.ts | 2 +- 77 files changed, 93 insertions(+), 85 deletions(-) rename packages/website/src/{blitzkit/api.ts => api/dynamic.ts} (100%) create mode 100644 packages/website/src/hooks/useConsumables.ts rename packages/website/src/{blitzkit => tankopedia}/computeCharacteristics.ts (100%) diff --git a/packages/website/src/blitzkit/api.ts b/packages/website/src/api/dynamic.ts similarity index 100% rename from packages/website/src/blitzkit/api.ts rename to packages/website/src/api/dynamic.ts diff --git a/packages/website/src/components/AvatarsList/index.tsx b/packages/website/src/components/AvatarsList/index.tsx index 903c5e28e..fdb7057a9 100644 --- a/packages/website/src/components/AvatarsList/index.tsx +++ b/packages/website/src/components/AvatarsList/index.tsx @@ -3,7 +3,7 @@ import { literals } from "@blitzkit/i18n/src/literals"; import fuzzysort from "fuzzysort"; import { times } from "lodash-es"; import { useMemo, useState } from "react"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { useLocale } from "../../hooks/useLocale"; import { Gallery } from "../../stores/gallery"; import type { MaybeSkeletonComponentProps } from "../../types/maybeSkeletonComponentProps"; diff --git a/packages/website/src/components/Compare/CompareTable.tsx b/packages/website/src/components/Compare/CompareTable.tsx index 9a1c6ef9b..411054d8a 100644 --- a/packages/website/src/components/Compare/CompareTable.tsx +++ b/packages/website/src/components/Compare/CompareTable.tsx @@ -11,7 +11,7 @@ import { Text, } from "@radix-ui/themes"; import { times } from "lodash-es"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import type { TankCharacteristics } from "../../core/blitzkit/tankCharacteristics"; import { Var } from "../../core/radix/var"; import { useLocale } from "../../hooks/useLocale"; diff --git a/packages/website/src/components/Compare/Controls.tsx b/packages/website/src/components/Compare/Controls.tsx index 0a6a25a16..8f0030eea 100644 --- a/packages/website/src/components/Compare/Controls.tsx +++ b/packages/website/src/components/Compare/Controls.tsx @@ -1,6 +1,6 @@ import { PlusIcon, TrashIcon } from "@radix-ui/react-icons"; import { Button, Dialog, Flex, SegmentedControl } from "@radix-ui/themes"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { tankToCompareMember } from "../../core/blitzkit/tankToCompareMember"; import { useLocale } from "../../hooks/useLocale"; import { CompareEphemeral } from "../../stores/compareEphemeral"; diff --git a/packages/website/src/components/Compare/TankControl.tsx b/packages/website/src/components/Compare/TankControl.tsx index e880b3c95..f30800cb9 100644 --- a/packages/website/src/components/Compare/TankControl.tsx +++ b/packages/website/src/components/Compare/TankControl.tsx @@ -1,7 +1,7 @@ import { ExternalLinkIcon, LoopIcon, TrashIcon } from "@radix-ui/react-icons"; import { Dialog, Flex, IconButton } from "@radix-ui/themes"; import { useState } from "react"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { tankToCompareMember } from "../../core/blitzkit/tankToCompareMember"; import { useLocale } from "../../hooks/useLocale"; import { CompareEphemeral } from "../../stores/compareEphemeral"; diff --git a/packages/website/src/components/CrewSkillManager.tsx b/packages/website/src/components/CrewSkillManager.tsx index 24957b254..1ddcd534f 100644 --- a/packages/website/src/components/CrewSkillManager.tsx +++ b/packages/website/src/components/CrewSkillManager.tsx @@ -1,6 +1,6 @@ import { alias, permanentSkills, romanize } from "@blitzkit/core"; import { Flex } from "@radix-ui/themes"; -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import { GenericTankComponentButton } from "./ModuleButtons/GenericTankComponentButton"; interface CrewSkillManagerProps { diff --git a/packages/website/src/components/Embeds/breakdown.tsx b/packages/website/src/components/Embeds/breakdown.tsx index 197de2216..4c00c1fb3 100644 --- a/packages/website/src/components/Embeds/breakdown.tsx +++ b/packages/website/src/components/Embeds/breakdown.tsx @@ -12,9 +12,9 @@ import { STRINGS } from "@blitzkit/i18n"; import { ReloadIcon } from "@radix-ui/react-icons"; import { ContextMenu } from "@radix-ui/themes"; import { useEffect, useMemo, useState } from "react"; +import { api } from "../../api/dynamic"; import { breakdownConfig } from "../../constants/embeds"; import { awaitableAverageDefinitions } from "../../core/awaitables/averageDefinitions"; -import { api } from "../../blitzkit/api"; import { EmbedBreakdown } from "../../stores/embedBreakdown"; import { useEmbedStateCurry } from "../../stores/embedState/utilities"; import { BreakdownEmbedCard, BreakdownEmbedWrapper } from "../TanksEmbed"; diff --git a/packages/website/src/components/GuessBackground/index.tsx b/packages/website/src/components/GuessBackground/index.tsx index e7382a35e..941635d3d 100644 --- a/packages/website/src/components/GuessBackground/index.tsx +++ b/packages/website/src/components/GuessBackground/index.tsx @@ -1,6 +1,6 @@ import { Box } from "@radix-ui/themes"; import { useEffect } from "react"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { tankToDuelMember } from "../../core/blitzkit/tankToDuelMember"; import { Var } from "../../core/radix/var"; import { Duel } from "../../stores/duel"; diff --git a/packages/website/src/components/Guesser.tsx b/packages/website/src/components/Guesser.tsx index d42f7adbb..41c253443 100644 --- a/packages/website/src/components/Guesser.tsx +++ b/packages/website/src/components/Guesser.tsx @@ -29,8 +29,8 @@ import { import fuzzysort from "fuzzysort"; import { debounce, times } from "lodash-es"; import { useCallback, useEffect, useRef, useState } from "react"; +import { api } from "../api/dynamic"; import { awaitableTankNames } from "../core/awaitables/tankNames"; -import { api } from "../blitzkit/api"; import { useLocale } from "../hooks/useLocale"; import { Guess, GuessState } from "../stores/guess"; import { classIcons } from "./ClassIcon"; diff --git a/packages/website/src/components/HomePageHotTanks.tsx b/packages/website/src/components/HomePageHotTanks.tsx index aeee78308..7bd93ca43 100644 --- a/packages/website/src/components/HomePageHotTanks.tsx +++ b/packages/website/src/components/HomePageHotTanks.tsx @@ -1,8 +1,8 @@ import { literals } from "@blitzkit/i18n/src/literals"; import { EyeOpenIcon } from "@radix-ui/react-icons"; import { Box, Flex, Heading, Text } from "@radix-ui/themes"; +import { api } from "../api/dynamic"; import { awaitablePopularTanks } from "../core/awaitables/popularTanks"; -import { api } from "../blitzkit/api"; import { LocaleProvider, useLocale, diff --git a/packages/website/src/components/MixerScene/components/Model.tsx b/packages/website/src/components/MixerScene/components/Model.tsx index 2848525dd..e00a1646c 100644 --- a/packages/website/src/components/MixerScene/components/Model.tsx +++ b/packages/website/src/components/MixerScene/components/Model.tsx @@ -2,7 +2,7 @@ import { useThree, type ThreeEvent } from "@react-three/fiber"; import type { QuicklimeEvent } from "quicklime"; import { useCallback, useEffect, useRef } from "react"; import { Group, Vector2 } from "three"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; import { jsxTree } from "../../../core/blitzkit/jsxTree"; import { modelTransformEvent, diff --git a/packages/website/src/components/ModuleButtons/ConsumableButton.tsx b/packages/website/src/components/ModuleButtons/ConsumableButton.tsx index 3ee56570a..6dbeee65f 100644 --- a/packages/website/src/components/ModuleButtons/ConsumableButton.tsx +++ b/packages/website/src/components/ModuleButtons/ConsumableButton.tsx @@ -1,7 +1,7 @@ import { alias } from "@blitzkit/core"; import { ClockIcon, ReloadIcon } from "@radix-ui/react-icons"; import { Flex, Text } from "@radix-ui/themes"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { useDelta } from "../../hooks/useDelta"; import { useLocale } from "../../hooks/useLocale"; import { GenericTankComponentButton } from "./GenericTankComponentButton"; diff --git a/packages/website/src/components/ModuleButtons/EquipmentButton.tsx b/packages/website/src/components/ModuleButtons/EquipmentButton.tsx index b55f67297..5ae1e053d 100644 --- a/packages/website/src/components/ModuleButtons/EquipmentButton.tsx +++ b/packages/website/src/components/ModuleButtons/EquipmentButton.tsx @@ -1,5 +1,5 @@ import { alias } from "@blitzkit/core"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { useLocale } from "../../hooks/useLocale"; import { GenericTankComponentButton } from "./GenericTankComponentButton"; import type { TankComponentButtonProps } from "./TankComponentButton"; diff --git a/packages/website/src/components/ModuleButtons/ProvisionButton.tsx b/packages/website/src/components/ModuleButtons/ProvisionButton.tsx index 54c782e52..c72ae3743 100644 --- a/packages/website/src/components/ModuleButtons/ProvisionButton.tsx +++ b/packages/website/src/components/ModuleButtons/ProvisionButton.tsx @@ -1,5 +1,5 @@ import { alias } from "@blitzkit/core"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { useLocale } from "../../hooks/useLocale"; import { GenericTankComponentButton } from "./GenericTankComponentButton"; import type { TankComponentButtonProps } from "./TankComponentButton"; diff --git a/packages/website/src/components/Performance/Tanks.tsx b/packages/website/src/components/Performance/Tanks.tsx index 6e60a25b7..824a03467 100644 --- a/packages/website/src/components/Performance/Tanks.tsx +++ b/packages/website/src/components/Performance/Tanks.tsx @@ -10,8 +10,8 @@ import { useState, } from "react"; import usePromise from "react-promise-suspense"; +import { api } from "../../api/dynamic"; import { awaitableAverageDefinitions } from "../../core/awaitables/averageDefinitions"; -import { api } from "../../blitzkit/api"; import { filterTanks } from "../../core/blitzkit/filterTanks"; import { useAveragesExclusionRatio } from "../../hooks/useAveragesExclusionRatio"; import { useLocale } from "../../hooks/useLocale"; diff --git a/packages/website/src/components/PlaylistGenerator.tsx b/packages/website/src/components/PlaylistGenerator.tsx index 5e83c74e6..1a4ac21f7 100644 --- a/packages/website/src/components/PlaylistGenerator.tsx +++ b/packages/website/src/components/PlaylistGenerator.tsx @@ -12,7 +12,7 @@ import { } from "@radix-ui/themes"; import { useMemo, useState } from "react"; import usePromise from "react-promise-suspense"; -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import { filterTanks } from "../core/blitzkit/filterTanks"; import { generatePlaylist } from "../core/blitzkit/generatePlaylist"; import { useLocale } from "../hooks/useLocale"; diff --git a/packages/website/src/components/PlaylistTankEntry.tsx b/packages/website/src/components/PlaylistTankEntry.tsx index 6ffddd634..e6e284fa0 100644 --- a/packages/website/src/components/PlaylistTankEntry.tsx +++ b/packages/website/src/components/PlaylistTankEntry.tsx @@ -5,7 +5,7 @@ import { } from "@radix-ui/react-icons"; import { Checkbox, Flex, IconButton, Table, Text } from "@radix-ui/themes"; import { memo } from "react"; -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import { useLocale } from "../hooks/useLocale"; import { Playlist, type PlaylistEntry } from "../stores/playlist"; import { TankRowHeaderCell } from "./TankRowHeaderCell"; diff --git a/packages/website/src/components/ProvisionsManager.tsx b/packages/website/src/components/ProvisionsManager.tsx index 910df237d..e99f4cdfa 100644 --- a/packages/website/src/components/ProvisionsManager.tsx +++ b/packages/website/src/components/ProvisionsManager.tsx @@ -1,5 +1,5 @@ import { Flex } from "@radix-ui/themes"; -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import { ProvisionButton } from "./ModuleButtons/ProvisionButton"; interface ProvisionsManagerProps { diff --git a/packages/website/src/components/RecentlyViewedTanks/index.tsx b/packages/website/src/components/RecentlyViewedTanks/index.tsx index 0699a6a48..48de5fa29 100644 --- a/packages/website/src/components/RecentlyViewedTanks/index.tsx +++ b/packages/website/src/components/RecentlyViewedTanks/index.tsx @@ -1,6 +1,6 @@ import { isEqual } from "lodash-es"; import { useMemo } from "react"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { useLocale } from "../../hooks/useLocale"; import { TankFilters } from "../../stores/tankFilters"; import { TankopediaPersistent } from "../../stores/tankopediaPersistent"; diff --git a/packages/website/src/components/TankCard/index.tsx b/packages/website/src/components/TankCard/index.tsx index 70041aab6..116990d5e 100644 --- a/packages/website/src/components/TankCard/index.tsx +++ b/packages/website/src/components/TankCard/index.tsx @@ -1,7 +1,7 @@ import { alias, TankType, type TankDefinition } from "@blitzkit/core"; import { uniq } from "lodash-es"; import { type ReactNode } from "react"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { useLocale } from "../../hooks/useLocale"; import { TankopediaPersistent } from "../../stores/tankopediaPersistent"; import type { MaybeSkeletonComponentProps } from "../../types/maybeSkeletonComponentProps"; diff --git a/packages/website/src/components/TankSearch/components/Card.tsx b/packages/website/src/components/TankSearch/components/Card.tsx index a7cfee4ef..25f20c8de 100644 --- a/packages/website/src/components/TankSearch/components/Card.tsx +++ b/packages/website/src/components/TankSearch/components/Card.tsx @@ -5,7 +5,7 @@ import { type TankDefinition, } from "@blitzkit/core"; import { useMemo } from "react"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; import { resolveReload } from "../../../core/blitzkit/resolveReload"; import { TankSort } from "../../../stores/tankopediaSort"; import { TankCard } from "../../TankCard"; diff --git a/packages/website/src/components/TankSearch/index.tsx b/packages/website/src/components/TankSearch/index.tsx index 41bc3c44f..6bda2757d 100644 --- a/packages/website/src/components/TankSearch/index.tsx +++ b/packages/website/src/components/TankSearch/index.tsx @@ -11,8 +11,8 @@ import fuzzysort from "fuzzysort"; import { uniq } from "lodash-es"; import { memo, useMemo } from "react"; import usePromise from "react-promise-suspense"; +import { api } from "../../api/dynamic"; import { awaitableTankNames } from "../../core/awaitables/tankNames"; -import { api } from "../../blitzkit/api"; import { filterTanks } from "../../core/blitzkit/filterTanks"; import { resolveReload } from "../../core/blitzkit/resolveReload"; import { useLocale } from "../../hooks/useLocale"; diff --git a/packages/website/src/components/TankSearchFilters/index.tsx b/packages/website/src/components/TankSearchFilters/index.tsx index 2e7a044a1..ab79d4c41 100644 --- a/packages/website/src/components/TankSearchFilters/index.tsx +++ b/packages/website/src/components/TankSearchFilters/index.tsx @@ -1,23 +1,23 @@ import { - alias, - GunDefinition, - ShellType, - TANK_CLASSES, - TANK_TYPES, - TankType, - TIER_ROMAN_NUMERALS, + alias, + GunDefinition, + ShellType, + TANK_CLASSES, + TANK_TYPES, + TankType, + TIER_ROMAN_NUMERALS, } from "@blitzkit/core"; import { literals } from "@blitzkit/i18n"; import locales from "@blitzkit/i18n/locales.json"; import { - LockClosedIcon, - LockOpen2Icon, - ResetIcon, - TrashIcon, + LockClosedIcon, + LockOpen2Icon, + ResetIcon, + TrashIcon, } from "@radix-ui/react-icons"; import { times } from "lodash-es"; import { Fragment, type ComponentProps, type ReactNode } from "react"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { useLocale } from "../../hooks/useLocale"; import { App } from "../../stores/app"; import { TankFilters, type CaseType } from "../../stores/tankFilters"; diff --git a/packages/website/src/components/Tankopedia/CalloutsSection.tsx b/packages/website/src/components/Tankopedia/CalloutsSection.tsx index 9628f21f0..49a410380 100644 --- a/packages/website/src/components/Tankopedia/CalloutsSection.tsx +++ b/packages/website/src/components/Tankopedia/CalloutsSection.tsx @@ -3,7 +3,7 @@ import { MinusCircledIcon } from "@radix-ui/react-icons"; import { Callout, Flex } from "@radix-ui/themes"; import { uniq } from "lodash-es"; import { useEffect } from "react"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { Duel } from "../../stores/duel"; import { TankopediaPersistent } from "../../stores/tankopediaPersistent"; import { AesonPlug } from "../AesonPlug"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx index c9fffbc59..e5a6e1481 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Crew.tsx @@ -3,7 +3,7 @@ import { literals } from "@blitzkit/i18n"; import { AccessibilityIcon, InfoCircledIcon } from "@radix-ui/react-icons"; import { Flex, Heading, IconButton, Popover, Text } from "@radix-ui/themes"; import { Fragment } from "react/jsx-runtime"; -import { api } from "../../../../../../blitzkit/api"; +import { api } from "../../../../../../api/dynamic"; import { useEquipment } from "../../../../../../hooks/useEquipment"; import { useLocale } from "../../../../../../hooks/useLocale"; import { Duel } from "../../../../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx index fae9756ae..884109a56 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/CanvasContent.tsx @@ -1,7 +1,7 @@ import type { QuicklimeEvent } from "quicklime"; import { useEffect, useRef } from "react"; import type { Group } from "three"; -import { api } from "../../../../../../../../blitzkit/api"; +import { api } from "../../../../../../../../api/dynamic"; import { modelTransformEvent, type ModelTransformEventData, diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/ModelChunk.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/ModelChunk.tsx index 22240f72d..83bd4a2ed 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/ModelChunk.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/components/ModelChunk.tsx @@ -1,6 +1,6 @@ import { mauveDark } from "@radix-ui/colors"; import { LineBasicMaterial, MeshBasicMaterial } from "three"; -import { api } from "../../../../../../../../blitzkit/api"; +import { api } from "../../../../../../../../api/dynamic"; import { jsxTree } from "../../../../../../../../core/blitzkit/jsxTree"; import { useModel } from "../../../../../../../../hooks/useModel"; import { Duel } from "../../../../../../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx index 75f96ca03..96c0a97db 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/GunFlexibilityVisualizer/index.tsx @@ -3,11 +3,11 @@ import { Box, Card, Flex } from "@radix-ui/themes"; import { clamp } from "lodash-es"; import { useRef, useState } from "react"; import { degToRad, radToDeg } from "three/src/math/MathUtils.js"; +import { api } from "../../../../../../../api/dynamic"; import { DEFAULT_PITCH_TRANSITION, applyPitchYawLimits, } from "../../../../../../../core/blitz/applyPitchYawLimits"; -import { api } from "../../../../../../../blitzkit/api"; import { hasEquipment } from "../../../../../../../core/blitzkit/hasEquipment"; import { modelTransformEvent } from "../../../../../../../core/blitzkit/modelTransform"; import { Var } from "../../../../../../../core/radix/var"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/InfoWithDelta.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/InfoWithDelta.tsx index 8e0ec8a7b..05d23a7f8 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/InfoWithDelta.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/InfoWithDelta.tsx @@ -2,7 +2,7 @@ import { createDefaultSkills } from "@blitzkit/core"; import { Flex, Progress, Text } from "@radix-ui/themes"; import { clamp } from "lodash-es"; import { memo, useMemo, type ComponentProps, type ReactNode } from "react"; -import { api } from "../../../../../../blitzkit/api"; +import { api } from "../../../../../../api/dynamic"; import { tankCharacteristics, type TankCharacteristics, diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx index 08a304886..b739150db 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/index.tsx @@ -1,7 +1,7 @@ import { Flex } from "@radix-ui/themes"; import { useEffect } from "react"; +import { api } from "../../../../../api/dynamic"; import { applyPitchYawLimits } from "../../../../../core/blitz/applyPitchYawLimits"; -import { api } from "../../../../../blitzkit/api"; import { modelTransformEvent } from "../../../../../core/blitzkit/modelTransform"; import { tankCharacteristics } from "../../../../../core/blitzkit/tankCharacteristics"; import { useEquipment } from "../../../../../hooks/useEquipment"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx index f24d11eb0..972a69356 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Consumables.tsx @@ -8,7 +8,7 @@ import { Popover, Text, } from "@radix-ui/themes"; -import { api } from "../../../../blitzkit/api"; +import { api } from "../../../../api/dynamic"; import { useEquipment } from "../../../../hooks/useEquipment"; import { useLocale } from "../../../../hooks/useLocale"; import { Duel } from "../../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equipment.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equipment.tsx index ef7393ca7..ff37622e0 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equipment.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Equipment.tsx @@ -1,5 +1,5 @@ import { Button, Flex, Heading } from "@radix-ui/themes"; -import { api } from "../../../../blitzkit/api"; +import { api } from "../../../../api/dynamic"; import { useLocale } from "../../../../hooks/useLocale"; import { Duel } from "../../../../stores/duel"; import { EquipmentManager } from "../../../EquipmentManager"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx index 7a640b198..25f8c382a 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Modules.tsx @@ -20,7 +20,7 @@ import { Text, Tooltip, } from "@radix-ui/themes"; -import { api } from "../../../../blitzkit/api"; +import { api } from "../../../../api/dynamic"; import { useLocale } from "../../../../hooks/useLocale"; import { Duel } from "../../../../stores/duel"; import { LinkI18n } from "../../../LinkI18n"; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Provisions.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Provisions.tsx index cba181a22..8052b9d57 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Provisions.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Provisions.tsx @@ -1,6 +1,6 @@ import { availableProvisions } from "@blitzkit/core"; import { Button, Flex, Heading } from "@radix-ui/themes"; -import { api } from "../../../../blitzkit/api"; +import { api } from "../../../../api/dynamic"; import { useLocale } from "../../../../hooks/useLocale"; import { Duel } from "../../../../stores/duel"; import { ProvisionsManager } from "../../../ProvisionsManager"; diff --git a/packages/website/src/components/Tankopedia/GameModeSection.tsx b/packages/website/src/components/Tankopedia/GameModeSection.tsx index 04741f445..56b8bdf13 100644 --- a/packages/website/src/components/Tankopedia/GameModeSection.tsx +++ b/packages/website/src/components/Tankopedia/GameModeSection.tsx @@ -1,6 +1,6 @@ import { alias } from "@blitzkit/core"; import { Box, Flex, Heading, Text } from "@radix-ui/themes"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { useLocale } from "../../hooks/useLocale"; import { Duel } from "../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/Control.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/Control.tsx index 7d141ba21..c9a5d56f1 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/Control.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/Control.tsx @@ -5,8 +5,8 @@ import type { QuicklimeEvent } from "quicklime"; import { useEffect, useRef } from "react"; import { PerspectiveCamera, Vector3 } from "three"; import { OrbitControls as OrbitControlsClass } from "three-stdlib"; +import { api } from "../../../../../../api/dynamic"; import { applyPitchYawLimits } from "../../../../../../core/blitz/applyPitchYawLimits"; -import { api } from "../../../../../../blitzkit/api"; import { hasEquipment } from "../../../../../../core/blitzkit/hasEquipment"; import { Pose, poseEvent } from "../../../../../../core/blitzkit/pose"; import { controlsEnabledEvent } from "../../../../../../core/controlsEnabled"; diff --git a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/InitialAligner.tsx b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/InitialAligner.tsx index c2fa1c967..9bd6999ae 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/InitialAligner.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/components/TankSandbox/components/InitialAligner.tsx @@ -1,7 +1,7 @@ import { useEffect } from "react"; import { degToRad } from "three/src/math/MathUtils.js"; +import { api } from "../../../../../../api/dynamic"; import { applyPitchYawLimits } from "../../../../../../core/blitz/applyPitchYawLimits"; -import { api } from "../../../../../../blitzkit/api"; import { modelTransformEvent } from "../../../../../../core/blitzkit/modelTransform"; import { Duel } from "../../../../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/HeroSection/index.tsx b/packages/website/src/components/Tankopedia/HeroSection/index.tsx index c4f57d55c..0d1501664 100644 --- a/packages/website/src/components/Tankopedia/HeroSection/index.tsx +++ b/packages/website/src/components/Tankopedia/HeroSection/index.tsx @@ -1,7 +1,7 @@ import { Box, Flex } from "@radix-ui/themes"; import { times } from "lodash-es"; import { useEffect, useMemo, useRef } from "react"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; import { defaultEqualizer } from "../../../core/blitzkit/tankToDuelMember"; import { useFullScreen } from "../../../hooks/useFullScreen"; import { Duel } from "../../../stores/duel"; diff --git a/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx b/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx index af4a07855..68728d161 100644 --- a/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx +++ b/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx @@ -1,8 +1,8 @@ import { alias, formatCompact, TIER_ROMAN_NUMERALS } from "@blitzkit/core"; import { literals } from "@blitzkit/i18n/src/literals"; import { Box, Flex, Skeleton, Text } from "@radix-ui/themes"; +import { api } from "../../../../api/dynamic"; import { awaitableAverageDefinitions } from "../../../../core/awaitables/averageDefinitions"; -import { api } from "../../../../blitzkit/api"; import { useLocale } from "../../../../hooks/useLocale"; import { Tankopedia } from "../../../../stores/tankopedia"; import type { MaybeSkeletonComponentProps } from "../../../../types/maybeSkeletonComponentProps"; diff --git a/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx b/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx index 5ea243ad2..7bf4e5c2b 100644 --- a/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx +++ b/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx @@ -3,7 +3,7 @@ import { literals } from "@blitzkit/i18n/src/literals"; import { CaretLeftIcon, CaretRightIcon, PlusIcon } from "@radix-ui/react-icons"; import { Flex, Heading, IconButton, ScrollArea, Text } from "@radix-ui/themes"; import { Fragment, useEffect, useMemo, useRef, useState } from "react"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; import { useLocale } from "../../../hooks/useLocale"; import { Duel } from "../../../stores/duel"; import { Tankopedia } from "../../../stores/tankopedia"; diff --git a/packages/website/src/components/TankopediaLoadout/index.tsx b/packages/website/src/components/TankopediaLoadout/index.tsx index dd80e2516..d8dfa8a72 100644 --- a/packages/website/src/components/TankopediaLoadout/index.tsx +++ b/packages/website/src/components/TankopediaLoadout/index.tsx @@ -3,6 +3,7 @@ import { useProtagonist } from "../../hooks/useProtagonist"; import { useStrings } from "../../hooks/useStrings"; import { Tankopedia } from "../../stores/tankopedia"; import { hasUpgrades } from "../../tankopedia/hasUpgrades"; +import { vehicleStatusKeys } from "../../tankopedia/tankState"; import type { ComputedCharacteristics } from "../../types/characteristics"; import { Heading } from "../Heading"; import { IconButton } from "../IconButton"; diff --git a/packages/website/src/components/TierList/Row/index.tsx b/packages/website/src/components/TierList/Row/index.tsx index 34683e500..167fde474 100644 --- a/packages/website/src/components/TierList/Row/index.tsx +++ b/packages/website/src/components/TierList/Row/index.tsx @@ -1,6 +1,6 @@ import { Flex, Table } from "@radix-ui/themes"; import { useEffect, useRef } from "react"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; import { TierList } from "../../../stores/tierList"; import { tierListRowElements } from "../Table/constants"; import { TierListTile } from "../Tile"; diff --git a/packages/website/src/components/TierList/Tiles.tsx b/packages/website/src/components/TierList/Tiles.tsx index 4809b62f6..332d40f1f 100644 --- a/packages/website/src/components/TierList/Tiles.tsx +++ b/packages/website/src/components/TierList/Tiles.tsx @@ -2,7 +2,7 @@ import { metaSortTank } from "@blitzkit/core"; import { times } from "lodash-es"; import { useMemo, useState } from "react"; import usePromise from "react-promise-suspense"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { filterTanks } from "../../core/blitzkit/filterTanks"; import { TankFilters } from "../../stores/tankFilters"; import { TierList } from "../../stores/tierList"; diff --git a/packages/website/src/components/TierList/URLManager.tsx b/packages/website/src/components/TierList/URLManager.tsx index c51531c95..615ae912d 100644 --- a/packages/website/src/components/TierList/URLManager.tsx +++ b/packages/website/src/components/TierList/URLManager.tsx @@ -1,5 +1,5 @@ import { useEffect } from "react"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; import { generateTierListParams } from "../../core/blitzkit/generateTierListParams"; import { TierList } from "../../stores/tierList"; diff --git a/packages/website/src/core/awaitables/tankNames.ts b/packages/website/src/core/awaitables/tankNames.ts index 21b71e9a7..ee0d98e7a 100644 --- a/packages/website/src/core/awaitables/tankNames.ts +++ b/packages/website/src/core/awaitables/tankNames.ts @@ -1,4 +1,4 @@ import { fetchTankNames } from "@blitzkit/core"; -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; export const awaitableTankNames = fetchTankNames(api); diff --git a/packages/website/src/core/blitzkit/curateMixer.ts b/packages/website/src/core/blitzkit/curateMixer.ts index 0291f7a09..f4cda7b27 100644 --- a/packages/website/src/core/blitzkit/curateMixer.ts +++ b/packages/website/src/core/blitzkit/curateMixer.ts @@ -1,4 +1,4 @@ -import { api } from "../../blitzkit/api"; +import { api } from "../../api/dynamic"; const tankDefinitions = await api.tanks(); const modelDefinitions = await api.models(); diff --git a/packages/website/src/core/blitzkit/filterTank.ts b/packages/website/src/core/blitzkit/filterTank.ts index 4184d9a10..4137ea37b 100644 --- a/packages/website/src/core/blitzkit/filterTank.ts +++ b/packages/website/src/core/blitzkit/filterTank.ts @@ -1,8 +1,8 @@ import type { TankDefinition } from "@blitzkit/core"; import { checkConsumableProvisionInclusivity } from "@blitzkit/core/src/blitzkit/checkConsumableProvisionInclusivity"; import { times } from "lodash-es"; +import { api } from "../../api/dynamic"; import type { TankFilters } from "../../stores/tankFilters"; -import { api } from "../../blitzkit/api"; const SHELLS = times(3, (index) => index); diff --git a/packages/website/src/core/blitzkit/generatePlaylist.ts b/packages/website/src/core/blitzkit/generatePlaylist.ts index 35e6a6109..be03afc25 100644 --- a/packages/website/src/core/blitzkit/generatePlaylist.ts +++ b/packages/website/src/core/blitzkit/generatePlaylist.ts @@ -4,10 +4,10 @@ import { idToRegion, type IndividualTankStats, } from "@blitzkit/core"; +import { api } from "../../api/dynamic"; import { App } from "../../stores/app"; import { Playlist } from "../../stores/playlist"; import { TankFilters } from "../../stores/tankFilters"; -import { api } from "../../blitzkit/api"; import { filterTanks } from "./filterTanks"; const tankDefinitions = await api.tanks(); diff --git a/packages/website/src/core/blitzkit/hasEquipment.ts b/packages/website/src/core/blitzkit/hasEquipment.ts index afaa3518b..1445996f0 100644 --- a/packages/website/src/core/blitzkit/hasEquipment.ts +++ b/packages/website/src/core/blitzkit/hasEquipment.ts @@ -1,5 +1,5 @@ +import { api } from "../../api/dynamic"; import type { EquipmentMatrix } from "../../stores/duel"; -import { api } from "../../blitzkit/api"; const equipmentDefinitions = await api.equipment(); diff --git a/packages/website/src/hooks/useConsumables.ts b/packages/website/src/hooks/useConsumables.ts new file mode 100644 index 000000000..175fe4751 --- /dev/null +++ b/packages/website/src/hooks/useConsumables.ts @@ -0,0 +1,7 @@ +import { api } from "../api/dynamic"; +import { useAwait } from "./useAwait"; + +export function useConsumables() { + const consumables = useAwait(() => api.consumables(), "consumables"); + return consumables; +} diff --git a/packages/website/src/hooks/useEccentricity.ts b/packages/website/src/hooks/useEccentricity.ts index 8ff426904..ba26014d4 100644 --- a/packages/website/src/hooks/useEccentricity.ts +++ b/packages/website/src/hooks/useEccentricity.ts @@ -1,7 +1,7 @@ import { TankDefinition } from "@blitzkit/core"; import { sumBy } from "lodash-es"; import { useMemo } from "react"; -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import { Duel } from "../stores/duel"; export enum UseEccentricityMode { diff --git a/packages/website/src/hooks/useEquipment.ts b/packages/website/src/hooks/useEquipment.ts index 87f61a6a6..ab222f5f5 100644 --- a/packages/website/src/hooks/useEquipment.ts +++ b/packages/website/src/hooks/useEquipment.ts @@ -1,5 +1,5 @@ import { useMemo } from "react"; -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import { Duel } from "../stores/duel"; const equipmentDefinitions = await api.equipment(); diff --git a/packages/website/src/hooks/useEquipmentPreset.ts b/packages/website/src/hooks/useEquipmentPreset.ts index c4e60a5ac..b29271fd9 100644 --- a/packages/website/src/hooks/useEquipmentPreset.ts +++ b/packages/website/src/hooks/useEquipmentPreset.ts @@ -1,4 +1,4 @@ -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; const equipmentDefinitions = await api.equipment(); diff --git a/packages/website/src/hooks/useProtagonist.ts b/packages/website/src/hooks/useProtagonist.ts index 5f471a3f1..057247738 100644 --- a/packages/website/src/hooks/useProtagonist.ts +++ b/packages/website/src/hooks/useProtagonist.ts @@ -1,4 +1,4 @@ -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import { Tankopedia } from "../stores/tankopedia"; import { useAwait } from "./useAwait"; diff --git a/packages/website/src/hooks/useStrings.ts b/packages/website/src/hooks/useStrings.ts index 4c188e157..4e2dd1520 100644 --- a/packages/website/src/hooks/useStrings.ts +++ b/packages/website/src/hooks/useStrings.ts @@ -1,4 +1,4 @@ -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import { useAwait } from "./useAwait"; import { useLocale } from "./useLocale"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts index 0e5ccd637..d38086fe3 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/camouflage.pb.ts @@ -1,5 +1,5 @@ import { CamouflageDefinitions } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts index c384c12c3..05a024f03 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/consumables.pb.ts @@ -1,5 +1,5 @@ import { ConsumableDefinitions } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts index 6ff6797d8..1072e5b53 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/equipment.pb.ts @@ -1,5 +1,5 @@ import { EquipmentDefinitions } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts index 39ea7e5db..065231e48 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/gallery.pb.ts @@ -1,5 +1,5 @@ import { Gallery } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts index 302911efd..9ce5cc2d7 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/game.pb.ts @@ -1,5 +1,5 @@ import { GameDefinitions } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/maps.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/maps.pb.ts index ad57a63d3..b6241913d 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/maps.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/maps.pb.ts @@ -1,5 +1,5 @@ import { MapDefinitions } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts index 400a6bea0..6bbf5374d 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/models.pb.ts @@ -1,5 +1,5 @@ import { ModelDefinitions } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts index 19b006ea4..4aa908346 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/provisions.pb.ts @@ -1,5 +1,5 @@ import { ProvisionDefinitions } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/scripts.json.ts b/packages/website/src/pages/[...chunk_api]/definitions/scripts.json.ts index 3f2ef3938..7c9aa4b86 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/scripts.json.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/scripts.json.ts @@ -1,4 +1,4 @@ -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts index 57df50153..3f6de0460 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/skills.pb.ts @@ -1,5 +1,5 @@ import { SkillDefinitions } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts b/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts index 42bc10e86..cfcb9d8b4 100644 --- a/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts +++ b/packages/website/src/pages/[...chunk_api]/definitions/tanks.pb.ts @@ -1,5 +1,5 @@ import { TankDefinitions } from "@blitzkit/core"; -import { api } from "../../../blitzkit/api"; +import { api } from "../../../api/dynamic"; export { getStaticPaths } from "../_index"; diff --git a/packages/website/src/pages/[...chunk_api]/strings/[locale].json.ts b/packages/website/src/pages/[...chunk_api]/strings/[locale].json.ts index 0cd08c1e2..377311c07 100644 --- a/packages/website/src/pages/[...chunk_api]/strings/[locale].json.ts +++ b/packages/website/src/pages/[...chunk_api]/strings/[locale].json.ts @@ -1,7 +1,7 @@ import locales from "@blitzkit/i18n/locales.json"; import type { APIContext } from "astro"; +import { api } from "../../../api/dynamic"; import { mixStaticPaths } from "../../../astro/mixStaticPaths"; -import { api } from "../../../blitzkit/api"; import { getStaticPaths as _getStaticPaths } from "../_index"; export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => { diff --git a/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts b/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts index 6a20added..57788ad51 100644 --- a/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts +++ b/packages/website/src/pages/[...chunk_api]/tanks/[id]/_index.ts @@ -1,4 +1,4 @@ -import { api } from "../../../../blitzkit/api"; +import { api } from "../../../../api/dynamic"; import { mixStaticPaths } from "../../../../astro/mixStaticPaths"; import { getStaticPaths as _getStaticPaths } from "../../_index"; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx index a1b40c74f..7d43a430a 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx @@ -1,6 +1,6 @@ import { createDefaultSkills } from "@blitzkit/core"; import { useEffect, useMemo, useState } from "react"; -import { api } from "../../../../blitzkit/api"; +import { api } from "../../../../api/dynamic"; import { CompareTable } from "../../../../components/Compare/CompareTable"; import { Controls } from "../../../../components/Compare/Controls"; import { DamageWarning } from "../../../../components/DamageWarning"; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/guess/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/guess/_index.tsx index 901fdd471..32c7c88bc 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/guess/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/guess/_index.tsx @@ -1,11 +1,11 @@ import { Box, Flex, Heading } from "@radix-ui/themes"; import { Suspense, useEffect } from "react"; +import { api } from "../../../../api/dynamic"; import { GuessBackground } from "../../../../components/GuessBackground"; import { Guesser } from "../../../../components/Guesser"; import { GuessRenderer } from "../../../../components/GuessRenderer"; import { GuessRendererLoader } from "../../../../components/GuessRendererLoader"; import { PageWrapper } from "../../../../components/PageWrapper"; -import { api } from "../../../../blitzkit/api"; import { type LocaleAcceptorProps, LocaleProvider, diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx index e5bb00a9a..aa4d79501 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/mixer/_index.tsx @@ -19,12 +19,12 @@ import { type ButtonProps, } from "@radix-ui/themes"; import { useRef, useState } from "react"; +import { api } from "../../../../api/dynamic"; import { MixerScene } from "../../../../components/MixerScene"; import { ModuleButton } from "../../../../components/ModuleButtons/ModuleButton"; import { PageWrapper } from "../../../../components/PageWrapper"; import { ScreenshotButton } from "../../../../components/ScreenshotButton"; import { TankSearch } from "../../../../components/TankSearch"; -import { api } from "../../../../blitzkit/api"; import { curateMixer } from "../../../../core/blitzkit/curateMixer"; import { LocaleProvider, diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx index 4b57512a6..64062df39 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/session/_index.tsx @@ -33,12 +33,12 @@ import { } from "@radix-ui/themes"; import { debounce } from "lodash-es"; import { useEffect, useMemo, useRef, useState } from "react"; +import { api } from "../../../../api/dynamic"; import { PageWrapper } from "../../../../components/PageWrapper"; import { StickyRowHeaderCell } from "../../../../components/StickyRowHeaderCell"; import { StickyTableRoot } from "../../../../components/StickyTableRoot"; import { TankRowHeaderCell } from "../../../../components/TankRowHeaderCell"; import { awaitableAverageDefinitions } from "../../../../core/awaitables/averageDefinitions"; -import { api } from "../../../../blitzkit/api"; import { type LocaleAcceptorProps, LocaleProvider, diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx index 64293fe37..4f729490e 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/_index.tsx @@ -1,6 +1,6 @@ import { useMemo } from "react"; -import { api } from "../../../../../blitzkit/api"; -import { computeCharacteristics } from "../../../../../blitzkit/computeCharacteristics"; +import { api } from "../../../../../api/dynamic"; +import { computeCharacteristics } from "../../../../../tankopedia/computeCharacteristics"; import { withErrorWrapper } from "../../../../../hocs/withErrorWrapper"; import { withLocale } from "../../../../../hocs/withLocale"; import { useAwait } from "../../../../../hooks/useAwait"; diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro index d6c07c28e..402d94c50 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/tanks/[slug]/index.astro @@ -1,7 +1,7 @@ --- import "@radix-ui/colors/violet-dark.css"; +import { api } from "../../../../../api/dynamic"; import { mixStaticPaths } from "../../../../../astro/mixStaticPaths"; -import { api } from "../../../../../blitzkit/api"; import ColorScale from "../../../../../components/ColorScale.astro"; import BaseLayout from "../../../../../layouts/BaseLayout.astro"; import { getStaticPaths as _getStaticPaths } from "../index.astro"; diff --git a/packages/website/src/stores/tankopedia.ts b/packages/website/src/stores/tankopedia.ts index 9e1cc9e4f..d116b38e9 100644 --- a/packages/website/src/stores/tankopedia.ts +++ b/packages/website/src/stores/tankopedia.ts @@ -5,7 +5,7 @@ import { } from "@blitzkit/core"; import type { Vector3 } from "three"; import { Varuna } from "varuna"; -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import type { ArmorType } from "../components/Armor/components/SpacedArmorScene"; import type { ExternalModuleVariant } from "../components/Armor/components/SpacedArmorSceneComponent"; import type { XP_MULTIPLIERS } from "../components/Tankopedia/TechTreeSection"; diff --git a/packages/website/src/blitzkit/computeCharacteristics.ts b/packages/website/src/tankopedia/computeCharacteristics.ts similarity index 100% rename from packages/website/src/blitzkit/computeCharacteristics.ts rename to packages/website/src/tankopedia/computeCharacteristics.ts diff --git a/packages/website/src/tankopedia/createTankState.ts b/packages/website/src/tankopedia/createTankState.ts index d69c3129f..f2aa0fa36 100644 --- a/packages/website/src/tankopedia/createTankState.ts +++ b/packages/website/src/tankopedia/createTankState.ts @@ -1,5 +1,5 @@ import { createDefaultProvisions, type TankDefinition } from "@blitzkit/core"; -import { api } from "../blitzkit/api"; +import { api } from "../api/dynamic"; import { createTankStatus } from "./createTankStatus"; import type { TankState } from "./tankState";