Merge branch 'develop' of ssh://mnml.gg:40022/~/mnml into develop

This commit is contained in:
Mashy
2019-07-18 20:32:15 +10:00
5 changed files with 12 additions and 16 deletions
+1
View File
@@ -65,6 +65,7 @@ function Game(props) {
if (!game) return <div>...</div>;
console.log('running game');
const otherTeams = game.players.filter(t => t.id !== account.id);
const playerTeam = game.players.find(t => t.id === account.id);
+1 -1
View File
@@ -129,7 +129,7 @@ function List(args) {
.sort(idSort)
.map(construct => {
const constructName = constructRename === construct.id
? <input id='renameInput' type="text" style="text-align: center" placeholder={construct.name}></input>
? <input id='renameInput' type="text" style="text-align: center" placeholder="enter a new name"></input>
: <h2>{construct.name}</h2>;
const confirm = constructRename === construct.id