From 34f31d00a46d43e3dcf2b795e1544340b9936a89 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Tue, 19 Dec 2017 13:20:27 -0500
Subject: [PATCH] Fixing a few things for subpath deployment

---
 app/__init__.py                  |  6 +++++-
 app/app.py                       | 25 +++++++++++++++++--------
 app/templates/appci_app.html     |  2 +-
 app/templates/appci_branch.html  |  2 +-
 app/templates/appci_compare.html |  2 +-
 5 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 5b256c3..2f38666 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -5,7 +5,11 @@ db = SQLAlchemy()
 
 def create_app():
 
-    from .app import app
+    from .app import main
+    from .settings import STATIC_ROOT
+
+    app = Flask(__name__, static_url_path=STATIC_ROOT)
+    app.register_blueprint(main)
 
     SQLALCHEMY_DATABASE_URI = 'sqlite:///./db.sqlite'
     app.config['SQLALCHEMY_DATABASE_URI'] = SQLALCHEMY_DATABASE_URI
diff --git a/app/app.py b/app/app.py
index c23b636..6a708dd 100644
--- a/app/app.py
+++ b/app/app.py
@@ -1,8 +1,9 @@
-from flask import Flask, render_template, jsonify
-from flask_sqlalchemy import SQLAlchemy
+from flask import render_template, Blueprint
 from .models import App, AppCI, AppCIBranch
+from .settings import SITE_ROOT
+
+main = Blueprint('main', __name__, url_prefix=SITE_ROOT)
 
-app = Flask(__name__)
 
 def sort_test_results(results):
 
@@ -14,14 +15,20 @@ def sort_test_results(results):
     print(results)
 
     return sorted(results,
-                 key=lambda r: (-r.level, -r.score(), r.app.name))
+                  key=lambda r: (-r.level, -r.score(), r.app.name))
 
 
-@app.route('/')
+@main.route('/tartiflette')
+@main.route('/tartiflette/')
+def woopsies():
+    return "Woopsies"
+
+@main.route('/')
 def index():
     return render_template('index.html')
 
-@app.route('/appci/branch/<branch>')
+
+@main.route('/appci/branch/<branch>')
 def appci_branch(branch):
 
     branch = AppCIBranch.query.filter_by(name=branch).first_or_404()
@@ -32,7 +39,8 @@ def appci_branch(branch):
                                                 branch=branch,
                                                 app_results=app_results)
 
-@app.route('/appci/app/<app>')
+
+@main.route('/appci/app/<app>')
 def appci_app(app):
 
     app = App.query.filter_by(name=app).first_or_404()
@@ -46,7 +54,8 @@ def appci_app(app):
                                              app=app,
                                              branch_results=branch_results)
 
-@app.route('/appci/compare/<ref>...<target>')
+
+@main.route('/appci/compare/<ref>...<target>')
 def appci_compare(ref, target):
 
     assert ref != target, "Can't compare the same branches, bruh"
diff --git a/app/templates/appci_app.html b/app/templates/appci_app.html
index 4494acb..d5d7b25 100644
--- a/app/templates/appci_app.html
+++ b/app/templates/appci_app.html
@@ -21,7 +21,7 @@
                 {% for result in branch_results %}
                 <tr branch="{{ result.branch.name }}">
                     <td class="ci-app-row-title">
-                        <a href="{{ url_for('appci_branch', branch=result.branch.name) }}">
+                        <a href="{{ url_for('main.appci_branch', branch=result.branch.name) }}">
                             <span title="Branch">
                             <strong>{{ result.branch.display_name }}</strong></span>
                         </a>
diff --git a/app/templates/appci_branch.html b/app/templates/appci_branch.html
index bff76a5..dba4a02 100644
--- a/app/templates/appci_branch.html
+++ b/app/templates/appci_branch.html
@@ -25,7 +25,7 @@
                         {% if result.app.list.name == "official" %}
                             <span class="official-star oi oi-star" title="Official" aria-hidden="true"></span>
                         {% endif %}
-                        <a href="{{ url_for('appci_app', app=result.app.name) }}">
+                        <a href="{{ url_for('main.appci_app', app=result.app.name) }}">
                             <span title="App">
                             <strong>{{ result.app.name }}</strong></span>
                         </a>
diff --git a/app/templates/appci_compare.html b/app/templates/appci_compare.html
index e9f9ddc..bd31c1d 100644
--- a/app/templates/appci_compare.html
+++ b/app/templates/appci_compare.html
@@ -22,7 +22,7 @@
                         {% if result.app.list.name == "official" %}
                             <span class="official-star oi oi-star" title="Official" aria-hidden="true"></span>
                         {% endif %}
-                        <a href="{{ url_for('appci_app', app=result.app.name) }}">
+                        <a href="{{ url_for('main.appci_app', app=result.app.name) }}">
                             <span title="App">
                             <strong>{{ result.app.name }}</strong></span>
                         </a>