Bob/fix landing

client/apps/landing/dojoConfig.ts

@@ -1,6 +1,5 @@
 import { createDojoConfig } from "@dojoengine/core";
-import { Chain, getGameManifest } from "../../common/utils";
-
+import { Chain, getGameManifest } from "../../../config/utils/utils";
 import { env } from "./env";
 
 const {
@@ -14,7 +13,7 @@ const {
   VITE_PUBLIC_CHAIN,
 } = env;
 
-const manifest = getGameManifest(VITE_PUBLIC_CHAIN as Chain);
+const manifest = await getGameManifest(VITE_PUBLIC_CHAIN as Chain);
 
 export const dojoConfig = createDojoConfig({
   rpcUrl: VITE_PUBLIC_NODE_URL,

client/apps/landing/package.json

@@ -13,7 +13,8 @@
     "format:check": "npx prettier --check . --root=..",
     "lint": "eslint .",
     "preview": "vite preview",
-    "storybook": "storybook dev -p 6006"
+    "storybook": "storybook dev -p 6006",
+    "vite-plugin-pwa": "^0.20.5"
   },
   "dependencies": {
     "@ark-project/core": "3.0.0-beta.1",

client/apps/landing/src/components/modules/app-sidebar.tsx

@@ -11,8 +11,11 @@ import { Link } from "@tanstack/react-router";
 import { Castle, Coins, Gamepad2, Home, PlayCircle, Scale, Sheet, Ship, Twitter } from "lucide-react";
 import { TypeH2 } from "../typography/type-h2";
 
-import Discord from "@/assets/icons/discord.svg?react";
-import EternumLogo from "@/assets/icons/eternum-new-logo.svg?react";
+// import { default as Discord } from "@/assets/icons/discord.svg?react";
+// import { default as EternumLogo } from "@/assets/icons/eternum-new-logo.svg?react";
+// import Discord from "@/assets/icons/discord.svg?react";
+// import EternumLogo from "@/assets/icons/eternum-new-logo.svg?react";
+
 // Menu items.
 const items = [
   {
@@ -59,7 +62,7 @@ export function AppSidebar() {
       <SidebarContent>
         <a href="/">
           <div className="flex flex-col items-center">
-            <EternumLogo className="w-24 h-24 fill-gold mx-auto pt-8" />
+            {/* <EternumLogo className="w-24 h-24 fill-gold mx-auto pt-8" /> */}
             <TypeH2 className="p-3">Eternum</TypeH2>
           </div>
         </a>
@@ -95,7 +98,7 @@ export function AppSidebar() {
                 <Twitter />
               </a>
               <a href="https://discord.gg/realmsworld" target="_blank" rel="noopener noreferrer">
-                <Discord className="w-6 h-6 fill-gold" />
+                {/* <Discord className="w-6 h-6 fill-gold" /> */}
               </a>
             </div>
           </SidebarGroupContent>

client/apps/landing/src/components/modules/bridge-fees.tsx

@@ -1,4 +1,4 @@
-import { ResourcesIds } from "@bibliothecadao/eternum";
+import { configManager, ResourcesIds } from "@bibliothecadao/eternum";
 import { Minus, Plus } from "lucide-react";
 import { useMemo } from "react";
 import { Button } from "../ui/button";
@@ -40,7 +40,7 @@ export const BridgeFees = ({
   type,
   setResourceFees,
 }: FeesCollapsibleProps) => {
-  const bridgeConfig = ETERNUM_CONFIG().bridge;
+  const bridgeConfig = configManager.getResourceBridgeFeeSplitConfig();
 
   const calculateBridgeFeeDisplayPercent = (percent: number) => {
     return (percent * 100) / BRIDGE_FEE_DENOMINATOR;
@@ -91,7 +91,7 @@ export const BridgeFees = ({
       </CollapsibleTrigger>
       <CollapsibleContent className="flex flex-col ">
         {feesForAllResources.map((fees) => {
-          const resourceName = ResourcesIds[fees.id as keyof typeof ResourcesIds];
+          const resourceName = ResourcesIds[fees.id as keyof typeof ResourcesIds].toString();
           return (
             <div key={fees.id} className="flex flex-col gap-2 py-4 border-b border-gold/15">
               <div className="font-semibold text-sm">

client/apps/landing/src/components/modules/player-leaderboard-panel.tsx

@@ -1,4 +1,4 @@
-import { Player, ResourcesIds } from "@bibliothecadao/eternum";
+import { PlayerInfo, ResourcesIds } from "@bibliothecadao/eternum";
 import { ChevronLeft, ChevronRight } from "lucide-react";
 import { useState } from "react";
 import { Button } from "../ui/button";
@@ -11,7 +11,7 @@ interface PlayerLeaderboardPanelProps {
   /** Title displayed at the top of the leaderboard */
   title?: string;
   /** Array of players to display in the leaderboard */
-  players: Player[];
+  players: PlayerInfo[];
   /** Whether to show player rankings */
   showRank?: boolean;
   /** Custom points suffix (e.g. "pts", "points", etc) */

client/apps/landing/src/components/providers/starknet-provider.tsx

@@ -3,6 +3,7 @@ import { ColorMode } from "@cartridge/controller";
 import { mainnet, sepolia } from "@starknet-react/chains";
 import { StarknetConfig, argent, braavos, jsonRpcProvider, useInjectedConnectors, voyager } from "@starknet-react/core";
 import React, { useCallback } from "react";
+import { constants } from "starknet";
 import { env } from "../../../env";
 import { getResourceAddresses } from "../ui/utils/addresses";
 //import { cartridgeController } from "./cartridge-controller";
@@ -17,18 +18,20 @@ const otherResources = Object.entries(resourceAddresses)
 const theme: string = "eternum";
 const slot: string = env.VITE_PUBLIC_SLOT;
 const namespace: string = "eternum";
+const preset: string = "eternum";
 const colorMode: ColorMode = "dark";
 
 const cartridgeController = new ControllerConnector({
-  policies: [],
-  rpc: "https://api.cartridge.gg/x/starknet/" + env.VITE_PUBLIC_CHAIN,
+  chains: [{ rpcUrl: env.VITE_PUBLIC_NODE_URL }],
+  defaultChainId: constants.StarknetChainId.SN_SEPOLIA,
+  namespace,
+  slot,
+  preset,
   theme,
-  colorMode,
   tokens: {
     erc20: [LORDS, ...otherResources],
   },
   // namespace,
-  slot,
 });
 
 export function StarknetProvider({ children, onlyCartridge }: { children: React.ReactNode; onlyCartridge?: boolean }) {

client/apps/landing/src/components/ui/sidebar.tsx

@@ -1,8 +1,3 @@
-import { Slot } from "@radix-ui/react-slot";
-import { VariantProps, cva } from "class-variance-authority";
-import { PanelLeft } from "lucide-react";
-import * as React from "react";
-
 import { Button } from "@/components/ui/button";
 import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
@@ -11,6 +6,10 @@ import { Skeleton } from "@/components/ui/skeleton";
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
 import { useIsMobile } from "@/hooks/use-mobile";
 import { cn } from "@/lib/utils";
+import { Slot } from "@radix-ui/react-slot";
+import { VariantProps, cva } from "class-variance-authority";
+import { PanelLeft } from "lucide-react";
+import * as React from "react";
 
 const SIDEBAR_COOKIE_NAME = "sidebar:state";
 const SIDEBAR_COOKIE_MAX_AGE = 60 * 60 * 24 * 7;
@@ -635,5 +634,6 @@ export {
   SidebarRail,
   SidebarSeparator,
   SidebarTrigger,
-  useSidebar,
+  useSidebar
 };
+

client/apps/landing/src/components/ui/utils/addresses.ts

@@ -1,4 +1,4 @@
-import { Chain, getSeasonAddresses } from "../../../../../../common/utils";
+import { Chain, getSeasonAddresses } from "../../../../../../../config/utils/utils";
 import { env } from "../../../../env";
 
 export const getResourceAddresses = async () => {

client/apps/landing/src/hooks/use-lords-bridged.tsx

@@ -2,9 +2,12 @@ import { lordsAddress } from "@/config";
 // why not working
 // import { env } from "env";
 import { useEffect, useState } from "react";
-import { getGameManifest } from "../../../../common/utils";
+import { Chain, getGameManifest } from "../../../../../config/utils/utils";
+import { env } from "../../env";
 import { useDojo } from "./context/DojoContext";
 
+const { VITE_PUBLIC_CHAIN } = env;
+
 export const useLordsBridgeBalance = () => {
   const {
     network: { provider },
@@ -16,7 +19,9 @@ export const useLordsBridgeBalance = () => {
 
   useEffect(() => {
     const initManifest = async () => {
-      const manifest = await getGameManifest(meta.env.VITE_PUBLIC_CHAIN);
+      const manifest: { contracts?: Array<{ tag: string; address?: string }> } = await getGameManifest(
+        VITE_PUBLIC_CHAIN as Chain,
+      );
       const bridge = manifest.contracts?.find(
         (contract: { tag: string }) => contract.tag === "s1_eternum-resource_bridge_systems",
       );

client/apps/landing/src/hooks/use-rewards.tsx

@@ -1,3 +1,4 @@
+import { getLordsAddress } from "@/components/ui/utils/addresses";
 import { configManager } from "@bibliothecadao/eternum";
 import { useAccount } from "@starknet-react/core";
 import { useEffect, useState } from "react";

client/apps/landing/src/routes/mint.lazy.tsx

@@ -51,7 +51,7 @@ function Mint() {
     [data, realmsAddress],
   );
 
-  const isDev = meta.env.VITE_PUBLIC_CHAIN === "local";
+  const isDev = import.meta.env.VITE_PUBLIC_CHAIN === "local" || import.meta.env.VITE_PUBLIC_DEV === "true";
 
   const { deselectAllNfts, isNftSelected, selectBatchNfts, toggleNftSelection, totalSelectedNfts, selectedTokenIds } =
     useNftSelection({ userAddress: address as `0x${string}` });

client/apps/landing/src/types/index.ts

@@ -7,3 +7,17 @@ export type RealmMetadata = {
     value: string | number;
   }[];
 };
+
+export type SeasonPassMint = {
+  node: {
+    __typename?: "Token__Balance";
+    tokenMetadata: {
+      __typename: "ERC721__Token";
+      tokenId: string;
+      metadataDescription: string;
+      imagePath: string;
+      contractAddress: string;
+      metadata: string;
+    };
+  };
+} | null;

client/apps/landing/tsconfig.json

@@ -4,10 +4,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "@/*": ["./src/*"],
-      "env": ["./env.ts"]
-    },
-    "allowJs": true
-  },
-  "include": ["src", "env.ts"]
+      "@/*": ["./src/*"]
+    }
+  }
 }

client/apps/landing/vite.config.ts

@@ -15,6 +15,7 @@ export default defineConfig(({ mode }) => {
     resolve: {
       alias: {
         "@": path.resolve(__dirname, "./src"),
+        "@/assets": path.resolve(__dirname, "../../public/assets"),
       },
     },
     server: {

config/utils/utils.ts

@@ -13,7 +13,7 @@ export async function getSeasonAddresses(chain: Chain): Promise<SeasonAddresses>
   const ADDRESSES_FILE = `../../contracts/common/addresses/${chain}.json`;
   console.log({ ADDRESSES_FILE });
   try {
-    const seasonAddressesJson = (await import(ADDRESSES_FILE)).default;
+    const seasonAddressesJson = (await import(/* @vite-ignore */ ADDRESSES_FILE)).default;
 
     return seasonAddressesJson;
   } catch (error) {
@@ -38,7 +38,7 @@ interface GameManifest {
 export async function getGameManifest(chain: Chain): Promise<GameManifest> {
   const MANIFEST_FILE = `../../contracts/game/manifest_${chain}.json`;
   try {
-    const manifest = (await import(MANIFEST_FILE)).default;
+    const manifest = (await import(/* @vite-ignore */ MANIFEST_FILE)).default;
     return manifest;
   } catch (error) {
     throw new Error(`Failed to load game manifest for chain ${chain}: ${error}`);

packages/core/src/modelManager/ConfigManager.ts

@@ -87,6 +87,7 @@ export class ClientConfigManager {
 
     //   this.resourceInputs[Number(resourceType)] = inputs;
     // }
+    return ;
     this.resourceInputs = Object.entries(this.config.resources.resourceInputs).reduce(
       (acc, [key, inputs]) => {
         acc[Number(key)] = inputs.map((input: { resource: number; amount: number }) => ({
@@ -162,6 +163,7 @@ export class ClientConfigManager {
     //   }
     //   this.realmUpgradeCosts[index] = resources;
     // }
+    return;
     this.realmUpgradeCosts = Object.fromEntries(
       Object.entries(this.config.realmUpgradeCosts).map(([key, costs]) => [
         key,
@@ -198,6 +200,7 @@ export class ClientConfigManager {
     // this.resourceBuildingCosts[Number(resourceId)] = resourceCosts;
 
     // }
+    return;
     this.resourceBuildingCosts = Object.fromEntries(
       Object.entries(this.config.resources.resourceBuildingCosts).map(([key, costs]) => [
         key,
@@ -235,6 +238,7 @@ export class ClientConfigManager {
     //   }
     //   this.buildingCosts[Number(buildingType)] = resourceCosts;
     // }
+    return;
     this.buildingCosts = Object.fromEntries(
       Object.entries(this.config.buildings.buildingCosts).map(([key, costs]) => [
         key,