Tighten up the display of the PlayerInfo block

[lmno.games] / tictactoe / tictactoe.jsx

diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 3c7de0b014ca5481b5b64a46882032d29096b0ce..579526b7dcb401e0310027da092f47c8fead5691 100644 (file)
--- a/tictactoe/tictactoe.jsx
+++ b/tictactoe/tictactoe.jsx
@@ -84,14 +84,14 @@ function GameInfo(props) {
 }
 
 function PlayerInfo(props) {
-  if (! props.id)
+  if (! props.player.id)
     return null;
 
   return (
     <div className="player-info">
       <h2>Player</h2>
-      {props.name}, ID: {props.id},
-      {props.team ? ` on team ${props.team}` : " not on a team"}
+      {props.player.name}
+      {props.player.team ? ` (${props.player.team})` : ""}
     </div>
   );
 }
@@ -197,10 +197,6 @@ class Game extends React.Component {
     });
   }
 
-  send_move(i) {
-    return fetch_post_json("move", { move: i });
-  }
-
   reset_board() {
     this.setState({
       history: [
@@ -237,8 +233,12 @@ class Game extends React.Component {
     });
   }
 
-  async handle_click(i) {
-    const response = await this.send_move(i);
+  async handle_click(i, first_move) {
+    let move = { move: i };
+    if (first_move) {
+      move.assert_first_move = true;
+    }
+    const response = await fetch_post_json("move", move);
     if (response.status == 200) {
       const result = await response.json();
       if (! result.legal)
@@ -257,20 +257,42 @@ class Game extends React.Component {
     const history = state.history;
     const current = history[state.step_number];
     const winner = calculate_winner(current.squares);
+    const first_move = state.step_number === 0;
+    const my_team = state.player_info.team;
     var board_active;
 
     let status;
-    if (winner) {
-      status = "Winner: " + winner;
-      board_active = false;
-    } else {
-      if (state.player_info.team === Team.properties[state.next_to_play].name) {
-        status = "Your turn. Make a move.";
-        board_active = true;
-      } else {
-        status = "Waiting for your opponent to move.";
-        board_active = false;
+    if (winner)
+    {
+      status = winner + " wins!";
+      if (state.player_info.team != "")
+      {
+        if (my_team === winner)
+          status += " Congratulations!";
+        else
+          status += " Better luck next time.";
       }
+      board_active = false;
+    }
+    else if (first_move)
+    {
+      status = "Either player can make the first move.";
+      board_active = true;
+    }
+    else if (my_team === "")
+    {
+      status = "You're just watching the game.";
+      board_active = false;
+    }
+    else if (my_team === Team.properties[state.next_to_play].name)
+    {
+      status = "Your turn. Make a move.";
+      board_active = true;
+    }
+    else
+    {
+      status = "Waiting for your opponent to move.";
+      board_active = false;
     }
 
     return [
@@ -281,14 +303,12 @@ class Game extends React.Component {
       />,
       <PlayerInfo
         key="player-info"
-        id={state.player_info.id}
-        name={state.player_info.name}
-        team={state.player_info.team}
+        player={state.player_info}
       />,
       <div key="game" className="game">
         <button className="inline"
                 onClick={() => this.join_team('X')}>Join Team X</button>
-        &nbsp;
+        {" "}
         <button className="inline"
                 onClick={() => this.join_team('O')}>Join Team O</button>
         <div>{status}</div>
@@ -296,7 +316,7 @@ class Game extends React.Component {
           <Board
             active={board_active}
             squares={current.squares}
-            onClick={i => this.handle_click(i)}
+            onClick={i => this.handle_click(i, first_move)}
           />
         </div>
       </div>