merge in main

cartridge-gg · Nov 13, 2023 · 25bc67a · 25bc67a
2 parents 2223a37 + 82f16c0
commit 25bc67a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/web/src/components/Inventory.tsx b/web/src/components/Inventory.tsx
@@ -1,5 +1,8 @@
 import { Divider, HStack, StyleProps, Text, VStack, Card, Tooltip, Spacer } from "@chakra-ui/react";
 
+import BorderImage from "@/components/icons/BorderImage";
+import colors from "@/theme/colors";
+
 import React from "react";
 import { useRouter } from "next/router";
 import { useDojoContext } from "@/dojo/hooks/useDojoContext";

diff --git a/web/src/pages/[gameId]/travel.tsx b/web/src/pages/[gameId]/travel.tsx
@@ -266,7 +266,16 @@ const LocationPrices = ({ prices, isCurrentLocation }: { prices: MarketPriceInfo
           ({!isPercentage ? "#" : "%"})
         </Text>
       </HStack>
-      <Card w="full" p="5px" pointerEvents="all">
+      <Card
+        w="full"
+        p="5px"
+        pointerEvents="all"
+        sx={{
+          borderImageSource: `url("data:image/svg+xml,${BorderImage({
+            color: colors.neon["700"].toString(),
+          })}")`,
+        }}
+      >
         <Grid templateColumns="repeat(2, 1fr)" position="relative">
           <Box position="absolute" boxSize="full" border="2px" borderColor="neon.900" />
           {prices.map((drug, index) => {

diff --git a/web/src/pages/index.tsx b/web/src/pages/index.tsx
@@ -37,11 +37,12 @@ export default function Home() {
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [isGated, setIsGated] = useState(false);
 
-  // useEffect(
-  //   () =>
-  //     setIsGated(window.location.host === "rollyourown.preview.cartridge.gg"),
-  //   [],
-  // );
+  useEffect(
+    () =>
+    //setIsGated(window.location.host ==! "rollyourown.preview.cartridge.gg"),
+    setIsGated(false),
+    [],
+  );
 
   const disableAutoPlay = process.env.NEXT_PUBLIC_DISABLE_MEDIAPLAYER_AUTOPLAY === "true";
   const [isTutorialOpen, setIsTutorialOpen] = useState(false);
@@ -71,7 +72,9 @@ export default function Home() {
                   <Alert />
                   <Text align="center">Under Construction</Text>
                 </HStack>
-                <Text align="center">Get ready hustlers... Season II starts in September</Text>
+                <Text align="center">
+                  Get ready hustlers... Season III starts in November
+                </Text>
               </VStack>
             ) : (
               <>