From a196ba2c08bd16479134ab542f2560b75f19424f Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 15 Jul 2020 15:45:02 +0200
Subject: Make frontend independent of API

This change makes the frontend independent of the API by removing the
static file serving logic from the API server. Instead, we can serve the
frontend as static HTML over CDNs.
---
 api/main.py | 36 ++++++------------------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

(limited to 'api')

diff --git a/api/main.py b/api/main.py
index a2481269..7544333a 100755
--- a/api/main.py
+++ b/api/main.py
@@ -1,15 +1,16 @@
 #!/usr/bin/env python3
-import flask_socketio
 import json
 import os
 import sys
 import traceback
 import urllib.request
-from flask import Flask, request, send_from_directory, jsonify
+
+import flask_socketio
+from dotenv import load_dotenv
+from flask import Flask, request, jsonify
 from flask_compress import Compress
-from oauth2client import client, crypt
 from flask_cors import CORS
-from dotenv import load_dotenv
+from oauth2client import client, crypt
 
 from opendc.models.user import User
 from opendc.util import rest, path_parser, database
@@ -19,12 +20,6 @@ load_dotenv()
 
 TEST_MODE = "OPENDC_FLASK_TESTING" in os.environ
 
-# Specify the directory of static assets
-if TEST_MODE:
-    STATIC_ROOT = os.curdir
-else:
-    STATIC_ROOT = os.path.join(os.environ['OPENDC_ROOT_DIR'], 'frontend', 'build')
-
 # Set up database if not testing
 if not TEST_MODE:
     database.DB.initialize_database(
@@ -34,7 +29,7 @@ if not TEST_MODE:
         host=os.environ['OPENDC_DB_HOST'] if 'OPENDC_DB_HOST' in os.environ else 'localhost')
 
 # Set up the core app
-FLASK_CORE_APP = Flask(__name__, static_url_path='', static_folder=STATIC_ROOT)
+FLASK_CORE_APP = Flask(__name__)
 FLASK_CORE_APP.config['SECRET_KEY'] = os.environ['OPENDC_FLASK_SECRET']
 
 # Set up CORS support for local setups
@@ -50,11 +45,6 @@ else:
     SOCKET_IO_CORE = flask_socketio.SocketIO(FLASK_CORE_APP)
 
 
-@FLASK_CORE_APP.errorhandler(404)
-def page_not_found(e):
-    return send_from_directory(STATIC_ROOT, 'index.html')
-
-
 @FLASK_CORE_APP.route('/tokensignin', methods=['POST'])
 def sign_in():
     """Authenticate a user with Google sign in"""
@@ -132,20 +122,6 @@ def api_call(version, endpoint_path):
     return flask_response
 
 
-@FLASK_CORE_APP.route('/my-auth-token')
-def serve_web_server_test():
-    """Serve the web server test."""
-    return send_from_directory(STATIC_ROOT, 'index.html')
-
-
-@FLASK_CORE_APP.route('/')
-@FLASK_CORE_APP.route('/projects')
-@FLASK_CORE_APP.route('/projects/<path:project_id>')
-@FLASK_CORE_APP.route('/profile')
-def serve_index(project_id=None):
-    return send_from_directory(STATIC_ROOT, 'index.html')
-
-
 @SOCKET_IO_CORE.on('request')
 def receive_message(message):
     """"Receive a SocketIO request"""
-- 
cgit v1.2.3