Updated frontend for k8s and fixed a backend bug to correctly color t…

…he machines
robocup-logistics · Feb 9, 2024 · ff6d544 · ff6d544
1 parent 363d0a4
commit ff6d544
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -4,7 +4,7 @@ name: Docker Container Build
 
 on:
   push:
-    branches: [ "master", "mqtt-test"]
+    branches: [ "master", "mqtt-test" ]
   pull_request:
     branches: [ "master" ]
 

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -5,7 +5,7 @@ name: .NET build and test
 
 on:
   push:
-    branches: [ "master", "mqtt-test"]
+    branches: [ "master", "mqtt-test" ]
   pull_request:
     branches: [ "master" ]
 

diff --git a/Simulator/MPS/MPS_BS.cs b/Simulator/MPS/MPS_BS.cs
@@ -73,7 +73,7 @@ private void Work()
 
                 //MyLogger.Info("We got a write and reset the wait!");
                 InEvent.Reset();
-                GotConnection= true;
+                GotConnection = true;
                 //HandleBasicTasks();
                 switch (MQTT ? MqttHelper.InNodes.ActionId : InNodes.ActionId.Value)
                 {

diff --git a/Simulator/MPS/Mps.cs b/Simulator/MPS/Mps.cs
@@ -227,6 +227,7 @@ public void HandleBasicTasks()
                 BasicEvent.WaitOne();
                 //MyLogger.Info("We got a write and reset the wait!");
                 BasicEvent.Reset();
+                GotConnection = true;
                 var actionId = 0;
                 if (MQTT)
                 {

diff --git a/frontend/src/app/services/zones.service.ts b/frontend/src/app/services/zones.service.ts
@@ -12,10 +12,17 @@ export class ZonesService {
   private Client: HttpClient;
   private robots : Zone[] | undefined;
   private BaseUrl : string;
-  constructor(private http: HttpClient) {
+  constructor(http: HttpClient) {
     this.Client = http;
     this.BaseUrl = "http://localhost:8000/";
-
+    for (let i = 0; i < document.head.children.length; i++) {
+      if(document.head.children.item(i)?.tagName == "BASE") {
+        const baseHref = document.head.children.item(i)?.getAttribute("href");
+        if (baseHref != "/") {
+          this.BaseUrl = "api/";
+        }
+      }
+    }
   }
 
   getZones(): Observable<Zone[]> {

diff --git a/frontend/src/index.html b/frontend/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>HttpClient Example</title>
+  <title>Agent-Sim</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">