From e1fa53aaf1dd8555b89ab7c3277fac91eb910b34 Mon Sep 17 00:00:00 2001
From: Joni Laukka <jonilaukka@hotmail.com>
Date: Wed, 17 Jul 2019 21:08:58 +0300
Subject: [PATCH] Added confirmation to edit form X button, if changes has been
made to inputs
---
src/components/EditGameForm.js | 28 ++++++----------------------
src/components/GameView.js | 11 ++++++-----
2 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/src/components/EditGameForm.js b/src/components/EditGameForm.js
index 5e0f9b2..5a9d675 100644
--- a/src/components/EditGameForm.js
+++ b/src/components/EditGameForm.js
@@ -31,19 +31,13 @@ export default class EditGameForm extends React.Component {
capture_time: 300,
confirmation_time: 60,
displayColorPicker: false,
- saved: false
+ saved: true
};
-
- this.handleMapDrag = this.handleMapDrag.bind(this);
}
- handleError = error => {
- this.setState({ errorMsg: error });
- };
-
handleChange = e => {
const { name, value } = e.target;
- this.setState({ [name]: value });
+ this.setState({ [name]: value, saved: false });
};
handleFactionAdd = e => {
@@ -201,17 +195,7 @@ export default class EditGameForm extends React.Component {
}
};
- handleMapDrag = e => {
- this.setState({
- mapCenter: e.target.getCenter()
- });
- };
-
- handleMapScroll = e => {
- this.setState({
- zoom: e.target.getZoom()
- });
- };
+ handleMapScroll = e => {};
handleGameSave = e => {
e.preventDefault();
@@ -461,7 +445,7 @@ export default class EditGameForm extends React.Component {
onSubmit={this.handleObjectivePointAdd}
/>
- <h1>Demo Game Editor</h1>
+ <h1>Game Editor</h1>
<br />
<input
placeholder="Game name"
@@ -635,8 +619,8 @@ export default class EditGameForm extends React.Component {
zoom={this.state.zoom}
maxZoom="13"
style={{ height: "400px", width: "400px" }}
- onmoveend={this.handleMapDrag}
- onzoomend={this.handleMapScroll}
+ onmoveend={e => this.setState({ mapCenter: e.target.getCenter() })}
+ onzoomend={e => this.setState({ zoom: e.target.getZoom() })}
>
<TileLayer
attribution="Maanmittauslaitoksen kartta"
diff --git a/src/components/GameView.js b/src/components/GameView.js
index 8f1859e..351850e 100644
--- a/src/components/GameView.js
+++ b/src/components/GameView.js
@@ -25,8 +25,11 @@ export default class GameView extends React.Component {
componentDidMount() {
let gameId = new URL(window.location.href).searchParams.get("id");
- let token = sessionStorage.getItem("token");
+ this.getGameInfo(gameId);
+ }
+ getGameInfo(gameId) {
+ let token = sessionStorage.getItem("token");
fetch(`${process.env.REACT_APP_API_URL}/game/${gameId}`)
.then(res => {
if (!res.ok) {
@@ -191,16 +194,14 @@ export default class GameView extends React.Component {
<EditGameForm
gameId={this.state.gameInfo.id}
toggleView={() => this.setState({ form: "" })}
- onEditSave={() => {
- this.getGameInfo();
- }}
+ onEditSave={() => this.getGameInfo(this.state.gameInfo.id)}
/>
)}
{this.state.form === "join" && (
<JoinGameForm
gameId={this.state.gameInfo.id}
toggleView={() => this.setState({ form: "" })}
- onJoin={() => console.log("joinde")}
+ onJoin={() => console.log("joined")}
/>
)}
{this.state.form === "players" && (
--
GitLab