Add in jinja logic

admin/main.py

@@ -4,8 +4,7 @@
 from performanceplatform.client.admin import AdminAPI
 
 
-@app.route("/", methods=['GET'])
-def root():
+def get_context(session):
     context = dict()
 
     if 'oauth_user' in session and 'oauth_token' in session:
@@ -16,12 +15,17 @@ def root():
             'data_sets': admin_client.list_data_sets(),
         }
 
-    return render_template('index.html', **context)
+    return context
+
+
+@app.route("/", methods=['GET'])
+def root():
+    return render_template('index.html')
 
 
 @app.route("/data-sets", methods=['GET'])
 def data_sets():
-    return render_template('data_sets.html')
+    return render_template('data_sets.html', **get_context(session))
 
 
 @app.route("/upload-error", methods=['GET'])

admin/templates/data_sets.html

@@ -35,12 +35,16 @@ <h3>Upload data to the Performance Platform</h3>
         <ul class="list-unstyled">
           <li>
             <h4>Some data group</h4>
-            <ul class="list-unstyled">
-              <strong>Some data set name</strong>
-              <li>
-                {% include "upload/form.html" %}
-              </li>
-            </ul>    
+            {% if data_sets %}
+              <ul class="list-unstyled">
+                {% for data_set in data_sets %}
+                  <li>
+                  <strong>{{ data_set.name }}</strong>
+                    {% include "upload/form.html" %}
+                  </li>
+                {% endfor %}
+              </ul>    
+              {% endif %}
           </li>
         </ul>
       </div>

admin/templates/navbar/nav.html

@@ -20,9 +20,11 @@
     </div>
     <nav role="navigation" class="collapse navbar-collapse">
         <ul class="nav navbar-nav">
-          <li>
-            <a href="/login" title="Sign in">Sign in</a>
-          </li>
+          {% if not user %}
+            <li>
+              <a href="/login" title="Sign in">Sign in</a>
+            </li>
+          {% endif %}
           <li >
             <a href="/contact">Contact</a>
           </li>

admin/templates/navbar/signed_in.html

@@ -1,8 +1,7 @@
-{% if session.get('user') %}
+{% if user %}
     <div class="navbar-text pull-right">
-        Hello, <a href="https://signon.production.alphagov.co.uk">{{ session.get('user').get('name') }}</a>
-&bull; <a href="{{ url_for("oauth_sign_out") }}">Sign out</a>
-
+        Hello, {{ user.name }}
+        &bull; <a href="/sign-out">Sign out</a>
     </div>
 {% endif %}