diff --git a/client/apps/game-docs/docs/pages/development/client.mdx b/client/apps/game-docs/docs/pages/development/client.mdx index 04158dd327..b458ad25ea 100644 --- a/client/apps/game-docs/docs/pages/development/client.mdx +++ b/client/apps/game-docs/docs/pages/development/client.mdx @@ -49,7 +49,7 @@ management, and network interactions. ### Usage ```tsx -import { useDojo } from "@/hooks/context/DojoContext"; +import { useDojo } from "@/hooks/context/dojo-context"; function GameComponent() { const { account, network, masterAccount } = useDojo(); // ... your game logic diff --git a/client/apps/landing/src/components/modules/bridge-fees.tsx b/client/apps/landing/src/components/modules/bridge-fees.tsx index f0ad99cd9a..c82d7c469b 100644 --- a/client/apps/landing/src/components/modules/bridge-fees.tsx +++ b/client/apps/landing/src/components/modules/bridge-fees.tsx @@ -3,7 +3,7 @@ import { Minus, Plus } from "lucide-react"; import { useMemo } from "react"; import { Button } from "../ui/button"; import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "../ui/collapsible"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; // todo : get it directly from the config export const BRIDGE_FEE_DENOMINATOR = 10_000; diff --git a/client/apps/landing/src/components/modules/bridge-in.tsx b/client/apps/landing/src/components/modules/bridge-in.tsx index 8ec78205b0..31ee48ef77 100644 --- a/client/apps/landing/src/components/modules/bridge-in.tsx +++ b/client/apps/landing/src/components/modules/bridge-in.tsx @@ -1,10 +1,10 @@ import { execute } from "@/hooks/gql/execute"; -import { useEntities } from "@/hooks/helpers/useEntities"; -import { useResourceBalance } from "@/hooks/helpers/useResources"; -import { GET_CAPACITY_SPEED_CONFIG } from "@/hooks/query/capacityConfig"; +import { useEntities } from "@/hooks/helpers/use-entities"; +import { useResourceBalance } from "@/hooks/helpers/use-resources"; +import { GET_CAPACITY_SPEED_CONFIG } from "@/hooks/query/capacity-config"; +import { useBridgeAsset } from "@/hooks/use-bridge"; import { useLords } from "@/hooks/use-lords"; -import { useBridgeAsset } from "@/hooks/useBridge"; -import { useTravel } from "@/hooks/useTravel"; +import { useTravel } from "@/hooks/use-travel"; import { displayAddress, divideByPrecision, multiplyByPrecision } from "@/lib/utils"; import { ADMIN_BANK_ENTITY_ID, @@ -23,7 +23,7 @@ import { uint256 } from "starknet"; import { formatEther } from "viem"; import { TypeP } from "../typography/type-p"; import { Button } from "../ui/button"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; import { Input } from "../ui/input"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select"; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip"; diff --git a/client/apps/landing/src/components/modules/bridge-out-step-1.tsx b/client/apps/landing/src/components/modules/bridge-out-step-1.tsx index 8c1674fe26..12ebdc907b 100644 --- a/client/apps/landing/src/components/modules/bridge-out-step-1.tsx +++ b/client/apps/landing/src/components/modules/bridge-out-step-1.tsx @@ -1,9 +1,9 @@ import { execute } from "@/hooks/gql/execute"; -import { useEntities } from "@/hooks/helpers/useEntities"; -import { useResourceBalance } from "@/hooks/helpers/useResources"; -import { GET_CAPACITY_SPEED_CONFIG } from "@/hooks/query/capacityConfig"; -import { useBridgeAsset } from "@/hooks/useBridge"; -import { useTravel } from "@/hooks/useTravel"; +import { useEntities } from "@/hooks/helpers/use-entities"; +import { useResourceBalance } from "@/hooks/helpers/use-resources"; +import { GET_CAPACITY_SPEED_CONFIG } from "@/hooks/query/capacity-config"; +import { useBridgeAsset } from "@/hooks/use-bridge"; +import { useTravel } from "@/hooks/use-travel"; import { displayAddress, multiplyByPrecision } from "@/lib/utils"; import { ADMIN_BANK_ENTITY_ID, @@ -19,10 +19,10 @@ import { useQuery } from "@tanstack/react-query"; import { InfoIcon, Loader, Plus } from "lucide-react"; import { useMemo, useState } from "react"; import { TypeP } from "../typography/type-p"; -import { SelectSingleResource } from "../ui/SelectResources"; import { Button } from "../ui/button"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../ui/select"; +import { SelectSingleResource } from "../ui/select-resources"; import { Tooltip, TooltipProvider } from "../ui/tooltip"; import { getResourceAddresses } from "../ui/utils/addresses"; import { calculateDonkeysNeeded, divideByPrecision, getTotalResourceWeight } from "../ui/utils/utils"; diff --git a/client/apps/landing/src/components/modules/bridge-out-step-2.tsx b/client/apps/landing/src/components/modules/bridge-out-step-2.tsx index f00b30e39f..fc9ef2eb1d 100644 --- a/client/apps/landing/src/components/modules/bridge-out-step-2.tsx +++ b/client/apps/landing/src/components/modules/bridge-out-step-2.tsx @@ -1,7 +1,7 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible"; -import { useDonkeyArrivals } from "@/hooks/helpers/useDonkeyArrivals"; -import { useEntities } from "@/hooks/helpers/useEntities"; -import { useBridgeAsset } from "@/hooks/useBridge"; +import { useDonkeyArrivals } from "@/hooks/helpers/use-donkey-arrivals"; +import { useEntities } from "@/hooks/helpers/use-entities"; +import { useBridgeAsset } from "@/hooks/use-bridge"; import { displayAddress } from "@/lib/utils"; import { ADMIN_BANK_ENTITY_ID, RESOURCE_PRECISION, ResourcesIds } from "@bibliothecadao/eternum"; import { useAccount } from "@starknet-react/core"; @@ -9,7 +9,7 @@ import { ChevronDown, ChevronUp, Loader } from "lucide-react"; import { useEffect, useState } from "react"; import { TypeP } from "../typography/type-p"; import { Button } from "../ui/button"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; import { Input } from "../ui/input"; import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "../ui/table"; import { getResourceAddresses } from "../ui/utils/addresses"; diff --git a/client/apps/landing/src/components/modules/bridged-resources.tsx b/client/apps/landing/src/components/modules/bridged-resources.tsx index 7ffef7e545..a8e63b1ea7 100644 --- a/client/apps/landing/src/components/modules/bridged-resources.tsx +++ b/client/apps/landing/src/components/modules/bridged-resources.tsx @@ -1,11 +1,11 @@ -import { useDojo } from "@/hooks/context/DojoContext"; +import { useDojo } from "@/hooks/context/dojo-context"; import { ResourcesIds } from "@bibliothecadao/eternum"; import { useAccount } from "@starknet-react/core"; import { ArrowDownUp, Pickaxe } from "lucide-react"; import { useCallback, useEffect, useState } from "react"; import { TypeH2 } from "../typography/type-h2"; import { Card, CardHeader } from "../ui/card"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; import { getResourceAddresses } from "../ui/utils/addresses"; type SortKey = "totalSupply" | "balance"; diff --git a/client/apps/landing/src/components/modules/player-leaderboard-panel.tsx b/client/apps/landing/src/components/modules/player-leaderboard-panel.tsx index c5cbc04908..2f3d8d37eb 100644 --- a/client/apps/landing/src/components/modules/player-leaderboard-panel.tsx +++ b/client/apps/landing/src/components/modules/player-leaderboard-panel.tsx @@ -3,7 +3,7 @@ import { ChevronLeft, ChevronRight } from "lucide-react"; import { useState } from "react"; import { Button } from "../ui/button"; import { CardContent } from "../ui/card"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; import { Input } from "../ui/input"; import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "../ui/tooltip"; diff --git a/client/apps/landing/src/components/modules/realm-card.tsx b/client/apps/landing/src/components/modules/realm-card.tsx index 6d661eb00b..9b0302656e 100644 --- a/client/apps/landing/src/components/modules/realm-card.tsx +++ b/client/apps/landing/src/components/modules/realm-card.tsx @@ -6,7 +6,7 @@ import { useReadContract } from "@starknet-react/core"; import { Loader } from "lucide-react"; import { useEffect, useState } from "react"; import { Checkbox } from "../ui/checkbox"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; interface RealmCardProps { realm: NonNullable["tokenBalances"]>["edges"]>[0] & { seasonPassMinted?: boolean; diff --git a/client/apps/landing/src/components/modules/realm-mint-dialog.tsx b/client/apps/landing/src/components/modules/realm-mint-dialog.tsx index 18e7b68a3b..9776076425 100644 --- a/client/apps/landing/src/components/modules/realm-mint-dialog.tsx +++ b/client/apps/landing/src/components/modules/realm-mint-dialog.tsx @@ -1,6 +1,6 @@ import { execute } from "@/hooks/gql/execute"; import { GET_ERC_MINTS } from "@/hooks/query/erc721"; -import { useMintTestRealm } from "@/hooks/useMintTestRealm"; +import { useMintTestRealm } from "@/hooks/use-mint-test-realm"; import { useSuspenseQuery } from "@tanstack/react-query"; import { ChevronsUpDown, Loader } from "lucide-react"; import { useMemo, useState } from "react"; diff --git a/client/apps/landing/src/components/modules/season-pass-card.tsx b/client/apps/landing/src/components/modules/season-pass-card.tsx index 140b68b6ed..d1c44247a7 100644 --- a/client/apps/landing/src/components/modules/season-pass-card.tsx +++ b/client/apps/landing/src/components/modules/season-pass-card.tsx @@ -1,7 +1,7 @@ import { Card, CardContent, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"; import { GetRealmsQuery } from "@/hooks/gql/graphql"; import { RealmMetadata } from "@/types"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; interface SeasonPassCardProps { pass: NonNullable["tokenBalances"]>["edges"]>[0]; diff --git a/client/apps/landing/src/components/modules/season-pass-mint-dialog.tsx b/client/apps/landing/src/components/modules/season-pass-mint-dialog.tsx index df6448aecd..09092f5a07 100644 --- a/client/apps/landing/src/components/modules/season-pass-mint-dialog.tsx +++ b/client/apps/landing/src/components/modules/season-pass-mint-dialog.tsx @@ -1,4 +1,4 @@ -import { useMintSeasonPass } from "@/hooks/useMintSeasonPass"; +import { useMintSeasonPass } from "@/hooks/use-mint-season-pass"; import { displayAddress } from "@/lib/utils"; import { useAccount } from "@starknet-react/core"; import { Link } from "@tanstack/react-router"; diff --git a/client/apps/landing/src/components/modules/season-registration-timer.tsx b/client/apps/landing/src/components/modules/season-registration-timer.tsx index a6bd499ce9..748cd947f2 100644 --- a/client/apps/landing/src/components/modules/season-registration-timer.tsx +++ b/client/apps/landing/src/components/modules/season-registration-timer.tsx @@ -1,4 +1,4 @@ -import { useLeaderboardStatus } from "@/hooks/usePrizeClaim"; +import { useLeaderboardStatus } from "@/hooks/use-prize-claim"; import { useEffect, useState } from "react"; export const SeasonRegistrationTimer = () => { diff --git a/client/apps/landing/src/components/modules/top-navigation-view.tsx b/client/apps/landing/src/components/modules/top-navigation-view.tsx index 4807303ac3..684cdefbfb 100644 --- a/client/apps/landing/src/components/modules/top-navigation-view.tsx +++ b/client/apps/landing/src/components/modules/top-navigation-view.tsx @@ -7,7 +7,7 @@ import { Uint256, uint256 } from "starknet"; import { formatEther } from "viem"; import { env } from "../../../env"; import { Button } from "../ui/button"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; import { SidebarTrigger } from "../ui/sidebar"; import { ModeToggle } from "./mode-toggle"; import { SeasonRegistrationTimer } from "./season-registration-timer"; diff --git a/client/apps/landing/src/components/modules/transfer-season-pass-dialog.tsx b/client/apps/landing/src/components/modules/transfer-season-pass-dialog.tsx index a6336dd5ab..94d9c827fe 100644 --- a/client/apps/landing/src/components/modules/transfer-season-pass-dialog.tsx +++ b/client/apps/landing/src/components/modules/transfer-season-pass-dialog.tsx @@ -6,7 +6,7 @@ import { TypeH2 } from "../typography/type-h2"; import { Button } from "../ui/button"; import { Checkbox } from "../ui/checkbox"; import { Dialog, DialogContent } from "../ui/dialog"; -import { ResourceIcon } from "../ui/elements/ResourceIcon"; +import { ResourceIcon } from "../ui/elements/resource-icon"; import { Input } from "../ui/input"; import { abi } from "@/abi/SeasonPass"; diff --git a/client/apps/landing/src/components/ui/elements/CountdownTimer.tsx b/client/apps/landing/src/components/ui/elements/countdown-timer.tsx similarity index 100% rename from client/apps/landing/src/components/ui/elements/CountdownTimer.tsx rename to client/apps/landing/src/components/ui/elements/countdown-timer.tsx diff --git a/client/apps/landing/src/components/ui/elements/ListSelect.tsx b/client/apps/landing/src/components/ui/elements/list-select.tsx similarity index 100% rename from client/apps/landing/src/components/ui/elements/ListSelect.tsx rename to client/apps/landing/src/components/ui/elements/list-select.tsx diff --git a/client/apps/landing/src/components/ui/elements/NumberInput.tsx b/client/apps/landing/src/components/ui/elements/number-input.tsx similarity index 100% rename from client/apps/landing/src/components/ui/elements/NumberInput.tsx rename to client/apps/landing/src/components/ui/elements/number-input.tsx diff --git a/client/apps/landing/src/components/ui/elements/ResourceCost.tsx b/client/apps/landing/src/components/ui/elements/resource-cost.tsx similarity index 97% rename from client/apps/landing/src/components/ui/elements/ResourceCost.tsx rename to client/apps/landing/src/components/ui/elements/resource-cost.tsx index 498724ee17..490a0c6681 100644 --- a/client/apps/landing/src/components/ui/elements/ResourceCost.tsx +++ b/client/apps/landing/src/components/ui/elements/resource-cost.tsx @@ -2,7 +2,7 @@ import { findResourceById } from "@bibliothecadao/eternum"; import clsx from "clsx"; import { useMemo } from "react"; import { divideByPrecision, formatNumber } from "../utils/utils"; -import { ResourceIcon } from "./ResourceIcon"; +import { ResourceIcon } from "./resource-icon"; type ResourceCostProps = { isLabor?: boolean; diff --git a/client/apps/landing/src/components/ui/elements/ResourceIcon.tsx b/client/apps/landing/src/components/ui/elements/resource-icon.tsx similarity index 100% rename from client/apps/landing/src/components/ui/elements/ResourceIcon.tsx rename to client/apps/landing/src/components/ui/elements/resource-icon.tsx diff --git a/client/apps/landing/src/components/ui/SelectResources.tsx b/client/apps/landing/src/components/ui/select-resources.tsx similarity index 96% rename from client/apps/landing/src/components/ui/SelectResources.tsx rename to client/apps/landing/src/components/ui/select-resources.tsx index eeb2a0d935..54393f3495 100644 --- a/client/apps/landing/src/components/ui/SelectResources.tsx +++ b/client/apps/landing/src/components/ui/select-resources.tsx @@ -1,12 +1,12 @@ -import { useResourceBalance } from "@/hooks/helpers/useResources"; +import { useResourceBalance } from "@/hooks/helpers/use-resources"; import { ID, resources } from "@bibliothecadao/eternum"; import { XIcon } from "lucide-react"; import { useEffect, useMemo } from "react"; -import { divideByPrecision } from "../ui/utils/utils"; -import Button from "./elements/Button"; -import ListSelect from "./elements/ListSelect"; -import { NumberInput } from "./elements/NumberInput"; -import { ResourceCost } from "./elements/ResourceCost"; +import Button from "./elements/button"; +import ListSelect from "./elements/list-select"; +import { NumberInput } from "./elements/number-input"; +import { ResourceCost } from "./elements/resource-cost"; +import { divideByPrecision } from "./utils/utils"; export const SelectResources = ({ selectedResourceIds, diff --git a/client/apps/landing/src/hooks/context/DojoContext.tsx b/client/apps/landing/src/hooks/context/dojo-context.tsx similarity index 96% rename from client/apps/landing/src/hooks/context/DojoContext.tsx rename to client/apps/landing/src/hooks/context/dojo-context.tsx index 1ecfbc6274..a494b8afe1 100644 --- a/client/apps/landing/src/hooks/context/DojoContext.tsx +++ b/client/apps/landing/src/hooks/context/dojo-context.tsx @@ -1,10 +1,9 @@ -import { SetupNetworkResult } from "@/dojo/setupNetwork"; import { displayAddress } from "@/lib/utils"; +import { SetupNetworkResult, SetupResult } from "@bibliothecadao/eternum"; import { useAccount } from "@starknet-react/core"; import { ReactNode, createContext, useContext, useMemo } from "react"; import { Account, AccountInterface, RpcProvider } from "starknet"; import { env } from "../../../env"; -import { SetupResult } from "@/dojo/setup"; interface DojoAccount { account: Account | AccountInterface | null; accountDisplay: string; diff --git a/client/apps/landing/src/hooks/helpers/useDonkeyArrivals.tsx b/client/apps/landing/src/hooks/helpers/use-donkey-arrivals.tsx similarity index 98% rename from client/apps/landing/src/hooks/helpers/useDonkeyArrivals.tsx rename to client/apps/landing/src/hooks/helpers/use-donkey-arrivals.tsx index 64ba50424b..1b2150de51 100644 --- a/client/apps/landing/src/hooks/helpers/useDonkeyArrivals.tsx +++ b/client/apps/landing/src/hooks/helpers/use-donkey-arrivals.tsx @@ -4,7 +4,7 @@ import { useQueries, useQuery } from "@tanstack/react-query"; import { useMemo } from "react"; import { execute } from "../gql/execute"; import { GetEternumEntityOwnerQuery } from "../gql/graphql"; -import { GET_ETERNUM_ENTITY_OWNERS } from "../query/entityOwners"; +import { GET_ETERNUM_ENTITY_OWNERS } from "../query/entity-owners"; import { GET_ENTITY_DISTANCE } from "../query/position"; import { GET_ENTITIES_RESOURCES } from "../query/resources"; diff --git a/client/apps/landing/src/hooks/helpers/useEntities.tsx b/client/apps/landing/src/hooks/helpers/use-entities.tsx similarity index 100% rename from client/apps/landing/src/hooks/helpers/useEntities.tsx rename to client/apps/landing/src/hooks/helpers/use-entities.tsx diff --git a/client/apps/landing/src/hooks/helpers/useResources.tsx b/client/apps/landing/src/hooks/helpers/use-resources.tsx similarity index 100% rename from client/apps/landing/src/hooks/helpers/useResources.tsx rename to client/apps/landing/src/hooks/helpers/use-resources.tsx diff --git a/client/apps/landing/src/hooks/query/capacityConfig.tsx b/client/apps/landing/src/hooks/query/capacity-config.tsx similarity index 100% rename from client/apps/landing/src/hooks/query/capacityConfig.tsx rename to client/apps/landing/src/hooks/query/capacity-config.tsx diff --git a/client/apps/landing/src/hooks/query/entityOwners.tsx b/client/apps/landing/src/hooks/query/entity-owners.tsx similarity index 100% rename from client/apps/landing/src/hooks/query/entityOwners.tsx rename to client/apps/landing/src/hooks/query/entity-owners.tsx diff --git a/client/apps/landing/src/hooks/query/eternumStatistics.tsx b/client/apps/landing/src/hooks/query/eternum-statistics.tsx similarity index 100% rename from client/apps/landing/src/hooks/query/eternumStatistics.tsx rename to client/apps/landing/src/hooks/query/eternum-statistics.tsx diff --git a/client/apps/landing/src/hooks/useBridge.tsx b/client/apps/landing/src/hooks/use-bridge.tsx similarity index 98% rename from client/apps/landing/src/hooks/useBridge.tsx rename to client/apps/landing/src/hooks/use-bridge.tsx index f97cb7ed7a..433084aca6 100644 --- a/client/apps/landing/src/hooks/useBridge.tsx +++ b/client/apps/landing/src/hooks/use-bridge.tsx @@ -3,7 +3,7 @@ import { useAccount } from "@starknet-react/core"; import { useCallback } from "react"; import { toast } from "sonner"; import { env } from "../../env"; -import { useDojo } from "./context/DojoContext"; +import { useDojo } from "./context/dojo-context"; export const useBridgeAsset = () => { // todo; use starknet-react diff --git a/client/apps/landing/src/hooks/use-donkeys-burned.tsx b/client/apps/landing/src/hooks/use-donkeys-burned.tsx index f3216b08e0..0c7d448b13 100644 --- a/client/apps/landing/src/hooks/use-donkeys-burned.tsx +++ b/client/apps/landing/src/hooks/use-donkeys-burned.tsx @@ -1,6 +1,6 @@ import { defineQuery, getComponentValue, Has, isComponentUpdate } from "@dojoengine/recs"; import { useEffect, useState } from "react"; -import { useDojo } from "./context/DojoContext"; +import { useDojo } from "./context/dojo-context"; export const useDonkeysBurned = () => { const { diff --git a/client/apps/landing/src/hooks/use-lords-bridged.tsx b/client/apps/landing/src/hooks/use-lords-bridged.tsx index 006464ae76..543e95e453 100644 --- a/client/apps/landing/src/hooks/use-lords-bridged.tsx +++ b/client/apps/landing/src/hooks/use-lords-bridged.tsx @@ -4,7 +4,7 @@ import { lordsAddress } from "@/config"; import { useEffect, useState } from "react"; import { Chain, getGameManifest } from "../../../../../config/utils/utils"; import { env } from "../../env"; -import { useDojo } from "./context/DojoContext"; +import { useDojo } from "./context/dojo-context"; const { VITE_PUBLIC_CHAIN } = env; diff --git a/client/apps/landing/src/hooks/useMintSeasonPass.tsx b/client/apps/landing/src/hooks/use-mint-season-pass.tsx similarity index 94% rename from client/apps/landing/src/hooks/useMintSeasonPass.tsx rename to client/apps/landing/src/hooks/use-mint-season-pass.tsx index 55ca17fe92..c990c289d1 100644 --- a/client/apps/landing/src/hooks/useMintSeasonPass.tsx +++ b/client/apps/landing/src/hooks/use-mint-season-pass.tsx @@ -4,20 +4,18 @@ import { lordsAddress, seasonPassAddress } from "@/config"; import { useAccount, useContract, useSendTransaction } from "@starknet-react/core"; import { abi } from "@/abi/SeasonPass"; -import { useDojo } from "./context/DojoContext"; +import { useDojo } from "./context/dojo-context"; export const useMintSeasonPass = () => { const [isMinting, setIsMinting] = useState(false); const [mintingTokenId, setMintingTokenId] = useState(["0"]); - const { address } = useAccount(); - const { contract } = useContract({ abi, address: seasonPassAddress, }); - const { send, error, isPending, isSuccess } = useSendTransaction({}); + const { send, isPending, isSuccess } = useSendTransaction({}); const { setup: { systemCalls: { attach_lords, detach_lords }, diff --git a/client/apps/landing/src/hooks/useMintTestRealm.tsx b/client/apps/landing/src/hooks/use-mint-test-realm.tsx similarity index 96% rename from client/apps/landing/src/hooks/useMintTestRealm.tsx rename to client/apps/landing/src/hooks/use-mint-test-realm.tsx index d040c96969..1df03518db 100644 --- a/client/apps/landing/src/hooks/useMintTestRealm.tsx +++ b/client/apps/landing/src/hooks/use-mint-test-realm.tsx @@ -2,7 +2,7 @@ import { realmsAddress } from "@/config"; import { useAccount } from "@starknet-react/core"; import { useCallback, useEffect, useMemo, useState } from "react"; import { toast } from "sonner"; -import { useDojo } from "./context/DojoContext"; +import { useDojo } from "./context/dojo-context"; export const useMintTestRealm = () => { const { diff --git a/client/apps/landing/src/hooks/useNftSelection.tsx b/client/apps/landing/src/hooks/use-nft-selection.tsx similarity index 100% rename from client/apps/landing/src/hooks/useNftSelection.tsx rename to client/apps/landing/src/hooks/use-nft-selection.tsx diff --git a/client/apps/landing/src/hooks/use-player-count.tsx b/client/apps/landing/src/hooks/use-player-count.tsx index 2761625b89..7e58413290 100644 --- a/client/apps/landing/src/hooks/use-player-count.tsx +++ b/client/apps/landing/src/hooks/use-player-count.tsx @@ -1,6 +1,6 @@ import { useEntityQuery } from "@dojoengine/react"; import { Has } from "@dojoengine/recs"; -import { useDojo } from "./context/DojoContext"; +import { useDojo } from "./context/dojo-context"; export const usePlayerCount = () => { return useEntityQuery([Has(useDojo().setup.components.AddressName)]).length; diff --git a/client/apps/landing/src/hooks/usePrizeClaim.tsx b/client/apps/landing/src/hooks/use-prize-claim.tsx similarity index 100% rename from client/apps/landing/src/hooks/usePrizeClaim.tsx rename to client/apps/landing/src/hooks/use-prize-claim.tsx diff --git a/client/apps/landing/src/hooks/use-structures.tsx b/client/apps/landing/src/hooks/use-structures.tsx index 685e0098f2..605e560aa7 100644 --- a/client/apps/landing/src/hooks/use-structures.tsx +++ b/client/apps/landing/src/hooks/use-structures.tsx @@ -1,7 +1,7 @@ import { StructureType } from "@bibliothecadao/eternum"; import { useEntityQuery } from "@dojoengine/react"; import { Has, HasValue } from "@dojoengine/recs"; -import { useDojo } from "./context/DojoContext"; +import { useDojo } from "./context/dojo-context"; export const useStructuresNumber = () => { const { diff --git a/client/apps/landing/src/hooks/useTravel.tsx b/client/apps/landing/src/hooks/use-travel.tsx similarity index 100% rename from client/apps/landing/src/hooks/useTravel.tsx rename to client/apps/landing/src/hooks/use-travel.tsx diff --git a/client/apps/landing/src/main.tsx b/client/apps/landing/src/main.tsx index 79e8ec35b9..ac6a94a64e 100644 --- a/client/apps/landing/src/main.tsx +++ b/client/apps/landing/src/main.tsx @@ -12,7 +12,7 @@ import { dojoConfig } from "../dojoConfig"; import { StarknetProvider } from "./components/providers/starknet-provider"; import { ThemeProvider } from "./components/providers/theme-provider"; import { TypeH1 } from "./components/typography/type-h1"; -import { DojoProvider } from "./hooks/context/DojoContext"; +import { DojoProvider } from "./hooks/context/dojo-context"; import { DojoEventListener } from "./hooks/subscriptions.tsx/dojo-event-listener"; import { routeTree } from "./routeTree.gen"; import { ETERNUM_CONFIG } from "./utils/config"; diff --git a/client/apps/landing/src/routeTree.gen.ts b/client/apps/landing/src/routeTree.gen.ts index b6bc8e30a2..c42b75cd2f 100644 --- a/client/apps/landing/src/routeTree.gen.ts +++ b/client/apps/landing/src/routeTree.gen.ts @@ -8,166 +8,149 @@ // You should NOT make any changes in this file as it will be overwritten. // Additionally, you should also exclude this file from your linter and/or formatter to prevent it from being checked or modified. -import { createFileRoute } from "@tanstack/react-router"; +import { createFileRoute } from '@tanstack/react-router' // Import Routes -import { Route as rootRoute } from "./routes/__root"; -import { Route as MyEmpireImport } from "./routes/my-empire"; +import { Route as rootRoute } from './routes/__root' // Create Virtual Routes -const TradeLazyImport = createFileRoute("/trade")(); -const SeasonPassesLazyImport = createFileRoute("/season-passes")(); -const MintLazyImport = createFileRoute("/mint")(); -const ClaimLazyImport = createFileRoute("/claim")(); -const IndexLazyImport = createFileRoute("/")(); +const TradeLazyImport = createFileRoute('/trade')() +const SeasonPassesLazyImport = createFileRoute('/season-passes')() +const MintLazyImport = createFileRoute('/mint')() +const ClaimLazyImport = createFileRoute('/claim')() +const IndexLazyImport = createFileRoute('/')() // Create/Update Routes const TradeLazyRoute = TradeLazyImport.update({ - id: "/trade", - path: "/trade", + id: '/trade', + path: '/trade', getParentRoute: () => rootRoute, -} as any).lazy(() => import("./routes/trade.lazy").then((d) => d.Route)); +} as any).lazy(() => import('./routes/trade.lazy').then((d) => d.Route)) const SeasonPassesLazyRoute = SeasonPassesLazyImport.update({ - id: "/season-passes", - path: "/season-passes", + id: '/season-passes', + path: '/season-passes', getParentRoute: () => rootRoute, -} as any).lazy(() => import("./routes/season-passes.lazy").then((d) => d.Route)); +} as any).lazy(() => import('./routes/season-passes.lazy').then((d) => d.Route)) const MintLazyRoute = MintLazyImport.update({ - id: "/mint", - path: "/mint", + id: '/mint', + path: '/mint', getParentRoute: () => rootRoute, -} as any).lazy(() => import("./routes/mint.lazy").then((d) => d.Route)); +} as any).lazy(() => import('./routes/mint.lazy').then((d) => d.Route)) const ClaimLazyRoute = ClaimLazyImport.update({ - id: "/claim", - path: "/claim", + id: '/claim', + path: '/claim', getParentRoute: () => rootRoute, -} as any).lazy(() => import("./routes/claim.lazy").then((d) => d.Route)); - -const MyEmpireRoute = MyEmpireImport.update({ - id: "/my-empire", - path: "/my-empire", - getParentRoute: () => rootRoute, -} as any); +} as any).lazy(() => import('./routes/claim.lazy').then((d) => d.Route)) const IndexLazyRoute = IndexLazyImport.update({ - id: "/", - path: "/", + id: '/', + path: '/', getParentRoute: () => rootRoute, -} as any).lazy(() => import("./routes/index.lazy").then((d) => d.Route)); +} as any).lazy(() => import('./routes/index.lazy').then((d) => d.Route)) // Populate the FileRoutesByPath interface -declare module "@tanstack/react-router" { +declare module '@tanstack/react-router' { interface FileRoutesByPath { - "/": { - id: "/"; - path: "/"; - fullPath: "/"; - preLoaderRoute: typeof IndexLazyImport; - parentRoute: typeof rootRoute; - }; - "/my-empire": { - id: "/my-empire"; - path: "/my-empire"; - fullPath: "/my-empire"; - preLoaderRoute: typeof MyEmpireImport; - parentRoute: typeof rootRoute; - }; - "/claim": { - id: "/claim"; - path: "/claim"; - fullPath: "/claim"; - preLoaderRoute: typeof ClaimLazyImport; - parentRoute: typeof rootRoute; - }; - "/mint": { - id: "/mint"; - path: "/mint"; - fullPath: "/mint"; - preLoaderRoute: typeof MintLazyImport; - parentRoute: typeof rootRoute; - }; - "/season-passes": { - id: "/season-passes"; - path: "/season-passes"; - fullPath: "/season-passes"; - preLoaderRoute: typeof SeasonPassesLazyImport; - parentRoute: typeof rootRoute; - }; - "/trade": { - id: "/trade"; - path: "/trade"; - fullPath: "/trade"; - preLoaderRoute: typeof TradeLazyImport; - parentRoute: typeof rootRoute; - }; + '/': { + id: '/' + path: '/' + fullPath: '/' + preLoaderRoute: typeof IndexLazyImport + parentRoute: typeof rootRoute + } + '/claim': { + id: '/claim' + path: '/claim' + fullPath: '/claim' + preLoaderRoute: typeof ClaimLazyImport + parentRoute: typeof rootRoute + } + '/mint': { + id: '/mint' + path: '/mint' + fullPath: '/mint' + preLoaderRoute: typeof MintLazyImport + parentRoute: typeof rootRoute + } + '/season-passes': { + id: '/season-passes' + path: '/season-passes' + fullPath: '/season-passes' + preLoaderRoute: typeof SeasonPassesLazyImport + parentRoute: typeof rootRoute + } + '/trade': { + id: '/trade' + path: '/trade' + fullPath: '/trade' + preLoaderRoute: typeof TradeLazyImport + parentRoute: typeof rootRoute + } } } // Create and export the route tree export interface FileRoutesByFullPath { - "/": typeof IndexLazyRoute; - "/my-empire": typeof MyEmpireRoute; - "/claim": typeof ClaimLazyRoute; - "/mint": typeof MintLazyRoute; - "/season-passes": typeof SeasonPassesLazyRoute; - "/trade": typeof TradeLazyRoute; + '/': typeof IndexLazyRoute + '/claim': typeof ClaimLazyRoute + '/mint': typeof MintLazyRoute + '/season-passes': typeof SeasonPassesLazyRoute + '/trade': typeof TradeLazyRoute } export interface FileRoutesByTo { - "/": typeof IndexLazyRoute; - "/my-empire": typeof MyEmpireRoute; - "/claim": typeof ClaimLazyRoute; - "/mint": typeof MintLazyRoute; - "/season-passes": typeof SeasonPassesLazyRoute; - "/trade": typeof TradeLazyRoute; + '/': typeof IndexLazyRoute + '/claim': typeof ClaimLazyRoute + '/mint': typeof MintLazyRoute + '/season-passes': typeof SeasonPassesLazyRoute + '/trade': typeof TradeLazyRoute } export interface FileRoutesById { - __root__: typeof rootRoute; - "/": typeof IndexLazyRoute; - "/my-empire": typeof MyEmpireRoute; - "/claim": typeof ClaimLazyRoute; - "/mint": typeof MintLazyRoute; - "/season-passes": typeof SeasonPassesLazyRoute; - "/trade": typeof TradeLazyRoute; + __root__: typeof rootRoute + '/': typeof IndexLazyRoute + '/claim': typeof ClaimLazyRoute + '/mint': typeof MintLazyRoute + '/season-passes': typeof SeasonPassesLazyRoute + '/trade': typeof TradeLazyRoute } export interface FileRouteTypes { - fileRoutesByFullPath: FileRoutesByFullPath; - fullPaths: "/" | "/my-empire" | "/claim" | "/mint" | "/season-passes" | "/trade"; - fileRoutesByTo: FileRoutesByTo; - to: "/" | "/my-empire" | "/claim" | "/mint" | "/season-passes" | "/trade"; - id: "__root__" | "/" | "/my-empire" | "/claim" | "/mint" | "/season-passes" | "/trade"; - fileRoutesById: FileRoutesById; + fileRoutesByFullPath: FileRoutesByFullPath + fullPaths: '/' | '/claim' | '/mint' | '/season-passes' | '/trade' + fileRoutesByTo: FileRoutesByTo + to: '/' | '/claim' | '/mint' | '/season-passes' | '/trade' + id: '__root__' | '/' | '/claim' | '/mint' | '/season-passes' | '/trade' + fileRoutesById: FileRoutesById } export interface RootRouteChildren { - IndexLazyRoute: typeof IndexLazyRoute; - MyEmpireRoute: typeof MyEmpireRoute; - ClaimLazyRoute: typeof ClaimLazyRoute; - MintLazyRoute: typeof MintLazyRoute; - SeasonPassesLazyRoute: typeof SeasonPassesLazyRoute; - TradeLazyRoute: typeof TradeLazyRoute; + IndexLazyRoute: typeof IndexLazyRoute + ClaimLazyRoute: typeof ClaimLazyRoute + MintLazyRoute: typeof MintLazyRoute + SeasonPassesLazyRoute: typeof SeasonPassesLazyRoute + TradeLazyRoute: typeof TradeLazyRoute } const rootRouteChildren: RootRouteChildren = { IndexLazyRoute: IndexLazyRoute, - MyEmpireRoute: MyEmpireRoute, ClaimLazyRoute: ClaimLazyRoute, MintLazyRoute: MintLazyRoute, SeasonPassesLazyRoute: SeasonPassesLazyRoute, TradeLazyRoute: TradeLazyRoute, -}; +} -export const routeTree = rootRoute._addFileChildren(rootRouteChildren)._addFileTypes(); +export const routeTree = rootRoute + ._addFileChildren(rootRouteChildren) + ._addFileTypes() /* ROUTE_MANIFEST_START { @@ -176,7 +159,6 @@ export const routeTree = rootRoute._addFileChildren(rootRouteChildren)._addFileT "filePath": "__root.tsx", "children": [ "/", - "/my-empire", "/claim", "/mint", "/season-passes", @@ -186,9 +168,6 @@ export const routeTree = rootRoute._addFileChildren(rootRouteChildren)._addFileT "/": { "filePath": "index.lazy.tsx" }, - "/my-empire": { - "filePath": "my-empire.tsx" - }, "/claim": { "filePath": "claim.lazy.tsx" }, diff --git a/client/apps/landing/src/routes/claim.lazy.tsx b/client/apps/landing/src/routes/claim.lazy.tsx index 873f4b5133..6fc19b8456 100644 --- a/client/apps/landing/src/routes/claim.lazy.tsx +++ b/client/apps/landing/src/routes/claim.lazy.tsx @@ -1,13 +1,13 @@ import { Button } from "@/components/ui/button"; import { lordsAddress } from "@/config"; -import { useDojo } from "@/hooks/context/DojoContext"; +import { useDojo } from "@/hooks/context/dojo-context"; import { useGameWinner, useGetEpochs, useGetPlayerHyperstructureContributions, useLeaderboardEntry, useLeaderboardStatus, -} from "@/hooks/usePrizeClaim"; +} from "@/hooks/use-prize-claim"; import { useAccount } from "@starknet-react/core"; import { createLazyFileRoute } from "@tanstack/react-router"; import { Loader2 } from "lucide-react"; diff --git a/client/apps/landing/src/routes/index.lazy.tsx b/client/apps/landing/src/routes/index.lazy.tsx index 9796e5cfc3..45a3a09332 100644 --- a/client/apps/landing/src/routes/index.lazy.tsx +++ b/client/apps/landing/src/routes/index.lazy.tsx @@ -8,7 +8,7 @@ import { PRIZE_POOL_INDIVIDUAL_LEADERBOARD, } from "@/constants"; import { execute } from "@/hooks/gql/execute"; -import { GET_ETERNUM_STATTISTICS } from "@/hooks/query/eternumStatistics"; +import { GET_ETERNUM_STATTISTICS } from "@/hooks/query/eternum-statistics"; import { useDonkeysBurned } from "@/hooks/use-donkeys-burned"; import { useLordsBridgeBalance } from "@/hooks/use-lords-bridged"; import { usePlayerCount } from "@/hooks/use-player-count"; diff --git a/client/apps/landing/src/routes/mint.lazy.tsx b/client/apps/landing/src/routes/mint.lazy.tsx index 71c600dcbc..4b7e399e29 100644 --- a/client/apps/landing/src/routes/mint.lazy.tsx +++ b/client/apps/landing/src/routes/mint.lazy.tsx @@ -9,7 +9,7 @@ import { Skeleton } from "@/components/ui/skeleton"; import { realmsAddress } from "@/config"; import { execute } from "@/hooks/gql/execute"; import { GET_ACCOUNT_TOKENS } from "@/hooks/query/erc721"; -import useNftSelection from "@/hooks/useNftSelection"; +import useNftSelection from "@/hooks/use-nft-selection"; import { displayAddress } from "@/lib/utils"; import { useAccount, useConnect } from "@starknet-react/core"; import { useSuspenseQuery } from "@tanstack/react-query"; diff --git a/client/apps/landing/src/routes/my-empire.tsx b/client/apps/landing/src/routes/my-empire.tsx deleted file mode 100644 index c894a545e0..0000000000 --- a/client/apps/landing/src/routes/my-empire.tsx +++ /dev/null @@ -1,41 +0,0 @@ -import { AnimatedGrid } from "@/components/modules/animated-grid"; -import { DataCard } from "@/components/modules/data-card"; -import { TypeH2 } from "@/components/typography/type-h2"; -//import { GET_USERS } from "@/hooks/query/players"; -import { createFileRoute } from "@tanstack/react-router"; -import { Coins, UsersIcon } from "lucide-react"; -import { useMemo } from "react"; - -export const Route = createFileRoute("/my-empire")({ - component: MyEmpire, -}); - -function MyEmpire() { - /*onst { data } = useQuery({ - queryKey: ["number-of-players"], - queryFn: () => execute(GET_USERS), - });*/ - const dataCards = useMemo( - () => [ - { - title: "players", - value: /* data?.eternumOwnerModels?.totalCount ?? */ 0, - icon: , - }, - { - title: "lords prize pool", - value: "1,000,000", - icon: , - }, - ], - [ - /*data*/ - ], - ); - return ( - <> - My Empire - } /> - - ); -} diff --git a/client/apps/landing/src/routes/trade.lazy.tsx b/client/apps/landing/src/routes/trade.lazy.tsx index ce66774ef9..774e128be2 100644 --- a/client/apps/landing/src/routes/trade.lazy.tsx +++ b/client/apps/landing/src/routes/trade.lazy.tsx @@ -1,6 +1,6 @@ import { EternumConditionsModal } from "@/components/modules/eternum-conditions-modal"; import { SwapPanel } from "@/components/modules/swap-panel"; -import { CountdownTimer } from "@/components/ui/elements/CountdownTimer"; +import { CountdownTimer } from "@/components/ui/elements/countdown-timer"; import { createLazyFileRoute } from "@tanstack/react-router"; import { env } from "../../env"; diff --git a/client/apps/landing/tsconfig.app.tsbuildinfo b/client/apps/landing/tsconfig.app.tsbuildinfo index b6dab90397..9f18aa161b 100644 --- a/client/apps/landing/tsconfig.app.tsbuildinfo +++ b/client/apps/landing/tsconfig.app.tsbuildinfo @@ -94,7 +94,6 @@ "./src/routes/bridge.lazy.tsx", "./src/routes/index.lazy.tsx", "./src/routes/mint.lazy.tsx", - "./src/routes/my-empire.tsx", "./src/routes/passes.lazy.tsx", "./src/routes/trade.lazy.tsx", "./src/stories/button.stories.tsx",