4201VitruvianBots · Mevanessa · May 15, 2024 · Apr 12, 2024 · May 6, 2024 · May 6, 2024
diff --git a/.env b/.env
@@ -1,2 +1,2 @@
 IMAGE_NAME=scouting-database
-CONTAINER_NAME=LAR-quals
+CONTAINER_NAME=offseason_test
diff --git a/README.md b/README.md
@@ -8,9 +8,9 @@ These instructions will get you a copy of the project up and running on your loc
 
 ### Prerequisites
 
-- Node.js
-- npm
-- Docker (server only)
+-   Node.js
+-   npm
+-   Docker (server only)
 
 ### Installation
 
@@ -58,4 +58,4 @@ If you don't have real scouting data to use to test the picklist interface/other
 
 ```
 npm run --workspace server gen-fake-json
-```
+```
diff --git a/client/index.html b/client/index.html
@@ -5,11 +5,14 @@
         <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>Vitruvian Scouting</title>
-        <meta name="description" content="Vitruvian Scouting system">
-        <link rel="icon" href="/favicon.ico">
-        <link rel="apple-touch-icon" href="/apple-touch-icon.png" sizes="180x180">
-        <link rel="mask-icon" href="/mask-icon.svg" color="#48CA5D">
-        <meta name="theme-color" content="#48ca5d">
+        <meta name="description" content="Vitruvian Scouting system" />
+        <link rel="icon" href="/favicon.ico" />
+        <link
+            rel="apple-touch-icon"
+            href="/apple-touch-icon.png"
+            sizes="180x180" />
+        <link rel="mask-icon" href="/mask-icon.svg" color="#48CA5D" />
+        <meta name="theme-color" content="#48ca5d" />
     </head>
     <body>
         <div id="root"></div>

diff --git a/client/src/BatteryManager.d.ts b/client/src/BatteryManager.d.ts
@@ -8,7 +8,16 @@ export interface BatteryManager extends EventTarget {
     /** A number representing the system's battery charge level scaled to a value between 0.0 and 1.0. */
     readonly level: number;
 
-    addEventListener(type: string | 'chargingchange' | 'chargingtimechange' | 'dischargingtimechange' | 'levelchange', callback: EventListenerOrEventListenerObject | null, options?: AddEventListenerOptions | boolean): void;
+    addEventListener(
+        type:
+            | string
+            | 'chargingchange'
+            | 'chargingtimechange'
+            | 'dischargingtimechange'
+            | 'levelchange',
+        callback: EventListenerOrEventListenerObject | null,
+        options?: AddEventListenerOptions | boolean
+    ): void;
 }
 
 declare global {

diff --git a/client/src/RootMenu.tsx b/client/src/RootMenu.tsx
@@ -8,47 +8,55 @@ const images = [
     'bg-field-red-endgame',
     'bg-field-blue-endgame',
     'bg-field-blue-super',
-    'bg-field-red-super'
+    'bg-field-red-super',
 ];
 
 function RootMenu() {
     return (
-        <main className='min-h-screen bg-[#171c26] text-white text-center 
-        grid grid-cols-2 grid-rows-[auto] auto-rows-fr gap-10 pb-10 px-10 select-none'>
-            <h1 className='bg-[#2f3646] col-span-2 text-4xl text-[#48c55c] font-bold p-5'>
+        <main
+            className='grid min-h-screen select-none auto-rows-fr 
+        grid-cols-2 grid-rows-[auto] gap-10 bg-[#171c26] px-10 pb-10 text-center text-white'>
+            <h1 className='col-span-2 bg-[#2f3646] p-5 text-4xl font-bold text-[#48c55c]'>
                 Vitruvian Scouting
             </h1>
-            <div className='fixed bottom-2 left-1/2 -translate-x-1/2'> Version {import.meta.env.VITE_SCOUT_VERSION} </div>
-                <LinkButton link='/match'
-                className='text-5xl bg-[#2f3646] rounded-3xl'>
-                    Match
-                </LinkButton>
-                <LinkButton link='/super'
-                className='text-5xl bg-[#2f3646] rounded-3xl'>
-                    Super
-                </LinkButton>
-                <LinkButton link='/pit'
-                className='text-5xl bg-[#2f3646] rounded-3xl'>
-                    Pit
-                </LinkButton>
-                <LinkButton link='/recon'
-                className='text-5xl bg-[#2f3646] rounded-3xl'>
-                    Recon
-                </LinkButton>
-                <LinkButton link='/picklist'
-                className='text-5xl bg-[#2f3646] rounded-3xl'>
-                    Picklist
-                </LinkButton>
-                <LinkButton link='/games'
-                className='text-5xl bg-[#2f3646] rounded-3xl'>
-                    Games
-                </LinkButton>
-                <LinkButton link='/score_calculator'
-                className='text-5xl bg-[#2f3646] rounded-3xl col-span-2'>
-                    Scoring Calculator
-                </LinkButton>
+            <div className='fixed bottom-2 left-1/2 -translate-x-1/2'>
+                {' '}
+                Version {import.meta.env.VITE_SCOUT_VERSION}{' '}
+            </div>
+            <LinkButton
+                link='/match'
+                className='rounded-3xl bg-[#2f3646] text-5xl'>
+                Match
+            </LinkButton>
+            <LinkButton
+                link='/super'
+                className='rounded-3xl bg-[#2f3646] text-5xl'>
+                Super
+            </LinkButton>
+            <LinkButton
+                link='/pit'
+                className='rounded-3xl bg-[#2f3646] text-5xl'>
+                Pit
+            </LinkButton>
+            <LinkButton
+                link='/recon'
+                className='rounded-3xl bg-[#2f3646] text-5xl'>
+                Recon
+            </LinkButton>
+            <LinkButton
+                link='/picklist'
+                className='rounded-3xl bg-[#2f3646] text-5xl'>
+                Picklist
+            </LinkButton>
+            <LinkButton
+                link='/score_calculator'
+                className='rounded-3xl bg-[#2f3646] text-5xl'>
+                Scoring Calculator
+            </LinkButton>
             <div className='absolute opacity-0'>
-                {images.map(e => <div className={e} />)}
+                {images.map(e => (
+                    <div className={e} />
+                ))}
                 <MaterialSymbol icon='search' />
             </div>
         </main>

diff --git a/client/src/apps/admin/AdminApp.tsx b/client/src/apps/admin/AdminApp.tsx
@@ -1,20 +1,17 @@
-import { MaterialSymbol } from "react-material-symbols";
-import LinkButton from "../../components/LinkButton";
+import { MaterialSymbol } from 'react-material-symbols';
+import LinkButton from '../../components/LinkButton';
 import { useStatusRecieve } from '../../lib/useStatus';
-import { ScouterTable } from "./components/ScouterTable";
-import { MatchTable } from "./components/MatchTable";
+import { ScouterTable } from './components/ScouterTable';
+import { MatchTable } from './components/MatchTable';
 //import { useFetchJson } from "../../lib/useFetch";
 
 function AdminApp() {
     const status = useStatusRecieve();
 
-    console.log(status.matches)
+    // const [schedule] = useFetchJson<MatchSchedule>('/matchSchedule.json');
 
-   // const [schedule] = useFetchJson<MatchSchedule>('/matchSchedule.json');
-
-
     return (
-        <main className='flex select-none flex-col items-center text-center w-screen h-screen'>
+        <main className='flex h-screen w-screen select-none flex-col items-center text-center'>
             <h1 className='col-span-4 my-8 text-3xl'>Admin Interface</h1>
 
             <div className='fixed left-4 top-4 z-20 flex gap-2 rounded-md p-2'>
@@ -30,14 +27,14 @@ function AdminApp() {
                 </LinkButton>
             </div>
 
-            <div className="grid grid-cols-2 gap-4 items-center justify-center">
+            <div className='grid grid-cols-2 items-center justify-center gap-4'>
                 <div>
                     <ScouterTable scouters={status.scouters} />
-                    <p className="my-6">Connected Tablets</p>
+                    <p className='my-6'>Connected Tablets</p>
                 </div>
                 <div>
                     <p>Match Display</p>
-                    <div className="table-container">
+                    <div className='table-container'>
                         <MatchTable matches={status.matches}></MatchTable>
                     </div>
                 </div>

diff --git a/client/src/apps/admin/components/MatchRow.tsx b/client/src/apps/admin/components/MatchRow.tsx
@@ -1,23 +1,27 @@
-import { RobotPosition, SuperPosition } from "requests";
-import PositionCell from "./PositionCell";
+import { RobotPosition, SuperPosition } from 'requests';
+import PositionCell from './PositionCell';
 
-
-function MatchRow ({matchNumber, scouters} : {matchNumber:string, scouters:Record<RobotPosition, {schedule: number, real:number[]}> & Record<SuperPosition, boolean>}){
-    return(
+function MatchRow({
+    matchNumber,
+    scouters,
+}: {
+    matchNumber: string;
+    scouters: Record<RobotPosition, { schedule: number; real: number[] }> &
+        Record<SuperPosition, boolean>;
+}) {
+    return (
         <tr>
-            <th>
-                {matchNumber}
-            </th>
-            <PositionCell scouter={scouters.red_1}/>
-            <PositionCell scouter={scouters.red_2}/>
-            <PositionCell scouter={scouters.red_3}/>
-            <PositionCell scouter={scouters.red_ss}/>
-            <PositionCell scouter={scouters.blue_1}/>
-            <PositionCell scouter={scouters.blue_2}/>
-            <PositionCell scouter={scouters.blue_3}/>
-            <PositionCell scouter={scouters.blue_ss}/>
+            <th>{matchNumber}</th>
+            <PositionCell scouter={scouters.red_1} />
+            <PositionCell scouter={scouters.red_2} />
+            <PositionCell scouter={scouters.red_3} />
+            <PositionCell scouter={scouters.red_ss} />
+            <PositionCell scouter={scouters.blue_1} />
+            <PositionCell scouter={scouters.blue_2} />
+            <PositionCell scouter={scouters.blue_3} />
+            <PositionCell scouter={scouters.blue_ss} />
         </tr>
-    )
+    );
 }
 
-export default MatchRow
+export default MatchRow;
diff --git a/client/src/apps/admin/components/MatchTable.tsx b/client/src/apps/admin/components/MatchTable.tsx
@@ -1,27 +1,29 @@
-import { StatusRecieve } from "requests"
-import MatchRow from "./MatchRow"
+import { StatusRecieve } from 'requests';
+import MatchRow from './MatchRow';
 
-
-function MatchTable({matches}:{matches : StatusRecieve['matches']}) {
-
- return(
-<table className="match-status overflow-auto h-72">
-                    <thead><tr>
-                        <th>Match</th>
-                        <th className="status-red col-span-1">Red 1</th>
-                        <th className="status-red col-span-1">Red 2</th>
-                        <th className="status-red col-span-1">Red 3</th>
-                        <th className="status-red col-span-1">Red SS</th>
-                        <th className="status-blue col-span-1">Blue 1</th>
-                        <th className="status-blue col-span-1">Blue 2</th>
-                        <th className="status-blue col-span-1">Blue 3</th>
-                        <th className="status-blue col-span-1">Blue SS</th>
-                    </tr></thead>
-                    <tbody>
-                        {Object.entries(matches).map(([matchNumber, scouters]) => <MatchRow matchNumber={matchNumber} scouters={scouters}/>)}
-                    </tbody>
-                </table>
- )   
+function MatchTable({ matches }: { matches: StatusRecieve['matches'] }) {
+    return (
+        <table className='match-status h-72 overflow-auto'>
+            <thead>
+                <tr>
+                    <th>Match</th>
+                    <th className='status-red col-span-1'>Red 1</th>
+                    <th className='status-red col-span-1'>Red 2</th>
+                    <th className='status-red col-span-1'>Red 3</th>
+                    <th className='status-red col-span-1'>Red SS</th>
+                    <th className='status-blue col-span-1'>Blue 1</th>
+                    <th className='status-blue col-span-1'>Blue 2</th>
+                    <th className='status-blue col-span-1'>Blue 3</th>
+                    <th className='status-blue col-span-1'>Blue SS</th>
+                </tr>
+            </thead>
+            <tbody>
+                {Object.entries(matches).map(([matchNumber, scouters]) => (
+                    <MatchRow matchNumber={matchNumber} scouters={scouters} />
+                ))}
+            </tbody>
+        </table>
+    );
 }
 
-export {MatchTable}
+export { MatchTable };
diff --git a/client/src/apps/admin/components/PositionCell.tsx b/client/src/apps/admin/components/PositionCell.tsx
@@ -1,15 +1,24 @@
-import { MaterialSymbol } from "react-material-symbols"
+import { MaterialSymbol } from 'react-material-symbols';
 
-function PositionCell ({scouter}:{scouter:{schedule: number, real:number[]} | boolean }){
-    const isBoolean =  typeof scouter==='boolean'
+function PositionCell({
+    scouter,
+}: {
+    scouter: { schedule: number; real: number[] } | boolean;
+}) {
+    const isBoolean = typeof scouter === 'boolean';
     return (
-        <td className={`border-2 border-slate-700 text-center w-auto ${(isBoolean? scouter: scouter.real.length > 0)? 'bg-amber-400': ''}`}>{
-                isBoolean
-                ?scouter&&<MaterialSymbol icon='check'/>
-                :scouter.real.length===0?scouter.schedule
-                :scouter.real.length===1?scouter.real[0]
-                :<MaterialSymbol icon="warning"/>}
+        <td
+            className={`w-auto border-2 border-slate-700 text-center ${(isBoolean ? scouter : scouter.real.length > 0) ? 'bg-amber-400' : ''}`}>
+            {isBoolean ? (
+                scouter && <MaterialSymbol icon='check' />
+            ) : scouter.real.length === 0 ? (
+                scouter.schedule
+            ) : scouter.real.length === 1 ? (
+                scouter.real[0]
+            ) : (
+                <MaterialSymbol icon='warning' />
+            )}
         </td>
-    )
+    );
 }
-export default PositionCell
+export default PositionCell;