[odrs-web] Merge in the users section into stats

[Richard Hughes <rhughes src gnome org>]

commit ae924c590762e460e97a26b8b384a3f7e923a37d
Author: Richard Hughes <richard hughsie com>
Date:   Mon Jul 8 15:59:52 2019 +0100

    Merge in the users section into stats

 app_data/odrs/templates/default.html |  1 -
 app_data/odrs/templates/stats.html   | 56 ++++++++++++++++++++++++++++++++
 app_data/odrs/templates/users.html   | 62 ------------------------------------
 app_data/odrs/tests/odrs_test.py     |  4 +--
 app_data/odrs/views_admin.py         | 30 +++++++----------
 5 files changed, 69 insertions(+), 84 deletions(-)
---
diff --git a/app_data/odrs/templates/default.html b/app_data/odrs/templates/default.html
index 4e86e92..384a3a7 100644
--- a/app_data/odrs/templates/default.html
+++ b/app_data/odrs/templates/default.html
@@ -37,7 +37,6 @@
             <li><a href="{{url_for('.odrs_show_reported', limit=2)}}">Reported</a></li>
 {% if g.user.is_admin %}
             <li><a href="{{url_for('.admin_show_stats')}}">Statistics</a></li>
-            <li><a href="{{url_for('.admin_users_all')}}">Users</a></li>
             <li><a href="{{url_for('.admin_moderator_show_all')}}">Moderators</a></li>
             <li><a href="{{url_for('.admin_taboo_show_all')}}">Taboos</a></li>
             <li><a href="{{url_for('.admin_component_show_all')}}">Components</a></li>
diff --git a/app_data/odrs/templates/stats.html b/app_data/odrs/templates/stats.html
index a849362..d6c5f03 100644
--- a/app_data/odrs/templates/stats.html
+++ b/app_data/odrs/templates/stats.html
@@ -27,4 +27,60 @@
 {% endfor %}
 </ol>
 
+<h2>Most Awesome Users</h2>
+<table class="table table-hover table-responsive">
+  <tr>
+    <th>User</th>
+    <th>Karma</th>
+    <th>Hash</th>
+    <th>Created</th>
+    <th>Banned</th>
+  </tr>
+{% for u in users_awesome %}
+  <tr>
+    <td>{{u.id}}</td>
+    <td>{{u.karma}}</td>
+    <td>
+{% if current_user.is_authenticated %}
+      <a href="{{url_for('.admin_show_user', user_hash=u.user_hash)}}">
+        <code>{{u.user_hash}}</code>
+      </a>
+{% else %}
+      <code>{{u.user_hash}}</code>
+{% endif %}
+    </td>
+    <td>{{u.date_created}}</td>
+    <td>{{u.is_banned}}</td>
+  </tr>
+{% endfor %}
+</table>
+
+<h2>Haters Gonna Hate</h2>
+<table class="table table-hover table-responsive">
+  <tr>
+    <th>User</th>
+    <th>Karma</th>
+    <th>Hash</th>
+    <th>Created</th>
+    <th>Banned</th>
+  </tr>
+{% for u in users_haters %}
+  <tr>
+    <td>{{u.id}}</td>
+    <td>{{u.karma}}</td>
+    <td>
+{% if current_user.is_authenticated %}
+      <a href="{{url_for('.admin_show_user', user_hash=u.user_hash)}}">
+        <code>{{u.user_hash}}</code>
+      </a>
+{% else %}
+      <code>{{u.user_hash}}</code>
+{% endif %}
+    </td>
+    <td>{{u.date_created}}</td>
+    <td>{{u.is_banned}}</td>
+  </tr>
+{% endfor %}
+</table>
+
 {% endblock %}
diff --git a/app_data/odrs/tests/odrs_test.py b/app_data/odrs/tests/odrs_test.py
index bd48084..1c74fc4 100644
--- a/app_data/odrs/tests/odrs_test.py
+++ b/app_data/odrs/tests/odrs_test.py
@@ -112,8 +112,6 @@ class OdrsTest(unittest.TestCase):
 
         rv = self.app.get('/admin/stats')
         assert b'Active reviews</td>\n    <td>1</td>' in rv.data, rv.data
-
-        rv = self.app.get('/admin/users/all')
         assert b'Haters Gonna Hate' in rv.data, rv.data
 
     def test_admin_unreport(self):
@@ -639,7 +637,7 @@ class OdrsTest(unittest.TestCase):
                 '/admin/user_ban/1',
                 '/admin/show/reported',
                 '/admin/show/unmoderated',
-                '/admin/users/all',
+                '/admin/stats',
                 '/admin/moderators/all',
                 '/admin/distros']
         for uri in uris:
diff --git a/app_data/odrs/views_admin.py b/app_data/odrs/views_admin.py
index 5e050a9..852bfad 100644
--- a/app_data/odrs/views_admin.py
+++ b/app_data/odrs/views_admin.py
@@ -232,7 +232,19 @@ def admin_show_stats():
                                     order_by(Component.review_cnt.desc()).\
                                     limit(50).all()
 
+    # users
+    users_awesome = db.session.query(User).\
+                        filter(User.karma != 0).\
+                        order_by(User.karma.desc()).\
+                        limit(10).all()
+    users_haters = db.session.query(User).\
+                        filter(User.karma != 0).\
+                        order_by(User.karma.asc()).\
+                        limit(10).all()
+
     return render_template('stats.html',
+                           users_awesome=users_awesome,
+                           users_haters=users_haters,
                            results_stats=stats,
                            results_viewed=viewed,
                            results_submitted=submitted)
@@ -519,24 +531,6 @@ def admin_show_lang(locale):
     reviews = db.session.query(Review).filter(Review.locale == locale).all()
     return render_template('show-all.html', reviews=reviews)
 
-@app.route('/admin/users/all')
-@login_required
-def admin_users_all():
-    """
-    Return all the users as HTML.
-    """
-    users_awesome = db.session.query(User).\
-                        filter(User.karma != 0).\
-                        order_by(User.karma.desc()).\
-                        limit(10).all()
-    users_haters = db.session.query(User).\
-                        filter(User.karma != 0).\
-                        order_by(User.karma.asc()).\
-                        limit(10).all()
-    return render_template('users.html',
-                           users_awesome=users_awesome,
-                           users_haters=users_haters)
-
 @app.route('/admin/moderators/all')
 @login_required
 def admin_moderator_show_all():