X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=tictactoe%2Ftictactoe.jsx;h=153dd74a796a92fa8117bf65d537479610c2751f;hb=47118511015be30e5efb9131f3a6a77828c0fb6a;hp=934faa8e0cc63e37adc530c22beea642f7782fb7;hpb=d1b224fb4410e5ae5a06a5a8edc707524f1c2b73;p=lmno.games

diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 934faa8..153dd74 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";
 }
@@ -20,24 +29,47 @@ events.onerror = function(event) {
 };
 
 events.addEventListener("move", event => {
-  const square = JSON.parse(event.data);
+  const move = JSON.parse(event.data);
+
+  window.game.receive_move(move);
+});
+
+events.addEventListener("game-state", event => {
+  const state = JSON.parse(event.data);
 
-  window.game.receiveMove(square);
+  window.game.reset_board();
+
+  for (let square of state.moves) {
+    window.game.receive_move(square);
+  }
 });
 
 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)}
       />
     );
@@ -47,19 +79,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>
     );
@@ -86,75 +118,86 @@ class Game extends React.Component {
           squares: Array(9).fill(null)
         }
       ],
-      stepNumber: 0,
-      xIsNext: true
+      step_number: 0,
+      next_to_play: Team.X
     };
   }
 
-  sendMove(i) {
-    return fetch_post_json("move", { square: i });
+  send_move(i) {
+    return fetch_post_json("move", { move: i });
   }
 
-  receiveMove(i) {
-    const history = this.state.history.slice(0, this.state.stepNumber + 1);
+  reset_board() {
+    this.setState({
+      history: [
+        {
+          squares: Array(9).fill(null)
+        }
+      ],
+      step_number: 0,
+      next_to_play: Team.X
+    });
+  }
+
+  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 legal = await response.json();
-      if (! legal)
-        add_message("danger", `Illegal move.`);
+      const result = await response.json();
+      if (! result.legal)
+        add_message("danger", result.message);
     } else {
       add_message("danger", `Error occurred sending move`);
     }
   }
 
-  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 (
       <div className="game">
+        <div className="game-info">
+          <div>{status}</div>
+        </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 className="game-info">
-          <div>{status}</div>
-        </div>
       </div>
     );
   }
@@ -166,7 +209,7 @@ 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],