X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=a9911d760188ba0736a8f8fb1db15057ab97bbc5;hp=5782b7879076bdd8812bccffc58a281b63760d5b;hb=2bb9bc00050a317973c677d8efa697e48ea1eaf6;hpb=5d49d1235592034458ce875b5d73d024ef23355d
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 5782b78..a9911d7 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
@@ -502,8 +508,11 @@ 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)
+ word_groups: this.state.word_sets.map(
+ set => ({
+ words: Array.from(set),
+ kudos: this.state.starred === set ? true : false
+ }))
}
);
@@ -595,7 +604,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
{[...this.props.votes].map(v => {
return (
@@ -783,29 +792,6 @@ class ActivePrompt extends React.PureComponent {
}
render() {
- let move_on_button = null;
- if (this.props.idle) {
- move_on_button =(
-
- );
- }
let still_waiting = null;
const answering_players = Object.keys(this.props.players_answering);;
@@ -839,6 +825,32 @@ class ActivePrompt extends React.PureComponent {
);
}
+ let move_on_button = null;
+ if (this.props.idle) {
+ move_on_button =(
+
+ );
+ }
+
if (this.props.players_answered.has(this.props.player.name)) {
return (
@@ -1206,12 +1218,18 @@ class Game extends React.PureComponent {
{state.scores.scores.map(score => {
let perfect = null;
- if (score.score == perfect_score) {
- perfect = Perfect!;
+ if (score.score === perfect_score) {
+ perfect = Perfect!;
+ }
+ let quirkster = null;
+ if (score.score === state.active_prompt.items) {
+ quirkster = Quirkster!;
}
return (
-
- {score.players.join("/")}: {score.score} {perfect}
+ {score.players.join("/")}: {score.score}
+ {score.kudos ? `, ${'â
'.repeat(score.kudos)}` : ""}
+ {perfect} {quirkster}
);
})}
@@ -1221,7 +1239,9 @@ class Game extends React.PureComponent {
{state.scores.words.map(word => {
return (
-
- {word.word} ({word.players.length}): {word.players.join(', ')}
+ {word.word} ({word.players.length}
+ {word.kudos.length ? `, ${'â
'.repeat(word.kudos.length)}` : ""}
+ ): {word.players.join(', ')}
);
})}
@@ -1290,15 +1310,15 @@ class Game extends React.PureComponent {
,
- ,
,
+
];
}