From 70026cebc0fd20b660cafe0bf95d0eea73459de2 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 27 Oct 2020 20:30:09 +0100
Subject: Propagate user-specified API url to React build

This change fixes an issue where we did not forward the environmental
variable for controlling the API url to the React build.
---
 frontend/src/api/routes/token-signin.js | 9 +++++++--
 frontend/src/api/socket.js              | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'frontend/src')

diff --git a/frontend/src/api/routes/token-signin.js b/frontend/src/api/routes/token-signin.js
index 7553d043..577f4723 100644
--- a/frontend/src/api/routes/token-signin.js
+++ b/frontend/src/api/routes/token-signin.js
@@ -1,5 +1,10 @@
 export function performTokenSignIn(token) {
-    return new Promise((resolve) => {
-        window['jQuery'].post('/tokensignin', { idtoken: token }, (data) => resolve(data))
+    const apiUrl = process.env.REACT_APP_API_BASE_URL || ''
+    const data = new FormData()
+    data.append('idtoken', token)
+
+    return fetch(`https://${apiUrl}/tokensignin`, {
+        method: 'POST',
+        body: data,
     })
 }
diff --git a/frontend/src/api/socket.js b/frontend/src/api/socket.js
index 96034021..6974d5eb 100644
--- a/frontend/src/api/socket.js
+++ b/frontend/src/api/socket.js
@@ -6,7 +6,7 @@ let requestIdCounter = 0
 const callbacks = {}
 
 export function setupSocketConnection(onConnect) {
-    const apiUrl = process.env.REACT_APP_API_URL || window.location.hostname + ':' + window.location.port
+    const apiUrl = process.env.REACT_APP_API_BASE_URL || window.location.hostname + ':' + window.location.port
 
     socket = io.connect(window.location.protocol + '//' + apiUrl)
     socket.on('connect', onConnect)
-- 
cgit v1.2.3


From 45c3adb6fdfed5c191d8a14562eaabbd54c5c91b Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 27 Oct 2020 23:08:12 +0100
Subject: Split prod and dev config for Docker Compose

This change splits the Docker Compose configuration into three files in
order to share the configuration for different environments (e.g.
development and production).

Furthermore, this change drops the requirement for a reverse proxy.
---
 frontend/src/api/routes/token-signin.js | 10 +++++-----
 frontend/src/api/socket.js              |  6 ++++--
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'frontend/src')

diff --git a/frontend/src/api/routes/token-signin.js b/frontend/src/api/routes/token-signin.js
index 577f4723..d6cff570 100644
--- a/frontend/src/api/routes/token-signin.js
+++ b/frontend/src/api/routes/token-signin.js
@@ -1,10 +1,10 @@
 export function performTokenSignIn(token) {
     const apiUrl = process.env.REACT_APP_API_BASE_URL || ''
-    const data = new FormData()
-    data.append('idtoken', token)
 
-    return fetch(`https://${apiUrl}/tokensignin`, {
+    return fetch(`${apiUrl}/tokensignin`, {
         method: 'POST',
-        body: data,
-    })
+        body: new URLSearchParams({
+            idtoken: token,
+        }),
+    }).then((res) => res.json())
 }
diff --git a/frontend/src/api/socket.js b/frontend/src/api/socket.js
index 6974d5eb..1c432167 100644
--- a/frontend/src/api/socket.js
+++ b/frontend/src/api/socket.js
@@ -6,9 +6,11 @@ let requestIdCounter = 0
 const callbacks = {}
 
 export function setupSocketConnection(onConnect) {
-    const apiUrl = process.env.REACT_APP_API_BASE_URL || window.location.hostname + ':' + window.location.port
+    const apiUrl =
+        process.env.REACT_APP_API_BASE_URL ||
+        `${window.location.protocol}//${window.location.hostname}:${window.location.port}`
 
-    socket = io.connect(window.location.protocol + '//' + apiUrl)
+    socket = io.connect(apiUrl)
     socket.on('connect', onConnect)
     socket.on('response', onSocketResponse)
 }
-- 
cgit v1.2.3


From add670266391580e300235365e733f1ceea70122 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 27 Oct 2020 23:20:33 +0100
Subject: Fix images on frontpage

This change fixes the invalid images on the frontpage by hosting them
ourselves.
---
 frontend/src/components/home/ModelingSection.js   | 2 +-
 frontend/src/components/home/SimulationSection.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'frontend/src')

diff --git a/frontend/src/components/home/ModelingSection.js b/frontend/src/components/home/ModelingSection.js
index 60d372f2..643dca65 100644
--- a/frontend/src/components/home/ModelingSection.js
+++ b/frontend/src/components/home/ModelingSection.js
@@ -5,7 +5,7 @@ const ModelingSection = () => (
     <ScreenshotSection
         name="modeling"
         title="Datacenter Modeling"
-        imageUrl="https://github.com/atlarge-research/opendc/raw/master/images/opendc-frontend-construction.PNG"
+        imageUrl="/img/screenshot-construction.png"
         caption="Building a datacenter in OpenDC"
         imageIsRight={true}
     >
diff --git a/frontend/src/components/home/SimulationSection.js b/frontend/src/components/home/SimulationSection.js
index 9852cbb8..e7a02068 100644
--- a/frontend/src/components/home/SimulationSection.js
+++ b/frontend/src/components/home/SimulationSection.js
@@ -5,7 +5,7 @@ const ModelingSection = () => (
     <ScreenshotSection
         name="simulation"
         title="Datacenter Simulation"
-        imageUrl="https://github.com/atlarge-research/opendc/raw/master/images/opendc-frontend-simulation-zoom.PNG"
+        imageUrl="/img/screenshot-simulation-zoom.png"
         caption="Running an experiment in OpenDC"
         imageIsRight={false}
     >
-- 
cgit v1.2.3