Display all players, not just a single component

[lmno.games] / tictactoe / tictactoe.jsx

diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 46cee2a7f42e9f4bc3a7809e7d93b3855eb383ed..49c6005c38fe395c610502853f1ec69ab28d3438 100644 (file)
--- a/tictactoe/tictactoe.jsx
+++ b/tictactoe/tictactoe.jsx
@@ -44,11 +44,19 @@ events.addEventListener("player-info", event => {
   window.game.set_player_info(info);
 });
 
+events.addEventListener("player-enter", event => {
+  const info = JSON.parse(event.data);
+
+  window.game.set_opponent_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);
+  else
+    window.game.set_opponent_info(info);
 });
 
 events.addEventListener("move", event => {
@@ -84,14 +92,21 @@ 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"}
+      <h2>Players</h2>
+      {props.player.name}
+      {props.player.team ? ` (${props.player.team})` : ""}
+      {props.opponents.map(opponent => (
+        <span key={opponent.id}>
+          {", "}
+          {opponent.name}
+          {opponent.team ? ` (${opponent.team})` : ""}
+        </span>
+      ))}
     </div>
   );
 }
@@ -175,6 +190,7 @@ class Game extends React.Component {
     this.state = {
       game_info: {},
       player_info: {},
+      opponent_info: [],
       history: [
         {
           squares: Array(9).fill(null)
@@ -197,6 +213,19 @@ class Game extends React.Component {
     });
   }
 
+  set_opponent_info(info) {
+    const new_opponents = [...this.state.opponent_info];
+    const idx = new_opponents.findIndex(o => o.id === info.id);
+    if (idx >= 0) {
+      new_opponents[idx] = info;
+    } else {
+      new_opponents.push(info);
+    }
+    this.setState({
+      opponent_info: new_opponents
+    });
+  }
+
   reset_board() {
     this.setState({
       history: [
@@ -303,14 +332,13 @@ 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}
+        opponents={state.opponent_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>