From fcdecf554d0bbad80b96b3c34fb5ba8cefef2144 Mon Sep 17 00:00:00 2001 From: Carl Worth Date: Mon, 8 Jun 2020 06:54:16 -0700 Subject: [PATCH] Empathy: Send prompt suggestions to server and display received prompts The received prompts can come in an initial list as part of the "game-state" event sent when first connecting, and they can also come in subsequent "prompt" events when a player submits a category suggestion. These are all displayed as large buttons. Clicking a button also sends a vote to the server, but received votes are not yet displayed in any way. --- empathy/empathy.css | 11 +++++- empathy/empathy.jsx | 81 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 86 insertions(+), 6 deletions(-) diff --git a/empathy/empathy.css b/empathy/empathy.css index e8a317e..f3a4c4b 100644 --- a/empathy/empathy.css +++ b/empathy/empathy.css @@ -1 +1,10 @@ -/* Nothing to see here yet. */ +.vote-button { + width: 100%; + background-color: var(--accent-color); + color: var(--text-fg-on-accent); + text-align: left; + border-radius: 25px; + font-size: 200%; + padding: 1em; + margin-top: 0.25em; +} diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index 1ee8000..1867381 100644 --- a/empathy/empathy.jsx +++ b/empathy/empathy.jsx @@ -52,6 +52,20 @@ events.addEventListener("player-update", event => { window.game.set_other_player_info(info); }); +events.addEventListener("game-state", event => { + const state = JSON.parse(event.data); + + for (let prompt of state.prompts) { + window.game.add_or_update_prompt(prompt); + } +}); + +events.addEventListener("prompt", event => { + const prompt = JSON.parse(event.data); + + window.game.add_or_update_prompt(prompt); +}); + /********************************************************* * Game and supporting classes * *********************************************************/ @@ -140,19 +154,26 @@ class CategoryRequest extends React.Component { } handle_submit(event) { + const form = event.currentTarget; const category_input = this.category.current; const category = category_input.value; /* Prevent the default page-changing form-submission behavior. */ event.preventDefault(); - if (! /[0-9]/.test(category)) { + const match = category.match(/[0-9]+/); + if (match === null) { category_input.setCustomValidity("Category must include a number"); - event.currentTarget.reportValidity(); + form.reportValidity(); return; } - console.log("Do something here with category: " + category); + fetch_post_json("prompts", { + items: parseInt(match[0], 10), + prompt: category + }); + + form.reset(); } render() { @@ -160,8 +181,8 @@ class CategoryRequest extends React.Component {

Submit a Category

- Suggest a category to play with your friends. Don't forget to - include the number of items for each person to submit. + Suggest a category to play. Don't forget to include the + number of items for each person to submit.

@@ -171,6 +192,7 @@ class CategoryRequest extends React.Component { id="category" placeholder="6 things at the beach" required + autoComplete="off" onChange={this.handle_change} ref={this.category} /> @@ -188,6 +210,37 @@ class CategoryRequest extends React.Component { } } +function PromptOptions(props) { + + function handle_click(id) { + fetch_post_json(`vote/${id}`); + } + + if (props.prompts.length === 0) + return null; + + return ( +
+

Vote on Categories

+

+ Select any categories below that you'd like to play. + You can choose as many as you'd like. +

+ {props.prompts.map(p => { + return ( + + ); + })} +
+ ); +} + class Game extends React.Component { constructor(props) { super(props); @@ -195,6 +248,7 @@ class Game extends React.Component { game_info: {}, player_info: {}, other_players: [], + prompts: [] }; } @@ -223,6 +277,19 @@ class Game extends React.Component { }); } + add_or_update_prompt(prompt) { + const prompts_copy = [...this.state.prompts]; + const idx = prompts_copy.findIndex(p => p.id === prompt.id); + if (idx >= 0) { + prompts_copy[idx] = prompt; + } else { + prompts_copy.push(prompt); + } + this.setState({ + prompts: prompts_copy + }); + } + render() { const state = this.state; @@ -241,6 +308,10 @@ class Game extends React.Component {

, , + ]; } -- 2.43.0