Use "answer" instead of "answers" when there is only one item in a category

[lmno.games] / empathy / empathy.jsx

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index c216e4921b9b5d68d8731defddc353125a010d68..6133463f35a7a9d6ba4d58cbe8e4188bf4af48a9 100644 (file)
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -89,6 +89,8 @@ events.addEventListener("game-state", event => {
 
   window.game.set_scores(state.scores);
 
 
   window.game.set_scores(state.scores);
 

+  window.game.set_new_game_votes(state.new_game_votes);
+

   window.game.state_ready();
 });
 
   window.game.state_ready();
 });
 


@@ -176,6 +178,18 @@ events.addEventListener("scores", event => {
   window.game.set_scores(scores);
 });
 
   window.game.set_scores(scores);
 });
 

+events.addEventListener("vote-new-game", event => {
+  const player = JSON.parse(event.data);
+
+  window.game.set_player_vote_new_game(player);
+});
+
+events.addEventListener("unvote-new-game", event => {
+  const player = JSON.parse(event.data);
+
+  window.game.set_player_unvote_new_game(player);
+});
+

 /*********************************************************
  * Game and supporting classes                           *
  *********************************************************/
 /*********************************************************
  * Game and supporting classes                           *
  *********************************************************/


@@ -560,7 +574,7 @@ class Ambiguities extends React.PureComponent {
         <div className="please-wait">
           <h2>Submission received</h2>
           <p>
         <div className="please-wait">
           <h2>Submission received</h2>
           <p>

-            The following players have completed judging:
+            The following players have completed judging:{' '}

             {[...this.props.players_judged].join(', ')}
           </p>
           <p>
             {[...this.props.players_judged].join(', ')}
           </p>
           <p>


@@ -597,6 +611,7 @@ class Ambiguities extends React.PureComponent {
           what goes around comes around, so it's best to be generous when
           judging.
         </p>
           what goes around comes around, so it's best to be generous when
           judging.
         </p>

+        <h2>{this.props.prompt.prompt}</h2>

         {this.state.word_sets.map(set => {
           return (
             <div
         {this.state.word_sets.map(set => {
           return (
             <div


@@ -722,7 +737,7 @@ class ActivePrompt extends React.PureComponent {
         <div className="please-wait">
           <h2>Submission received</h2>
           <p>
         <div className="please-wait">
           <h2>Submission received</h2>
           <p>

-            The following players have submitted their answers:
+            The following players have submitted their answers:{' '}

             {[...this.props.players_answered].join(', ')}
           </p>
           <p>
             {[...this.props.players_answered].join(', ')}
           </p>
           <p>


@@ -753,7 +768,8 @@ class ActivePrompt extends React.PureComponent {
         <p>
           Remember, you're trying to match your answers with
           what the other players submit.
         <p>
           Remember, you're trying to match your answers with
           what the other players submit.

-          Give {this.props.prompt.items} answers for the following prompt:
+          Give {this.props.prompt.items} answer
+          {this.props.prompt.items > 1 ? 's' : ''} for the following prompt:

         </p>
         <h2>{this.props.prompt.prompt}</h2>
         <form onSubmit={this.handle_submit}>
         </p>
         <h2>{this.props.prompt.prompt}</h2>
         <form onSubmit={this.handle_submit}>


@@ -807,6 +823,7 @@ class Game extends React.PureComponent {
       judging_idle: false,
       end_judging_votes: new Set(),
       scores: null,
       judging_idle: false,
       end_judging_votes: new Set(),
       scores: null,

+      new_game_votes: new Set(),

       ready: false
     };
   }
       ready: false
     };
   }


@@ -856,6 +873,7 @@ class Game extends React.PureComponent {
       judging_idle: false,
       end_judging_votes: new Set(),
       scores: null,
       judging_idle: false,
       end_judging_votes: new Set(),
       scores: null,

+      new_game_votes: new Set(),

       ready: false
     });
   }
       ready: false
     });
   }


@@ -1015,6 +1033,24 @@ class Game extends React.PureComponent {
     });
   }
 
     });
   }
 

+  set_new_game_votes(players) {
+    this.setState({
+      new_game_votes: new Set(players)
+    });
+  }
+
+  set_player_vote_new_game(player) {
+    this.setState({
+      new_game_votes: new Set([...this.state.new_game_votes, player])
+    });
+  }
+
+  set_player_unvote_new_game(player) {
+    this.setState({
+      new_game_votes: new Set([...this.state.new_game_votes].filter(p => p !== player))
+    });
+  }
+

   state_ready() {
     this.setState({
       ready: true
   state_ready() {
     this.setState({
       ready: true


@@ -1028,12 +1064,13 @@ class Game extends React.PureComponent {
     if (state.scores) {
       return (
         <div className="scores">
     if (state.scores) {
       return (
         <div className="scores">

+          <h2>{state.active_prompt.prompt}</h2>

           <h2>Scores</h2>
           <ul>
             {state.scores.scores.map(score => {
               return (
                 <li key={score.player}>
           <h2>Scores</h2>
           <ul>
             {state.scores.scores.map(score => {
               return (
                 <li key={score.player}>

-                  {score.player}: {score.score}
+                  {score.players.join("/")}: {score.score}

                 </li>
               );
             })}
                 </li>
               );
             })}


@@ -1043,16 +1080,28 @@ class Game extends React.PureComponent {
             {state.scores.words.map(word => {
               return (
                 <li key={word.word}>
             {state.scores.words.map(word => {
               return (
                 <li key={word.word}>

-                  {`${word.word}: ${word.players.join(', ')}`}
+                  {word.word} ({word.players.length}): {word.players.join(', ')}

                 </li>
               );
             })}
           </ul>
           <button
                 </li>
               );
             })}
           </ul>
           <button

-            className="new-game"
-            onClick={() => fetch_post_json('reset') }
+            className="vote-button"
+            onClick={() => fetch_post_json(`new-game/${state.active_prompt.id}`) }

           >
             New Game
           >
             New Game

+            <div className="vote-choices">
+              {[...state.new_game_votes].map(v => {
+                return (
+                  <div
+                    key={v}
+                    className="vote-choice"
+                  >
+                    {v}
+                  </div>
+                );
+              })}
+            </div>

           </button>
         </div>
       );
           </button>
         </div>
       );