X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=tictactoe%2Ftictactoe.jsx;h=498e708fbf9cc3d733517ff91215300952afee31;hp=61a828eb751d6662e63681aa6e313cb6ed95dd20;hb=a203a3aca4fb8428bfa47d7f05c3478780d69554;hpb=9c92603bbe96c1bb54db5247ba73e7ea447845c1

diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 61a828e..498e708 100644
--- a/tictactoe/tictactoe.jsx
+++ b/tictactoe/tictactoe.jsx
@@ -1,3 +1,12 @@
+const Team = {
+  X: 0,
+  O: 1,
+  properties: {
+    0: {name: "X"},
+    1: {name: "O"}
+  }
+};
+
 function undisplay(element) {
   element.style.display="none";
 }
@@ -11,6 +20,10 @@ ${message}
   message_area.insertAdjacentHTML('beforeend', message);
 }
 
+/*********************************************************
+ * Handling server-sent event stream                     *
+ *********************************************************/
+
 const events = new EventSource("events");
 
 events.onerror = function(event) {
@@ -19,35 +32,89 @@ events.onerror = function(event) {
   }
 };
 
+events.addEventListener("game-info", event => {
+  const info = JSON.parse(event.data);
+
+  window.game.set_game_info(info);
+});
+
+events.addEventListener("player-info", event => {
+  const info = JSON.parse(event.data);
+
+  window.game.set_player_info(info);
+});
+
+events.addEventListener("player-update", event => {
+  const info = JSON.parse(event.data);
+
+  if (info.id === window.game.state.player_info.id)
+    window.game.set_player_info(info);
+});
+
 events.addEventListener("move", event => {
   const move = JSON.parse(event.data);
 
-  window.game.receiveMove(move);
+  window.game.receive_move(move);
 });
 
 events.addEventListener("game-state", event => {
   const state = JSON.parse(event.data);
 
-  window.game.resetState();
+  window.game.reset_board();
 
   for (let square of state.moves) {
-    window.game.receiveMove(square);
+    window.game.receive_move(square);
   }
 });
 
