X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=110b330a71142a5de6c27ee0bd567a1c5abf0591;hp=84a35a5eab96f71fd37336ce6f4bcef37312a85b;hb=67bface07504b1e5809c860f81c2cdc1d3a720a3;hpb=a1ed0fc881f3bfe6cc55041fda3b54f7c0baa94b diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx index 84a35a5..110b330 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 * *********************************************************/ @@ -66,7 +80,7 @@ function copy_to_clipboard(id) document.body.removeChild(tmp); } -function GameInfo(props) { +const GameInfo = React.memo(props => { if (! props.id) return null; @@ -83,9 +97,9 @@ function GameInfo(props) { >Copy Link ); -} +}); -function PlayerInfo(props) { +const PlayerInfo = React.memo(props => { if (! props.player.id) return null; @@ -101,7 +115,7 @@ function PlayerInfo(props) { ))} ); -} +}); function fetch_method_json(method, api = '', data = {}) { const response = fetch(api, { @@ -122,22 +136,44 @@ async function fetch_put_json(api = '', data = {}) { return fetch_method_json('PUT', api, data); } -class CategoryRequest extends React.Component { +class CategoryRequest extends React.PureComponent { constructor(props) { super(props); this.category = React.createRef(); + this.handle_change = this.handle_change.bind(this); this.handle_submit = this.handle_submit.bind(this); } + handle_change(event) { + const category_input = this.category.current; + const category = category_input.value; + + if (/[0-9]/.test(category)) + category_input.setCustomValidity(""); + } + 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(); - console.log("Do something here with category: " + category); + const match = category.match(/[0-9]+/); + if (match === null) { + category_input.setCustomValidity("Category must include a number"); + form.reportValidity(); + return; + } + + fetch_post_json("prompts", { + items: parseInt(match[0], 10), + prompt: category + }); + + form.reset(); } render() { @@ -145,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.

@@ -155,8 +191,9 @@ class CategoryRequest extends React.Component { type="text" id="category" placeholder="6 things at the beach" - required pattern=".*[0-9]+.*" - title="Category must contain a number" + required + autoComplete="off" + onChange={this.handle_change} ref={this.category} />
@@ -173,13 +210,53 @@ class CategoryRequest extends React.Component { } } -class Game extends React.Component { +const PromptOptions = React.memo(props => { + + 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.PureComponent { constructor(props) { super(props); this.state = { game_info: {}, player_info: {}, other_players: [], + prompts: [] }; } @@ -208,6 +285,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; @@ -226,6 +316,10 @@ class Game extends React.Component {

, , + ]; }