From d0be8e4fc68247eb4d48ce0fa90f5e7e43104b43 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Thu, 22 Jan 2026 22:13:00 +0200
Subject: [PATCH 01/23] Yoni - basic shift tab

---
 .../frontend/src/scouter/pages/ScoutMatch.tsx | 34 +++++++++++--------
 .../src/scouter/pages/tabs/ShiftTab.tsx       | 31 +++++++++++++++++
 2 files changed, 51 insertions(+), 14 deletions(-)
 create mode 100644 apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx

diff --git a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
index 0605b8a..61a09fd 100644
--- a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
@@ -9,10 +9,16 @@ import {
   useState,
 } from "react";
 import { defaultScoutForm, type ScoutingForm } from "@repo/scouting_types";
+import { ShiftTab } from "./tabs/ShiftTab";
+
+export interface TabProps {
+  setForm: Dispatch<SetStateAction<ScoutingForm>>;
+  alliance: "red" | "blue";
+}
 
 interface Tab {
   name: string;
-  Component: FC<{ setForm: Dispatch<SetStateAction<ScoutingForm>> }>;
+  Component: FC<TabProps>;
 }
 const TABS: Tab[] = [
   {
@@ -24,25 +30,21 @@ const TABS: Tab[] = [
     name: "Trans",
     Component: () => <div className="p-4">Transition Content</div>,
   },
-  {
-    name: "Tele",
-    Component: () => <div className="p-4">Teleop Content</div>,
-  },
   {
     name: "Shift1",
-    Component: () => <div className="p-4">Shift1 Content</div>,
+    Component: (props) => <ShiftTab tabIndex={0} {...props} />,
   },
   {
     name: "Shift2",
-    Component: () => <div className="p-4">Shift2 Content</div>,
+    Component: (props) => <ShiftTab tabIndex={1} {...props} />,
   },
   {
     name: "Shift3",
-    Component: () => <div className="p-4">Shift3 Content</div>,
+    Component: (props) => <ShiftTab tabIndex={2} {...props} />,
   },
   {
     name: "Shift4",
-    Component: () => <div className="p-4">Shift4 Content</div>,
+    Component: (props) => <ShiftTab tabIndex={3} {...props} />,
   },
   {
     name: "Endgame",
@@ -149,16 +151,20 @@ export const ScoutMatch: FC = () => {
       className="max-h-screen bg-black p-4 md:p-6 flex items-center justify-center
       force-landscape"
     >
-      <div className="flex flex-row max-w-5xl w-full mx-auto bg-linear-to-br
+      <div
+        className="flex flex-row max-w-5xl w-full mx-auto bg-linear-to-br
        from-black via-gray-900 to-black border-2 border-green-500 
-       rounded-2xl shadow-[0_0_30px_rgba(34,197,94,0.3)] overflow-hidden h-[90vh] relative">
+       rounded-2xl shadow-[0_0_30px_rgba(34,197,94,0.3)] overflow-hidden h-[90vh] relative"
+      >
         <SideBar setActiveTab={setActiveTab} activeTabIndex={activeTabIndex} />
 
         <div className="flex-1 flex flex-col overflow-hidden p-2 relative z-10">
-          <div className="flex-1 text-green-100 overflow-y-auto pr-2
+          <div
+            className="flex-1 text-green-100 overflow-y-auto pr-2
            bg-black/40 rounded-xl p-6 border border-green-500/20 shadow-inner
-            animate-in fade-in slide-in-from-right-4 duration-300">
-            <CurrentTab setForm={setScoutingForm} />
+            animate-in fade-in slide-in-from-right-4 duration-300"
+          >
+            <CurrentTab setForm={setScoutingForm} alliance="red" />
           </div>
         </div>
       </div>
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
new file mode 100644
index 0000000..66189f6
--- /dev/null
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -0,0 +1,31 @@
+// בס"ד
+
+import { useState, type FC } from "react";
+import type { TabProps } from "../ScoutMatch";
+import { ScoreMap } from "../../components/ScoreMap";
+import type { Point } from "@repo/scouting_types";
+
+type Alliance = "red" | "blue";
+
+interface ShiftTabProps extends TabProps {
+  tabIndex: number;
+}
+
+export const ShiftTab: FC<ShiftTabProps> = ({
+  setForm,
+  tabIndex,
+  alliance,
+}) => {
+  const [mapPosition, setMapPosition] = useState<Point>();
+  const [mapZone, setMapZone] = useState<Alliance>(alliance);
+  return (
+    <>
+      <ScoreMap
+        setPosition={setMapPosition}
+        currentPoint={mapPosition}
+        alliance={alliance}
+        mapZone={mapZone}
+      />
+    </>
+  );
+};

From 63a7c5fbb27ec1c6de434ca934bf71d77c6176d2 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Thu, 22 Jan 2026 22:22:07 +0200
Subject: [PATCH 02/23] Yoni - fixed image scaling issue

---
 .../src/scouter/components/ScoreMap.tsx       | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
index ca055bc..39de16d 100644
--- a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
+++ b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
@@ -58,20 +58,17 @@ export const ScoreMap: FC<ScoreMapProps> = ({
   };
 
   return (
-    <div
-      draggable={false}
-      className="max-h-screen relative mx-auto touch-none"
-      onTouchMove={handleMapClick}
-      onTouchStart={() => {
-        setHolding(true);
-      }}
-      onTouchEnd={() => {
-        setHolding(false);
-      }}
-    >
+    <div draggable={false} className="h-full relative mx-auto touch-none">
       <img
         src={`/${mapZone}-field-4418.png`}
-        className="max-h-screen block select-none"
+        onTouchMove={handleMapClick}
+        onTouchStart={() => {
+          setHolding(true);
+        }}
+        onTouchEnd={() => {
+          setHolding(false);
+        }}
+        className="h-full block select-none"
         alt="Game Map"
         draggable={false}
       />

From 1d25cfe6fdee455b6f75decc16a995e3b869abc7 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Thu, 22 Jan 2026 22:26:16 +0200
Subject: [PATCH 03/23] Yoni - better styling

---
 apps/scouting/frontend/src/scouter/components/ScoreMap.tsx | 2 +-
 apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
index 39de16d..2ab213d 100644
--- a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
+++ b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
@@ -58,7 +58,7 @@ export const ScoreMap: FC<ScoreMapProps> = ({
   };
 
   return (
-    <div draggable={false} className="h-full relative mx-auto touch-none">
+    <div draggable={false} className="h-full relative touch-none">
       <img
         src={`/${mapZone}-field-4418.png`}
         onTouchMove={handleMapClick}
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 66189f6..2a932cd 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -19,13 +19,14 @@ export const ShiftTab: FC<ShiftTabProps> = ({
   const [mapPosition, setMapPosition] = useState<Point>();
   const [mapZone, setMapZone] = useState<Alliance>(alliance);
   return (
-    <>
+    <div className="flex flex-row h-full w-full">
       <ScoreMap
         setPosition={setMapPosition}
         currentPoint={mapPosition}
         alliance={alliance}
         mapZone={mapZone}
       />
-    </>
+      
+    </div>
   );
 };

From f87ef2c4ba8252b2ff9ffeb2a0ba77a77fab1478 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Thu, 22 Jan 2026 22:31:06 +0200
Subject: [PATCH 04/23] Yoni - tweaked stopwatch

---
 .../frontend/src/components/stopwatch.tsx     | 37 +++++--------------
 .../src/scouter/pages/tabs/ShiftTab.tsx       |  3 +-
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/apps/scouting/frontend/src/components/stopwatch.tsx b/apps/scouting/frontend/src/components/stopwatch.tsx
index 7032e48..50a2a45 100644
--- a/apps/scouting/frontend/src/components/stopwatch.tsx
+++ b/apps/scouting/frontend/src/components/stopwatch.tsx
@@ -11,7 +11,8 @@ const MILLLISECONDS_IN_A_SECOND = 1000;
 const SECOND_IN_A_MINUTE = 60;
 const INITIAL_TIME_MILLISECONDS = 0;
 const CYCLE_TIME_MILLISECONDS = 10;
-const DECIMAL_PLACES = 2
+const DECIMAL_PLACES = 2;
+const DECIMAL_PLACES_MILLISECONDS = 3;
 
 const Stopwatch: React.FC = () => {
   const [isRunning, setIsRunning] = useState(false);
@@ -30,13 +31,6 @@ const Stopwatch: React.FC = () => {
     setIsRunning(false);
   }
 
-  function calculateMinutes() {
-    return Math.floor(
-      (elapsedTime / (MILLLISECONDS_IN_A_SECOND * SECOND_IN_A_MINUTE)) %
-        SECOND_IN_A_MINUTE,
-    );
-  }
-
   function calculateSeconds() {
     return Math.floor(
       (elapsedTime / MILLLISECONDS_IN_A_SECOND) % SECOND_IN_A_MINUTE,
@@ -44,9 +38,7 @@ const Stopwatch: React.FC = () => {
   }
 
   function calculateMilliSeconds() {
-    return Math.floor(
-      (elapsedTime % MILLLISECONDS_IN_A_SECOND) / SECOND_IN_A_MINUTE,
-    );
+    return Math.floor(elapsedTime % MILLLISECONDS_IN_A_SECOND);
   }
 
   const getCurrentRelativeTime = () => {
@@ -98,18 +90,20 @@ const Stopwatch: React.FC = () => {
   }, [cycleTimesInMilliseconds]);
 
   function formatTime() {
-    const minutes = String(calculateMinutes()).padStart(DECIMAL_PLACES, "0");
     const seconds = String(calculateSeconds()).padStart(DECIMAL_PLACES, "0");
-    const milliseconds = String(calculateMilliSeconds()).padStart(DECIMAL_PLACES, "0");
-    return `${minutes}:${seconds}:${milliseconds}`;
+    const milliseconds = String(calculateMilliSeconds()).padStart(
+      DECIMAL_PLACES_MILLISECONDS,
+      "0",
+    );
+    return `${seconds}:${milliseconds}`;
   }
 
   return (
     <div className="flex flex-col items-center gap-6 p-6">
       <div
         className={`
-          select-none cursor-pointer rounded-2xl px-10 py-6
-          text-4xl font-mono font-semibold shadow-lg transition-all duration-150
+          select-none cursor-pointer rounded-2xl px-4 py-2
+          text-2xl font-mono font-semibold shadow-lg transition-all duration-150
           ${isRunning ? "bg-emerald-500 text-white scale-95" : "bg-slate-800 text-emerald-400 hover:bg-slate-700"}
         `}
         onMouseDown={start}
@@ -120,17 +114,6 @@ const Stopwatch: React.FC = () => {
       >
         {formatTime()}
       </div>
-
-      <button
-        onClick={reset}
-        className="
-          rounded-lg px-4 py-1.5 text-sm font-medium text-slate-600
-          border border-slate-300 hover:bg-slate-100 hover:text-slate-800
-          active:scale-95 transition
-        "
-      >
-        Reset
-      </button>
     </div>
   );
 };
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 2a932cd..7817e01 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -4,6 +4,7 @@ import { useState, type FC } from "react";
 import type { TabProps } from "../ScoutMatch";
 import { ScoreMap } from "../../components/ScoreMap";
 import type { Point } from "@repo/scouting_types";
+import Stopwatch from "../../../components/stopwatch";
 
 type Alliance = "red" | "blue";
 
@@ -26,7 +27,7 @@ export const ShiftTab: FC<ShiftTabProps> = ({
         alliance={alliance}
         mapZone={mapZone}
       />
-      
+      <Stopwatch />
     </div>
   );
 };

From 1667b72d17e891638404e5af92e3d32bef1417f4 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Thu, 22 Jan 2026 22:46:45 +0200
Subject: [PATCH 05/23] Yoni - changed props of stopwatch

---
 .../frontend/src/components/stopwatch.tsx     | 42 +++++++++----------
 .../src/scouter/pages/tabs/ShiftTab.tsx       | 10 ++++-
 packages/scouting_types/rebuilt/Interval.ts   |  1 +
 packages/scouting_types/rebuilt/ShootEvent.ts |  2 +
 packages/scouting_types/rebuilt/index.ts      |  1 +
 5 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/apps/scouting/frontend/src/components/stopwatch.tsx b/apps/scouting/frontend/src/components/stopwatch.tsx
index 50a2a45..3b96b36 100644
--- a/apps/scouting/frontend/src/components/stopwatch.tsx
+++ b/apps/scouting/frontend/src/components/stopwatch.tsx
@@ -1,11 +1,12 @@
 // בס"ד
 import type React from "react";
-import { useEffect, useRef, useState } from "react";
-
-interface CycleStopwatchCounter {
-  startCycleTime: number;
-  endCycleTimer: number;
-}
+import {
+  useEffect,
+  useRef,
+  useState,
+  type Dispatch,
+} from "react";
+import type { Interval } from "@repo/scouting_types";
 
 const MILLLISECONDS_IN_A_SECOND = 1000;
 const SECOND_IN_A_MINUTE = 60;
@@ -14,15 +15,19 @@ const CYCLE_TIME_MILLISECONDS = 10;
 const DECIMAL_PLACES = 2;
 const DECIMAL_PLACES_MILLISECONDS = 3;
 
-const Stopwatch: React.FC = () => {
+interface StopwatchProps {
+  setCycleTimesInSeconds: Dispatch<(prev: Interval[]) => Interval[]>;
+  originTime: number;
+}
+
+const Stopwatch: React.FC<StopwatchProps> = ({
+  setCycleTimesInSeconds,
+  originTime,
+}) => {
   const [isRunning, setIsRunning] = useState(false);
   const [elapsedTime, setElapsedTime] = useState(INITIAL_TIME_MILLISECONDS);
-  const [cycleTimesInMilliseconds, setCycleTimesInMilliseconds] = useState<
-    CycleStopwatchCounter[]
-  >([]);
 
   const startTimeRef = useRef(INITIAL_TIME_MILLISECONDS);
-  const originRef = useRef<number | null>(null);
 
   const startCurrentCycleTime = useRef<number>(INITIAL_TIME_MILLISECONDS);
 
@@ -42,8 +47,7 @@ const Stopwatch: React.FC = () => {
   }
 
   const getCurrentRelativeTime = () => {
-    originRef.current ??= Date.now();
-    return Date.now() - originRef.current;
+    return Date.now() - originTime;
   };
 
   useEffect(() => {
@@ -75,20 +79,16 @@ const Stopwatch: React.FC = () => {
       return;
     }
 
-    const cycleStopwatchCounter: CycleStopwatchCounter = {
-      startCycleTime: startCurrentCycleTime.current,
-      endCycleTimer: getCurrentRelativeTime(),
+    const cycleStopwatchCounter: Interval = {
+      start: startCurrentCycleTime.current * MILLLISECONDS_IN_A_SECOND,
+      end: getCurrentRelativeTime() * MILLLISECONDS_IN_A_SECOND,
     };
-    setCycleTimesInMilliseconds((prev) => [...prev, cycleStopwatchCounter]);
+    setCycleTimesInSeconds((prev) => [...prev, cycleStopwatchCounter]);
 
     setIsRunning(false);
     reset();
   }
 
-  useEffect(() => {
-    console.log(cycleTimesInMilliseconds);
-  }, [cycleTimesInMilliseconds]);
-
   function formatTime() {
     const seconds = String(calculateSeconds()).padStart(DECIMAL_PLACES, "0");
     const milliseconds = String(calculateMilliSeconds()).padStart(
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 7817e01..4f0ade8 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -3,7 +3,7 @@
 import { useState, type FC } from "react";
 import type { TabProps } from "../ScoutMatch";
 import { ScoreMap } from "../../components/ScoreMap";
-import type { Point } from "@repo/scouting_types";
+import type { Point, ScoutingForm, ShootEvent } from "@repo/scouting_types";
 import Stopwatch from "../../../components/stopwatch";
 
 type Alliance = "red" | "blue";
@@ -19,6 +19,7 @@ export const ShiftTab: FC<ShiftTabProps> = ({
 }) => {
   const [mapPosition, setMapPosition] = useState<Point>();
   const [mapZone, setMapZone] = useState<Alliance>(alliance);
+
   return (
     <div className="flex flex-row h-full w-full">
       <ScoreMap
@@ -27,7 +28,12 @@ export const ShiftTab: FC<ShiftTabProps> = ({
         alliance={alliance}
         mapZone={mapZone}
       />
-      <Stopwatch />
+      <Stopwatch
+        setCycleTimesInSeconds={() => {
+          console.log("not implemented");
+        }}
+        originTime={0}
+      />
     </div>
   );
 };
diff --git a/packages/scouting_types/rebuilt/Interval.ts b/packages/scouting_types/rebuilt/Interval.ts
index 89de702..c29d63a 100644
--- a/packages/scouting_types/rebuilt/Interval.ts
+++ b/packages/scouting_types/rebuilt/Interval.ts
@@ -6,3 +6,4 @@ export const maxInterval: t.TypeOf<typeof intervalCodec> = {
     start: 0,
     end: 255
 };
+export type Interval = t.TypeOf<typeof intervalCodec>
diff --git a/packages/scouting_types/rebuilt/ShootEvent.ts b/packages/scouting_types/rebuilt/ShootEvent.ts
index 06f4f11..1ff7d0e 100644
--- a/packages/scouting_types/rebuilt/ShootEvent.ts
+++ b/packages/scouting_types/rebuilt/ShootEvent.ts
@@ -9,3 +9,5 @@ export const shootEventCodec = t.type({
   interval: intervalCodec,
   startPosition: point,
 });
+
+export type ShootEvent = t.TypeOf<typeof shootEventCodec>;
diff --git a/packages/scouting_types/rebuilt/index.ts b/packages/scouting_types/rebuilt/index.ts
index 848b208..182a9e3 100644
--- a/packages/scouting_types/rebuilt/index.ts
+++ b/packages/scouting_types/rebuilt/index.ts
@@ -2,3 +2,4 @@
 export * from "./GameData";
 export * from "./ScoutingForm";
 export * from "./ShootEvent";
+export * from "./Interval";

From 3db316fa0021e00c4085758086afb4be83d5558c Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Thu, 22 Jan 2026 22:52:55 +0200
Subject: [PATCH 06/23] Yoni - added disable to stopwatch

---
 apps/scouting/frontend/src/components/stopwatch.tsx | 13 +++++--------
 .../frontend/src/scouter/pages/tabs/ShiftTab.tsx    |  7 ++++---
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/apps/scouting/frontend/src/components/stopwatch.tsx b/apps/scouting/frontend/src/components/stopwatch.tsx
index 3b96b36..decc6a4 100644
--- a/apps/scouting/frontend/src/components/stopwatch.tsx
+++ b/apps/scouting/frontend/src/components/stopwatch.tsx
@@ -1,11 +1,6 @@
 // בס"ד
 import type React from "react";
-import {
-  useEffect,
-  useRef,
-  useState,
-  type Dispatch,
-} from "react";
+import { useEffect, useRef, useState, type Dispatch } from "react";
 import type { Interval } from "@repo/scouting_types";
 
 const MILLLISECONDS_IN_A_SECOND = 1000;
@@ -18,11 +13,13 @@ const DECIMAL_PLACES_MILLISECONDS = 3;
 interface StopwatchProps {
   setCycleTimesInSeconds: Dispatch<(prev: Interval[]) => Interval[]>;
   originTime: number;
+  disabled: boolean;
 }
 
 const Stopwatch: React.FC<StopwatchProps> = ({
   setCycleTimesInSeconds,
   originTime,
+  disabled,
 }) => {
   const [isRunning, setIsRunning] = useState(false);
   const [elapsedTime, setElapsedTime] = useState(INITIAL_TIME_MILLISECONDS);
@@ -64,7 +61,7 @@ const Stopwatch: React.FC<StopwatchProps> = ({
   }, [isRunning]);
 
   function start() {
-    if (isRunning) {
+    if (isRunning || disabled) {
       return;
     }
     const relativeTime = getCurrentRelativeTime();
@@ -104,7 +101,7 @@ const Stopwatch: React.FC<StopwatchProps> = ({
         className={`
           select-none cursor-pointer rounded-2xl px-4 py-2
           text-2xl font-mono font-semibold shadow-lg transition-all duration-150
-          ${isRunning ? "bg-emerald-500 text-white scale-95" : "bg-slate-800 text-emerald-400 hover:bg-slate-700"}
+          ${disabled ? "bg-slate-800 text-slate-900" : isRunning ? "bg-emerald-500 text-white scale-95" : "bg-slate-800 text-emerald-400 hover:bg-slate-700"}
         `}
         onMouseDown={start}
         onMouseUp={stop}
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 4f0ade8..fc24296 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -3,7 +3,7 @@
 import { useState, type FC } from "react";
 import type { TabProps } from "../ScoutMatch";
 import { ScoreMap } from "../../components/ScoreMap";
-import type { Point, ScoutingForm, ShootEvent } from "@repo/scouting_types";
+import type { Point } from "@repo/scouting_types";
 import Stopwatch from "../../../components/stopwatch";
 
 type Alliance = "red" | "blue";
@@ -29,10 +29,11 @@ export const ShiftTab: FC<ShiftTabProps> = ({
         mapZone={mapZone}
       />
       <Stopwatch
-        setCycleTimesInSeconds={() => {
-          console.log("not implemented");
+        setCycleTimesInSeconds={(handler) => {
+          console.log("");
         }}
         originTime={0}
+        disabled={mapPosition === undefined}
       />
     </div>
   );

From f83659214569874a06b5121d3de74c20a2f006a3 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Fri, 23 Jan 2026 13:21:35 +0200
Subject: [PATCH 07/23] Yoni - got correct times on form

---
 .../frontend/src/components/stopwatch.tsx     | 11 ++++++-----
 .../frontend/src/scouter/pages/ScoutMatch.tsx | 19 ++++++++++++++++---
 .../src/scouter/pages/tabs/ShiftTab.tsx       | 14 +++++++++++---
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/apps/scouting/frontend/src/components/stopwatch.tsx b/apps/scouting/frontend/src/components/stopwatch.tsx
index decc6a4..fde0e7f 100644
--- a/apps/scouting/frontend/src/components/stopwatch.tsx
+++ b/apps/scouting/frontend/src/components/stopwatch.tsx
@@ -11,13 +11,13 @@ const DECIMAL_PLACES = 2;
 const DECIMAL_PLACES_MILLISECONDS = 3;
 
 interface StopwatchProps {
-  setCycleTimesInSeconds: Dispatch<(prev: Interval[]) => Interval[]>;
+  addCycleTimeSeconds: Dispatch<Interval>;
   originTime: number;
   disabled: boolean;
 }
 
 const Stopwatch: React.FC<StopwatchProps> = ({
-  setCycleTimesInSeconds,
+  addCycleTimeSeconds,
   originTime,
   disabled,
 }) => {
@@ -77,10 +77,11 @@ const Stopwatch: React.FC<StopwatchProps> = ({
     }
 
     const cycleStopwatchCounter: Interval = {
-      start: startCurrentCycleTime.current * MILLLISECONDS_IN_A_SECOND,
-      end: getCurrentRelativeTime() * MILLLISECONDS_IN_A_SECOND,
+      start: startCurrentCycleTime.current,
+      end: getCurrentRelativeTime(),
     };
-    setCycleTimesInSeconds((prev) => [...prev, cycleStopwatchCounter]);
+
+    addCycleTimeSeconds(cycleStopwatchCounter);
 
     setIsRunning(false);
     reset();
diff --git a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
index 61a09fd..62c0637 100644
--- a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
@@ -10,10 +10,12 @@ import {
 } from "react";
 import { defaultScoutForm, type ScoutingForm } from "@repo/scouting_types";
 import { ShiftTab } from "./tabs/ShiftTab";
+import { useLocalStorage } from "@repo/local_storage_hook";
 
 export interface TabProps {
   setForm: Dispatch<SetStateAction<ScoutingForm>>;
   alliance: "red" | "blue";
+  originTime: number;
 }
 
 interface Tab {
@@ -135,12 +137,19 @@ const SideBar: FC<SideBarProps> = ({ setActiveTab, activeTabIndex }) => {
   );
 };
 
-const createNewScoutingForm = () => structuredClone(defaultScoutForm);
+const createNewScoutingForm = (): ScoutingForm =>
+  JSON.parse(JSON.stringify(defaultScoutForm));
 
 export const ScoutMatch: FC = () => {
-  const [scoutingForm, setScoutingForm] = useState(createNewScoutingForm());
+  const [scoutingForm, setScoutingForm] = useLocalStorage(
+    "form",
+    createNewScoutingForm(),
+  );
   const [activeTabIndex, setActiveTab] = useState(STARTING_TAB_INDEX);
 
+  const originTime = useMemo(() => Date.now(), []);
+  console.log(originTime);
+
   const CurrentTab = useMemo(
     () => TABS[activeTabIndex].Component,
     [activeTabIndex],
@@ -164,7 +173,11 @@ export const ScoutMatch: FC = () => {
            bg-black/40 rounded-xl p-6 border border-green-500/20 shadow-inner
             animate-in fade-in slide-in-from-right-4 duration-300"
           >
-            <CurrentTab setForm={setScoutingForm} alliance="red" />
+            <CurrentTab
+              setForm={setScoutingForm}
+              alliance="red"
+              originTime={originTime}
+            />
           </div>
         </div>
       </div>
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index fc24296..5eb68b5 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -16,6 +16,7 @@ export const ShiftTab: FC<ShiftTabProps> = ({
   setForm,
   tabIndex,
   alliance,
+  originTime,
 }) => {
   const [mapPosition, setMapPosition] = useState<Point>();
   const [mapZone, setMapZone] = useState<Alliance>(alliance);
@@ -29,10 +30,17 @@ export const ShiftTab: FC<ShiftTabProps> = ({
         mapZone={mapZone}
       />
       <Stopwatch
-        setCycleTimesInSeconds={(handler) => {
-          console.log("");
+        addCycleTimeSeconds={(cycle) => {
+          setForm((prevForm) => {
+            const prevEvents = prevForm.tele.shifts[tabIndex].shootEvents;
+            prevEvents.push({
+              interval: cycle,
+              startPosition: mapPosition ?? { x: 0, y: 0 },
+            });
+            return prevForm;
+          });
         }}
-        originTime={0}
+        originTime={originTime}
         disabled={mapPosition === undefined}
       />
     </div>

From d3f89cebcd8db9b6b52d54495da6c0a0c434e120 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Fri, 23 Jan 2026 13:22:35 +0200
Subject: [PATCH 08/23] Yoni - truncated position

---
 apps/scouting/frontend/src/scouter/components/ScoreMap.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
index 2ab213d..56a6e84 100644
--- a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
+++ b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
@@ -36,7 +36,7 @@ const getRobotPosition = (touch: Touch, bound: DOMRect) => {
     bound.bottom - dotRadius - bound.top,
     Math.max(y, dotRadius),
   );
-  return { x: boundedX, y: boundedY };
+  return { x: Math.round(boundedX), y: Math.round(boundedY) };
 };
 
 export const ScoreMap: FC<ScoreMapProps> = ({

From 939c0331f6baa1cb8b5da8b6cc500192e2a2dc77 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Fri, 23 Jan 2026 14:09:59 +0200
Subject: [PATCH 09/23] Yoni - truly standardized the allmap position

---
 .../src/scouter/components/ScoreMap.tsx       | 65 ++++++++++++++++---
 .../frontend/src/scouter/pages/ScoutMatch.tsx |  2 +-
 .../src/scouter/pages/tabs/ShiftTab.tsx       |  4 +-
 3 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
index 56a6e84..66241a2 100644
--- a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
+++ b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
@@ -9,14 +9,44 @@ import {
   type Touch,
 } from "react";
 import type { Point } from "@repo/scouting_types";
+import { pipe } from "fp-ts/lib/function";
+
+type Alliance = "red" | "blue";
 
 interface ScoreMapProps {
   currentPoint?: Point;
   setPosition: Dispatch<SetStateAction<Point | undefined>>;
-  alliance: "red" | "blue";
-  mapZone: "red" | "blue";
+  alliance: Alliance;
+  mapZone: Alliance;
 }
 
+const ALLIANCE_ZONE_WIDTH_PIXELS = 395;
+const TWO_THIRDS_WIDTH_PIXELS = 1010;
+const HEIGHT_PIXELS = 652;
+const alliancizePosition = (
+  alliance: Alliance,
+  position: Point,
+  bounds: Point,
+): Point => {
+  if (alliance === "red") {
+    return position;
+  }
+
+  return { x: bounds.x - position.x, y: bounds.y - position.y };
+};
+
+const otherZone = (point: Point) => {
+  return {
+    ...point,
+    x: point.x + ALLIANCE_ZONE_WIDTH_PIXELS,
+  };
+};
+
+const normalizePosition = (point: Point, bounds: Point) => ({
+  x: (point.x * TWO_THIRDS_WIDTH_PIXELS) / bounds.x,
+  y: (point.y * HEIGHT_PIXELS) / bounds.y,
+});
+
 const dotRadius = 10;
 const radiusToDiameterRatio = 2;
 const dotDiameter = dotRadius * radiusToDiameterRatio;
@@ -36,7 +66,8 @@ const getRobotPosition = (touch: Touch, bound: DOMRect) => {
     bound.bottom - dotRadius - bound.top,
     Math.max(y, dotRadius),
   );
-  return { x: Math.round(boundedX), y: Math.round(boundedY) };
+
+  return { x: boundedX, y: boundedY };
 };
 
 export const ScoreMap: FC<ScoreMapProps> = ({
@@ -46,15 +77,33 @@ export const ScoreMap: FC<ScoreMapProps> = ({
   mapZone,
 }) => {
   const [isHolding, setHolding] = useState(false);
+
+  const [mapPoint, setMapPoint] = useState(currentPoint);
+
   const handleMapClick = (event: TouchEvent<HTMLDivElement>) => {
     if (!isHolding) {
       return;
     }
     const rect = event.currentTarget.getBoundingClientRect();
-
     const touch = event.touches[firstTouchIndex];
 
-    setPosition(getRobotPosition(touch, rect));
+    const dotPoint = getRobotPosition(touch, rect);
+
+    setMapPoint(dotPoint);
+
+    setPosition(
+      pipe(
+        dotPoint,
+        (point) =>
+          alliancizePosition(alliance, point, {
+            x: rect.width,
+            y: rect.height,
+          }),
+        (point) => normalizePosition(point, { x: rect.width, y: rect.height }),
+        (point) => (alliance === mapZone ? point : otherZone(point)),
+        (point) => ({ x: Math.round(point.x), y: Math.round(point.y) }),
+      ),
+    );
   };
 
   return (
@@ -73,12 +122,12 @@ export const ScoreMap: FC<ScoreMapProps> = ({
         draggable={false}
       />
 
-      {currentPoint && (
+      {mapPoint && (
         <div
           className={`absolute border-2 border-black shadow-[0_0_10px_#ccff00] -translate-x-1/2 -translate-y-1/2 pointer-events-none`}
           style={{
-            left: currentPoint.x,
-            top: currentPoint.y,
+            left: mapPoint.x,
+            top: mapPoint.y,
             width: dotDiameter,
             height: dotDiameter,
             backgroundColor: alliance === "blue" ? "darkcyan" : "crimson",
diff --git a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
index 62c0637..ff77457 100644
--- a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
@@ -175,7 +175,7 @@ export const ScoutMatch: FC = () => {
           >
             <CurrentTab
               setForm={setScoutingForm}
-              alliance="red"
+              alliance="blue"
               originTime={originTime}
             />
           </div>
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 5eb68b5..1e3d2fe 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -6,8 +6,6 @@ import { ScoreMap } from "../../components/ScoreMap";
 import type { Point } from "@repo/scouting_types";
 import Stopwatch from "../../../components/stopwatch";
 
-type Alliance = "red" | "blue";
-
 interface ShiftTabProps extends TabProps {
   tabIndex: number;
 }
@@ -19,7 +17,7 @@ export const ShiftTab: FC<ShiftTabProps> = ({
   originTime,
 }) => {
   const [mapPosition, setMapPosition] = useState<Point>();
-  const [mapZone, setMapZone] = useState<Alliance>(alliance);
+  const [mapZone, setMapZone] = useState<"red" | "blue">(alliance);
 
   return (
     <div className="flex flex-row h-full w-full">

From 233b76e599a1c32ec3ee41663c0e8e773f1a2452 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Fri, 23 Jan 2026 14:12:00 +0200
Subject: [PATCH 10/23] Yoni - simplified logic

---
 .../src/scouter/components/ScoreMap.tsx         | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
index 66241a2..38b3303 100644
--- a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
+++ b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
@@ -23,16 +23,15 @@ interface ScoreMapProps {
 const ALLIANCE_ZONE_WIDTH_PIXELS = 395;
 const TWO_THIRDS_WIDTH_PIXELS = 1010;
 const HEIGHT_PIXELS = 652;
-const alliancizePosition = (
-  alliance: Alliance,
-  position: Point,
-  bounds: Point,
-): Point => {
+const alliancizePosition = (alliance: Alliance, position: Point): Point => {
   if (alliance === "red") {
     return position;
   }
 
-  return { x: bounds.x - position.x, y: bounds.y - position.y };
+  return {
+    x: TWO_THIRDS_WIDTH_PIXELS - position.x,
+    y: HEIGHT_PIXELS - position.y,
+  };
 };
 
 const otherZone = (point: Point) => {
@@ -94,12 +93,8 @@ export const ScoreMap: FC<ScoreMapProps> = ({
     setPosition(
       pipe(
         dotPoint,
-        (point) =>
-          alliancizePosition(alliance, point, {
-            x: rect.width,
-            y: rect.height,
-          }),
         (point) => normalizePosition(point, { x: rect.width, y: rect.height }),
+        (point) => alliancizePosition(alliance, point),
         (point) => (alliance === mapZone ? point : otherZone(point)),
         (point) => ({ x: Math.round(point.x), y: Math.round(point.y) }),
       ),

From 7bc901a41c9bbf7de27e3e0a8a4eba7d18bf6fc8 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Fri, 23 Jan 2026 15:47:55 +0200
Subject: [PATCH 11/23] Yoni - added side button and changed basic css (!
 changed button css !)

---
 .../frontend/src/components/stopwatch.tsx     |  4 +--
 apps/scouting/frontend/src/index.css          |  3 +-
 .../src/scouter/pages/tabs/ShiftTab.tsx       | 36 ++++++++++++-------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/apps/scouting/frontend/src/components/stopwatch.tsx b/apps/scouting/frontend/src/components/stopwatch.tsx
index fde0e7f..b33f176 100644
--- a/apps/scouting/frontend/src/components/stopwatch.tsx
+++ b/apps/scouting/frontend/src/components/stopwatch.tsx
@@ -100,8 +100,8 @@ const Stopwatch: React.FC<StopwatchProps> = ({
     <div className="flex flex-col items-center gap-6 p-6">
       <div
         className={`
-          select-none cursor-pointer rounded-2xl px-4 py-2
-          text-2xl font-mono font-semibold shadow-lg transition-all duration-150
+          select-none cursor-pointer rounded-2xl px-4 py-3
+          text-3xl font-mono font-semibold shadow-lg transition-all duration-150
           ${disabled ? "bg-slate-800 text-slate-900" : isRunning ? "bg-emerald-500 text-white scale-95" : "bg-slate-800 text-emerald-400 hover:bg-slate-700"}
         `}
         onMouseDown={start}
diff --git a/apps/scouting/frontend/src/index.css b/apps/scouting/frontend/src/index.css
index 95f46d7..97429e2 100644
--- a/apps/scouting/frontend/src/index.css
+++ b/apps/scouting/frontend/src/index.css
@@ -74,7 +74,7 @@ button {
   font-size: 1em;
   font-weight: 500;
   font-family: inherit;
-  background-color: #1a1a1a;
+  /* background-color: #1a1a1a; */
   cursor: pointer;
   transition: border-color 0.25s;
 }
@@ -121,6 +121,7 @@ button:focus-visible {
   .unhighlighted-tab {
     @apply text-emerald-400 hover:bg-green-950 hover:text-emerald-300 
     border border-emerald-500/20 hover:border-emerald-500/50 
+    bg-[#1a1a1a]
     hover:shadow-[0_0_10px_rgba(34,197,94,0.3)];
   }
 }
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 1e3d2fe..ee3679f 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -27,20 +27,30 @@ export const ShiftTab: FC<ShiftTabProps> = ({
         alliance={alliance}
         mapZone={mapZone}
       />
-      <Stopwatch
-        addCycleTimeSeconds={(cycle) => {
-          setForm((prevForm) => {
-            const prevEvents = prevForm.tele.shifts[tabIndex].shootEvents;
-            prevEvents.push({
-              interval: cycle,
-              startPosition: mapPosition ?? { x: 0, y: 0 },
+      <div className="flex flex-col items-center">
+        <Stopwatch
+          addCycleTimeSeconds={(cycle) => {
+            setForm((prevForm) => {
+              const prevEvents = prevForm.tele.shifts[tabIndex].shootEvents;
+              prevEvents.push({
+                interval: cycle,
+                startPosition: mapPosition ?? { x: 0, y: 0 },
+              });
+              return prevForm;
             });
-            return prevForm;
-          });
-        }}
-        originTime={originTime}
-        disabled={mapPosition === undefined}
-      />
+          }}
+          originTime={originTime}
+          disabled={mapPosition === undefined}
+        />
+        <button
+          className={`bg-${mapZone}-500 h-10 text-xs`}
+          onClick={() => {
+            setMapZone((prev) => (prev === "red" ? "blue" : "red"));
+          }}
+        >
+          Side
+        </button>
+      </div>
     </div>
   );
 };

From e2f21cbfedf50be6fd2f10ca9de4eaf35a90df29 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Fri, 23 Jan 2026 16:12:13 +0200
Subject: [PATCH 12/23] Yoni - added hidden color divs

---
 apps/scouting/frontend/src/scouter/components/ScoreMap.tsx | 1 +
 apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
index 38b3303..80b46c1 100644
--- a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
+++ b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
@@ -7,6 +7,7 @@ import {
   useState,
   type TouchEvent,
   type Touch,
+  useEffect,
 } from "react";
 import type { Point } from "@repo/scouting_types";
 import { pipe } from "fp-ts/lib/function";
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index ee3679f..4fdc3f2 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -42,8 +42,10 @@ export const ShiftTab: FC<ShiftTabProps> = ({
           originTime={originTime}
           disabled={mapPosition === undefined}
         />
+        <div className="bg-red-800" />
+        <div className="bg-blue-800" />
         <button
-          className={`bg-${mapZone}-500 h-10 text-xs`}
+          className={`bg-${mapZone}-800 h-10 text-xs`}
           onClick={() => {
             setMapZone((prev) => (prev === "red" ? "blue" : "red"));
           }}

From 8d24af56b65bd5888ec7747e5a40a5173d59f011 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Fri, 23 Jan 2026 16:30:04 +0200
Subject: [PATCH 13/23] Yoni -started working on movement

---
 .../src/scouter/components/MovementForm.tsx    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 apps/scouting/frontend/src/scouter/components/MovementForm.tsx

diff --git a/apps/scouting/frontend/src/scouter/components/MovementForm.tsx b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
new file mode 100644
index 0000000..0cd5664
--- /dev/null
+++ b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
@@ -0,0 +1,18 @@
+// בס"ד
+
+import type { Dispatch, FC } from "react";
+import type { ScoutingForm } from "@repo/scouting_types";
+
+type Movement = ScoutingForm["tele"]["movement"];
+
+interface MovementFormProps {
+  setMovement: Dispatch<Movement>;
+  currentMovement: Movement;
+}
+
+const MovementForm: FC<MovementFormProps> = ({
+  setMovement,
+  currentMovement,
+}) => {
+  return <div></div>;
+};

From 9c7683a7770941e93920559c50549f1494e34234 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 16:39:20 +0200
Subject: [PATCH 14/23] Yoni - added movement

---
 apps/scouting/frontend/src/index.css          |  5 ++-
 .../src/scouter/components/MovementForm.tsx   | 45 ++++++++++++++++++-
 .../frontend/src/scouter/pages/ScoutMatch.tsx |  5 ++-
 .../src/scouter/pages/tabs/ShiftTab.tsx       | 13 +++++-
 4 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/apps/scouting/frontend/src/index.css b/apps/scouting/frontend/src/index.css
index 97429e2..85bac9e 100644
--- a/apps/scouting/frontend/src/index.css
+++ b/apps/scouting/frontend/src/index.css
@@ -1,4 +1,3 @@
-@import "tailwindcss";
 :root {
   font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
   line-height: 1.5;
@@ -70,7 +69,7 @@ h1 {
 button {
   border-radius: 8px;
   border: 1px solid transparent;
-  padding: 0.6em 1.2em;
+  /* padding: 0.6em 1.2em; */
   font-size: 1em;
   font-weight: 500;
   font-family: inherit;
@@ -130,3 +129,5 @@ button:focus-visible {
   --color-greenBlitz: #00ff00;
   --color-blackBlitz: #001100;
 }
+
+@import "tailwindcss";
diff --git a/apps/scouting/frontend/src/scouter/components/MovementForm.tsx b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
index 0cd5664..c69ce41 100644
--- a/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
+++ b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
@@ -10,9 +10,50 @@ interface MovementFormProps {
   currentMovement: Movement;
 }
 
-const MovementForm: FC<MovementFormProps> = ({
+export const MovementForm: FC<MovementFormProps> = ({
   setMovement,
   currentMovement,
 }) => {
-  return <div></div>;
+  return (
+    <div className="flex flex-wrap items-center">
+      <div className="bg-green-700" />
+      <div className="flex flex-row mx-auto">
+        <button
+          className={`bg-${currentMovement.bumpPass ? "green-700" : "slate-800"} m-1 w-16 px-2`}
+          onClick={() => {
+            setMovement({
+              ...currentMovement,
+              bumpPass: !currentMovement.bumpPass,
+            });
+          }}
+        >
+          Over Bump
+        </button>
+        <button
+          className={`bg-${currentMovement.trenchPass ? "green-700" : "slate-800"} m-1 w-16 px-2`}
+          onClick={() => {
+            setMovement({
+              ...currentMovement,
+              trenchPass: !currentMovement.trenchPass,
+            });
+          }}
+        >
+          Over Trench
+        </button>
+      </div>
+      <div className="mx-auto">
+        <button
+          className={`bg-${currentMovement.bumpStuck ? "green-700" : "slate-800"} m-1 w-16 px-2`}
+          onClick={() => {
+            setMovement({
+              ...currentMovement,
+              bumpStuck: !currentMovement.bumpStuck,
+            });
+          }}
+        >
+          Stuck Bump
+        </button>
+      </div>
+    </div>
+  );
 };
diff --git a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
index ff77457..8ecdd75 100644
--- a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
@@ -14,6 +14,7 @@ import { useLocalStorage } from "@repo/local_storage_hook";
 
 export interface TabProps {
   setForm: Dispatch<SetStateAction<ScoutingForm>>;
+  currentForm: ScoutingForm;
   alliance: "red" | "blue";
   originTime: number;
 }
@@ -112,6 +113,7 @@ const SideBar: FC<SideBarProps> = ({ setActiveTab, activeTabIndex }) => {
             className={`
                 shrink-0 flex w-full py-3 text-sm font-bold rounded-xl 
                 transition-all duration-300 text-left relative overflow-hidden group
+                px-2
                 ${
                   activeTabIndex === index
                     ? "highlighted-tab"
@@ -175,8 +177,9 @@ export const ScoutMatch: FC = () => {
           >
             <CurrentTab
               setForm={setScoutingForm}
-              alliance="blue"
+              alliance="red"
               originTime={originTime}
+              currentForm={scoutingForm}
             />
           </div>
         </div>
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 4fdc3f2..153dcfc 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -5,6 +5,7 @@ import type { TabProps } from "../ScoutMatch";
 import { ScoreMap } from "../../components/ScoreMap";
 import type { Point } from "@repo/scouting_types";
 import Stopwatch from "../../../components/stopwatch";
+import { MovementForm } from "../../components/MovementForm";
 
 interface ShiftTabProps extends TabProps {
   tabIndex: number;
@@ -15,6 +16,7 @@ export const ShiftTab: FC<ShiftTabProps> = ({
   tabIndex,
   alliance,
   originTime,
+  currentForm,
 }) => {
   const [mapPosition, setMapPosition] = useState<Point>();
   const [mapZone, setMapZone] = useState<"red" | "blue">(alliance);
@@ -42,10 +44,19 @@ export const ShiftTab: FC<ShiftTabProps> = ({
           originTime={originTime}
           disabled={mapPosition === undefined}
         />
+        <MovementForm
+          setMovement={(value) => {
+            setForm((prevForm) => ({
+              ...prevForm,
+              tele: { ...prevForm.tele, movement: value },
+            }));
+          }}
+          currentMovement={currentForm.tele.movement}
+        />
         <div className="bg-red-800" />
         <div className="bg-blue-800" />
         <button
-          className={`bg-${mapZone}-800 h-10 text-xs`}
+          className={`bg-${mapZone}-800 h-10 w-16 text-xs px-2 mt-5`}
           onClick={() => {
             setMapZone((prev) => (prev === "red" ? "blue" : "red"));
           }}

From 7f4db142336a7ec4cfd15b1b77f61d5c1131fbfb Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 17:29:18 +0200
Subject: [PATCH 15/23] Yoni - finished basic design

---
 .../frontend/src/components/stopwatch.tsx     |  6 +-
 .../src/scouter/components/MovementForm.tsx   | 74 +++++++++----------
 .../src/scouter/pages/tabs/ShiftTab.tsx       |  4 +-
 3 files changed, 40 insertions(+), 44 deletions(-)

diff --git a/apps/scouting/frontend/src/components/stopwatch.tsx b/apps/scouting/frontend/src/components/stopwatch.tsx
index b33f176..df955dc 100644
--- a/apps/scouting/frontend/src/components/stopwatch.tsx
+++ b/apps/scouting/frontend/src/components/stopwatch.tsx
@@ -97,12 +97,12 @@ const Stopwatch: React.FC<StopwatchProps> = ({
   }
 
   return (
-    <div className="flex flex-col items-center gap-6 p-6">
+    <div className="flex flex-col items-center pb-3 px-6">
       <div
         className={`
-          select-none cursor-pointer rounded-2xl px-4 py-3
+          select-none cursor-pointer rounded-2xl px-4 py-4
           text-3xl font-mono font-semibold shadow-lg transition-all duration-150
-          ${disabled ? "bg-slate-800 text-slate-900" : isRunning ? "bg-emerald-500 text-white scale-95" : "bg-slate-800 text-emerald-400 hover:bg-slate-700"}
+          ${disabled ? "bg-slate-800 text-slate-900" : isRunning ? "bg-emerald-500 text-white scale-95" : "bg-slate-800 text-green-400 hover:bg-slate-700"}
         `}
         onMouseDown={start}
         onMouseUp={stop}
diff --git a/apps/scouting/frontend/src/scouter/components/MovementForm.tsx b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
index c69ce41..a259ee3 100644
--- a/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
+++ b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
@@ -15,45 +15,41 @@ export const MovementForm: FC<MovementFormProps> = ({
   currentMovement,
 }) => {
   return (
-    <div className="flex flex-wrap items-center">
-      <div className="bg-green-700" />
-      <div className="flex flex-row mx-auto">
-        <button
-          className={`bg-${currentMovement.bumpPass ? "green-700" : "slate-800"} m-1 w-16 px-2`}
-          onClick={() => {
-            setMovement({
-              ...currentMovement,
-              bumpPass: !currentMovement.bumpPass,
-            });
-          }}
-        >
-          Over Bump
-        </button>
-        <button
-          className={`bg-${currentMovement.trenchPass ? "green-700" : "slate-800"} m-1 w-16 px-2`}
-          onClick={() => {
-            setMovement({
-              ...currentMovement,
-              trenchPass: !currentMovement.trenchPass,
-            });
-          }}
-        >
-          Over Trench
-        </button>
-      </div>
-      <div className="mx-auto">
-        <button
-          className={`bg-${currentMovement.bumpStuck ? "green-700" : "slate-800"} m-1 w-16 px-2`}
-          onClick={() => {
-            setMovement({
-              ...currentMovement,
-              bumpStuck: !currentMovement.bumpStuck,
-            });
-          }}
-        >
-          Stuck Bump
-        </button>
-      </div>
+    <div className="flex flex-col items-center">
+      <div className="bg-green-500" />
+      <button
+        className={`bg-${currentMovement.bumpPass ? "green-500" : "slate-800"} m-1 w-32 h-11 px-2`}
+        onClick={() => {
+          setMovement({
+            ...currentMovement,
+            bumpPass: !currentMovement.bumpPass,
+          });
+        }}
+      >
+        Over Bump
+      </button>
+      <button
+        className={`bg-${currentMovement.bumpStuck ? "green-500" : "slate-800"} m-1 w-32 h-11 px-2`}
+        onClick={() => {
+          setMovement({
+            ...currentMovement,
+            bumpStuck: !currentMovement.bumpStuck,
+          });
+        }}
+      >
+        Stuck Bump
+      </button>
+      <button
+        className={`bg-${currentMovement.trenchPass ? "green-500" : "slate-800"} m-1 w-32 h-11 px-2`}
+        onClick={() => {
+          setMovement({
+            ...currentMovement,
+            trenchPass: !currentMovement.trenchPass,
+          });
+        }}
+      >
+        Over Trench
+      </button>
     </div>
   );
 };
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 153dcfc..40b346e 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -56,12 +56,12 @@ export const ShiftTab: FC<ShiftTabProps> = ({
         <div className="bg-red-800" />
         <div className="bg-blue-800" />
         <button
-          className={`bg-${mapZone}-800 h-10 w-16 text-xs px-2 mt-5`}
+          className={`bg-${mapZone}-800 h-full w-32 text-xs px-2 mt-3`}
           onClick={() => {
             setMapZone((prev) => (prev === "red" ? "blue" : "red"));
           }}
         >
-          Side
+          Field Side
         </button>
       </div>
     </div>

From 79b6b7834f3872f30bb0bb523c446299bbbf3d08 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 18:06:43 +0200
Subject: [PATCH 16/23] Yoni - redesigned movement and changed direction of
 teleop scouting

---
 .../frontend/src/components/stopwatch.tsx     |  2 +-
 .../src/scouter/components/MovementForm.tsx   | 26 ++-----------------
 .../src/scouter/pages/tabs/ShiftTab.tsx       |  2 +-
 packages/scouting_types/rebuilt/Movement.ts   | 13 +++++++---
 packages/scouting_types/rebuilt/Segments.ts   |  4 +--
 5 files changed, 16 insertions(+), 31 deletions(-)

diff --git a/apps/scouting/frontend/src/components/stopwatch.tsx b/apps/scouting/frontend/src/components/stopwatch.tsx
index df955dc..2eb1f56 100644
--- a/apps/scouting/frontend/src/components/stopwatch.tsx
+++ b/apps/scouting/frontend/src/components/stopwatch.tsx
@@ -97,7 +97,7 @@ const Stopwatch: React.FC<StopwatchProps> = ({
   }
 
   return (
-    <div className="flex flex-col items-center pb-3 px-6">
+    <div className="flex flex-col items-center py-6 px-5">
       <div
         className={`
           select-none cursor-pointer rounded-2xl px-4 py-4
diff --git a/apps/scouting/frontend/src/scouter/components/MovementForm.tsx b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
index a259ee3..bb7c6e2 100644
--- a/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
+++ b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
@@ -16,20 +16,9 @@ export const MovementForm: FC<MovementFormProps> = ({
 }) => {
   return (
     <div className="flex flex-col items-center">
-      <div className="bg-green-500" />
+      <div className="bg-yellow-500" />
       <button
-        className={`bg-${currentMovement.bumpPass ? "green-500" : "slate-800"} m-1 w-32 h-11 px-2`}
-        onClick={() => {
-          setMovement({
-            ...currentMovement,
-            bumpPass: !currentMovement.bumpPass,
-          });
-        }}
-      >
-        Over Bump
-      </button>
-      <button
-        className={`bg-${currentMovement.bumpStuck ? "green-500" : "slate-800"} m-1 w-32 h-11 px-2`}
+        className={`bg-${currentMovement.bumpStuck ? "yellow-500" : "slate-800"} m-1 w-32 h-16 px-2`}
         onClick={() => {
           setMovement({
             ...currentMovement,
@@ -39,17 +28,6 @@ export const MovementForm: FC<MovementFormProps> = ({
       >
         Stuck Bump
       </button>
-      <button
-        className={`bg-${currentMovement.trenchPass ? "green-500" : "slate-800"} m-1 w-32 h-11 px-2`}
-        onClick={() => {
-          setMovement({
-            ...currentMovement,
-            trenchPass: !currentMovement.trenchPass,
-          });
-        }}
-      >
-        Over Trench
-      </button>
     </div>
   );
 };
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 40b346e..5aa8683 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -56,7 +56,7 @@ export const ShiftTab: FC<ShiftTabProps> = ({
         <div className="bg-red-800" />
         <div className="bg-blue-800" />
         <button
-          className={`bg-${mapZone}-800 h-full w-32 text-xs px-2 mt-3`}
+          className={`bg-${mapZone}-800 h-10 w-32 text-xs px-2 mt-10`}
           onClick={() => {
             setMapZone((prev) => (prev === "red" ? "blue" : "red"));
           }}
diff --git a/packages/scouting_types/rebuilt/Movement.ts b/packages/scouting_types/rebuilt/Movement.ts
index 931c89d..97dda92 100644
--- a/packages/scouting_types/rebuilt/Movement.ts
+++ b/packages/scouting_types/rebuilt/Movement.ts
@@ -1,11 +1,18 @@
 // בס"ד
 import * as t from "io-ts";
 
-export const movementCodec = t.type({
-  trenchPass: t.boolean,
-  bumpPass: t.boolean,
+export const teleMovementCodec = t.type({
   bumpStuck: t.boolean,
 });
+
+export const movementCodec = t.intersection([
+  t.type({
+    trenchPass: t.boolean,
+    bumpPass: t.boolean,
+  }),
+  teleMovementCodec,
+]);
+
 export const defaultMovement: t.TypeOf<typeof movementCodec> = {
   trenchPass: false,
   bumpPass: false,
diff --git a/packages/scouting_types/rebuilt/Segments.ts b/packages/scouting_types/rebuilt/Segments.ts
index 24c5cf2..ae768a8 100644
--- a/packages/scouting_types/rebuilt/Segments.ts
+++ b/packages/scouting_types/rebuilt/Segments.ts
@@ -1,6 +1,6 @@
 // בס"ד
 import * as t from "io-ts";
-import { defaultMovement, movementCodec } from "./Movement";
+import { defaultMovement, movementCodec, teleMovementCodec } from "./Movement";
 import { climbCodec, defaultClimb, defaultShift, shiftCodec } from "./Shift";
 
 const autoTypes = t.keyof({
@@ -27,7 +27,7 @@ export const teleCodec = t.type({
   transitionShift: shiftCodec,
   shifts: t.tuple([shiftCodec, shiftCodec, shiftCodec, shiftCodec]),
   endgameShift: shiftCodec,
-  movement: movementCodec,
+  movement: teleMovementCodec,
   climb: climbCodec,
 });
 

From 18eec652aea75ad3e79c7046d96df8692aa620cc Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 18:12:02 +0200
Subject: [PATCH 17/23] Yoni - changed color to rose

---
 .../scouting/frontend/src/scouter/components/MovementForm.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/scouting/frontend/src/scouter/components/MovementForm.tsx b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
index bb7c6e2..b65b46d 100644
--- a/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
+++ b/apps/scouting/frontend/src/scouter/components/MovementForm.tsx
@@ -16,9 +16,9 @@ export const MovementForm: FC<MovementFormProps> = ({
 }) => {
   return (
     <div className="flex flex-col items-center">
-      <div className="bg-yellow-500" />
+      <div className="bg-rose-500" />
       <button
-        className={`bg-${currentMovement.bumpStuck ? "yellow-500" : "slate-800"} m-1 w-32 h-16 px-2`}
+        className={`bg-${currentMovement.bumpStuck ? "rose-500" : "slate-800"} m-1 w-32 h-16 px-2`}
         onClick={() => {
           setMovement({
             ...currentMovement,

From b2bce1fac0281c0fbcf6b93a1ee1b460af6e4c57 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 19:05:05 +0200
Subject: [PATCH 18/23] Yoni - fixed bad task

---
 .vscode/tasks.json                        |   9 +-
 apps/scouting/backend/src/routes/index.ts |   4 -
 package-lock.json                         | 627 +++++++++++++++++++++-
 package.json                              |   1 +
 4 files changed, 628 insertions(+), 13 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index a465e8d..2270314 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -13,7 +13,7 @@
     {
       "label": "dev",
       "type": "shell",
-      "command": "./node_modules/.bin/dotenv -e .public.env -e .secret.env -- 'turbo run dev --filter=${input:project}-frontend --filter=${input:project}-backend'",
+      "command": "./node_modules/.bin/dotenv -e .dev.env -e .public.env -e .secret.env -- 'turbo run dev --filter=${input:project}-frontend --filter=${input:project}-backend --env-mode=loose'",
       "problemMatcher": []
     },
     {
@@ -24,10 +24,7 @@
     {
       "label": "deploy",
       "type": "shell",
-      "dependsOn": [
-        "build",
-        "serve"
-      ],
+      "dependsOn": ["build", "serve"],
       "dependsOrder": "sequence"
     },
     {
@@ -48,7 +45,7 @@
       "type": "pickString",
       "options": ["template", "test", "scouting"]
     },
-    
+
     {
       "id": "workspace",
       "description": "Workspaces within projects",
diff --git a/apps/scouting/backend/src/routes/index.ts b/apps/scouting/backend/src/routes/index.ts
index 415eb76..3edf5df 100644
--- a/apps/scouting/backend/src/routes/index.ts
+++ b/apps/scouting/backend/src/routes/index.ts
@@ -4,14 +4,10 @@ import { StatusCodes } from "http-status-codes";
 import { tbaRouter } from "./tba";
 import { gameRouter } from "./game-router";
 
-
-
 export const apiRouter = Router();
 
-
 apiRouter.use("/tba", tbaRouter);
 apiRouter.use("/game", gameRouter);
 apiRouter.get("/health", (req, res) => {
   res.status(StatusCodes.OK).send({ message: "Healthy!" });
 });
-
diff --git a/package-lock.json b/package-lock.json
index 70d9a70..f4849d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
       ],
       "dependencies": {
         "@radix-ui/react-slider": "^1.3.6",
+        "@rollup/rollup-win32-x64-msvc": "^4.56.0",
         "@tailwindcss/vite": "^4.1.17",
         "axios": "^1.13.2",
         "dotenv": "^17.2.3",
@@ -788,6 +789,248 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@radix-ui/number": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz",
+      "integrity": "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==",
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/primitive": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz",
+      "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==",
+      "license": "MIT"
+    },
+    "node_modules/@radix-ui/react-collection": {
+      "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.7.tgz",
+      "integrity": "sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-slot": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-compose-refs": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz",
+      "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-context": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz",
+      "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-direction": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.1.tgz",
+      "integrity": "sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-primitive": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz",
+      "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-slot": "1.2.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slider": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slider/-/react-slider-1.3.6.tgz",
+      "integrity": "sha512-JPYb1GuM1bxfjMRlNLE+BcmBC8onfCi60Blk7OBqi2MLTFdS+8401U4uFjnwkOr49BLmXxLC6JHkvAsx5OJvHw==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/number": "1.1.1",
+        "@radix-ui/primitive": "1.1.3",
+        "@radix-ui/react-collection": "1.1.7",
+        "@radix-ui/react-compose-refs": "1.1.2",
+        "@radix-ui/react-context": "1.1.2",
+        "@radix-ui/react-direction": "1.1.1",
+        "@radix-ui/react-primitive": "2.1.3",
+        "@radix-ui/react-use-controllable-state": "1.2.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1",
+        "@radix-ui/react-use-previous": "1.1.1",
+        "@radix-ui/react-use-size": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-slot": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz",
+      "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-controllable-state": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz",
+      "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-effect-event": "0.0.2",
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-effect-event": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz",
+      "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-layout-effect": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz",
+      "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-previous": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.1.tgz",
+      "integrity": "sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-use-size": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.1.tgz",
+      "integrity": "sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-use-layout-effect": "1.1.1"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@repo/better_child_process": {
       "resolved": "packages/better_child_process",
       "link": true
@@ -805,6 +1048,354 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.55.2.tgz",
+      "integrity": "sha512-21J6xzayjy3O6NdnlO6aXi/urvSRjm6nCI6+nF6ra2YofKruGixN9kfT+dt55HVNwfDmpDHJcaS3JuP/boNnlA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.55.2.tgz",
+      "integrity": "sha512-eXBg7ibkNUZ+sTwbFiDKou0BAckeV6kIigK7y5Ko4mB/5A1KLhuzEKovsmfvsL8mQorkoincMFGnQuIT92SKqA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.55.2.tgz",
+      "integrity": "sha512-UCbaTklREjrc5U47ypLulAgg4njaqfOVLU18VrCrI+6E5MQjuG0lSWaqLlAJwsD7NpFV249XgB0Bi37Zh5Sz4g==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.55.2.tgz",
+      "integrity": "sha512-dP67MA0cCMHFT2g5XyjtpVOtp7y4UyUxN3dhLdt11at5cPKnSm4lY+EhwNvDXIMzAMIo2KU+mc9wxaAQJTn7sQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.55.2.tgz",
+      "integrity": "sha512-WDUPLUwfYV9G1yxNRJdXcvISW15mpvod1Wv3ok+Ws93w1HjIVmCIFxsG2DquO+3usMNCpJQ0wqO+3GhFdl6Fow==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.55.2.tgz",
+      "integrity": "sha512-Ng95wtHVEulRwn7R0tMrlUuiLVL/HXA8Lt/MYVpy88+s5ikpntzZba1qEulTuPnPIZuOPcW9wNEiqvZxZmgmqQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.55.2.tgz",
+      "integrity": "sha512-AEXMESUDWWGqD6LwO/HkqCZgUE1VCJ1OhbvYGsfqX2Y6w5quSXuyoy/Fg3nRqiwro+cJYFxiw5v4kB2ZDLhxrw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.55.2.tgz",
+      "integrity": "sha512-ZV7EljjBDwBBBSv570VWj0hiNTdHt9uGznDtznBB4Caj3ch5rgD4I2K1GQrtbvJ/QiB+663lLgOdcADMNVC29Q==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.55.2.tgz",
+      "integrity": "sha512-uvjwc8NtQVPAJtq4Tt7Q49FOodjfbf6NpqXyW/rjXoV+iZ3EJAHLNAnKT5UJBc6ffQVgmXTUL2ifYiLABlGFqA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.55.2.tgz",
+      "integrity": "sha512-s3KoWVNnye9mm/2WpOZ3JeUiediUVw6AvY/H7jNA6qgKA2V2aM25lMkVarTDfiicn/DLq3O0a81jncXszoyCFA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.55.2.tgz",
+      "integrity": "sha512-gi21faacK+J8aVSyAUptML9VQN26JRxe484IbF+h3hpG+sNVoMXPduhREz2CcYr5my0NE3MjVvQ5bMKX71pfVA==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.55.2.tgz",
+      "integrity": "sha512-qSlWiXnVaS/ceqXNfnoFZh4IiCA0EwvCivivTGbEu1qv2o+WTHpn1zNmCTAoOG5QaVr2/yhCoLScQtc/7RxshA==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.55.2.tgz",
+      "integrity": "sha512-rPyuLFNoF1B0+wolH277E780NUKf+KoEDb3OyoLbAO18BbeKi++YN6gC/zuJoPPDlQRL3fIxHxCxVEWiem2yXw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.55.2.tgz",
+      "integrity": "sha512-g+0ZLMook31iWV4PvqKU0i9E78gaZgYpSrYPed/4Bu+nGTgfOPtfs1h11tSSRPXSjC5EzLTjV/1A7L2Vr8pJoQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.55.2.tgz",
+      "integrity": "sha512-i+sGeRGsjKZcQRh3BRfpLsM3LX3bi4AoEVqmGDyc50L6KfYsN45wVCSz70iQMwPWr3E5opSiLOwsC9WB4/1pqg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.55.2.tgz",
+      "integrity": "sha512-C1vLcKc4MfFV6I0aWsC7B2Y9QcsiEcvKkfxprwkPfLaN8hQf0/fKHwSF2lcYzA9g4imqnhic729VB9Fo70HO3Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.55.2.tgz",
+      "integrity": "sha512-68gHUK/howpQjh7g7hlD9DvTTt4sNLp1Bb+Yzw2Ki0xvscm2cOdCLZNJNhd2jW8lsTPrHAHuF751BygifW4bkQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.55.2.tgz",
+      "integrity": "sha512-1e30XAuaBP1MAizaOBApsgeGZge2/Byd6wV4a8oa6jPdHELbRHBiw7wvo4dp7Ie2PE8TZT4pj9RLGZv9N4qwlw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.55.2.tgz",
+      "integrity": "sha512-4BJucJBGbuGnH6q7kpPqGJGzZnYrpAzRd60HQSt3OpX/6/YVgSsJnNzR8Ot74io50SeVT4CtCWe/RYIAymFPwA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.55.2.tgz",
+      "integrity": "sha512-cT2MmXySMo58ENv8p6/O6wI/h/gLnD3D6JoajwXFZH6X9jz4hARqUhWpGuQhOgLNXscfZYRQMJvZDtWNzMAIDw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.55.2.tgz",
+      "integrity": "sha512-sZnyUgGkuzIXaK3jNMPmUIyJrxu/PjmATQrocpGA1WbCPX8H5tfGgRSuYtqBYAvLuIGp8SPRb1O4d1Fkb5fXaQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.55.2.tgz",
+      "integrity": "sha512-sDpFbenhmWjNcEbBcoTV0PWvW5rPJFvu+P7XoTY0YLGRupgLbFY0XPfwIbJOObzO7QgkRDANh65RjhPmgSaAjQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.55.2.tgz",
+      "integrity": "sha512-GvJ03TqqaweWCigtKQVBErw2bEhu1tyfNQbarwr94wCGnczA9HF8wqEe3U/Lfu6EdeNP0p6R+APeHVwEqVxpUQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.55.2.tgz",
+      "integrity": "sha512-KvXsBvp13oZz9JGe5NYS7FNizLe99Ny+W8ETsuCyjXiKdiGrcz2/J/N8qxZ/RSwivqjQguug07NLHqrIHrqfYw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.56.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.56.0.tgz",
+      "integrity": "sha512-H8AE9Ur/t0+1VXujj90w0HrSOuv0Nq9r1vSZF2t5km20NTfosQsGGUXDaKdQZzwuLts7IyL1fYT4hM95TI9c4g==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@tailwindcss/node": {
       "version": "4.1.18",
       "license": "MIT",
@@ -982,7 +1573,7 @@
     },
     "node_modules/@types/react": {
       "version": "19.2.8",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "csstype": "^3.2.2"
@@ -990,7 +1581,7 @@
     },
     "node_modules/@types/react-dom": {
       "version": "19.2.3",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "peerDependencies": {
         "@types/react": "^19.2.0"
@@ -1812,7 +2403,7 @@
     },
     "node_modules/csstype": {
       "version": "3.2.3",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "node_modules/data-view-buffer": {
@@ -1943,6 +2534,8 @@
     },
     "node_modules/dotenv": {
       "version": "17.2.3",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
+      "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
@@ -2834,6 +3427,20 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.2",
       "license": "MIT",
@@ -4405,6 +5012,20 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/rollup/node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.55.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.55.2.tgz",
+      "integrity": "sha512-xNO+fksQhsAckRtDSPWaMeT1uIM+JrDRXlerpnWNXhn1TdB3YZ6uKBMBTKP0eX9XtYEP978hHk1f8332i2AW8Q==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "peer": true
+    },
     "node_modules/router": {
       "version": "2.2.0",
       "license": "MIT",
diff --git a/package.json b/package.json
index 375acfd..78f7854 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
   ],
   "dependencies": {
     "@radix-ui/react-slider": "^1.3.6",
+    "@rollup/rollup-win32-x64-msvc": "^4.56.0",
     "@tailwindcss/vite": "^4.1.17",
     "axios": "^1.13.2",
     "dotenv": "^17.2.3",

From fe8c8a60f113faf80884a49844195a02342b2e31 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 19:07:35 +0200
Subject: [PATCH 19/23] Yoni - fixed according to CR

---
 .../frontend/src/scouter/components/ScoreMap.tsx         | 9 +++------
 apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx  | 5 ++---
 .../frontend/src/scouter/pages/tabs/ShiftTab.tsx         | 4 ++--
 packages/scouting_types/index.ts                         | 3 +++
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
index 80b46c1..1d20897 100644
--- a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
+++ b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
@@ -7,13 +7,10 @@ import {
   useState,
   type TouchEvent,
   type Touch,
-  useEffect,
 } from "react";
-import type { Point } from "@repo/scouting_types";
+import type { Alliance, Point } from "@repo/scouting_types";
 import { pipe } from "fp-ts/lib/function";
 
-type Alliance = "red" | "blue";
-
 interface ScoreMapProps {
   currentPoint?: Point;
   setPosition: Dispatch<SetStateAction<Point | undefined>>;
@@ -35,7 +32,7 @@ const alliancizePosition = (alliance: Alliance, position: Point): Point => {
   };
 };
 
-const otherZone = (point: Point) => {
+const switchZone = (point: Point) => {
   return {
     ...point,
     x: point.x + ALLIANCE_ZONE_WIDTH_PIXELS,
@@ -96,7 +93,7 @@ export const ScoreMap: FC<ScoreMapProps> = ({
         dotPoint,
         (point) => normalizePosition(point, { x: rect.width, y: rect.height }),
         (point) => alliancizePosition(alliance, point),
-        (point) => (alliance === mapZone ? point : otherZone(point)),
+        (point) => (alliance === mapZone ? point : switchZone(point)),
         (point) => ({ x: Math.round(point.x), y: Math.round(point.y) }),
       ),
     );
diff --git a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
index 8ecdd75..22e103e 100644
--- a/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/ScoutMatch.tsx
@@ -8,14 +8,14 @@ import {
   type SetStateAction,
   useState,
 } from "react";
-import { defaultScoutForm, type ScoutingForm } from "@repo/scouting_types";
+import { defaultScoutForm, type Alliance, type ScoutingForm } from "@repo/scouting_types";
 import { ShiftTab } from "./tabs/ShiftTab";
 import { useLocalStorage } from "@repo/local_storage_hook";
 
 export interface TabProps {
   setForm: Dispatch<SetStateAction<ScoutingForm>>;
   currentForm: ScoutingForm;
-  alliance: "red" | "blue";
+  alliance: Alliance;
   originTime: number;
 }
 
@@ -150,7 +150,6 @@ export const ScoutMatch: FC = () => {
   const [activeTabIndex, setActiveTab] = useState(STARTING_TAB_INDEX);
 
   const originTime = useMemo(() => Date.now(), []);
-  console.log(originTime);
 
   const CurrentTab = useMemo(
     () => TABS[activeTabIndex].Component,
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 5aa8683..7a8e6df 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -3,7 +3,7 @@
 import { useState, type FC } from "react";
 import type { TabProps } from "../ScoutMatch";
 import { ScoreMap } from "../../components/ScoreMap";
-import type { Point } from "@repo/scouting_types";
+import type { Alliance, Point } from "@repo/scouting_types";
 import Stopwatch from "../../../components/stopwatch";
 import { MovementForm } from "../../components/MovementForm";
 
@@ -19,7 +19,7 @@ export const ShiftTab: FC<ShiftTabProps> = ({
   currentForm,
 }) => {
   const [mapPosition, setMapPosition] = useState<Point>();
-  const [mapZone, setMapZone] = useState<"red" | "blue">(alliance);
+  const [mapZone, setMapZone] = useState<Alliance>(alliance);
 
   return (
     <div className="flex flex-row h-full w-full">
diff --git a/packages/scouting_types/index.ts b/packages/scouting_types/index.ts
index 1d0ead4..d39d5b4 100644
--- a/packages/scouting_types/index.ts
+++ b/packages/scouting_types/index.ts
@@ -1,3 +1,6 @@
 // בס"ד
 export * from "./rebuilt";
 export * from "./tba";
+
+export type Alliance = "red" | "blue";
+

From 294c303f0eaffa032e380254f00c36156545c0d1 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 19:15:48 +0200
Subject: [PATCH 20/23] Yoni - removed loose mode

---
 .vscode/tasks.json |  2 +-
 package-lock.json  | 13 -------------
 package.json       |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 2270314..2985d4a 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -13,7 +13,7 @@
     {
       "label": "dev",
       "type": "shell",
-      "command": "./node_modules/.bin/dotenv -e .dev.env -e .public.env -e .secret.env -- 'turbo run dev --filter=${input:project}-frontend --filter=${input:project}-backend --env-mode=loose'",
+      "command": "./node_modules/.bin/dotenv -e .dev.env -e .public.env -e .secret.env -- 'turbo run dev --filter=${input:project}-frontend --filter=${input:project}-backend'",
       "problemMatcher": []
     },
     {
diff --git a/package-lock.json b/package-lock.json
index f4849d0..c948d7c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,6 @@
       ],
       "dependencies": {
         "@radix-ui/react-slider": "^1.3.6",
-        "@rollup/rollup-win32-x64-msvc": "^4.56.0",
         "@tailwindcss/vite": "^4.1.17",
         "axios": "^1.13.2",
         "dotenv": "^17.2.3",
@@ -1384,18 +1383,6 @@
       ],
       "peer": true
     },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.56.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.56.0.tgz",
-      "integrity": "sha512-H8AE9Ur/t0+1VXujj90w0HrSOuv0Nq9r1vSZF2t5km20NTfosQsGGUXDaKdQZzwuLts7IyL1fYT4hM95TI9c4g==",
-      "cpu": [
-        "x64"
-      ],
-      "license": "MIT",
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@tailwindcss/node": {
       "version": "4.1.18",
       "license": "MIT",
diff --git a/package.json b/package.json
index 78f7854..375acfd 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,6 @@
   ],
   "dependencies": {
     "@radix-ui/react-slider": "^1.3.6",
-    "@rollup/rollup-win32-x64-msvc": "^4.56.0",
     "@tailwindcss/vite": "^4.1.17",
     "axios": "^1.13.2",
     "dotenv": "^17.2.3",

From 976091818d34950df1693aa96588cbc52228fab6 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 19:33:42 +0200
Subject: [PATCH 21/23] Yoni - target touche

---
 apps/scouting/frontend/src/scouter/components/ScoreMap.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
index 1d20897..b852f16 100644
--- a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
+++ b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
@@ -82,7 +82,7 @@ export const ScoreMap: FC<ScoreMapProps> = ({
       return;
     }
     const rect = event.currentTarget.getBoundingClientRect();
-    const touch = event.touches[firstTouchIndex];
+    const touch = event.targetTouches[firstTouchIndex];
 
     const dotPoint = getRobotPosition(touch, rect);
 

From d4c435f14d66018e877ed33818e78c5b921ea168 Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 19:34:17 +0200
Subject: [PATCH 22/23] Yoni - improved pipe

---
 .../frontend/src/scouter/components/ScoreMap.tsx  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
index b852f16..7e536c5 100644
--- a/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
+++ b/apps/scouting/frontend/src/scouter/components/ScoreMap.tsx
@@ -88,14 +88,13 @@ export const ScoreMap: FC<ScoreMapProps> = ({
 
     setMapPoint(dotPoint);
 
-    setPosition(
-      pipe(
-        dotPoint,
-        (point) => normalizePosition(point, { x: rect.width, y: rect.height }),
-        (point) => alliancizePosition(alliance, point),
-        (point) => (alliance === mapZone ? point : switchZone(point)),
-        (point) => ({ x: Math.round(point.x), y: Math.round(point.y) }),
-      ),
+    pipe(
+      dotPoint,
+      (point) => normalizePosition(point, { x: rect.width, y: rect.height }),
+      (point) => alliancizePosition(alliance, point),
+      (point) => (alliance === mapZone ? point : switchZone(point)),
+      (point) => ({ x: Math.round(point.x), y: Math.round(point.y) }),
+      setPosition,
     );
   };
 

From 140b0eafc0577525933c7abf7429f449d3115e6a Mon Sep 17 00:00:00 2001
From: YoniKiriaty <yonikiriaty@gmail.com>
Date: Sun, 25 Jan 2026 20:23:03 +0200
Subject: [PATCH 23/23] Yoni - default point

---
 apps/scouting/frontend/src/index.css                       | 2 --
 apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/scouting/frontend/src/index.css b/apps/scouting/frontend/src/index.css
index 85bac9e..d9eca5a 100644
--- a/apps/scouting/frontend/src/index.css
+++ b/apps/scouting/frontend/src/index.css
@@ -69,11 +69,9 @@ h1 {
 button {
   border-radius: 8px;
   border: 1px solid transparent;
-  /* padding: 0.6em 1.2em; */
   font-size: 1em;
   font-weight: 500;
   font-family: inherit;
-  /* background-color: #1a1a1a; */
   cursor: pointer;
   transition: border-color 0.25s;
 }
diff --git a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
index 7a8e6df..345be0f 100644
--- a/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
+++ b/apps/scouting/frontend/src/scouter/pages/tabs/ShiftTab.tsx
@@ -11,6 +11,8 @@ interface ShiftTabProps extends TabProps {
   tabIndex: number;
 }
 
+const defaultPoint: Point = { x: 0, y: 0 };
+
 export const ShiftTab: FC<ShiftTabProps> = ({
   setForm,
   tabIndex,
@@ -36,7 +38,7 @@ export const ShiftTab: FC<ShiftTabProps> = ({
               const prevEvents = prevForm.tele.shifts[tabIndex].shootEvents;
               prevEvents.push({
                 interval: cycle,
-                startPosition: mapPosition ?? { x: 0, y: 0 },
+                startPosition: mapPosition ?? { ...defaultPoint },
               });
               return prevForm;
             });