Merge branch 'main' into balance

cartridge-gg · Sep 15, 2023 · 0b47f6d · 0b47f6d
2 parents 295f14a + 4f45fdc
commit 0b47f6d
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 55 deletions.
diff --git a/web/src/pages/[gameId]/[locationSlug]/index.tsx b/web/src/pages/[gameId]/[locationSlug]/index.tsx
@@ -13,6 +13,7 @@ import {
   StyleProps,
   useDisclosure,
   useBreakpointValue,
+  Flex,
 } from "@chakra-ui/react";
 import Layout from "@/components/Layout";
 import { useRouter } from "next/router";
@@ -120,24 +121,31 @@ export default function Location() {
                   {drugInfo.name}
                 </CardHeader>
                 <CardBody>
-                  <HStack w="full" justify="center" position="relative" m="2px">
-                    <HStack
+                  <HStack w="full" justify="center">
+                    <Flex
                       as={motion.div}
                       initial={{ opacity: 0 }}
                       whileHover={{ opacity: 1 }}
-                      w="full"
-                      p="20px"
-                      gap="10px"
+                      p="2px"
+                      align="center"
+                      boxSize="full"
                       position="absolute"
-                      bgColor="neon.900"
                       pointerEvents={["none", "auto"]}
                     >
-                      <BuySellBtns
-                        canBuy={canBuy}
-                        canSell={canSell}
-                        drugSlug={drugInfo.slug}
-                      />
-                    </HStack>
+                      <HStack
+                        h="100px"
+                        w="full"
+                        p="20px"
+                        gap="10px"
+                        bgColor="neon.900"
+                      >
+                        <BuySellBtns
+                          canBuy={canBuy}
+                          canSell={canSell}
+                          drugSlug={drugInfo.slug}
+                        />
+                      </HStack>
+                    </Flex>
                     {drugInfo.icon({})}
                   </HStack>
                 </CardBody>

diff --git a/web/src/pages/[gameId]/travel.tsx b/web/src/pages/[gameId]/travel.tsx
@@ -41,6 +41,7 @@ export default function Travel() {
     if (playerEntity && !isSubmitting) {
       const location = getLocationById(playerEntity.locationId);
       setCurrentLocationId(location.id);
+      setTargetId(location.id);
     }
   }, [playerEntity, isSubmitting]);
 

diff --git a/web/src/pages/index.tsx b/web/src/pages/index.tsx
@@ -27,7 +27,7 @@ import { usePlayerStore } from "@/hooks/state";
 import { Cartridge } from "@/components/icons/branding/Cartridge";
 import { Dojo } from "@/components/icons/branding/Dojo";
 import { ScrollDown } from "@/components/icons/ScrollDown";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 // hardcode game params for now
 const START_TIME = 0;
@@ -49,59 +49,76 @@ export default function Home() {
   const { resetAll } = usePlayerStore();
   const { toast } = useToast();
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const [isGated, setIsGated] = useState(false);
+
+  useEffect(
+    () =>
+      setIsGated(window.location.host === "rollyourown.preview.cartridge.gg"),
+    [],
+  );
 
   return (
     <Layout CustomLeftPanel={HomeLeftPanel}>
       <VStack boxSize="full" gap="10px" justify="center">
         <Card variant="pixelated">
           <HStack w="full" p="20px" gap="10px" justify="center">
-            {/* <VStack>
-              <HStack>
-                <Alert />
-                <Text align="center">Under Construction</Text>
-              </HStack>
-              <Text align="center">
-                Get ready hustlers... Season II starts in September
-              </Text>
-            </VStack> */}
+            {isGated ? (
+              <VStack>
+                <HStack>
+                  <Alert />
+                  <Text align="center">Under Construction</Text>
+                </HStack>
+                <Text align="center">
+                  Get ready hustlers... Season II starts in September
+                </Text>
+              </VStack>
+            ) : (
+              <Button
+                flex="1"
+                isDisabled={!account}
+                isLoading={isSubmitting && !txError}
+                onClick={async () => {
+                  setIsSubmitting(true);
+                  resetAll();
+                  const { event, hash } = await createGame(
+                    START_TIME,
+                    MAX_PLAYERS,
+                    NUM_TURNS,
+                  );
 
-            <Button
-              flex="1"
-              isDisabled={!account}
-              isLoading={isSubmitting && !txError}
-              onClick={async () => {
-                setIsSubmitting(true);
-                resetAll();
-                const { event, hash } = await createGame(
-                  START_TIME,
-                  MAX_PLAYERS,
-                  NUM_TURNS,
-                );
+                  const { gameId, locationId } = event as JoinedEventData;
+                  toast(
+                    "Created Game",
+                    Alert,
+                    `http://amazing_explorer/${hash}`,
+                  );
 
-                const { gameId, locationId } = event as JoinedEventData;
-                toast("Created Game", Alert, `http://amazing_explorer/${hash}`);
-
-                router.push(`/${gameId}/${getLocationById(locationId).slug}`);
-              }}
-            >
-              Hustle
-            </Button>
+                  router.push(`/${gameId}/${getLocationById(locationId).slug}`);
+                }}
+              >
+                Hustle
+              </Button>
+            )}
           </HStack>
         </Card>
 
-        <Text>HALL OF FAME</Text>
-        <VStack
-          boxSize="full"
-          gap="20px"
-          sx={{
-            overflowY: "scroll",
-            "&::-webkit-scrollbar": {
-              display: "none",
-            },
-          }}
-        >
-          <Leaderboard />
-        </VStack>
+        {!isGated && (
+          <>
+            <Text>HALL OF FAME</Text>
+            <VStack
+              boxSize="full"
+              gap="20px"
+              sx={{
+                overflowY: "scroll",
+                "&::-webkit-scrollbar": {
+                  display: "none",
+                },
+              }}
+            >
+              <Leaderboard />
+            </VStack>
+          </>
+        )}
       </VStack>
     </Layout>
   );