Merge pull request #69 from nsidc/create_user_list_view

Create user list view
nsidc · Jul 31, 2023 · 576cf02 · 576cf02
2 parents b76ae62 + 1752c1f
commit 576cf02
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 11 deletions.
diff --git a/usaon_vta_survey/constants/roles.py b/usaon_vta_survey/constants/roles.py
@@ -1,5 +1,5 @@
 ROLES = [
     'admin',
-    # 'respondent',
+    'respondent',
     # 'analyst',
 ]
diff --git a/usaon_vta_survey/routes/__init__.py b/usaon_vta_survey/routes/__init__.py
@@ -8,3 +8,4 @@
 import usaon_vta_survey.routes.profile
 import usaon_vta_survey.routes.survey
 import usaon_vta_survey.routes.surveys
+import usaon_vta_survey.routes.users
diff --git a/usaon_vta_survey/routes/users.py b/usaon_vta_survey/routes/users.py
@@ -0,0 +1,13 @@
+from flask import render_template
+
+from usaon_vta_survey import app
+from usaon_vta_survey.models.tables import User
+
+
+@app.route('/users')
+def view_users():
+    users = User.query.order_by(User.name).all()
+    return render_template(
+        'users.html',
+        users=users,
+    )
diff --git a/usaon_vta_survey/templates/base.html b/usaon_vta_survey/templates/base.html
@@ -1,4 +1,4 @@
-{% from 'macros/user_login_management_buttons.j2' import user_login_buttons %}
+{% from 'macros/login_button_or_private_nav_buttons.j2' import user_login_buttons %}
 
 <!doctype html>
 <head>

diff --git a/usaon_vta_survey/templates/macros/login_button_or_private_nav_buttons.j2 b/usaon_vta_survey/templates/macros/login_button_or_private_nav_buttons.j2
@@ -0,0 +1,15 @@
+{% macro user_login_buttons(current_user) -%}
+  {% if current_user.is_authenticated %}
+    {% if current_user.role=='admin' %}
+      <a href="{{url_for('profile', user_id=current_user.id)}}">Profile</a>
+      <a href="{{url_for('view_users')}}">Users</a>
+      <a href="{{url_for('logout')}}">Logout</a>
+    {% else %}
+      <a href="{{url_for('profile', user_id=current_user.id)}}">Profile</a>
+      <a href="{{url_for('logout')}}">Logout</a>
+    {% endif %}
+  {% else %}
+    <a href="{{url_for('login')}}">Login</a>
+  {% endif %}
+
+{%- endmacro -%}
diff --git a/usaon_vta_survey/templates/macros/user_login_management_buttons.j2 b/usaon_vta_survey/templates/macros/user_login_management_buttons.j2
diff --git a/usaon_vta_survey/templates/users.html b/usaon_vta_survey/templates/users.html
@@ -0,0 +1,35 @@
+{% extends 'base.html' %}
+
+
+{% block content %}
+  <h2>{% block title %}Users{% endblock %}</h1>
+
+  {% if not current_user.is_authenticated %}
+    <h3>Please login to view this page.</h3>  
+  {% else %}
+    {% if not current_user.role=='admin' %}
+      <h3>You don't belong here! This page is for admins only.</h3>
+    {% else %}
+      <table>
+
+        <tr>
+          <th>id</th>
+          <th>Name</th>
+          <th>Role</th>
+          <th>Affiliation</th>
+          <th>Bio</th>
+
+      {% for user in users %}
+        <tr>
+          <td>{{user.id}} </td>
+          <td>{{user.name}}</td>
+          <td>{{user.role}}</td>
+          <td>{{user.affiliation}}</td>
+          <td>{{user.biography}}</td>
+        </tr>
+      {% endfor %}
+
+      </table>
+    {% endif %}
+  {% endif %}
+{% endblock %}