From b604c01e22fd917b702be23966aebb2987272791 Mon Sep 17 00:00:00 2001
From: Vinzenz Schroeter <vinzenz.f.s@gmail.com>
Date: Sat, 13 Apr 2024 23:07:08 +0200
Subject: [PATCH] wip scores, components

---
 tank-frontend/src/ClientScreen.css         |  4 +-
 tank-frontend/src/ClientScreen.tsx         |  9 +--
 tank-frontend/src/Controls.css             |  4 ++
 tank-frontend/src/Controls.tsx             | 13 ++--
 tank-frontend/src/JoinForm.css             |  9 +--
 tank-frontend/src/JoinForm.tsx             | 45 +++++++------
 tank-frontend/src/PlayerInfo.css           | 21 ++----
 tank-frontend/src/PlayerInfo.tsx           | 77 ++++++++++------------
 tank-frontend/src/Scoreboard.tsx           | 26 ++++++++
 tank-frontend/src/components/Button.css    |  7 ++
 tank-frontend/src/components/Button.tsx    | 15 +++++
 tank-frontend/src/components/Column.css    |  7 ++
 tank-frontend/src/components/Column.tsx    | 13 ++++
 tank-frontend/src/components/DataTable.css |  3 +
 tank-frontend/src/components/DataTable.tsx | 52 +++++++++++++++
 tank-frontend/src/components/Row.css       |  7 ++
 tank-frontend/src/components/Row.tsx       |  9 +++
 tank-frontend/src/index.css                | 14 +++-
 tank-frontend/src/index.tsx                | 26 +++++---
 tank-frontend/src/serverCalls.tsx          |  4 +-
 20 files changed, 250 insertions(+), 115 deletions(-)
 create mode 100644 tank-frontend/src/Scoreboard.tsx
 create mode 100644 tank-frontend/src/components/Button.css
 create mode 100644 tank-frontend/src/components/Button.tsx
 create mode 100644 tank-frontend/src/components/Column.css
 create mode 100644 tank-frontend/src/components/Column.tsx
 create mode 100644 tank-frontend/src/components/DataTable.css
 create mode 100644 tank-frontend/src/components/DataTable.tsx
 create mode 100644 tank-frontend/src/components/Row.css
 create mode 100644 tank-frontend/src/components/Row.tsx

diff --git a/tank-frontend/src/ClientScreen.css b/tank-frontend/src/ClientScreen.css
index 7b5a7bc..3304737 100644
--- a/tank-frontend/src/ClientScreen.css
+++ b/tank-frontend/src/ClientScreen.css
@@ -3,5 +3,7 @@
     aspect-ratio: calc(352 / 160);
     flex-grow: 1;
     object-fit: contain;
-    max-width: 100%;
+    max-width: 100vw;
+    max-height: 100vh;
+    flex-shrink: 0;
 }
diff --git a/tank-frontend/src/ClientScreen.tsx b/tank-frontend/src/ClientScreen.tsx
index a7eb341..589a1e3 100644
--- a/tank-frontend/src/ClientScreen.tsx
+++ b/tank-frontend/src/ClientScreen.tsx
@@ -1,7 +1,6 @@
 import useWebSocket from 'react-use-websocket';
 import {useEffect, useRef} from 'react';
 import './ClientScreen.css';
-import {statusTextForReadyState} from './statusTextForReadyState.tsx';
 
 const pixelsPerRow = 352;
 const pixelsPerCol = 160;
@@ -41,11 +40,10 @@ function drawPixelsToCanvas(pixels: Uint8Array, canvas: HTMLCanvasElement) {
     drawContext.putImageData(imageData, 0, 0);
 }
 
