From e669b18062c6282a8787a48d996811d198cf88f4 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Tue, 15 May 2018 15:00:07 +0100
Subject: [PATCH] Add user rank colors, sort user list

---
 app/scss/components.scss         | 20 ++++++++++++++++++++
 app/templates/packages/view.html |  2 +-
 app/templates/users/list.html    |  4 ++--
 app/views/users.py               |  2 +-
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/scss/components.scss b/app/scss/components.scss
index 30d0d48..8382d7f 100644
--- a/app/scss/components.scss
+++ b/app/scss/components.scss
@@ -198,3 +198,23 @@ table tfoot {
 table tfoot td {
 	font-size: 12px;
 }
+
+.userlist li.NOT_JOINED {
+	color: #aaa;
+}
+
+.NOT_JOINED a, a.NOT_JOINED {
+	color: #7ac;
+}
+
+.ADMIN a, a.ADMIN{
+	color: #e30;
+}
+
+.MODERATOR a, a.MODERATOR {
+	color: #e90;
+}
+
+.EDITOR a, a.EDITOR {
+	color: #b6f;
+}
diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index 47d74ea..808e176 100644
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -39,7 +39,7 @@
 			</tr>
 			<tr>
 				<td>Author</td>
-				<td>
+				<td class="{{ package.author.rank }}">
 					<a href="{{ url_for('user_profile_page', username=package.author.username) }}">
 						{{ package.author.display_name }}
 					</a>
diff --git a/app/templates/users/list.html b/app/templates/users/list.html
index 30d2ecc..6bc23b5 100644
--- a/app/templates/users/list.html
+++ b/app/templates/users/list.html
@@ -5,9 +5,9 @@
 {% endblock %}
 
 {% block content %}
-<ul>
+<ul class="userlist">
 	{% for user in users %}
-		<li>
+		<li class="{{ user.rank }}">
 			<a href="{{ url_for('user_profile_page', username=user.username) }}">
 				{{ user.display_name }}
 			</a> -
diff --git a/app/views/users.py b/app/views/users.py
index 247f6d0..ed195d4 100644
--- a/app/views/users.py
+++ b/app/views/users.py
@@ -22,7 +22,7 @@ class UserProfileForm(FlaskForm):
 @app.route("/users/", methods=["GET"])
 @rank_required(UserRank.MODERATOR)
 def user_list_page():
-	users = User.query.all()
+	users = User.query.order_by(db.asc(User.rank), db.asc(User.display_name)).all()
 	return render_template("users/list.html", users=users)