+/*********************************************************
+ * Game and supporting classes                           *
+ *********************************************************/
+
+function GameInfo(props) {
+  return (
+    <div className="game-info">
+      <h2>{props.id}</h2>
+      Invite a friend to play by sending this URL: {props.url}
+    </div>
+  );
+}
+
+function PlayerInfo(props) {
+  return (
+    <div className="player-info">
+      <h2>Player</h2>
+      {props.name}, ID: {props.id}, on team: {props.team}
+    </div>
+  );
+}
+
 function Square(props) {
+  let className = "square";
+
+  if (props.value) {
+    className += " occupied";
+  } else if (props.active) {
+    className += " open";
+  }
+
+  const onClick = props.active ? props.onClick : null;
+
   return (
-    <button className="square" onClick={props.onClick}>
+    <div className={className}
+         onClick={onClick}>
       {props.value}
-    </button>
+    </div>
   );
 }
 
 class Board extends React.Component {
-  renderSquare(i) {
+  render_square(i) {
+    const value = this.props.squares[i];
     return (
       <Square
-        value={this.props.squares[i]}
+        value={value}
+        active={! this.props.game_over && ! value}
         onClick={() => this.props.onClick(i)}
       />
     );
@@ -57,19 +124,19 @@ class Board extends React.Component {
     return (
       <div>
         <div className="board-row">
-          {this.renderSquare(0)}
-          {this.renderSquare(1)}
-          {this.renderSquare(2)}
+          {this.render_square(0)}
+          {this.render_square(1)}
+          {this.render_square(2)}
         </div>
         <div className="board-row">
-          {this.renderSquare(3)}
-          {this.renderSquare(4)}
-          {this.renderSquare(5)}
+          {this.render_square(3)}
+          {this.render_square(4)}
+          {this.render_square(5)}
         </div>
         <div className="board-row">
-          {this.renderSquare(6)}
-          {this.renderSquare(7)}
-          {this.renderSquare(8)}
+          {this.render_square(6)}
+          {this.render_square(7)}
+          {this.render_square(8)}
         </div>
       </div>
     );
@@ -91,53 +158,72 @@ class Game extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
+      game_info: {},
+      player_info: {},
       history: [
         {
           squares: Array(9).fill(null)
         }
       ],
-      stepNumber: 0,
-      xIsNext: true
+      step_number: 0,
+      next_to_play: Team.X
     };
   }
 
-  sendMove(i) {
+  set_game_info(info) {
+    this.setState({
+      game_info: info
+    });
+  }
+
+  set_player_info(info) {
+    this.setState({
+      player_info: info
+    });
+  }
+
+  send_move(i) {
     return fetch_post_json("move", { move: i });
   }
 
-  resetState() {
+  reset_board() {
     this.setState({
       history: [
         {
           squares: Array(9).fill(null)
         }
       ],
-      stepNumber: 0,
-      xIsNext: true
+      step_number: 0,
+      next_to_play: Team.X
     });
   }
 
-  receiveMove(i) {
-    const history = this.state.history.slice(0, this.state.stepNumber + 1);
+  receive_move(i) {
+    const history = this.state.history.slice(0, this.state.step_number + 1);
     const current = history[history.length - 1];
     const squares = current.squares.slice();
-    if (calculateWinner(squares) || squares[i]) {
+    if (calculate_winner(squares) || squares[i]) {
       return;
     }
-    squares[i] = this.state.xIsNext ? "X" : "O";
+    squares[i] = Team.properties[this.state.next_to_play].name;
+    let next_to_play;
+    if (this.state.next_to_play === Team.X)
+      next_to_play = Team.O;
+    else
+      next_to_play = Team.X;
     this.setState({
       history: history.concat([
         {
           squares: squares
         }
       ]),
-      stepNumber: history.length,
-      xIsNext: !this.state.xIsNext
+      step_number: history.length,
+      next_to_play: next_to_play
     });
   }
 
-  async handleClick(i) {
-    const response = await this.sendMove(i);
+  async handle_click(i) {
+    const response = await this.send_move(i);
     if (response.status == 200) {
       const result = await response.json();
       if (! result.legal)
@@ -147,48 +233,47 @@ class Game extends React.Component {
     }
   }
 
-  jumpTo(step) {
-    this.setState({
-      stepNumber: step,
-      xIsNext: (step % 2) === 0
-    });
-  }
-
   render() {
     const history = this.state.history;
-    const current = history[this.state.stepNumber];
-    const winner = calculateWinner(current.squares);
+    const current = history[this.state.step_number];
+    const winner = calculate_winner(current.squares);
 
     let status;
     if (winner) {
       status = "Winner: " + winner;
     } else {
-      status = "Next player: " + (this.state.xIsNext ? "X" : "O");
+      status = "Next player: " + (Team.properties[this.state.next_to_play].name);
     }
 
-    return (
+    return [
+      <GameInfo
+        id={this.state.game_info.id}
+        url={this.state.game_info.url}
+      />,
+      <PlayerInfo
+        id={this.state.player_info.id}
+        name={this.state.player_info.name}
+        team={this.state.player_info.team}
+      />,
       <div className="game">
-        <div className="game-info">
-          <div>{status}</div>
-        </div>
+        <div>{status}</div>
         <div className="game-board">
           <Board
+            game_over={winner}
             squares={current.squares}
-            onClick={i => this.handleClick(i)}
+            onClick={i => this.handle_click(i)}
           />
         </div>
       </div>
-    );
+    ];
   }
 }
 
-// ========================================
-
 ReactDOM.render(<Game
                   ref={(me) => window.game = me}
                 />, document.getElementById("tictactoe"));
 
-function calculateWinner(squares) {
+function calculate_winner(squares) {
   const lines = [
     [0, 1, 2],
     [3, 4, 5],