Merge branch 'profile-page' into development

This commit is contained in:
Inga Kirschnick
2022-12-19 12:51:06 +01:00
8 changed files with 133 additions and 13 deletions

View File

@ -1,5 +1,5 @@
from flask import flash, redirect, render_template, url_for
from flask_login import login_required, login_user
from flask_login import current_user, login_required, login_user
from app.auth.forms import LoginForm
from app.models import User
from . import bp
@ -27,7 +27,11 @@ def faq():
@bp.route('/dashboard')
@login_required
def dashboard():
return render_template('main/dashboard.html.j2', title='Dashboard')
users = [
u.to_json_serializeable(filter_by_privacy_settings=True, include_avatar_relationship=True) for u
in User.query.filter(User.is_public == True, User.id != current_user.id).all()
]
return render_template('main/dashboard.html.j2', title='Dashboard', users=users)
@bp.route('/dashboard2')