diff --git a/main.py b/main.py index 9d0add5..1a8fa15 100644 --- a/main.py +++ b/main.py @@ -26,9 +26,13 @@ db = SQLAlchemy(app) ma = Marshmallow(app) Bootstrap(app) +@app.route("/test", methods=["GET"]) +def test(): + return render_template("base.html", alert=st.GetAlert(), message=st.GetMessage()) + @app.route("/", methods=["GET"]) def main_page(): - return render_template("base.html") + return render_template("base.html", alert=st.GetAlert(), message=st.GetMessage()) if __name__ == "__main__": if hostname == PROD_HOST: diff --git a/templates/base.html b/templates/base.html index d805e48..b174353 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,9 +1,84 @@ - +{% if not InDBox %} - - Photo Assistant - - -
HI!
- - \ No newline at end of file + + + + + + + + + + + + {% import "bootstrap/wtf.html" as wtf %} + + + + + + + + + {% if message is defined and message|length %} +
+ {{message|safe}} + {{ ClearStatus() }} +
+ {% endif %} +{% endif %} + + {% block main_content %} + {% endblock main_content %} + +{% if not InDBox %} + + + + + + {%block script_content %}{% endblock script_content %} + + +{% endif %}