michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 11:26:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

community sorting on local and subscribed

Browse source
This commit is contained in:
rimu 2024-01-07 22:45:09 +13:00
parent 7ad2781eb5
commit 5751bff5a1
5 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/main/routes.py
View file

@ -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)

6
app/static/structure.css
View file

@ -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 */

10
app/static/structure.scss
View file

@ -461,4 +461,12 @@ fieldset {
.mobile_create_post {
float: right;
}
}
.comment_body {
blockquote {
border-left: 2px solid var(--bs-secondary);
padding: 0.1em 5px;
font-style: italic;
}
}

2
app/static/styles.css
View file

@ -370,7 +370,7 @@ fieldset legend {
}
body {
font-size: 0.9rem;
font-size: 0.95rem;
background-color: #fbfdfe;
color: #495057;
}

2
app/static/styles.scss
View file

@ -5,7 +5,7 @@
@import "scss/controls";
body {
font-size: 0.9rem;
font-size: 0.95rem;
background-color: #fbfdfe;
color: #495057;
}