From e2df0e7c6c8cdab4db95184018580017dbfa7ba4 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 25 Sep 2024 13:46:55 +0800 Subject: [PATCH 1/2] Fix typo --- Server/openapi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/openapi.json b/Server/openapi.json index a206742f6..ae4f7798f 100644 --- a/Server/openapi.json +++ b/Server/openapi.json @@ -33,7 +33,7 @@ } }, { - "url": "https://uptime-demo.bluewavelabs.ca:/{API_PATH}", + "url": "https://uptime-demo.bluewavelabs.ca/{API_PATH}", "description": "Bluewave Demo Server", "variables": { "PORT": { From 8fcafc069414b8285b331f0f06c870b22e69e79c Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 2 Oct 2024 08:46:33 +0800 Subject: [PATCH 2/2] Fix missed commit --- Client/src/Utils/NetworkService.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Client/src/Utils/NetworkService.js b/Client/src/Utils/NetworkService.js index a8d2d77c9..01f80e0a8 100644 --- a/Client/src/Utils/NetworkService.js +++ b/Client/src/Utils/NetworkService.js @@ -1,5 +1,4 @@ import axios from "axios"; -const DEFAULT_API_URL = "http://localhost:5000/api/v1"; const BASE_URL = import.meta.env.VITE_APP_API_BASE_URL; import { logger } from "./Logger"; class NetworkService { @@ -10,10 +9,8 @@ class NetworkService { this.setBaseUrl(baseURL); this.unsubscribe = store.subscribe(() => { const state = store.getState(); - if (BASE_URL === "undefined" && state.settings.apiBaseUrl) { + if (BASE_URL === undefined && state.settings.apiBaseUrl) { baseURL = state.settings.apiBaseUrl; - } else { - baseURL = DEFAULT_URL; } this.setBaseUrl(baseURL); });