Merge branch 'master' of github.com:adamhrv/megapixels_dev

1 files changed, 8 insertions, 2 deletions

diff --git a/megapixels/app/server/create.py b/megapixels/app/server/create.py
index 9efed669..c1f41dc4 100644
--- a/megapixels/app/server/create.py
+++ b/megapixels/app/server/create.py
@@ -1,4 +1,4 @@
-from flask import Flask, Blueprint, jsonify
+from flask import Flask, Blueprint, jsonify, send_from_directory
 from flask_sqlalchemy import SQLAlchemy
 from app.models.sql_factory import connection_url, load_sql_datasets
 
@@ -7,7 +7,7 @@ from app.server.api import api
 db = SQLAlchemy()
 
 def create_app(script_info=None):
-  app = Flask(__name__, static_url_path='')
+  app = Flask(__name__, static_folder='static', static_url_path='')
   app.config['SQLALCHEMY_DATABASE_URI'] = connection_url
   app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
 
@@ -15,6 +15,7 @@ def create_app(script_info=None):
   datasets = load_sql_datasets(replace=False, base_model=db.Model)
 
   app.register_blueprint(api, url_prefix='/api')
+  app.add_url_rule('/<path:file_relative_path_to_root>', 'serve_page', serve_page, methods=['GET'])
 
   @app.route('/', methods=['GET'])
   def index():
@@ -34,3 +35,8 @@ def create_app(script_info=None):
     return(jsonify(links))
 
   return app
+
+def serve_page(file_relative_path_to_root):
+  if file_relative_path_to_root[-1] == '/':
+    file_relative_path_to_root += 'index.html'
+  return send_from_directory("static", file_relative_path_to_root)