X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;ds=sidebyside;f=empathy%2Fempathy.jsx;h=683f92d9318a6afa6628fd238edacccf9f90f183;hb=1896a4e7c03026eb1ef2aa084b55e1434265fd9d;hp=973a9537f591e34917ff5a476c997cb795ac3de5;hpb=dd52f7568bff0f2125176829ba8b4bd928844d2d;p=lmno.games diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index 973a953..683f92d 100644 --- a/empathy/empathy.jsx +++ b/empathy/empathy.jsx @@ -63,9 +63,23 @@ events.addEventListener("game-state", event => { window.game.set_active_prompt(state.active_prompt); - window.game.set_scores(state.scores); + window.game.set_players_answered(state.players_answered); + + window.game.set_players_answering(state.players_answering); + + window.game.set_answering_idle(state.answering_idle); + + window.game.set_end_answers(state.end_answers); window.game.set_ambiguities(state.ambiguities); + + window.game.set_players_judged(state.players_judged); + + window.game.set_players_judging(state.players_judging); + + window.game.set_end_judging(state.end_judging); + + window.game.set_scores(state.scores); }); events.addEventListener("prompt", event => { @@ -92,6 +106,12 @@ events.addEventListener("player-answering", event => { window.game.set_player_answering(player); }); +events.addEventListener("answering-idle", event => { + const value = JSON.parse(event.data); + + window.game.set_answering_idle(value); +}); + events.addEventListener("vote-end-answers", event => { const player = JSON.parse(event.data); @@ -390,14 +410,19 @@ class Ambiguities extends React.PureComponent { this.state = { word_sets: word_sets, - submitted: false, 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( `judged/${this.props.prompt.id}`,{ word_groups: this.state.word_sets.map(set => Array.from(set)) @@ -415,9 +440,7 @@ class Ambiguities extends React.PureComponent { return; } - this.setState({ - submitted: true - }); + this.submitted = true; } handle_click(word) { @@ -486,7 +509,7 @@ class Ambiguities extends React.PureComponent { } render() { - if (this.state.submitted) + if (this.props.players_judged.has(this.props.player.name)) { return (

Submission received

@@ -531,6 +554,7 @@ class Ambiguities extends React.PureComponent {
); + } const btn_class = "ambiguity-button"; const btn_selected_class = btn_class + " selected"; @@ -584,9 +608,7 @@ class ActivePrompt extends React.PureComponent { super(props); const items = props.prompt.items; - this.state = { - submitted: false - }; + this.submitted = false; this.answers = [...Array(items)].map(() => React.createRef()); this.answering_sent_recently = false; @@ -618,6 +640,10 @@ class ActivePrompt extends React.PureComponent { /* Prevent the default page-changing form-submission behavior. */ event.preventDefault(); + /* And don't submit a second time. */ + if (this.submitted) + return; + const response = await fetch_post_json(`answer/${this.props.prompt.id}`, { answers: this.answers.map(r => r.current.value) }); @@ -634,13 +660,35 @@ class ActivePrompt extends React.PureComponent { /* Everything worked. Server is happy with our answers. */ form.reset(); - this.setState({ - submitted: true - }); + this.submitted = true; } render() { - if (this.state.submitted) + let move_on_button = null; + if (this.props.idle) { + move_on_button =( + + ); + } + + if (this.props.players_answered.has(this.props.player.name)) { return (

Submission received

@@ -664,27 +712,11 @@ class ActivePrompt extends React.PureComponent { ); })} - + {move_on_button}
); + } return (
@@ -738,6 +770,7 @@ class Game extends React.PureComponent { active_prompt: null, players_answered: new Set(), players_answering: {}, + answering_idle: false, end_answers_votes: new Set(), ambiguities: null, players_judged: new Set(), @@ -778,6 +811,7 @@ class Game extends React.PureComponent { active_prompt: null, players_answered: new Set(), players_answering: {}, + answering_idle: false, end_answers_votes: new Set(), ambiguities: null, players_judged: new Set(), @@ -812,6 +846,12 @@ class Game extends React.PureComponent { }); } + set_players_answered(players) { + this.setState({ + players_answered: new Set(players) + }); + } + set_player_answered(player) { const new_players_answering = {...this.state.players_answering}; delete new_players_answering[player]; @@ -822,6 +862,16 @@ class Game extends React.PureComponent { }); } + set_players_answering(players) { + const players_answering = {}; + for (let player of players) { + players_answering[player] = {active: false}; + } + this.setState({ + players_answering: players_answering + }); + } + set_player_answering(player) { this.setState({ players_answering: { @@ -831,6 +881,18 @@ class Game extends React.PureComponent { }); } + set_answering_idle(value) { + this.setState({ + answering_idle: value + }); + } + + set_end_answers(players) { + this.setState({ + end_answers_votes: new Set(players) + }); + } + set_player_vote_end_answers(player) { this.setState({ end_answers_votes: new Set([...this.state.end_answers_votes, player]) @@ -849,6 +911,12 @@ class Game extends React.PureComponent { }); } + set_players_judged(players) { + this.setState({ + players_judged: new Set(players) + }); + } + set_player_judged(player) { const new_players_judging = {...this.state.players_judging}; delete new_players_judging[player]; @@ -859,6 +927,16 @@ class Game extends React.PureComponent { }); } + set_players_judging(players) { + const players_judging = {}; + for (let player of players) { + players_judging[player] = {active: false}; + } + this.setState({ + players_judging: players_judging + }); + } + set_player_judging(player) { this.setState({ players_judging: { @@ -868,6 +946,11 @@ class Game extends React.PureComponent { }); } + set_end_judging(players) { + this.setState({ + end_judging_votes: new Set(players) + }); + } set_player_vote_end_judging(player) { this.setState({ @@ -928,6 +1011,7 @@ class Game extends React.PureComponent { return ; }