X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=30aa0ca12eff0152cc2b918b2e7b1e1c95b19423;hp=4151cf729edf1de6a53151ad49b947aeb2e504d9;hb=8da6d6a157c70f00f5e765c921c527b268f34a72;hpb=e4c308c3331de77071170b0711505a990eaba617

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 4151cf7..30aa0ca 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -283,7 +283,7 @@ class CategoryRequest extends React.PureComponent {
     const match = category.match(/[0-9]+/);
     if (match) {
       const num_items = parseInt(match[0], 10);
-      if (num_items <= MAX_PROMPT_ITEMS)
+      if (num_items > 0 && num_items <= MAX_PROMPT_ITEMS)
         category_input.setCustomValidity("");
     }
   }
@@ -311,6 +311,12 @@ class CategoryRequest extends React.PureComponent {
       return;
     }
 
+    if (num_items < 1) {
+      category_input.setCustomValidity("Category must require at least one item.");
+      form.reportValidity();
+      return;
+    }
+
     const response = await fetch_post_json("prompts", {
       items: num_items,
       prompt: category
@@ -414,7 +420,13 @@ const PromptOptions = React.memo(props => {
         Select any categories below that you'd like to play.
         You can choose as many as you'd like.
       </p>
-    {props.prompts.map(p => <PromptOption prompt={p} player={props.player} />)}
+      {props.prompts.map(
+        prompt => <PromptOption
+                    key={prompt.id}
+                    prompt={prompt}
+                    player={props.player}
+                  />
+      )}
     </div>
   );
 });
@@ -462,11 +474,9 @@ class Ambiguities extends React.PureComponent {
 
     for (let word of props.words) {
       const word_canon = canonize(word);
-      console.log("Canonized " + word + " to " + word_canon);
       let found_match = false;
       for (let set of word_sets) {
         const set_canon = canonize(set.values().next().value);
-        console.log("Comparing " + word_canon + " to " + set_canon);
         if (word_canon === set_canon) {
           set.add(word);
           found_match = true;;
@@ -499,7 +509,7 @@ class Ambiguities extends React.PureComponent {
     const response = await fetch_post_json(
       `judged/${this.props.prompt.id}`,{
         word_groups: this.state.word_sets.map(set => Array.from(set)),
-        kudos: Array.from(this.state.starred)
+        kudos: this.state.starred ? Array.from(this.state.starred) : null
       }
     );
 
@@ -591,7 +601,7 @@ class Ambiguities extends React.PureComponent {
           className="vote-button"
           onClick={() => fetch_post_json(`end-judging/${this.props.prompt.id}`) }
         >
-          Move On
+          Move On Without Their Input
           <div className="vote-choices">
             {[...this.props.votes].map(v => {
               return (
@@ -779,29 +789,6 @@ class ActivePrompt extends React.PureComponent {
   }
 
   render() {
-    let move_on_button = null;
-    if (this.props.idle) {
-      move_on_button =(
-        <button
-          className="vote-button"
-          onClick={() => fetch_post_json(`end-answers/${this.props.prompt.id}`) }
-        >
-          Move On
-          <div className="vote-choices">
-            {[...this.props.votes].map(v => {
-              return (
-                <div
-                  key={v}
-                  className="vote-choice"
-                >
-                  {v}
-                </div>
-              );
-            })}
-          </div>
-        </button>
-      );
-    }
 
     let still_waiting = null;
     const answering_players = Object.keys(this.props.players_answering);;
@@ -835,6 +822,32 @@ class ActivePrompt extends React.PureComponent {
       );
     }
 
+    let move_on_button = null;
+    if (this.props.idle) {
+      move_on_button =(
+        <button
+          className="vote-button"
+          onClick={() => fetch_post_json(`end-answers/${this.props.prompt.id}`) }
+        >
+          {answering_players.length ?
+           "Move On Without Their Answers" :
+           "Move On Without Anyone Else"}
+          <div className="vote-choices">
+            {[...this.props.votes].map(v => {
+              return (
+                <div
+                  key={v}
+                  className="vote-choice"
+                >
+                  {v}
+                </div>
+              );
+            })}
+          </div>
+        </button>
+      );
+    }
+
     if (this.props.players_answered.has(this.props.player.name)) {
       return (
         <div className="please-wait">
@@ -1203,7 +1216,7 @@ class Game extends React.PureComponent {
             {state.scores.scores.map(score => {
               let perfect = null;
               if (score.score == perfect_score) {
-                perfect = <span className="label">Perfect!</span>;
+                perfect = <span className="achievement">Perfect!</span>;
               }
               return (
                 <li key={score.players[0]}>