From: Carl Worth <cworth@cworth.org>
Date: Sat, 6 Jun 2020 01:13:16 +0000 (-0700)
Subject: Display the opponent's name/team next to our own name/team
X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=commitdiff_plain;h=d3a035c38d6deff85f63e313430ac7e45955e2a9

Display the opponent's name/team next to our own name/team

This is mostly functional, but has at least two problems:

1. The trailing comma appears when an opponent hasn't joined yet

2. It will only display a single opponent even if additional players
   join the game
---

diff --git a/tictactoe/tictactoe.jsx b/tictactoe/tictactoe.jsx
index 579526b..f0e9e88 100644
--- 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 => {
@@ -89,9 +97,12 @@ function PlayerInfo(props) {
 
   return (
     <div className="player-info">
-      <h2>Player</h2>
+      <h2>Players</h2>
       {props.player.name}
       {props.player.team ? ` (${props.player.team})` : ""}
+      {", "}
+      {props.opponent.name}
+      {props.opponent.team ? ` (${props.opponent.team})` : ""}
     </div>
   );
 }
@@ -175,6 +186,7 @@ class Game extends React.Component {
     this.state = {
       game_info: {},
       player_info: {},
+      opponent_info: {},
       history: [
         {
           squares: Array(9).fill(null)
@@ -197,6 +209,12 @@ class Game extends React.Component {
     });
   }
 
+  set_opponent_info(info) {
+    this.setState({
+      opponent_info: info
+    });
+  }
+
   reset_board() {
     this.setState({
       history: [
@@ -304,6 +322,7 @@ class Game extends React.Component {
       <PlayerInfo
         key="player-info"
         player={state.player_info}
+        opponent={state.opponent_info}
       />,
       <div key="game" className="game">
         <button className="inline"