Setup the sections with WebRTC apps, where required

ImperialCollegeLondon · Sep 21, 2023 · 8912140 · 8912140
1 parent 569f467
commit 8912140
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 11 deletions.
diff --git a/app/core_api.py b/app/core_api.py
@@ -9,7 +9,6 @@
 """
 Constants for API URLs.
 """
-APP_URL = os.environ.get("APP_URL", "http://146.179.34.13:8080/app/html")
 API_URL = os.environ.get("API_URL", "http://liionsden.rcs.ic.ac.uk:8080")
 PLOT_URL = os.environ.get("PLOT_URL", "http://liionsden.rcs.ic.ac.uk:8050")
 
@@ -23,71 +22,86 @@
         "w": 1440,
         "h": 808,
         "space": "Tablet",
-        "app": {"url": APP_URL, "states": {"load": {"url": f"{PLOT_URL}"}}},
+        "app": {
+            "url": f"{API_URL}/app/html",
+            "states": {"load": {"url": f"{PLOT_URL}"}},
+        },
     },
     {
         "x": 0,
         "y": 0,
         "w": 1920,
         "h": 1080,
         "space": "PC01-Top",
-        "app": {"url": APP_URL, "states": {"load": {"url": f"{PLOT_URL}/plot1"}}},
+        "app": {"url": f"{API_URL}/app/webrtc", "states": {"load": "ScreenShare"}},
     },
     {
         "x": 0,
         "y": 0,
         "w": 1920,
         "h": 1080,
         "space": "PC01-Left",
-        "app": {"url": APP_URL, "states": {"load": {"url": f"{PLOT_URL}/plot2"}}},
+        "app": {
+            "url": f"{API_URL}/app/html",
+            "states": {"load": {"url": f"{PLOT_URL}/plot2"}},
+        },
     },
     {
         "x": 0,
         "y": 0,
         "w": 1920,
         "h": 1080,
         "space": "PC01-Right",
-        "app": {"url": APP_URL, "states": {"load": {"url": f"{PLOT_URL}/plot3"}}},
+        "app": {
+            "url": f"{API_URL}/app/html",
+            "states": {"load": {"url": f"{PLOT_URL}/plot3"}},
+        },
     },
     {
         "x": 0,
         "y": 0,
         "w": 1920,
         "h": 1080,
         "space": "PC02-Top",
-        "app": {"url": APP_URL, "states": {"load": {"url": f"{PLOT_URL}/plot4"}}},
+        "app": {"url": f"{API_URL}/app/webrtc", "states": {"load": "ScreenShare"}},
     },
     {
         "x": 0,
         "y": 0,
         "w": 1920,
         "h": 1080,
         "space": "PC02-Left",
-        "app": {"url": APP_URL, "states": {"load": {"url": f"{PLOT_URL}/plot5"}}},
+        "app": {"url": f"{API_URL}/app/webrtc", "states": {"load": "ScreenShare"}},
     },
     {
         "x": 0,
         "y": 0,
         "w": 1920,
         "h": 1080,
         "space": "PC02-Right",
-        "app": {"url": APP_URL, "states": {"load": {"url": f"{PLOT_URL}/plot6"}}},
+        "app": {"url": f"{API_URL}/app/webrtc", "states": {"load": "ScreenShare"}},
     },
     {
         "x": 0,
         "y": 0,
         "w": 3840,
         "h": 2160,
         "space": "Hub01",
-        "app": {"url": APP_URL, "states": {"load": {"url": f"{PLOT_URL}/plot7"}}},
+        "app": {
+            "url": f"{API_URL}/app/html",
+            "states": {"load": {"url": f"{PLOT_URL}/plot7"}},
+        },
     },
     {
         "x": 0,
         "y": 0,
         "w": 3840,
         "h": 2160,
         "space": "Hub02",
-        "app": {"url": APP_URL, "states": {"load": {"url": f"{PLOT_URL}/plot8"}}},
+        "app": {
+            "url": f"{API_URL}/app/html",
+            "states": {"load": {"url": f"{PLOT_URL}/plot8"}},
+        },
     },
 ]
 

diff --git a/configure.py b/configure.py
@@ -70,7 +70,6 @@ def generate_docker_compose(template_file: str, ip: str, develop: bool = False)
         "ports": ["8050:8050"],
         "volumes": ["./app:/app"],
         "environment": {
-            "APP_URL": f"http://{lines_to_replace['OVE_HOST']}/app/html",
             "API_URL": f"http://{lines_to_replace['OVE_HOST']}",
             "PLOT_URL": f"http://{lines_to_replace['PLOT_URL']}",
         },