X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=53d7763c84f7a27643ac5f90b935dd945c601335;hb=c4f9db9ff6ba1f1f94490a0d8e96acccf0eb549e;hp=143acd930824a564af6a7153cbbd3b37006a54fc;hpb=182083e7c5284b7e373a133dce71eac86cb365f7;p=lmno.games
diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index 143acd9..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 =>
+ )}
);
});
@@ -437,15 +466,34 @@ class Ambiguities extends React.PureComponent {
constructor(props) {
super(props);
- const word_sets = props.words.map(word => {
- const set = new Set();
- set.add(word);
- return set;
- });
+ function canonize(word) {
+ return word.replace(/((a|an|the) )?(.*?)s?$/i, '$3');
+ }
+
+ const word_sets = [];
+
+ for (let word of props.words) {
+ const word_canon = canonize(word);
+ let found_match = false;
+ for (let set of word_sets) {
+ const set_canon = canonize(set.values().next().value);
+ if (word_canon === set_canon) {
+ set.add(word);
+ found_match = true;;
+ break;
+ }
+ }
+ if (! found_match) {
+ const set = new Set();
+ set.add(word);
+ word_sets.push(set);
+ }
+ }
this.state = {
word_sets: word_sets,
- selected: null
+ selected: null,
+ starred: null
};
this.submitted = false;
@@ -460,7 +508,8 @@ 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 => Array.from(set)),
+ kudos: this.state.starred ? Array.from(this.state.starred) : null
}
);
@@ -552,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
{[...this.props.votes].map(v => {
return (
@@ -647,6 +696,21 @@ class Ambiguities extends React.PureComponent {
);
})}
+ {
+ event.stopPropagation();
+ this.setState({
+ starred: set
+ });
+ }}
+ >
+ {this.state.starred === set ?
+ 'â
' : 'â'
+ }
+
);
})}
@@ -725,29 +789,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);;
@@ -781,6 +822,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 (
@@ -1131,15 +1198,29 @@ class Game extends React.PureComponent {
const players_total = 1 + state.other_players.length;
if (state.scores) {
+
+ let perfect_score = 0;
+ for (let i = 0;
+ i < state.active_prompt.items &&
+ i < state.scores.words.length;
+ i++)
+ {
+ perfect_score += state.scores.words[i].players.length;
+ }
+
return (
{state.active_prompt.prompt}
Scores
{state.scores.scores.map(score => {
+ let perfect = null;
+ if (score.score == perfect_score) {
+ perfect = Perfect!;
+ }
return (
- -
- {score.players.join("/")}: {score.score}
+
-
+ {score.players.join("/")}: {score.score} {perfect}
);
})}
@@ -1221,6 +1302,7 @@ class Game extends React.PureComponent {
,