From 99f33aa988bf1b5520a76f803d9fd074cb77cf49 Mon Sep 17 00:00:00 2001
From: Paul Bienkowski <pb@opatut.de>
Date: Fri, 3 Dec 2021 17:31:03 +0100
Subject: [PATCH] chore: Use config.json from API route in development mode

---
 api/config.dev.py              |  8 +++++++-
 api/obs/api/routes/frontend.py | 16 ++++++++--------
 docker-compose.yaml            |  6 +++---
 frontend/config.dev.json       | 18 ------------------
 frontend/public/config.json    | 15 ---------------
 frontend/webpack.config.js     |  1 +
 6 files changed, 19 insertions(+), 45 deletions(-)
 delete mode 100644 frontend/config.dev.json
 delete mode 100644 frontend/public/config.json

diff --git a/api/config.dev.py b/api/config.dev.py
index 6711c5d..49d0c04 100644
--- a/api/config.dev.py
+++ b/api/config.dev.py
@@ -11,7 +11,13 @@ DEDICATED_WORKER = True
 FRONTEND_URL = "http://localhost:3001/"
 FRONTEND_HTTPS = False
 FRONTEND_DIR = None
-FRONTEND_CONFIG = None
+FRONTEND_CONFIG = {
+    "imprintUrl": "https://example.com/imprint",
+    "privacyPolicyUrl": "https://example.com/privacy",
+    "mapHome": {"zoom": 6, "longitude": 10.2, "latitude": 51.3},
+    # "banner": {"text": "This is a development installation.", "style": "info"},
+}
+
 TILES_FILE = None  # "/tiles/tiles.mbtiles"
 DATA_DIR = "/data"
 ADDITIONAL_CORS_ORIGINS = [
diff --git a/api/obs/api/routes/frontend.py b/api/obs/api/routes/frontend.py
index 4dd022f..c5547c0 100644
--- a/api/obs/api/routes/frontend.py
+++ b/api/obs/api/routes/frontend.py
@@ -5,13 +5,7 @@ from sanic.exceptions import NotFound
 
 from obs.api.app import app
 
-INDEX_HTML = (
-    join(app.config.FRONTEND_DIR, "index.html")
-    if app.config.get("FRONTEND_DIR")
-    else None
-)
-if INDEX_HTML and exists(INDEX_HTML):
-
+if app.config.FRONTEND_CONFIG:
     @app.get("/config.json")
     def get_frontend_config(req):
         result = {
@@ -35,12 +29,18 @@ if INDEX_HTML and exists(INDEX_HTML):
 
         return response.json(result)
 
+
+INDEX_HTML = (
+    join(app.config.FRONTEND_DIR, "index.html")
+    if app.config.get("FRONTEND_DIR")
+    else None
+)
+if INDEX_HTML and exists(INDEX_HTML):
     with open(INDEX_HTML, "rt") as f:
         index_file_contents = f.read()
 
     @app.get("/<path:path>")
     def get_frontend_static(req, path):
-        print("++++++++++++++++++++++++++++++++++++++++++++++++", path)
         if path.startswith("api/"):
             raise NotFound()
 
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6e27cc2..1b73ff6 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -79,11 +79,11 @@ services:
       - ./frontend/tsconfig.json:/opt/obs/frontend/tsconfig.json
       - ./frontend/package.json:/opt/obs/frontend/package.json
       - ./frontend/webpack.config.js:/opt/obs/frontend/webpack.config.js
-
-      # Overwrite the default config with the development mode configuration
-      - ./frontend/config.dev.json:/opt/obs/frontend/public/config.json
     links:
       - api
+    environment:
+      # used for proxy only
+      - API_URL=http://api:3000/
     ports:
       - '3001:3001'
     restart: on-failure
diff --git a/frontend/config.dev.json b/frontend/config.dev.json
deleted file mode 100644
index f446fd5..0000000
--- a/frontend/config.dev.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "apiUrl": "http://localhost:3000/api",
-  "loginUrl": "http://localhost:3000/login",
-  "imprintUrl": "https://example.com/imprint",
-  "privacyPolicyUrl": "https://example.com/privacy",
-  "basename": "/",
-  "mapHome": {
-    "zoom": 6,
-    "longitude": 10.2,
-    "latitude": 51.3
-  },
-  "obsMapSource": {
-    "type": "vector",
-    "tiles": ["http://localhost:3000/tiles/{z}/{x}/{y}.pbf"],
-    "minzoom": 12,
-    "maxzoom": 14
-  }
-}
diff --git a/frontend/public/config.json b/frontend/public/config.json
deleted file mode 100644
index 7f0ba8d..0000000
--- a/frontend/public/config.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "apiUrl": "https://api.example.com",
-  "imprintUrl": "https://portal.example.com/imprint",
-  "privacyPolicyUrl": "https://portal.example.com/privacy",
-  "basename": "/",
-  "mapHome": {
-    "zoom": 6,
-    "longitude": 10.2,
-    "latitude": 51.3
-  },
-  "obsMapSource": {
-    "type": "vector",
-    "url": "https://portal.example.com/tileset/data/v3.json"
-  }
-}
diff --git a/frontend/webpack.config.js b/frontend/webpack.config.js
index 52a073a..0231a3a 100644
--- a/frontend/webpack.config.js
+++ b/frontend/webpack.config.js
@@ -159,6 +159,7 @@ module.exports = function (webpackEnv) {
         webSocketURL: `ws://0.0.0.0:${port}/ws`,
       },
       proxy: {
+        '/config.json': apiUrl,
         '/api': apiUrl,
         '/login': apiUrl,
       },