-export default function ClientScreen({logout}: {logout: () => void}) {
+export default function ClientScreen({logout}: { logout: () => void }) {
     const canvasRef = useRef<HTMLCanvasElement>(null);
 
     const {
-        readyState,
         lastMessage,
         sendMessage,
         getWebSocket
@@ -67,8 +65,5 @@ export default function ClientScreen({logout}: {logout: () => void}) {
         sendMessage('');
     }, [lastMessage, canvasRef.current]);
 
-    return <>
-        <span>The screen is currently {statusTextForReadyState[readyState]}</span>
-        <canvas ref={canvasRef} id="screen" width={pixelsPerRow} height={pixelsPerCol}/>
-    </>;
+    return <canvas ref={canvasRef} id="screen" width={pixelsPerRow} height={pixelsPerCol}/>;
 }
diff --git a/tank-frontend/src/Controls.css b/tank-frontend/src/Controls.css
index 4d0832b..88b5b6e 100644
--- a/tank-frontend/src/Controls.css
+++ b/tank-frontend/src/Controls.css
@@ -1,3 +1,7 @@
+.Controls * {
+    box-sizing: content-box;
+}
+
 kbd {
     background: hsl(0, 0%, 96%);
     padding: 10px;
diff --git a/tank-frontend/src/Controls.tsx b/tank-frontend/src/Controls.tsx
index 029dbc6..8f43450 100644
--- a/tank-frontend/src/Controls.tsx
+++ b/tank-frontend/src/Controls.tsx
@@ -1,7 +1,7 @@
 import './Controls.css';
 import useWebSocket from 'react-use-websocket';
 import {useEffect} from 'react';
-import {statusTextForReadyState} from './statusTextForReadyState.tsx';
+import Column from "./components/Column.tsx";
 
 export default function Controls({playerId, logout}: {
     playerId: string,
@@ -12,7 +12,6 @@ export default function Controls({playerId, logout}: {
     const {
         sendMessage,
         getWebSocket,
-        readyState
     } = useWebSocket(url.toString(), {
         onError: logout
     });
@@ -44,6 +43,7 @@ export default function Controls({playerId, logout}: {
         if (!value)
             return;
 
+        event.preventDefault();
         const message = new Uint8Array([typeCode, value]);
         sendMessage(message);
     };
@@ -60,8 +60,7 @@ export default function Controls({playerId, logout}: {
     }, [sendMessage]);
 
     return <>
-        <span>The controller is currently {statusTextForReadyState[readyState]}</span>
-        <div className="controls">
+        <Column className="Controls">
             <div className="control">
                 <div className="row">
                     <kbd className="up">▲</kbd>
@@ -71,12 +70,12 @@ export default function Controls({playerId, logout}: {
                     <kbd>▼</kbd>
                     <kbd>▶</kbd>
                 </div>
-                <h3>Move</h3>
             </div>
+            <h3>Move</h3>
             <div className="control">
                 <kbd className="space">Space</kbd>
-                <h3>Fire</h3>
             </div>
-        </div>
+            <h3>Fire</h3>
+        </Column>
     </>;
 }
diff --git a/tank-frontend/src/JoinForm.css b/tank-frontend/src/JoinForm.css
index d7bef0d..2285355 100644
--- a/tank-frontend/src/JoinForm.css
+++ b/tank-frontend/src/JoinForm.css
@@ -1,11 +1,4 @@
-.TankWelcome {
-    display: flex;
-    flex-direction: column;
-}
-
 .JoinForm {
-    display: flex;
-    flex-direction: column;
     border: 2px solid rgb(76, 76, 76);
     border-radius: 4px;
 }
@@ -13,4 +6,4 @@
 .JoinElems {
     padding: 8px 8px;
     margin: 8px 8px;
-}
\ No newline at end of file
+}
diff --git a/tank-frontend/src/JoinForm.tsx b/tank-frontend/src/JoinForm.tsx
index fecca9d..2d0180e 100644
--- a/tank-frontend/src/JoinForm.tsx
+++ b/tank-frontend/src/JoinForm.tsx
@@ -2,6 +2,7 @@ import {useEffect, useState} from 'react';
 import './JoinForm.css';
 import {NameId, PlayerResponse, postPlayer} from './serverCalls';
 import {Guid} from './Guid.ts';
+import Column from "./components/Column.tsx";
 
 export default function JoinForm({setNameId, clientId}: {
     setNameId: (mutator: (oldState: NameId) => NameId) => void,
@@ -30,27 +31,25 @@ export default function JoinForm({setNameId, clientId}: {
     }, [clicked, setData, data, clientId, setClicked, setNameId]);
 
     const disableButtons = clicked || name.trim() === '';
-    return <div className="TankWelcome">
-        <h1 className="JoinElems" style={{'color': 'white'}}>
-            Tanks
-        </h1>
-        <p className="JoinElems" style={{'color': 'white'}}> Welcome and have fun!</p>
-        <div className="JoinForm">
-            <p className="JoinElems" style={{'color': 'white'}}>
-                Enter your name to join the game!
-            </p>
-            <input className="JoinElems"
-                   type="text"
-                   value={name}
-                   placeholder="player name"
-                   onChange={e => setName(e.target.value)}
-            />
-            <button className="JoinElems"
-                    onClick={() => setClicked(true)}
-                    disabled={disableButtons}
-            >
-                join
-            </button>
-        </div>
-    </div>;
+    return <Column className='JoinForm'>
+        <p className="JoinElems"> Enter your name to join the game! </p>
+        <input
+            className="JoinElems"
+            type="text"
+            value={name}
+            placeholder="player name"
+            onChange={e => setName(e.target.value)}
+            onKeyUp={event => {
+                if (event.key === 'Enter')
+                    setClicked(true);
+            }}
+        />
+        <button
+            className="JoinElems"
+            onClick={() => setClicked(true)}
+            disabled={disableButtons}
+        >
+            join
+        </button>
+    </Column>;
 }
diff --git a/tank-frontend/src/PlayerInfo.css b/tank-frontend/src/PlayerInfo.css
index c4b38f2..720171a 100644
--- a/tank-frontend/src/PlayerInfo.css
+++ b/tank-frontend/src/PlayerInfo.css
@@ -1,21 +1,14 @@
-.Player {
-    display: flex;
-    flex-direction: column;
+.PlayerInfo {
     border: 2px solid rgb(76, 76, 76);
     border-radius: 4px;
 }
 
-.ScoreForm {
-    display: flex;
-    flex-direction: column;
-}
-
-.ElemGroup {
-    display: flex;
-    flex-direction: row;
-}
-
 .Elems {
     padding: 8px 8px;
     margin: 8px 8px;
-}
\ No newline at end of file
+}
+
+.PlayerInfo-Reset {
+    height: 4em;
+    width: 4em;
+}
diff --git a/tank-frontend/src/PlayerInfo.tsx b/tank-frontend/src/PlayerInfo.tsx
index 2cbc6b6..518b5b1 100644
--- a/tank-frontend/src/PlayerInfo.tsx
+++ b/tank-frontend/src/PlayerInfo.tsx
@@ -1,53 +1,46 @@
 import {useEffect, useState} from 'react';
 import './PlayerInfo.css'
 import {PlayerResponse, getPlayer} from './serverCalls';
+import {Guid} from "./Guid.ts";
+import Column from "./components/Column.tsx";
+import Row from "./components/Row.tsx";
+import Button from "./components/Button.tsx";
 
-export default function PlayerInfo({playerId, logout}: { playerId: string, logout: () => void }) {
+export default function PlayerInfo({playerId, logout, reset}: {
+    playerId: Guid,
+    logout: () => void,
+    reset: () => void
+}) {
     const [player, setPlayer] = useState<PlayerResponse | null>();
 
-    const refresh = () => {
-        getPlayer(playerId).then(value => {
-            if (value)
-                setPlayer(value);
-            else
-                logout();
-        });
-    };
-
     useEffect(() => {
+        const refresh = () => {
+            getPlayer(playerId).then(value => {
+                if (value)
+                    setPlayer(value);
+                else
+                    logout();
+            });
+        };
+
         const timer = setInterval(refresh, 5000);
         return () => clearInterval(timer);
-    });
+    }, [playerId]);
 
-    return <div className='TankWelcome'>
-        <h1 className='Elems' style={{"color": "white"}}>
-            Tanks
-        </h1>
-        <div className="ScoreForm">
-            <div className='ElemGroup'>
-                <p className='Elems' style={{"color": "white"}}>
-                    name:
-                </p>
-                <p className='Elems' style={{"color": "white"}}>
-                    {player?.name}
-                </p>
-            </div>
-            <div className='ElemGroup'>
-                <p className='Elems' style={{"color": "white"}}>
-                    kills:
-                </p>
-                <p className='Elems' style={{"color": "white"}}>
-                    {player?.scores.kills}
-                </p>
-            </div>
-            <div className='ElemGroup'>
-                <p className='Elems' style={{"color": "white"}}>
-                    deaths:
-                </p>
-                <p className='Elems' style={{"color": "white"}}>
-                    {player?.scores.deaths}
-                </p>
-            </div>
-        </div>
-    </div>;
+    return <Column className='PlayerInfo'>
+        <Row>
+            <h3 className='grow'>
+                {player ? `Playing as "${player?.name}"` : 'loading...'}
+            </h3>
+            <Button className='PlayerInfo-Reset' onClick={() => reset()} text='x'/>
+        </Row>
+        <Row>
+            <p className='Elems'> kills: </p>
+            <p className='Elems'>{player?.scores.kills}</p>
+        </Row>
+        <Row>
+            <p className='Elems'>deaths: </p>
+            <p className='Elems'>{player?.scores.deaths}</p>
+        </Row>
+    </Column>;
 }
diff --git a/tank-frontend/src/Scoreboard.tsx b/tank-frontend/src/Scoreboard.tsx
new file mode 100644
index 0000000..087830e
--- /dev/null
+++ b/tank-frontend/src/Scoreboard.tsx
@@ -0,0 +1,26 @@
+import {getScores, PlayerResponse} from "./serverCalls.tsx";
+import {useEffect, useState} from "react";
+import DataTable from "./components/DataTable.tsx";
+
+export default function Scoreboard({}: {}) {
+    const [players, setPlayers] = useState<PlayerResponse[]>([]);
+
+    useEffect(() => {
+        const refresh = () => {
+            getScores().then(value => {
+                if (value)
+                    setPlayers(value);
+            });
+        };
+
+        const timer = setInterval(refresh, 5000);
+        return () => clearInterval(timer);
+    }, [players]);
+
+    return <DataTable<PlayerResponse> data={players} columns={[
+        {field: 'name'},
+        {field: 'kills', visualize: p => p.scores.kills},
+        {field: 'deaths', visualize: p => p.scores.deaths},
+        {field: 'k/d', visualize: p => p.scores.kills / p.scores.deaths}
+    ]}/>
+}
diff --git a/tank-frontend/src/components/Button.css b/tank-frontend/src/components/Button.css
new file mode 100644
index 0000000..8efe497
--- /dev/null
+++ b/tank-frontend/src/components/Button.css
@@ -0,0 +1,7 @@
+.Button {
+    border: solid 1px green;
+    border-radius: 12px;
+
+    color: green;
+    background: transparent;
+}
diff --git a/tank-frontend/src/components/Button.tsx b/tank-frontend/src/components/Button.tsx
new file mode 100644
index 0000000..c3be029
--- /dev/null
+++ b/tank-frontend/src/components/Button.tsx
@@ -0,0 +1,15 @@
+import './Button.css';
+import {MouseEventHandler} from "react";
+
+export default function Button({text, onClick, className}: {
+    text: string,
+    onClick?: MouseEventHandler<HTMLButtonElement>,
+    className?: string
+}) {
+    return <button
+        className={'Button ' + (className ?? '')}
+        onClick={onClick}
+    >
+        {text}
+    </button>
+}
diff --git a/tank-frontend/src/components/Column.css b/tank-frontend/src/components/Column.css
new file mode 100644
index 0000000..c19f81c
--- /dev/null
+++ b/tank-frontend/src/components/Column.css
@@ -0,0 +1,7 @@
+.Column {
+    display: flex;
+    flex-direction: column;
+    flex: auto;
+    max-height: 100%;
+    align-items: stretch;
+}
diff --git a/tank-frontend/src/components/Column.tsx b/tank-frontend/src/components/Column.tsx
new file mode 100644
index 0000000..3772519
--- /dev/null
+++ b/tank-frontend/src/components/Column.tsx
@@ -0,0 +1,13 @@
+import {ReactNode} from "react";
+
+import './Column.css'
+
+export default function Column({children, className}: {
+    children: ReactNode,
+    className?: string
+}) {
+    return <div className={'Column ' + (className ?? '')}>
+        {children}
+    </div>
+}
+
diff --git a/tank-frontend/src/components/DataTable.css b/tank-frontend/src/components/DataTable.css
new file mode 100644
index 0000000..2fc4e78
--- /dev/null
+++ b/tank-frontend/src/components/DataTable.css
@@ -0,0 +1,3 @@
+.DataTable {
+    flex-grow: 1;
+}
diff --git a/tank-frontend/src/components/DataTable.tsx b/tank-frontend/src/components/DataTable.tsx
new file mode 100644
index 0000000..61fcb32
--- /dev/null
+++ b/tank-frontend/src/components/DataTable.tsx
@@ -0,0 +1,52 @@
+import {ReactNode} from "react";
+import './DataTable.css';
+
+export type DataTableColumnDefinition<T> = {
+    field: string,
+    label?: string,
+    visualize?: (value: T) => ReactNode
+};
+
+function TableHead({columns}: { columns: DataTableColumnDefinition<any>[] }) {
+    return <thead className='DataTableHead'>
+    <tr>
+        {
+            columns.map(column =>
+                <th key={column.field}>
+                    {column.label ?? column.field}
+                </th>)
+        }
+    </tr>
+    </thead>;
+}
+
+function DataTableRow({rowData, columns}: {
+    rowData: any,
+    columns: DataTableColumnDefinition<any>[]
+}) {
+    return <tr>
+        {
+            columns.map(column => {
+                return <td key={column.field}>
+                    {
+                        column.visualize
+                            ? column.visualize(rowData)
+                            : rowData[column.field]
+                    }
+                </td>;
+            })
+        }
+    </tr>;
+}
+
+export default function DataTable<T>({data, columns}: {
+    data: T[],
+    columns: DataTableColumnDefinition<any>[]
+}) {
+    return <table className='DataTable'>
+        <TableHead columns={columns}/>
+        <tbody>
+        {data.map((element, index) => <DataTableRow key={index} rowData={element} columns={columns}/>)}
+        </tbody>
+    </table>
+}
diff --git a/tank-frontend/src/components/Row.css b/tank-frontend/src/components/Row.css
new file mode 100644
index 0000000..45e17f2
--- /dev/null
+++ b/tank-frontend/src/components/Row.css
@@ -0,0 +1,7 @@
+.Row {
+    display: flex;
+    flex-direction: row;
+    flex: auto;
+    max-width: 100%;
+    align-items: stretch;
+}
diff --git a/tank-frontend/src/components/Row.tsx b/tank-frontend/src/components/Row.tsx
new file mode 100644
index 0000000..f9b5ce2
--- /dev/null
+++ b/tank-frontend/src/components/Row.tsx
@@ -0,0 +1,9 @@
+import {ReactNode} from "react";
+
+import './Row.css';
+
+export default function Row({children, className}: { children: ReactNode, className?: string }) {
+    return <div className={'Row ' + (className ?? '')}>
+        {children}
+    </div>
+}
diff --git a/tank-frontend/src/index.css b/tank-frontend/src/index.css
index 4056aaa..ab5bd76 100644
--- a/tank-frontend/src/index.css
+++ b/tank-frontend/src/index.css
@@ -1,3 +1,6 @@
+* {
+    box-sizing: border-box;
+}
 
 html, body {
     height: 100%;
@@ -11,12 +14,17 @@ body {
     justify-content: center;
 
     background-color: black;
+    color: white;
 }
 
 #root {
     display: flex;
-    flex-direction: column;
+    flex-direction: row;
     align-items: center;
-    width: 100%;
-    height: 100%;
+    width: 100vw;
+    height: 100vh;
+}
+
+.grow {
+    flex-grow: 1;
 }
diff --git a/tank-frontend/src/index.tsx b/tank-frontend/src/index.tsx
index 5f80438..d9a7c05 100644
--- a/tank-frontend/src/index.tsx
+++ b/tank-frontend/src/index.tsx
@@ -7,12 +7,17 @@ import {createRoot} from 'react-dom/client';
 import PlayerInfo from './PlayerInfo.tsx';
 import {useStoredObjectState} from './useStoredState.ts';
 import {NameId, postPlayer} from './serverCalls.tsx';
+import Column from "./components/Column.tsx";
+import Row from "./components/Row.tsx";
+import Scoreboard from "./Scoreboard.tsx";
+
+const getNewNameId = () => ({
+    id: crypto.randomUUID(),
+    name: ''
+});
 
 function App() {
-    const [nameId, setNameId] = useStoredObjectState<NameId>('access', () => ({
-        id: crypto.randomUUID(),
-        name: ''
-    }));
+    const [nameId, setNameId] = useStoredObjectState<NameId>('access', getNewNameId);
 
     const [isLoggedIn, setLoggedIn] = useState<boolean>(false);
     const logout = () => setLoggedIn(false);
@@ -24,12 +29,17 @@ function App() {
         setLoggedIn(result !== null);
     }, [nameId, isLoggedIn])();
 
-    return <>
+    return <Column className='grow'>
+        <h1>Tanks!</h1>
         {nameId.name === '' && <JoinForm setNameId={setNameId} clientId={nameId.id}/>}
-        {isLoggedIn && <PlayerInfo playerId={nameId.id} logout={logout}/>}
         <ClientScreen logout={logout}/>
-        {isLoggedIn && <Controls playerId={nameId.id} logout={logout}/>}
-    </>;
+        {isLoggedIn && <Row>
+            <Controls playerId={nameId.id} logout={logout}/>
+            <PlayerInfo playerId={nameId.id} logout={logout} reset={() => setNameId(getNewNameId)}/>
+            <Scoreboard/>
+        </Row>
+        }
+    </Column>;
 }
 
 createRoot(document.getElementById('root')!).render(
diff --git a/tank-frontend/src/serverCalls.tsx b/tank-frontend/src/serverCalls.tsx
index 1905910..d1b30bc 100644
--- a/tank-frontend/src/serverCalls.tsx
+++ b/tank-frontend/src/serverCalls.tsx
@@ -2,7 +2,7 @@ import {Guid} from './Guid.ts';
 
 export type PlayerResponse = {
     readonly name: string;
-    readonly id: string;
+    readonly id: Guid;
     readonly scores: {
         readonly kills: number;
         readonly deaths: number;
@@ -29,7 +29,7 @@ export function postPlayer({name, id}: NameId) {
     return fetchTyped<NameId>({url, method: 'POST'});
 }
 
-export function getPlayer(id: string) {
+export function getPlayer(id: Guid) {
     const url = new URL(import.meta.env.VITE_TANK_PLAYER_URL);
     url.searchParams.set('id', id);