webapp/src/App.js

@@ -1,11 +1,15 @@
 import './App.css';
 import React from 'react'
-import { BrowserRouter, Routes, Route } from "react-router-dom"
+import {
+  BrowserRouter,
+  Routes,
+  Route,
+} from "react-router-dom"
 
 import Header from "./components/Header"
 import Leaderboard from "./components/Leaderboard"
 import Game from "./components/Game"
-import About from "./components/About"
+import GameProposal from './components/Game/Proposal'
 
 function App() { 
 
@@ -14,14 +18,9 @@ function App() {
         <Header/>
         <div className="Container">
           <Routes>
-            {/* https://stackoverflow.com/questions/40541994/multiple-path-names-for-a-same-component-in-react-router */}
-            <Route path="/game" element={<Game/>} />
-            <Route path="/game/proposal" element={<Game/>} />
-            <Route path="/game/active" element={<Game/>} />
-            <Route path="/game/archive" element={<Game/>} />
-            
             <Route path="/leaderboard" element={<Leaderboard/>} />
-            <Route path="/about" element={<About/>} />
+            <Route path="/game" element={<Game/>} />
+            <Route path="/game/proposal" element={<GameProposal/>} />
           </Routes>
         </div>
     </BrowserRouter>

webapp/src/components/About/index.css

@@ -1,5 +0,0 @@
-.Leaderboard {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}

webapp/src/components/About/index.jsx

@@ -1,9 +0,0 @@
-import React from "react"
-import './index.css';
-
-export default function Leaderboard() {
-
-  return <div className="About">
-      A simple american checkers game<br/>
-    </div>
-};

webapp/src/components/Board/index.css

@@ -1,11 +1,3 @@
-.board {
-    display: flex;
-    flex-direction: column;
-    justify-content: center; 
-    align-items: center;
-    /* scale: 15%; */
-}
-
 .tile {
     border: 1px solid #e4e4e4;
     float: left;
@@ -18,16 +10,22 @@
     margin-top: -1px;
     padding: 0;
     text-align: center;
+   
 }
 
-.tile.black {
+.black {
     background: lightgray;
 }
 
-.tile.white:hover {
-    background-color:azure;
+.board {
+    display: flex;
+    flex-direction: column;
+    justify-content: center; 
+    align-items: center;
+    /* scale: 15%; */
+
 }
 
-.stone {
-    font-size: 120%;
+.white:hover {
+    background-color:azure;
 }

webapp/src/components/Board/index.jsx

@@ -1,7 +1,7 @@
 import './index.css';
 import React from 'react';
 
-import { WhiteStone, BlackStone } from '../Game/Stone' 
+import { WhiteStone, BlackStone } from '../Stone' 
 
 export default function Board() {
 

webapp/src/components/Game/GameHeader.jsx

@@ -1,14 +0,0 @@
-import './GameHeader.css';
-import React from 'react';
-import { NavLink } from "react-router-dom";
-
-export default function GameHeader() {
-
-  return (
-    <nav className='game-header'>
-      <NavLink to="/game/proposal">Proposal</NavLink>
-      <NavLink to="/game/active">Active</NavLink>
-      <NavLink to="/game/archive">Archive</NavLink>
-    </nav>
-  )
-}

webapp/src/components/Game/GameSelector.jsx

@@ -1,26 +0,0 @@
-import './GameSelector.css';
-import React from 'react';
-import { useLocation, matchPath } from "react-router";
-
-import { AppData } from "../../context/data"
-import Proposal from './GameSelector/GameProposal';
-
-export default function Game() {
-  const [data] = React.useContext(AppData)
-
-  const { pathname } = useLocation();
-  const isProposalPath = matchPath("/game/proposal/*", pathname);
-  const isActivelPath = matchPath("/game/active/*", pathname);
-  const isArchivePath = matchPath("/game/archive/*", pathname);
-
-  if (!data.games)
-    return <div>Loading..</div>
-
-  return (
-    <div className='game-selector'>
-      {isProposalPath && <Proposal games={data.games} />}
-      {isActivelPath  && <div>TBD #1</div>}
-      {isArchivePath  && <div>TBD #2</div>}
-    </div>
-  )
-}

webapp/src/components/Game/GameSelector/ActiveGames.jsx

@@ -1,32 +0,0 @@
-import './ProposalSelector.css'
-import React from 'react';
-import Selectable from './Selectable';
-
-export default function ProposalSelector({ games }) {
-
-  const waitForYou = games
-    .filter(game => game.status === Status.WaitForYou)
-    .map(game => <Selectable game={game} />)
-
-  const WaitForOpponent = games
-    .filter(game => game.status === Status.WaitForOpponent)
-    .map(game => <Selectable game={game} />)
-
-  return <div className="Container">
-    <div className="Games">
-      {waitForYou}
-      {WaitForOpponent.length > 0 &&
-        <div className="separator">
-          waiting for opponent ({WaitForOpponent.length})
-        </div>
-      }
-      {WaitForOpponent}
-    </div>
-  </div>
-};
-
-
-const Status = {
-  WaitForOpponent: "GAME_PROPOSAL_WAIT_FOR_OPPONENT",
-  WaitForYou: "GAME_PROPOSAL_WAIT_FOR_YOU",
-}

webapp/src/components/Game/GameSelector/GameArchive.jsx

@@ -1,32 +0,0 @@
-import './ProposalSelector.css'
-import React from 'react';
-import Selectable from './Selectable';
-
-export default function ProposalSelector({ games }) {
-
-  const waitForYou = games
-    .filter(game => game.status === Status.WaitForYou)
-    .map(game => <Selectable game={game} />)
-
-  const WaitForOpponent = games
-    .filter(game => game.status === Status.WaitForOpponent)
-    .map(game => <Selectable game={game} />)
-
-  return <div className="Container">
-    <div className="Games">
-      {waitForYou}
-      {WaitForOpponent.length > 0 &&
-        <div className="separator">
-          waiting for opponent ({WaitForOpponent.length})
-        </div>
-      }
-      {WaitForOpponent}
-    </div>
-  </div>
-};
-
-
-const Status = {
-  WaitForOpponent: "GAME_PROPOSAL_WAIT_FOR_OPPONENT",
-  WaitForYou: "GAME_PROPOSAL_WAIT_FOR_YOU",
-}

webapp/src/components/Game/GameSelector/GameProposal.jsx

@@ -1,30 +0,0 @@
-import React from 'react';
-import Selectable from './Selectable';
-
-export default function ProposalSelector({ games }) {
-
-  const waitForYou = games
-    .filter(game => game.status === Status.WaitForYou)
-    .map(game => <Selectable game={game} />)
-
-  const WaitForOpponent = games
-    .filter(game => game.status === Status.WaitForOpponent)
-    .map(game => <Selectable game={game} />)
-
-  return (
-    <div className="Games">
-      {waitForYou}
-      {WaitForOpponent.length > 0 &&
-        <div className="separator">
-          waiting for opponent ({WaitForOpponent.length})
-        </div>
-      }
-      {WaitForOpponent}
-    </div>
-  )
-}
-
-const Status = {
-  WaitForOpponent: "GAME_PROPOSAL_WAIT_FOR_OPPONENT",
-  WaitForYou: "GAME_PROPOSAL_WAIT_FOR_YOU",
-}

webapp/src/components/Game/GameSelector/Selectable.css

@@ -1,35 +0,0 @@
-.selectable {
-    border: 1px solid black;
-    margin-bottom: 5px;
-}
-
-.selectable q {
-    color: gray;
-}
-
-.selectable i {
-    font-size: 70%;
-}
-
-/* .Games .li button.action {
-    display: none;
-}
-
-.Games .li:hover button.action {
-    display: initial;
-} */
-
-.separator {
-    /* width: 20%;  */
-    /* height: 20px;  */
-    border-bottom: 1px dotted black; 
-    text-align: center;
-    font-size: 50%;
-    padding-left: 50%;
-    margin-bottom: 7px;
-}
-
-.stone {
-    vertical-align: -3px; 
-    margin: 3px 3px;
-} 

webapp/src/components/Game/GameSelector/Selectable.jsx

@@ -1,19 +0,0 @@
-import './Selectable.css'
-import React from 'react';
-import { Stone, oppositeColor } from '../Stone';
-
-export default function Selectable({game}) {
-
-  return (
-    <div className='selectable' key={game.uuid}>
-      <div className='tiltle'>
-        {Stone(game.myColor)}
-        <i>vs</i>
-        {Stone(oppositeColor(game.myColor))}
-        {game.opponentName}
-      </div>
-      <q>{game.message}</q>
-    </div>
-  )
-};
-

webapp/src/components/Game/Proposal/index.jsx

@@ -0,0 +1,22 @@
+import './index.css';
+import React from 'react';
+// import { NavLink } from "react-router-dom";
+// import { AppData } from "../../../context/data"
+import GameHeader from '../../GameHeader'
+import GameSelector from '../../GameSelector'
+import Board from '../../Board' 
+
+export default function Proposal() {
+  // const [data] = React.useContext(AppData)
+
+  return <div className="split">
+    <div className='split left'>
+      <GameHeader/>
+      <button>+ Create</button>
+      <GameSelector/>
+    </div>
+
+    <div className='split right'></div>
+      <Board/>
+    </div>
+};

webapp/src/components/Game/Stone.css

@@ -1,3 +0,0 @@
-.stone {
-    cursor: default; /* disable 'I beam' cursor change */
-}

webapp/src/components/Game/index.jsx

@@ -1,7 +1,7 @@
 import './index.css';
 import React from 'react';
-import GameHeader from './GameHeader'
-import GameSelector from './GameSelector'
+import GameHeader from '../GameHeader'
+import GameSelector from '../GameSelector'
 import Board from '../Board' 
 
 // import { AppData } from "../../context/data"
@@ -11,13 +11,12 @@ export default function Game() {
   return <div className="split">
     
     <div className='split left'>
-      <GameHeader />
-      <GameSelector />
+      <GameHeader/>
+      <GameSelector/>
     </div>
 
-    <div className='split right'>
-      <Board />
-    </div>
+    <div className='split right'></div>
+      <Board/>
     </div>
     
-}
+};

webapp/src/components/GameHeader/index.jsx

@@ -0,0 +1,15 @@
+import './index.css';
+import React from 'react';
+import { NavLink } from "react-router-dom";
+// import { AppData } from "../../context/data"
+
+export default function GameHeader() {
+  // const [data] = React.useContext(AppData)
+
+
+  return <nav className="game-header">
+    <NavLink to="/game/proposal">Proposal</NavLink>
+    <NavLink to="/game/active">Active</NavLink>
+    <NavLink to="/game/archive">Archive</NavLink>
+  </nav>
+};

webapp/src/components/GameSelector/index.css

@@ -40,3 +40,8 @@
     padding-left: 50%;
     margin-bottom: 7px;
 }
+
+.stone {
+    font-size: 140%;
+    vertical-align: -3px;
+}

webapp/src/components/GameSelector/index.jsx

@@ -0,0 +1,82 @@
+import './index.css';
+import React from 'react';
+
+import { AppData } from "../../context/data"
+
+export default function Game() {
+  const [data] = React.useContext(AppData)
+
+  if (!data?.games)
+    return <div>Loading..</div>
+
+  // for (const [key, value] of Object.entries(data.games))
+  //   console.log(key, value);
+   
+  console.log("data.games", data.games)
+  const waitForYou = data.games
+    .filter(game => game.status === Status.WaitForYou)
+    .map(game => { 
+      return <div className="li" key={game.uuid}>
+        <p>
+          You {Stone(game.myColor)} <i>vs</i> {game.opponentName} {Stone(oppositeColor(game.myColor))}
+          <br/>
+          <q>{game.message}</q>
+          <br/>
+          {/* <Accept uuid={game.uuid}/>
+          <Reject uuid={game.uuid}/> */}
+        </p>
+        </div>
+    });
+
+  const WaitForOpponent = data.games
+    .filter(game => game.status === Status.WaitForOpponent)
+    .map(game => { 
+      return <div className="li" key={game.uuid}>
+        <p> 
+          You {Stone(game.myColor)} <i>vs</i> {game.opponentName} {Stone(oppositeColor(game.myColor))}
+          <br/>
+          <q>{game.message}</q>
+          <br/>
+          {/* <Cancel uuid={game.uuid}/> */}
+        </p>
+        </div>
+    });
+
+  return <div className="Container">
+    <div className="Games">
+      {waitForYou}
+      {WaitForOpponent.length > 0 && 
+        <div className="separator">
+          waiting for opponent ({WaitForOpponent.length})
+        </div>
+      }
+      {WaitForOpponent}
+    </div>
+    </div>
+};
+
+
+const Status = {
+	WaitForOpponent: "GAME_PROPOSAL_WAIT_FOR_OPPONENT",
+	WaitForYou:      "GAME_PROPOSAL_WAIT_FOR_YOU",
+}
+
+function Stone(color) {
+  if (color === "WHITE")
+    return <span className="stone">⛀</span>
+
+  if (color === "BLACK")
+    return <span className="stone">⛂</span>
+
+  return <span className="stone">{color}</span>
+}
+
+function oppositeColor(color) {
+  if (color === "WHITE")
+    return "BLACK"
+
+  if (color === "BLACK")
+    return "WHITE"
+
+  return color
+}

webapp/src/components/Stone/index.css

@@ -0,0 +1,7 @@
+.white-stone {
+    cursor: default;
+}
+
+.black-stone {
+    cursor: default;
+}

webapp/src/components/Stone/index.jsx

@@ -1,4 +1,4 @@
-import './Stone.css';
+import './index.css';
 import React from 'react';
 
 export function Stone( color ) {
@@ -15,11 +15,11 @@ export function Stone( color ) {
 }
 
 export function WhiteStone() {
-    return <span className="stone white">⛀</span>
+    return <span className="white-stone">⛀</span>
 }
 
 export function BlackStone() {
-    return <span className="stone black">⛂</span>
+    return <span className="black-stone">⛂</span>
 }
 
 export function oppositeColor(color) {