X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=inline;f=empathy%2Fempathy.jsx;h=6e98b327be7ceea20096c3a4e5eb56f3d95c3f0d;hb=5fb4dec0d3dc03696ec2d00788d2d657a23b8bd1;hp=0789b463fe5813cb3fc23b8cb4a84610dd32b2a5;hpb=d49e0aa05e9204fcefa2e7e88653dcd5bdc73a06;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 0789b46..6e98b32 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.
- {props.prompts.map(p => )}
+ {props.prompts.map(
+ prompt =>
+ )}
);
});
@@ -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;;
@@ -482,7 +492,8 @@ class Ambiguities extends React.PureComponent {
this.state = {
word_sets: word_sets,
- selected: null
+ selected: null,
+ starred: null
};
this.submitted = false;
@@ -497,7 +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))
+ word_groups: this.state.word_sets.map(
+ set => ({
+ words: Array.from(set),
+ kudos: this.state.starred === set ? true : false
+ }))
}
);
@@ -589,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 (
@@ -684,6 +699,21 @@ class Ambiguities extends React.PureComponent {
);
})}
+ {
+ event.stopPropagation();
+ this.setState({
+ starred: set
+ });
+ }}
+ >
+ {this.state.starred === set ?
+ 'â
' : 'â'
+ }
+
);
})}
@@ -762,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);;
@@ -818,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 (
@@ -1185,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}
);
})}
@@ -1200,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(', ')}
);
})}