From 93f8f3d188f6efe5a5c1446863faa5eb5e5f90dc Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 12 Jan 2025 21:10:26 +0100 Subject: [PATCH] fix build --- client/apps/game/src/hooks/context/DojoContext.tsx | 2 ++ client/apps/game/src/main.tsx | 8 ++++---- client/apps/game/src/three/managers/minimap.ts | 2 +- .../src/ui/components/trading/TransferBetweenEntities.tsx | 6 +++--- .../apps/game/src/ui/components/trading/TransferView.tsx | 4 ++-- client/apps/game/src/ui/elements/Button.tsx | 2 +- client/apps/game/src/ui/elements/CircleButton.tsx | 2 +- client/apps/game/src/ui/elements/HintModalButton.tsx | 2 +- client/apps/game/src/ui/elements/NumberInput.tsx | 2 +- client/apps/game/src/ui/elements/tab/tabs.tsx | 2 +- client/apps/game/src/ui/modules/LoadingScreen.tsx | 2 +- .../apps/game/src/ui/modules/entity-details/Battles.tsx | 2 +- client/apps/game/src/ui/modules/navigation/QuestMenu.tsx | 4 ++-- 13 files changed, 21 insertions(+), 19 deletions(-) diff --git a/client/apps/game/src/hooks/context/DojoContext.tsx b/client/apps/game/src/hooks/context/DojoContext.tsx index 4fe31a0be8..8d0c1ccc4a 100644 --- a/client/apps/game/src/hooks/context/DojoContext.tsx +++ b/client/apps/game/src/hooks/context/DojoContext.tsx @@ -1,4 +1,6 @@ import { ReactComponent as CartridgeSmall } from "@/assets/icons/cartridge-small.svg"; +// import CartridgeSmall from '@/assets/icons/cartridge-small.svg?react'; +// import CartridgeSmall from '../../../../common/public/assets/icons/cartridge-small.svg?react'; import { SetupResult } from "@/dojo/setup"; import { SetupNetworkResult } from "@/dojo/setup-network"; import { useAccountStore } from "@/hooks/context/account-store"; diff --git a/client/apps/game/src/main.tsx b/client/apps/game/src/main.tsx index 89f685c96f..d637612955 100644 --- a/client/apps/game/src/main.tsx +++ b/client/apps/game/src/main.tsx @@ -12,11 +12,11 @@ import { env } from "../env"; import App from "./App"; import { setup } from "./dojo/setup"; import { DojoProvider } from "./hooks/context/DojoContext"; -import { StarknetProvider } from "./hooks/context/starknet-provider"; -import useUIStore from "./hooks/store/useUIStore"; +import { StarknetProvider } from "./hooks/context/StarknetProvider"; +import useUIStore from "./hooks/store/use-ui-store"; import "./index.css"; -import GameRenderer from "./three/GameRenderer"; -import { PWAUpdatePopup } from "./ui/components/pwa-update-popup"; +import GameRenderer from "./three/game-renderer"; +import { PWAUpdatePopup } from "./ui/components/PWAUpdatePopup"; import { LoadingScreen } from "./ui/modules/LoadingScreen"; import { getRandomBackgroundImage } from "./ui/utils/utils"; diff --git a/client/apps/game/src/three/managers/minimap.ts b/client/apps/game/src/three/managers/minimap.ts index 9a961a3a06..8a1ec71a5a 100644 --- a/client/apps/game/src/three/managers/minimap.ts +++ b/client/apps/game/src/three/managers/minimap.ts @@ -3,7 +3,7 @@ import { type ArmyManager } from "@/three/managers/army-manager"; import { type BattleManager } from "@/three/managers/battle-manager"; import { type Biome, BIOME_COLORS } from "@/three/managers/biome"; import { type StructureManager } from "@/three/managers/structure-manager"; -import type WorldmapScene from "@/three/scenes/Worldmap"; +import type WorldmapScene from "@/three/scenes/worldmap"; import { FELT_CENTER } from "@/ui/config"; import { getHexForWorldPosition } from "@/ui/utils/utils"; import { StructureType } from "@bibliothecadao/eternum"; diff --git a/client/apps/game/src/ui/components/trading/TransferBetweenEntities.tsx b/client/apps/game/src/ui/components/trading/TransferBetweenEntities.tsx index 540b070d94..b3dacb3953 100644 --- a/client/apps/game/src/ui/components/trading/TransferBetweenEntities.tsx +++ b/client/apps/game/src/ui/components/trading/TransferBetweenEntities.tsx @@ -1,8 +1,8 @@ import { configManager } from "@/dojo/setup"; import { useDojo } from "@/hooks/context/DojoContext"; -import { useRealm } from "@/hooks/helpers/useRealm"; -import { useTravel } from "@/hooks/helpers/useTravel"; -import { soundSelector, useUiSounds } from "@/hooks/useUISound"; +import { useRealm } from "@/hooks/helpers/use-realm"; +import { useTravel } from "@/hooks/helpers/use-travel"; +import { soundSelector, useUiSounds } from "@/hooks/use-ui-sound"; import Button from "@/ui/elements/Button"; import { Checkbox } from "@/ui/elements/Checkbox"; import { Headline } from "@/ui/elements/Headline"; diff --git a/client/apps/game/src/ui/components/trading/TransferView.tsx b/client/apps/game/src/ui/components/trading/TransferView.tsx index 4ff0933b4a..e6c85a29b6 100644 --- a/client/apps/game/src/ui/components/trading/TransferView.tsx +++ b/client/apps/game/src/ui/components/trading/TransferView.tsx @@ -1,6 +1,6 @@ import { useDojo } from "@/hooks/context/DojoContext"; -import { PlayerStructure, RealmWithPosition, useEntities, useEntitiesUtils } from "@/hooks/helpers/useEntities"; -import { useGuilds } from "@/hooks/helpers/useGuilds"; +import { PlayerStructure, RealmWithPosition, useEntities, useEntitiesUtils } from "@/hooks/helpers/use-entities"; +import { useGuilds } from "@/hooks/helpers/use-guilds"; import { getRealmNameById } from "@/ui/utils/realms"; import { ContractAddress, StructureType } from "@bibliothecadao/eternum"; import { useEntityQuery } from "@dojoengine/react"; diff --git a/client/apps/game/src/ui/elements/Button.tsx b/client/apps/game/src/ui/elements/Button.tsx index 745037c04e..a0e0290809 100644 --- a/client/apps/game/src/ui/elements/Button.tsx +++ b/client/apps/game/src/ui/elements/Button.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { soundSelector, useUiSounds } from "../../hooks/useUISound"; +import { soundSelector, useUiSounds } from "@/hooks/use-ui-sound"; type ButtonProps = { onClick?: (e: React.MouseEvent) => void; diff --git a/client/apps/game/src/ui/elements/CircleButton.tsx b/client/apps/game/src/ui/elements/CircleButton.tsx index a419b36fe9..d06fe33384 100644 --- a/client/apps/game/src/ui/elements/CircleButton.tsx +++ b/client/apps/game/src/ui/elements/CircleButton.tsx @@ -1,5 +1,5 @@ import useUIStore from "@/hooks/store/use-ui-store"; -import { soundSelector, useUiSounds } from "@/hooks/useUISound"; +import { soundSelector, useUiSounds } from "@/hooks/use-ui-sound"; import clsx from "clsx"; type CircleButtonProps = { diff --git a/client/apps/game/src/ui/elements/HintModalButton.tsx b/client/apps/game/src/ui/elements/HintModalButton.tsx index fdc1544857..9187ed2009 100644 --- a/client/apps/game/src/ui/elements/HintModalButton.tsx +++ b/client/apps/game/src/ui/elements/HintModalButton.tsx @@ -1,4 +1,4 @@ -import { useModalStore } from "@/hooks/store/useModalStore"; +import { useModalStore } from "@/hooks/store/use-modal-store"; import { HintModal } from "../components/hints/HintModal"; import { BuildingThumbs } from "../config"; import CircleButton from "./CircleButton"; diff --git a/client/apps/game/src/ui/elements/NumberInput.tsx b/client/apps/game/src/ui/elements/NumberInput.tsx index f72a16d300..5871c5e96b 100644 --- a/client/apps/game/src/ui/elements/NumberInput.tsx +++ b/client/apps/game/src/ui/elements/NumberInput.tsx @@ -2,7 +2,7 @@ import { ReactComponent as ArrowLeft } from "@/assets/icons/common/arrow-left.sv import { ReactComponent as ArrowRight } from "@/assets/icons/common/arrow-right.svg"; import clsx from "clsx"; import { useEffect, useState } from "react"; -import { soundSelector, useUiSounds } from "../../hooks/useUISound"; +import { soundSelector, useUiSounds } from "@/hooks/use-ui-sound"; type NumberInputProps = { value: number; diff --git a/client/apps/game/src/ui/elements/tab/tabs.tsx b/client/apps/game/src/ui/elements/tab/tabs.tsx index c137c88df7..786f63da1e 100644 --- a/client/apps/game/src/ui/elements/tab/tabs.tsx +++ b/client/apps/game/src/ui/elements/tab/tabs.tsx @@ -1,7 +1,7 @@ +import { soundSelector, useUiSounds } from "@/hooks/use-ui-sound"; import { Tab as HeadlessTab } from "@headlessui/react"; import clsx from "clsx"; import type { ReactNode } from "react"; -import { soundSelector, useUiSounds } from "../../../hooks/useUISound"; import { TabList } from "./TabList"; import { TabPanel } from "./TabPanel"; import { TabPanels } from "./TabPanels"; diff --git a/client/apps/game/src/ui/modules/LoadingScreen.tsx b/client/apps/game/src/ui/modules/LoadingScreen.tsx index cc04db1356..e4267d08a3 100644 --- a/client/apps/game/src/ui/modules/LoadingScreen.tsx +++ b/client/apps/game/src/ui/modules/LoadingScreen.tsx @@ -1,4 +1,4 @@ -import { useSeasonStart } from "@/hooks/useSeasonStart"; +import { useSeasonStart } from "@/hooks/use-season-start"; import { useEffect, useState } from "react"; import "../../index.css"; import { OnboardingContainer, StepContainer } from "../layouts/Onboarding"; diff --git a/client/apps/game/src/ui/modules/entity-details/Battles.tsx b/client/apps/game/src/ui/modules/entity-details/Battles.tsx index c022b69d81..b91c97eb2b 100644 --- a/client/apps/game/src/ui/modules/entity-details/Battles.tsx +++ b/client/apps/game/src/ui/modules/entity-details/Battles.tsx @@ -1,4 +1,4 @@ -import { BattleInfo } from "@/hooks/helpers/battles/useBattles"; +import { BattleInfo } from "@/hooks/helpers/battles/use-battles"; import { BattleListItem } from "@/ui/components/battles/BattleListItem"; import { ArmyInfo } from "@bibliothecadao/eternum"; diff --git a/client/apps/game/src/ui/modules/navigation/QuestMenu.tsx b/client/apps/game/src/ui/modules/navigation/QuestMenu.tsx index 4a4aa09434..12a0618dab 100644 --- a/client/apps/game/src/ui/modules/navigation/QuestMenu.tsx +++ b/client/apps/game/src/ui/modules/navigation/QuestMenu.tsx @@ -1,6 +1,6 @@ import { useDojo } from "@/hooks/context/DojoContext"; -import { Prize, QuestStatus, useQuests, useUnclaimedQuestsCount } from "@/hooks/helpers/useQuests"; -import { useRealm } from "@/hooks/helpers/useRealm"; +import { Prize, QuestStatus, useQuests, useUnclaimedQuestsCount } from "@/hooks/helpers/use-quests"; +import { useRealm } from "@/hooks/helpers/use-realm"; import useUIStore from "@/hooks/store/use-ui-store"; import { useStartingTutorial } from "@/hooks/use-starting-tutorial"; import { questSteps, useTutorial } from "@/hooks/use-tutorial";