diff --git a/client/openapi-config.ts b/client/openapi-config.ts index af1508d9..894f806f 100644 --- a/client/openapi-config.ts +++ b/client/openapi-config.ts @@ -1,7 +1,7 @@ import { ConfigFile } from "@rtk-query/codegen-openapi"; const config: ConfigFile = { - schemaFile: "http://[::1]:5000/openapi.json", + schemaFile: "http://[::1]:1688/openapi.json", apiFile: "./src/api/baseApi.ts", apiImport: "baseApi", outputFile: "./src/api/liberationApi.ts", diff --git a/client/src/api/backend.ts b/client/src/api/backend.ts index 8bc501b8..6b5e27fb 100644 --- a/client/src/api/backend.ts +++ b/client/src/api/backend.ts @@ -1,11 +1,11 @@ import axios from "axios"; -export const HTTP_URL = "http://[::1]:5000/"; +export const HTTP_URL = "http://[::1]:1688/"; export const backend = axios.create({ baseURL: HTTP_URL, }); -export const WEBSOCKET_URL = "ws://[::1]:5000/eventstream"; +export const WEBSOCKET_URL = "ws://[::1]:1688/eventstream"; export default backend; diff --git a/game/server/settings.py b/game/server/settings.py index 5574b125..d414271e 100644 --- a/game/server/settings.py +++ b/game/server/settings.py @@ -19,8 +19,9 @@ class ServerSettings(BaseSettings): # no client/server workflow yet, security has not been a focus. server_bind_address: str = "::1" - # If you for some reason change the port, you'll need to also update map.js. - server_port: int = 5000 + # If you for some reason change the port, you'll need to also update map.js and + # client/src/api/backend.ts. + server_port: int = 1688 # Disable to allow requests to be made to the backend without an API key. require_api_key: bool = True diff --git a/resources/ui/map/map.js b/resources/ui/map/map.js index 9d5aa97d..5e15b5f7 100644 --- a/resources/ui/map/map.js +++ b/resources/ui/map/map.js @@ -1,7 +1,7 @@ const ENABLE_EXPENSIVE_DEBUG_TOOLS = false; // Must be kept in sync with game.server.settings.ServerSettings. -const HTTP_BACKEND = "http://[::1]:5000"; -const WS_BACKEND = "ws://[::1]:5000/eventstream"; +const HTTP_BACKEND = "http://[::1]:1688"; +const WS_BACKEND = "ws://[::1]:1688/eventstream"; METERS_TO_FEET = 3.28084;