Skip to content

Commit df224d6

Browse files
authored
Fix routes (#171)
* fix: move index redirect into blueprint * feat: add favicon.ico
1 parent 4c49665 commit df224d6

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

materializationengine/app.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import numpy as np
66
from dynamicannotationdb.models import Base, AnalysisVersion
7-
from flask import Blueprint, Flask, current_app, jsonify, redirect
7+
from flask import Blueprint, Flask, current_app, jsonify, redirect, url_for
88
from flask_cors import CORS
99
from flask_restx import Api
1010
from flask_sqlalchemy import SQLAlchemy
@@ -22,6 +22,7 @@
2222
from materializationengine.views import views_bp
2323
from materializationengine.limiter import limiter
2424
from materializationengine.migrate import migrator
25+
2526
db = SQLAlchemy(model_class=Base)
2627

2728

@@ -68,6 +69,10 @@ def versions():
6869
def version():
6970
return jsonify(__version__), 200
7071

72+
@apibp.route("/")
73+
def index():
74+
return redirect("/materialize/views/")
75+
7176
db.init_app(app)
7277
ma.init_app(app)
7378

@@ -76,7 +81,10 @@ def version():
7681

7782
with app.app_context():
7883
api = Api(
79-
apibp, title="Materialization Engine API", version=__version__, doc="/doc"
84+
apibp,
85+
title="Materialization Engine API",
86+
version=__version__,
87+
doc="/api/doc",
8088
)
8189
api.add_namespace(mat_bp, path="/api/v2")
8290
api.add_namespace(client_bp, path="/api/v2")
@@ -98,10 +106,6 @@ def health():
98106
session.close()
99107
return jsonify({aligned_volume: n_versions}), 200
100108

101-
@app.route("/materialize/")
102-
def index():
103-
return redirect("/materialize/views")
104-
105109
@app.teardown_appcontext
106110
def shutdown_session(exception=None):
107111
for key in sqlalchemy_cache._sessions:

static/favicon.ico

15 KB
Binary file not shown.

templates/base.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{% block title %}{% endblock %} - Materialization Service - v.{{version}}
44
</title>
55
<link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}" />
6+
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
67
<nav>
78
<ul>
89
<li>

0 commit comments

Comments
 (0)