From da3ad0aa1bfda8d7bec7baa9d7f9843139c1d3b6 Mon Sep 17 00:00:00 2001
From: tresabhi <43380238+tresabhi@users.noreply.github.com>
Date: Sat, 31 Oct 2026 14:13:17 -0500
Subject: [PATCH] at least it runs

---
 .../components/AlertDialog/index.module.css   |  2 +
 .../src/components/AlertDialog/index.tsx      |  5 ++
 .../website/src/components/GuessRenderer.tsx  |  7 ++-
 packages/website/src/components/Guesser.tsx   | 47 ++++++++++---------
 4 files changed, 38 insertions(+), 23 deletions(-)
 create mode 100644 packages/website/src/components/AlertDialog/index.module.css
 create mode 100644 packages/website/src/components/AlertDialog/index.tsx

diff --git a/packages/website/src/components/AlertDialog/index.module.css b/packages/website/src/components/AlertDialog/index.module.css
new file mode 100644
index 000000000..9af9f452c
--- /dev/null
+++ b/packages/website/src/components/AlertDialog/index.module.css
@@ -0,0 +1,2 @@
+.Trigger {
+}
diff --git a/packages/website/src/components/AlertDialog/index.tsx b/packages/website/src/components/AlertDialog/index.tsx
new file mode 100644
index 000000000..c06176a16
--- /dev/null
+++ b/packages/website/src/components/AlertDialog/index.tsx
@@ -0,0 +1,5 @@
+import { AlertDialog as _ } from "radix-ui";
+import { composeRadixComponents } from "../../ui/compose";
+import styles from "./index.module.css";
+
+export const AlertDialog = composeRadixComponents(_, styles);
diff --git a/packages/website/src/components/GuessRenderer.tsx b/packages/website/src/components/GuessRenderer.tsx
index b81e0574e..6bbbe3310 100644
--- a/packages/website/src/components/GuessRenderer.tsx
+++ b/packages/website/src/components/GuessRenderer.tsx
@@ -1,6 +1,8 @@
 import { useModel } from "../hooks/useModel";
 import { Guess, GuessState } from "../stores/guess";
+import { CanvasControl } from "./CanvasControl";
 import { Lighting } from "./Lighting";
+import { SceneProps } from "./SceneProps";
 import { SmartCanvas } from "./SmartCanvas";
 import { TankModel } from "./TankModel";
 
@@ -12,7 +14,7 @@ export function GuessRenderer() {
   const helpingReveal = Guess.use((state) => state.helpingReveal);
   const isRevealed = helpingReveal || guessState !== GuessState.NotGuessed;
 
-  const id = Guess.use((state) => state.tank.id);
+  const id = Guess.use((state) => state.tank);
   const { hasPbr } = useModel(id);
 
   return (
@@ -26,7 +28,8 @@ export function GuessRenderer() {
       }}
       camera={{ position: [-5, 5, -5] }}
     >
-      <Controls zoomable={false} />
+      <SceneProps />
+      <CanvasControl zoomable={false} />
       <Lighting hasPbr={hasPbr} />
       <TankModel />
     </SmartCanvas>
diff --git a/packages/website/src/components/Guesser.tsx b/packages/website/src/components/Guesser.tsx
index 720e33c7b..f2c2237a9 100644
--- a/packages/website/src/components/Guesser.tsx
+++ b/packages/website/src/components/Guesser.tsx
@@ -19,8 +19,15 @@ import { awaitableTiers } from "../core/awaitables/tiers";
 import { useStrings } from "../hooks/useStrings";
 import { useUnwrapper } from "../hooks/useUnwrapper";
 import { Guess, GuessState } from "../stores/guess";
+import { AlertDialog } from "./AlertDialog";
+import { Button } from "./Button";
 import { ClassIcon } from "./ClassIcon";
+import { DropdownMenu } from "./DropdownMenu";
+import { IconButton } from "./IconButton";
 import { SearchResults } from "./SearchResults";
+import { Spinner } from "./Spinner";
+import { Text } from "./Text";
+import { TextField } from "./TextField";
 
 const { go } = fuzzysort;
 
@@ -98,7 +105,7 @@ export function Guesser() {
   }, [correctGuesses, totalGuesses, streak]);
 
   return (
-    <Flex
+    <div
       direction="column"
       position="absolute"
       bottom="0"
@@ -109,14 +116,14 @@ export function Guesser() {
       maxWidth="25rem"
       gap="3"
     >
-      <Box position="relative">
+      <div position="relative">
         {results !== null && (
           <Card variant="classic">
-            <Box py="2" px="3">
+            <div py="2" px="3">
               {results.length === 0 && (
-                <Flex justify="center">
+                <div justify="center">
                   <Text color="gray">{strings.common.search.no_results}</Text>
-                </Flex>
+                </div>
               )}
 
               <SearchResults.Root>
@@ -142,7 +149,7 @@ export function Guesser() {
                         />
                       }
                       discriminator={
-                        <Flex
+                        <div
                           align="center"
                           gap="1"
                           width="38px"
@@ -154,22 +161,22 @@ export function Guesser() {
                             height="1em"
                           />
                           {romanize(result.tier)}
-                        </Flex>
+                        </div>
                       }
                     />
                   );
                 })}
               </SearchResults.Root>
-            </Box>
+            </div>
           </Card>
         )}
-      </Box>
+      </div>
 
-      <Flex justify="center" style={{ userSelect: "none" }}>
+      <div justify="center" style={{ userSelect: "none" }}>
         <Text ref={status} />
-      </Flex>
+      </div>
 
-      <Flex gap={{ initial: "2", sm: "3" }}>
+      <div gap={{ initial: "2", sm: "3" }}>
         <DropdownMenu.Root modal={false}>
           <DropdownMenu.Trigger>
             <IconButton
@@ -240,7 +247,7 @@ export function Guesser() {
           </DropdownMenu.Content>
         </DropdownMenu.Root>
 
-        <TextField.Root
+        <TextField
           disabled={guessState !== GuessState.NotGuessed}
           ref={input}
           onChange={requestSearch}
@@ -249,10 +256,8 @@ export function Guesser() {
           size={{ initial: "2", sm: "3" }}
           variant="classic"
         >
-          <TextField.Slot>
-            {searching ? <Spinner /> : <MagnifyingGlassIcon />}
-          </TextField.Slot>
-        </TextField.Root>
+          {searching ? <Spinner /> : <MagnifyingGlassIcon />}
+        </TextField>
 
         <AlertDialog.Root>
           <AlertDialog.Trigger>
@@ -270,7 +275,7 @@ export function Guesser() {
               {strings.guesser.help.description}
             </AlertDialog.Description>
 
-            <Flex justify="end" gap="2">
+            <div justify="end" gap="2">
               <AlertDialog.Cancel>
                 <Button variant="outline">{strings.guesser.help.cancel}</Button>
               </AlertDialog.Cancel>
@@ -288,7 +293,7 @@ export function Guesser() {
                   {strings.guesser.help.reveal}
                 </Button>
               </AlertDialog.Action>
-            </Flex>
+            </div>
           </AlertDialog.Content>
         </AlertDialog.Root>
 
@@ -347,7 +352,7 @@ export function Guesser() {
             </>
           )}
         </Button>
-      </Flex>
-    </Flex>
+      </div>
+    </div>
   );
 }