Roflin/gamenight
1
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

gamenight-participants #4

Closed
Roflin wants to merge 7 commits from gamenight-participants into game-adding-to-gamenight
pull from: gamenight-participants
merge into: Roflin:game-adding-to-gamenight
Conversation 0 Commits 7 Files Changed 15 +3 -5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9de8ffaa2d - Show all commits

3
frontend/src/App.js
View File

@ -100,9 +100,6 @@ function App() {
setUser(JSON.parse(localStorage.getItem(localStorageUserKey))); setUser(JSON.parse(localStorage.getItem(localStorageUserKey)));
}, []); }, []);
console.log(activeGamenight);
if(user === null) { if(user === null) {
return ( return (
<div className="App"> <div className="App">

1
frontend/src/components/Gamenight.jsx
View File

@ -1,7 +1,6 @@
import * as React from 'react'; import * as React from 'react';
function Gamenight(props) { function Gamenight(props) {
console.log(props.gamenight);
let games = props.gamenight.game_list.map(g => let games = props.gamenight.game_list.map(g =>
( (

4
frontend/src/components/Gamenights.jsx
View File

@ -36,7 +36,9 @@ function Gamenights(props) {
<li onClick={(e) => props.onSelectGamenight(g)}> <li onClick={(e) => props.onSelectGamenight(g)}>
<span>{g.name}</span> <span>{g.name}</span>
{(props.user.id === g.owner_id || props.user.role === "Admin") && {(props.user.id === g.owner_id || props.user.role === "Admin") &&
<button onClick={() =>DeleteGameNight(g.id, g.owner)}>x</button> <button onClick={(e) => {
e.stopPropagation();
DeleteGameNight(g.id, g.owner)}}>x</button>
} }
</li> </li>
) )