Skip to content
Snippets Groups Projects

Combine gamelist and new game form

Merged H9031 requested to merge gamelist into 25-pelinluontilomake
1 file
+ 24
18
Compare changes
  • Side-by-side
  • Inline
+ 24
18
@@ -40,24 +40,24 @@ class Header extends React.Component {
@@ -40,24 +40,24 @@ class Header extends React.Component {
Authorization: 'Bearer ' + token
Authorization: 'Bearer ' + token
}
}
})
})
.then(res => res.json())
.then(res => res.json())
.then(
.then(
result => {
result => {
// if token is still valid, login user
// if token is still valid, login user
if (result === true) {
if (result === true) {
this.setState({
this.setState({
username: sessionStorage.getItem('name'),
username: sessionStorage.getItem('name'),
token: token
token: token
});
});
// logout user if token has expired / is invalid
// logout user if token has expired / is invalid
} else {
} else {
this.handleLogout();
this.handleLogout();
}
},
error => {
console.log(error);
}
}
);
},
 
error => {
 
console.log(error);
 
}
 
);
}
}
}
}
@@ -78,6 +78,13 @@ class Header extends React.Component {
@@ -78,6 +78,13 @@ class Header extends React.Component {
)}
)}
{this.state.username && <button>{this.state.username}</button>}
{this.state.username && <button>{this.state.username}</button>}
<button onClick={this.props.handleLayerChange}>change layer</button>
<button onClick={this.props.handleLayerChange}>change layer</button>
 
<label>Zoom: </label>
 
<select onChange={this.props.handleZoom}>
 
<option value="13">13</option>
 
<option value="10">10</option>
 
<option value="5">5</option>
 
<option value="15">15</option>
 
</select>
</div>
</div>
{this.state.register && (
{this.state.register && (
<RegisterForm
<RegisterForm
@@ -93,7 +100,6 @@ class Header extends React.Component {
@@ -93,7 +100,6 @@ class Header extends React.Component {
toggleView={this.toggleView}
toggleView={this.toggleView}
/>
/>
)}
)}
</div>
</div>
);
);
}
}
Loading