From 4a2de0aa1b8d4d2d97823b8d6b1b799cb62e4f92 Mon Sep 17 00:00:00 2001
From: Joni Laukka <joni.laukka.overflow@gmail.com>
Date: Mon, 15 Jul 2019 12:52:34 +0300
Subject: [PATCH] Role fix
---
src/components/GameCard.js | 17 -----------------
src/components/GameView.js | 32 ++++++++------------------------
src/components/PlayerlistView.js | 3 ++-
3 files changed, 10 insertions(+), 42 deletions(-)
diff --git a/src/components/GameCard.js b/src/components/GameCard.js
index 12f7058..b3c5a8c 100644
--- a/src/components/GameCard.js
+++ b/src/components/GameCard.js
@@ -1,5 +1,4 @@
import React from "react";
-import EditGameForm from "./EditGameForm";
import { Link } from "react-router-dom";
export default class GameCard extends React.Component {
@@ -57,22 +56,6 @@ export default class GameCard extends React.Component {
>
<button type="button">Select</button>
</Link>
- {/* <button
- id="editGameButton"
- onClick={() => this.setState({ editForm: true })}
- >
- Edit
- </button> */}
- {/* {this.state.editForm && (
- <EditGameForm
- gameId={this.state.gameInfo.id}
- toggleView={() => this.setState({ editForm: false })}
- onEditSave={() => {
- this.props.onEditSave();
- this.getGameInfo();
- }}
- />
- )} */}
</div>
);
}
diff --git a/src/components/GameView.js b/src/components/GameView.js
index 72e871a..84dae80 100644
--- a/src/components/GameView.js
+++ b/src/components/GameView.js
@@ -10,7 +10,7 @@ import NotificationView from "./NotificationView";
export default class GameView extends React.Component {
state = {
gameInfo: null,
- role: "", //empty, soldier, admin
+ role: "", //empty, soldier, factionleader, admin
form: "",
lat: 62.2416479,
lng: 25.7597186,
@@ -41,28 +41,15 @@ export default class GameView extends React.Component {
Authorization: "Bearer " + token
}
})
+ .then(res => res.json())
.then(res => {
- if (!res.ok) {
- error = true;
- }
- return res.json();
- })
- .then(res => {
- if (error && res.message === "You are admin for this game!") {
- this.setState({
- role: "admin"
- });
- } else if (error) {
- return;
- } else {
- this.setState({
- role: "soldier"
- });
- }
+ this.setState({ role: res.role });
})
- .catch();
+ .catch(error => console.log(error));
}
+ handleLeaveFaction = e => {};
+
render() {
const initialPosition = [this.state.lat, this.state.lng];
@@ -116,11 +103,8 @@ export default class GameView extends React.Component {
role={this.state.role}
/>
)}
- {this.state.role === "soldier" && (
- <button
- id="leaveFactionButton"
- onClick={() => console.log("WIP: leave faction")}
- >
+ {this.state.role !== "admin" && this.state.role !== "" && (
+ <button id="leaveFactionButton" onClick={this.handleLeaveFaction}>
Leave Faction
</button>
)}
diff --git a/src/components/PlayerlistView.js b/src/components/PlayerlistView.js
index 509201d..3c98fdd 100644
--- a/src/components/PlayerlistView.js
+++ b/src/components/PlayerlistView.js
@@ -10,11 +10,12 @@ export default class PlayerlistView extends React.Component {
componentDidMount() {
let token = sessionStorage.getItem("token");
- if (this.props.role !== "soldier") {
+ if (this.props.role !== "soldier" && this.props.role !== "factionleader") {
// get all factions in the game
fetch(`${process.env.REACT_APP_API_URL}/game/${this.props.gameId}`)
.then(res => res.json())
.then(res => {
+ console.log(res);
this.setState({ factions: res.factions });
})
.catch(error => console.log(error));
--
GitLab