Merge remote-tracking branch 'upstream/develop' into feat/flow-docs

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);
     });

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": {