);
});
@@ -185,11 +258,15 @@ class CategoryRequest extends React.PureComponent {
const category_input = this.category.current;
const category = category_input.value;
- if (/[0-9]/.test(category))
- category_input.setCustomValidity("");
+ const match = category.match(/[0-9]+/);
+ if (match) {
+ const num_items = parseInt(match[0], 10);
+ if (num_items <= MAX_PROMPT_ITEMS)
+ category_input.setCustomValidity("");
+ }
}
- handle_submit(event) {
+ async handle_submit(event) {
const form = event.currentTarget;
const category_input = this.category.current;
const category = category_input.value;
@@ -204,11 +281,29 @@ class CategoryRequest extends React.PureComponent {
return;
}
- fetch_post_json("prompts", {
- items: parseInt(match[0], 10),
+ const num_items = parseInt(match[0], 10);
+
+ if (num_items > MAX_PROMPT_ITEMS) {
+ category_input.setCustomValidity(`Maximum number of items is ${MAX_PROMPT_ITEMS}`);
+ form.reportValidity();
+ return;
+ }
+
+ const response = await fetch_post_json("prompts", {
+ items: num_items,
prompt: category
});
+ if (response.status === 200) {
+ const result = await response.json();
+ if (! result.valid) {
+ add_message("danger", result.message);
+ return;
+ }
+ } else {
+ add_message("danger", "An error occurred submitting your category");
+ }
+
form.reset();
}
@@ -287,10 +382,6 @@ const PromptOptions = React.memo(props => {
const LetsPlay = React.memo(props => {
- function handle_click(prompt_id) {
- fetch_post_json
- }
-
const quorum = Math.round((props.num_players + 1) / 2);
const max_votes = props.prompts.reduce(
(max_so_far, v) => Math.max(max_so_far, v.votes.length), 0);
@@ -324,17 +415,30 @@ 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;
+ });
+
this.state = {
- word_groups: props.words.map(word => [word]),
- submitted: false,
+ word_sets: word_sets,
selected: null
};
+
+ this.submitted = false;
+ this.judging_sent_recently = false;
}
async handle_submit() {
+
+ /* Don't submit a second time. */
+ if (this.submitted)
+ return;
+
const response = await fetch_post_json(
- `judging/${this.props.prompt.id}`,{
- word_groups: this.state.word_groups
+ `judged/${this.props.prompt.id}`,{
+ word_groups: this.state.word_sets.map(set => Array.from(set))
}
);
@@ -345,47 +449,70 @@ class Ambiguities extends React.PureComponent {
return;
}
} else {
- add_message("danger", "An error occurred submitting your answers");
+ add_message("danger", "An error occurred submitting the results of your judging");
return;
}
- this.setState({
- submitted: true
- });
+ this.submitted = true;
}
handle_click(word) {
+
+ /* Let the server know we are doing some judging, (but rate limit
+ * this so we don't send a "judging" notification more frquently
+ * than necessary.
+ */
+ if (! this.judging_sent_recently) {
+ fetch_post_json(`judging/${this.props.prompt.id}`);
+ this.judging_sent_recently = true;
+ setTimeout(() => { this.judging_sent_recently = false; }, 1000);
+ }
+
if (this.state.selected == word) {
/* Second click on same word removes the word from the group. */
- const new_groups = this.state.word_groups.filter(
- group => (! group.includes(this.state.selected)) || (group.length > 1)).map(
- group => {
- return group.filter(w => w !== this.state.selected);
- }
- );
+ const idx = this.state.word_sets.findIndex(s => s.has(word));
+ const set = this.state.word_sets[idx];
+ if (set.size === 1) {
+ /* When the word is already alone, there's nothing to do but
+ * to un-select it. */
+ this.setState({
+ selected: null
+ });
+ return;
+ }
+
+ const new_set = new Set([...set].filter(w => w !== word));
this.setState({
selected: null,
- word_groups: [...new_groups, [word]]
+ word_sets: [...this.state.word_sets.slice(0, idx),
+ new_set,
+ new Set().add(word),
+ ...this.state.word_sets.slice(idx+1)]
});
} else if (this.state.selected) {
/* Click of a second word groups the two together. */
- const new_groups = this.state.word_groups.filter(
- group => (! group.includes(word)) || (group.length > 1)).map(
- group => {
- if (group.includes(this.state.selected)) {
- if (! group.includes(word))
- return [...group, word];
- else
- return group;
- } else {
- return group.filter(w => w !== word);
- }
- }
- );
- this.setState({
- selected: null,
- word_groups: new_groups
- });
+ const idx1 = this.state.word_sets.findIndex(s => s.has(this.state.selected));
+ const idx2 = this.state.word_sets.findIndex(s => s.has(word));
+ const set1 = this.state.word_sets[idx1];
+ const set2 = this.state.word_sets[idx2];
+ const new_set = new Set([...set2, ...set1]);
+ if (idx1 < idx2) {
+ this.setState({
+ selected: null,
+ word_sets: [...this.state.word_sets.slice(0, idx1),
+ ...this.state.word_sets.slice(idx1 + 1, idx2),
+ new_set,
+ ...this.state.word_sets.slice(idx2 + 1)]
+ });
+ } else {
+ this.setState({
+ selected: null,
+ word_sets: [...this.state.word_sets.slice(0, idx2),
+ new_set,
+ ...this.state.word_sets.slice(idx2 + 1, idx1),
+ ...this.state.word_sets.slice(idx1 + 1)]
+ });
+ }
} else {
/* First click of a word selects it. */
this.setState({
@@ -395,16 +522,60 @@ class Ambiguities extends React.PureComponent {
}
render() {
- if (this.state.submitted)
+ let move_on_button = null;
+
+ if (this.props.idle) {
+ move_on_button = (
+
+ );
+ }
+
+ if (this.props.players_judged.has(this.props.player.name)) {
return (
-
{this.props.players_judged}/
- {this.props.players_total} players have responded
+
Submission received
- Please wait for the rest of the players to complete judging.
+ The following players have completed judging:
+ {[...this.props.players_judged].join(', ')}