X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=53d7763c84f7a27643ac5f90b935dd945c601335;hb=c4f9db9ff6ba1f1f94490a0d8e96acccf0eb549e;hp=9b37d0753f3f2839b4fb0e53c8966ff26f34b364;hpb=0e96dcd31acbae3c82d430db85da5be398e88264;p=lmno.games diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index 9b37d07..53d7763 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 @@ -363,6 +369,45 @@ class CategoryRequest extends React.PureComponent { } } +const PromptOption = React.memo(props => { + + const prompt = props.prompt; + + if (prompt.votes_against.find(v => v === props.player.name)) + return false; + + return ( + + ); +}); + const PromptOptions = React.memo(props => { if (props.prompts.length === 0) @@ -375,29 +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.
- {props.prompts.map(p => { - return ( - - ); - })} + {props.prompts.map( + prompt =>- The following players have completed judging:{' '} - {[...this.props.players_judged].join(', ')} -
+ let still_waiting = null; + const judging_players = Object.keys(this.props.players_judging); + if (judging_players.length) { + still_waiting = ( +- Still waiting for the following players: + Still waiting for the following player + {judging_players.length > 1 ? 's' : '' } + :
+ The following players have completed judging:{' '} + {[...this.props.players_judged].join(', ')} +
+ {still_waiting} {move_on_button}+ Still waiting for the following player + {answering_players.length > 1 ? 's' : ''} + : +
+- Still waiting for the following players: -
-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: