Skip to content
Snippets Groups Projects
Commit 26336913 authored by Sander Østrem Fagernes's avatar Sander Østrem Fagernes
Browse files

Merge branch 'add-settings-to-frontend' into 'main'

Create a common settings file for backed-url

See merge request !38
parents 55c93fc8 ef37379e
No related branches found
No related tags found
1 merge request!38Create a common settings file for backed-url
Pipeline #214584 passed
app.name=TankWars
app.version=1.0
backend.host=10.212.26.72
backend.port=80
backend.protocol=http
backend.url=http://10.212.26.72
# local development: change backend-url to http://localhost:80
package com.game.tankwars;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
public class ConfigReader {
private static Properties properties = new Properties();
static {
try {
FileHandle fileHandle = Gdx.files.internal("config.properties");
InputStream input = fileHandle.read();
properties.load(input);
} catch (IOException e) {
System.err.println("Error loading configuration file.");
e.printStackTrace();
}
}
public static String getProperty(String key) {
return properties.getProperty(key);
}
}
...@@ -6,6 +6,7 @@ import com.badlogic.gdx.net.HttpRequestBuilder; ...@@ -6,6 +6,7 @@ import com.badlogic.gdx.net.HttpRequestBuilder;
import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Json; import com.badlogic.gdx.utils.Json;
import com.game.tankwars.Callback; import com.game.tankwars.Callback;
import com.game.tankwars.ConfigReader;
import com.game.tankwars.ReceiverHandler; import com.game.tankwars.ReceiverHandler;
import com.game.tankwars.model.User; import com.game.tankwars.model.User;
...@@ -32,7 +33,8 @@ public class LeaderboardController { ...@@ -32,7 +33,8 @@ public class LeaderboardController {
} }
}; };
// Define the URL for the HTTP request // Define the URL for the HTTP request
String url = "http://localhost:3000/highscores"; String url = ConfigReader.getProperty("backend.url") + "/highscores";
// Create a new HttpRequest using the HttpRequestBuilder class // Create a new HttpRequest using the HttpRequestBuilder class
Net.HttpRequest httpRequest = new HttpRequestBuilder() Net.HttpRequest httpRequest = new HttpRequestBuilder()
.newRequest() .newRequest()
......
...@@ -13,6 +13,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField; ...@@ -13,6 +13,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.Json; import com.badlogic.gdx.utils.Json;
import com.game.tankwars.Callback; import com.game.tankwars.Callback;
import com.game.tankwars.ConfigReader;
import com.game.tankwars.ReceiverHandler; import com.game.tankwars.ReceiverHandler;
import com.game.tankwars.TankWarsGame; import com.game.tankwars.TankWarsGame;
import com.game.tankwars.model.CurrentUser; import com.game.tankwars.model.CurrentUser;
...@@ -119,7 +120,7 @@ public class LoginController { ...@@ -119,7 +120,7 @@ public class LoginController {
} }
}; };
String url = String.format("http://localhost:80/user/create/%s", username); String url = ConfigReader.getProperty("backend.url") + "/user/create/" + username;
Net.HttpRequest httpRequest = new HttpRequestBuilder() Net.HttpRequest httpRequest = new HttpRequestBuilder()
.newRequest() .newRequest()
.method(Net.HttpMethods.POST) .method(Net.HttpMethods.POST)
......
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