separate out templates

798d8653 · Travis Rivers · 366381d3 · 798d8653 · 798d8653 · 798d8653
Commit 798d8653 authored 5 years ago by Travis Rivers
--- a/geomagio/webservice/public_app.py
+++ b/geomagio/webservice/public_app.py
@@ -3,7 +3,7 @@ from __future__ import absolute_import, unicode_literals
 import os
 import flask

-from . import data, login
+from . import data


 def create_app():
@@ -12,7 +12,6 @@ def create_app():
    app.config.update(os.environ)

    # connect modules
-    login.init_app(app)
    data.init_app(app)

    # add default route

--- a/geomagio/webservice/templates/_template.html
+++ b/geomagio/webservice/templates/_template.html
@@ -10,8 +10,8 @@
  </head>
  <body>
    <nav>
-      {% if current_user.is_authenticated %} Logged in as {{ current_user.email
-      }}
+      {% if current_user & if current_user.is_authenticated %} Logged in as {{
+      current_user.email }}
      <a href="{{ url_for('login.logout') }}">Log Out</a>
      {% else %}
      <a href="{{ url_for('login.login') }}">Log In</a>

--- a/geomagio/webservice/templates/data/usage.html
+++ b/geomagio/webservice/templates/data/usage.html
-{% extends '_template.html' %} {% block header %}
+{% block header %}
 <link
  rel="stylesheet"
  type="text/css"

--- a/geomagio/webservice/templates/index.html
+++ b/geomagio/webservice/templates/index.html
-{% extends '_template.html' %}
-
 {% block header %}
 <h1>{% block title %}Index{% endblock %}</h1>
-{% endblock %}
-
-
-{% block content %}
+{% endblock %} {% block content %}
 <p>This is the default page, when logged out</p>
 {% endblock %}