Skip to content
Snippets Groups Projects
Commit f29df59d authored by Taneli Riihimäki's avatar Taneli Riihimäki
Browse files

Revert "added env variable for fetch url"

This reverts commit c5729360.
parent c5729360
No related branches found
No related tags found
1 merge request!21Development
REACT_APP_URL = "http://localhost:5000"
\ No newline at end of file
...@@ -75,7 +75,7 @@ export class EditGameForm extends React.Component { ...@@ -75,7 +75,7 @@ export class EditGameForm extends React.Component {
let token = sessionStorage.getItem('token'); let token = sessionStorage.getItem('token');
// Send Game info to the server // Send Game info to the server
fetch(`${process.env.REACT_APP_URL}/game/edit/` + this.props.gameId, { fetch('http://localhost:5000/game/edit/' + this.props.gameId, {
method: 'PUT', method: 'PUT',
headers: { headers: {
Authorization: 'Bearer ' + token, Authorization: 'Bearer ' + token,
...@@ -102,7 +102,7 @@ export class EditGameForm extends React.Component { ...@@ -102,7 +102,7 @@ export class EditGameForm extends React.Component {
} }
getGameInfo(gameId) { getGameInfo(gameId) {
fetch(`${process.env.REACT_APP_URL}/game/` + gameId) fetch('http://localhost:5000/game/' + gameId)
.then(response => response.json()) .then(response => response.json())
.then(json => this.handleGameInfo(json)) .then(json => this.handleGameInfo(json))
.catch(error => console.log(error)); .catch(error => console.log(error));
...@@ -126,79 +126,79 @@ export class EditGameForm extends React.Component { ...@@ -126,79 +126,79 @@ export class EditGameForm extends React.Component {
render() { render() {
return ReactDOM.createPortal( return ReactDOM.createPortal(
<div className='fade-main'> <div className="fade-main">
<div className='sticky'> <div className="sticky">
<span <span
id='closeEditGameFormX' id="closeEditGameFormX"
className='close' className="close"
onClick={this.handleView} onClick={this.handleView}
> >
× ×
</span> </span>
</div> </div>
<div className=''> <div className="">
<form onSubmit={this.handleGameSave}> <form onSubmit={this.handleGameSave}>
<h1>Demo Game Creation</h1> <h1>Demo Game Creation</h1>
<br /> <br />
<input <input
placeholder='Game name' placeholder="Game name"
name='gamename' name="gamename"
value={this.state.gamename} value={this.state.gamename}
onChange={this.handleChange} onChange={this.handleChange}
id='editGameNameInput' id="editGameNameInput"
/> />
<br /> <br />
<input <input
placeholder='Description' placeholder="Description"
type='text' type="text"
name='description' name="description"
value={this.state.description} value={this.state.description}
onChange={this.handleChange} onChange={this.handleChange}
id='editGameDescriptionInput' id="editGameDescriptionInput"
/> />
<br /> <br />
<label className=''>Start:</label> <label className="">Start:</label>
<input <input
className='formDate' className="formDate"
type='date' type="date"
name='startDate' name="startDate"
value={this.state.startDate} value={this.state.startDate}
onChange={this.handleChange} onChange={this.handleChange}
id='editGameDateStartInput' id="editGameDateStartInput"
/> />
<input <input
className='formTime' className="formTime"
type='time' type="time"
name='startTime' name="startTime"
value={this.state.startTime} value={this.state.startTime}
onChange={this.handleChange} onChange={this.handleChange}
rid='editGameTimeStartInput' rid="editGameTimeStartInput"
/> />
<br /> <br />
<label className=''>End:</label> <label className="">End:</label>
<input <input
className='formDate' className="formDate"
type='date' type="date"
name='endDate' name="endDate"
value={this.state.endDate} value={this.state.endDate}
onChange={this.handleChange} onChange={this.handleChange}
min={this.state.startDate} min={this.state.startDate}
id='editGameDateEndInput' id="editGameDateEndInput"
/> />
<input <input
className='formTime' className="formTime"
type='time' type="time"
name='endTime' name="endTime"
value={this.state.endTime} value={this.state.endTime}
onChange={this.handleChange} onChange={this.handleChange}
id='editGameTimeEndInput' id="editGameTimeEndInput"
/> />
<br /> <br />
<label>Map things</label> <label>Map things</label>
<br /> <br />
<Map <Map
id='editGameCenterMap' id="editGameCenterMap"
className='' className=""
center={[this.state.mapCenter.lat, this.state.mapCenter.lng]} center={[this.state.mapCenter.lat, this.state.mapCenter.lng]}
zoom={this.state.zoom} zoom={this.state.zoom}
style={{ height: '400px', width: '400px' }} style={{ height: '400px', width: '400px' }}
...@@ -206,12 +206,12 @@ export class EditGameForm extends React.Component { ...@@ -206,12 +206,12 @@ export class EditGameForm extends React.Component {
onzoomend={this.handleMapScroll} onzoomend={this.handleMapScroll}
> >
<TileLayer <TileLayer
attribution='Maanmittauslaitoksen kartta' attribution="Maanmittauslaitoksen kartta"
url=' https://tiles.kartat.kapsi.fi/taustakartta/{z}/{x}/{y}.jpg' url=" https://tiles.kartat.kapsi.fi/taustakartta/{z}/{x}/{y}.jpg"
/> />
</Map> </Map>
<br /> <br />
<button id='editGameSubmitButton' type='submit'> <button id="editGameSubmitButton" type="submit">
Save changes Save changes
</button> </button>
<h2>{this.state.errorMsg}</h2> <h2>{this.state.errorMsg}</h2>
......
...@@ -18,7 +18,7 @@ class GameList extends React.Component { ...@@ -18,7 +18,7 @@ class GameList extends React.Component {
} }
getGames() { getGames() {
fetch(`${process.env.REACT_APP_URL}/game/listgames`) fetch('http://localhost:5000/game/listgames')
.then(response => response.json()) .then(response => response.json())
.then(games => { .then(games => {
this.setState({ this.setState({
......
...@@ -34,7 +34,7 @@ class Header extends React.Component { ...@@ -34,7 +34,7 @@ class Header extends React.Component {
componentDidMount() { componentDidMount() {
let token = sessionStorage.getItem('token'); let token = sessionStorage.getItem('token');
if (token) { if (token) {
fetch(`${process.env.REACT_APP_URL}/user/verify`, { fetch('http://localhost:5000/user/verify', {
headers: { headers: {
Authorization: 'Bearer ' + token Authorization: 'Bearer ' + token
} }
......
...@@ -38,7 +38,7 @@ export class LoginForm extends React.Component { ...@@ -38,7 +38,7 @@ export class LoginForm extends React.Component {
e.preventDefault(); e.preventDefault();
// Send login info to the server // Send login info to the server
fetch(`${process.env.REACT_APP_URL}/user/login`, { fetch('http://localhost:5000/user/login', {
method: 'POST', method: 'POST',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
...@@ -80,11 +80,7 @@ export class LoginForm extends React.Component { ...@@ -80,11 +80,7 @@ export class LoginForm extends React.Component {
return ( return (
<div className='fade-main'> <div className='fade-main'>
<div className='sticky'> <div className='sticky'>
<span <span id="closeLoginFormX" className='close' onClick={this.handleView}>
id='closeLoginFormX'
className='close'
onClick={this.handleView}
>
× ×
</span> </span>
</div> </div>
...@@ -97,7 +93,7 @@ export class LoginForm extends React.Component { ...@@ -97,7 +93,7 @@ export class LoginForm extends React.Component {
name='username' name='username'
value={this.state.username} value={this.state.username}
onChange={this.handleChange} onChange={this.handleChange}
id='loginUsernameInput' id="loginUsernameInput"
/> />
<br /> <br />
<input <input
...@@ -106,16 +102,15 @@ export class LoginForm extends React.Component { ...@@ -106,16 +102,15 @@ export class LoginForm extends React.Component {
name='password' name='password'
value={this.state.password} value={this.state.password}
onChange={this.handleChange} onChange={this.handleChange}
id='loginPasswordInput' id="loginPasswordInput"
/> />
<br /> <br />
<button id='submitLoginButton' type='submit'> <button id="submitLoginButton" type='submit'>login</button>
login
</button>
<h2>{this.state.errorMsg}</h2> <h2>{this.state.errorMsg}</h2>
</form> </form>
</div> </div>
</div> </div>
); );
} }
} }
......
...@@ -77,7 +77,7 @@ export class NewGameForm extends React.Component { ...@@ -77,7 +77,7 @@ export class NewGameForm extends React.Component {
let token = sessionStorage.getItem('token'); let token = sessionStorage.getItem('token');
// Send Game info to the server // Send Game info to the server
fetch(`${process.env.REACT_APP_URL}/game/new`, { fetch('http://localhost:5000/game/new', {
method: 'POST', method: 'POST',
headers: { headers: {
Authorization: 'Bearer ' + token, Authorization: 'Bearer ' + token,
...@@ -103,77 +103,77 @@ export class NewGameForm extends React.Component { ...@@ -103,77 +103,77 @@ export class NewGameForm extends React.Component {
render() { render() {
return ReactDOM.createPortal( return ReactDOM.createPortal(
<div className='fade-main'> <div className="fade-main">
<div className='sticky'> <div className="sticky">
<span <span
id='closeNewGameFormX' id="closeNewGameFormX"
className='close' className="close"
onClick={this.handleView} onClick={this.handleView}
> >
× ×
</span> </span>
</div> </div>
<div className=''> <div className="">
<form onSubmit={this.handleGameCreation}> <form onSubmit={this.handleGameCreation}>
<h1>Demo Game Creation</h1> <h1>Demo Game Creation</h1>
<br /> <br />
<input <input
placeholder='Game name' placeholder="Game name"
name='gamename' name="gamename"
value={this.state.gamename} value={this.state.gamename}
onChange={this.handleChange} onChange={this.handleChange}
id='newGameNameInput' id="newGameNameInput"
/> />
<br /> <br />
<input <input
placeholder='Description' placeholder="Description"
type='text' type="text"
name='description' name="description"
value={this.state.description} value={this.state.description}
onChange={this.handleChange} onChange={this.handleChange}
id='newGameDescriptionInput' id="newGameDescriptionInput"
/> />
<br /> <br />
<label className=''>Start:</label> <label className="">Start:</label>
<input <input
className='formDate' className="formDate"
type='date' type="date"
name='startDate' name="startDate"
value={this.state.startDate} value={this.state.startDate}
onChange={this.handleChange} onChange={this.handleChange}
id='newGameDateStartInput' id="newGameDateStartInput"
/> />
<input <input
className='formTime' className="formTime"
type='time' type="time"
name='startTime' name="startTime"
onChange={this.handleChange} onChange={this.handleChange}
id='newGameTimeStartInput' id="newGameTimeStartInput"
/> />
<br /> <br />
<label className=''>End:</label> <label className="">End:</label>
<input <input
className='formDate' className="formDate"
type='date' type="date"
name='endDate' name="endDate"
value={this.state.endDate} value={this.state.endDate}
onChange={this.handleChange} onChange={this.handleChange}
min={this.state.startDate} min={this.state.startDate}
id='newGameDateEndInput' id="newGameDateEndInput"
/> />
<input <input
className='formTime' className="formTime"
type='time' type="time"
name='endTime' name="endTime"
onChange={this.handleChange} onChange={this.handleChange}
id='newGameTimeEndInput' id="newGameTimeEndInput"
/> />
<br /> <br />
<label>Map things</label> <label>Map things</label>
<br /> <br />
<Map <Map
id='newGameCenterMap' id="newGameCenterMap"
className='' className=""
center={[this.state.mapCenter.lat, this.state.mapCenter.lng]} center={[this.state.mapCenter.lat, this.state.mapCenter.lng]}
zoom={this.state.zoom} zoom={this.state.zoom}
style={{ height: '400px', width: '400px' }} style={{ height: '400px', width: '400px' }}
...@@ -181,12 +181,12 @@ export class NewGameForm extends React.Component { ...@@ -181,12 +181,12 @@ export class NewGameForm extends React.Component {
onzoomend={this.handleMapScroll} onzoomend={this.handleMapScroll}
> >
<TileLayer <TileLayer
attribution='Maanmittauslaitoksen kartta' attribution="Maanmittauslaitoksen kartta"
url=' https://tiles.kartat.kapsi.fi/taustakartta/{z}/{x}/{y}.jpg' url=" https://tiles.kartat.kapsi.fi/taustakartta/{z}/{x}/{y}.jpg"
/> />
</Map> </Map>
<br /> <br />
<button id='newGameSubmitButton' type='submit'> <button id="newGameSubmitButton" type="submit">
Submit Submit
</button> </button>
<h2>{this.state.errorMsg}</h2> <h2>{this.state.errorMsg}</h2>
......
...@@ -44,7 +44,7 @@ export class RegisterForm extends React.Component { ...@@ -44,7 +44,7 @@ export class RegisterForm extends React.Component {
this.handleError('Passwords do not match'); this.handleError('Passwords do not match');
} else { } else {
// Send register info to the server // Send register info to the server
fetch(`${process.env.REACT_APP_URL}/user/register`, { fetch('http://localhost:5000/user/register', {
method: 'POST', method: 'POST',
headers: { headers: {
Accept: 'application/json', Accept: 'application/json',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment