From 5751bff5a165c8ea621dd6fec76d66e77e8761d6 Mon Sep 17 00:00:00 2001
From: rimu <3310831+rimu@users.noreply.github.com>
Date: Sun, 7 Jan 2024 22:45:09 +1300
Subject: [PATCH] community sorting on local and subscribed

---
 app/main/routes.py        | 12 +++++++-----
 app/static/structure.css  |  6 ++++++
 app/static/structure.scss | 10 +++++++++-
 app/static/styles.css     |  2 +-
 app/static/styles.scss    |  2 +-
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/main/routes.py b/app/main/routes.py
index 0976f2f8..e45f3d7c 100644
--- a/app/main/routes.py
+++ b/app/main/routes.py
@@ -143,7 +143,7 @@ def list_communities():
         pass
     else:
         flash('Sorry, no search function yet. Use the topic filter for now.', 'warning')
-        communities = Community.query.filter_by(banned=False).all()
+        communities = Community.query.filter_by(banned=False)
         #query = search(select(Community), search_param, sort=True)  # todo: exclude banned communities from search
         #communities = db.session.scalars(query).all()
 
@@ -159,19 +159,21 @@ def list_communities():
 @bp.route('/communities/local', methods=['GET'])
 def list_local_communities():
     verification_warning()
-    communities = Community.query.filter_by(ap_id=None, banned=False).all()
-    return render_template('list_communities.html', communities=communities, title=_('Local communities'),
+    sort_by = text('community.' + request.args.get('sort_by') if request.args.get('sort_by') else 'community.post_reply_count desc')
+    communities = Community.query.filter_by(ap_id=None, banned=False)
+    return render_template('list_communities.html', communities=communities.order_by(sort_by).all(), title=_('Local communities'), sort_by=sort_by,
                            SUBSCRIPTION_PENDING=SUBSCRIPTION_PENDING, SUBSCRIPTION_MEMBER=SUBSCRIPTION_MEMBER)
 
 
 @bp.route('/communities/subscribed', methods=['GET'])
 def list_subscribed_communities():
     verification_warning()
+    sort_by = text('community.' + request.args.get('sort_by') if request.args.get('sort_by') else 'community.post_reply_count desc')
     if current_user.is_authenticated:
-        communities = Community.query.filter_by(banned=False).join(CommunityMember).filter(CommunityMember.user_id == current_user.id).all()
+        communities = Community.query.filter_by(banned=False).join(CommunityMember).filter(CommunityMember.user_id == current_user.id)
     else:
         communities = []
-    return render_template('list_communities.html', communities=communities, title=_('Joined communities'),
+    return render_template('list_communities.html', communities=communities.order_by(sort_by).all(), title=_('Joined communities'),
                            SUBSCRIPTION_PENDING=SUBSCRIPTION_PENDING, SUBSCRIPTION_MEMBER=SUBSCRIPTION_MEMBER)
 
 
diff --git a/app/static/structure.css b/app/static/structure.css
index dbb41bd2..308b88b5 100644
--- a/app/static/structure.css
+++ b/app/static/structure.css
@@ -786,4 +786,10 @@ fieldset legend {
   float: right;
 }
 
+.comment_body blockquote {
+  border-left: 2px solid var(--bs-secondary);
+  padding: 0.1em 5px;
+  font-style: italic;
+}
+
 /*# sourceMappingURL=structure.css.map */
diff --git a/app/static/structure.scss b/app/static/structure.scss
index fdd2ef4d..879a690c 100644
--- a/app/static/structure.scss
+++ b/app/static/structure.scss
@@ -461,4 +461,12 @@ fieldset {
 
 .mobile_create_post {
   float: right;
-}
\ No newline at end of file
+}
+
+.comment_body {
+  blockquote {
+    border-left: 2px solid var(--bs-secondary);
+    padding: 0.1em 5px;
+    font-style: italic;
+  }
+}
diff --git a/app/static/styles.css b/app/static/styles.css
index a8b02614..77ae7dfe 100644
--- a/app/static/styles.css
+++ b/app/static/styles.css
@@ -370,7 +370,7 @@ fieldset legend {
 }
 
 body {
-  font-size: 0.9rem;
+  font-size: 0.95rem;
   background-color: #fbfdfe;
   color: #495057;
 }
diff --git a/app/static/styles.scss b/app/static/styles.scss
index 239e704d..9d00b181 100644
--- a/app/static/styles.scss
+++ b/app/static/styles.scss
@@ -5,7 +5,7 @@
 @import "scss/controls";
 
 body {
-  font-size: 0.9rem;
+  font-size: 0.95rem;
   background-color: #fbfdfe;
   color: #495057;
 }