X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=tictactoe%2Ftictactoe.jsx;h=46cee2a7f42e9f4bc3a7809e7d93b3855eb383ed;hp=71690b91e2ecf7692790eeb5517080aa35ef5653;hb=7b54e4a8c6a461c186125b5e36d4d312ee9b41b2;hpb=e804009ec5cc7bb804c229915ce1c8ebedaa88c7

diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 71690b9..46cee2a 100644
--- a/tictactoe/tictactoe.jsx
+++ b/tictactoe/tictactoe.jsx
@@ -72,6 +72,9 @@ events.addEventListener("game-state", event => {
  *********************************************************/
 
 function GameInfo(props) {
+  if (! props.id)
+    return null;
+
   return (
     <div className="game-info">
       <h2>{props.id}</h2>
@@ -81,10 +84,14 @@ function GameInfo(props) {
 }
 
 function PlayerInfo(props) {
+  if (! props.id)
+    return null;
+
   return (
     <div className="player-info">
       <h2>Player</h2>
-      {props.name}, ID: {props.id}, on team: {props.team}
+      {props.name}, ID: {props.id},
+      {props.team ? ` on team ${props.team}` : " not on a team"}
     </div>
   );
 }
@@ -114,7 +121,7 @@ class Board extends React.Component {
     return (
       <Square
         value={value}
-        active={! this.props.game_over && ! value}
+        active={this.props.active && ! value}
         onClick={() => this.props.onClick(i)}
       />
     );
@@ -190,10 +197,6 @@ class Game extends React.Component {
     });
   }
 
-  send_move(i) {
-    return fetch_post_json("move", { move: i });
-  }
-
   reset_board() {
     this.setState({
       history: [
@@ -230,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)
@@ -241,37 +248,77 @@ class Game extends React.Component {
     }
   }
 
+  join_team(team) {
+    fetch_put_json("player", {team: team});
+  }
+
   render() {
-    const history = this.state.history;
-    const current = history[this.state.step_number];
+    const state = this.state;
+    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;
-    } else {
-      status = "Next player: " + (Team.properties[this.state.next_to_play].name);
+    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 [
       <GameInfo
         key="game-info"
-        id={this.state.game_info.id}
-        url={this.state.game_info.url}
+        id={state.game_info.id}
+        url={state.game_info.url}
       />,
       <PlayerInfo
         key="player-info"
-        id={this.state.player_info.id}
-        name={this.state.player_info.name}
-        team={this.state.player_info.team}
+        id={state.player_info.id}
+        name={state.player_info.name}
+        team={state.player_info.team}
       />,
       <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>
         <div className="game-board">
           <Board
-            game_over={winner}
+            active={board_active}
             squares={current.squares}
-            onClick={i => this.handle_click(i)}
+            onClick={i => this.handle_click(i, first_move)}
           />
         </div>
       </div>