social-area page and profile page update

app/users/routes.py

@@ -1,3 +1,4 @@
+from datetime import datetime
 from flask import (
     abort,
     current_app,
@@ -12,7 +13,7 @@ from flask_login import current_user, login_required
 from threading import Thread
 import os
 from app import db
-from app.models import Avatar, ProfilePrivacySettings, User
+from app.models import Avatar, Corpus, ProfilePrivacySettings, User
 from . import bp
 from .forms import (
   EditPrivacySettingsForm,
@@ -29,10 +30,23 @@ def before_request():
 @login_required
 def user(user_id):
     user = User.query.get_or_404(user_id)
+    last_seen = user.last_seen.strftime('%Y-%m-%d %H:%M')
+    member_since = user.member_since.strftime('%Y-%m-%d')
+    followed_corpora = [
+        c.to_json_serializeable() for c in user.followed_corpora
+    ]
+    own_public_corpora = [
+        c.to_json_serializeable() for c
+        in Corpus.query.filter_by(is_public = True, user = user).all()
+    ]
     if not user.is_public and user != current_user:
         abort(403)
     return render_template(
-        'users/profile.html.j2', 
+        'users/profile.html.j2',
+        followed_corpora=followed_corpora,
+        last_seen=last_seen,
+        member_since=member_since,
+        own_public_corpora=own_public_corpora,
         user=user.to_json_serializeable(),
         user_id=user_id
     )
@@ -56,18 +70,6 @@ def delete_user(user_id):
     thread.start()
     return {}, 202
 
-@bp.route('/<hashid:user_id>')
-def profile(user_id):
-    user = User.query.get_or_404(user_id)
-    if not user.is_public and user != current_user:
-        abort(403)
-    return render_template(
-        'users/profile.html.j2', 
-        user=user.to_json_serializeable(),
-        user_id=user_id
-    )
-
-
 @bp.route('/<hashid:user_id>/avatar')
 def profile_avatar(user_id):
     user = User.query.get_or_404(user_id)
@@ -91,7 +93,6 @@ def delete_profile_avatar(user_id):
             avatar = Avatar.query.get(avatar_id)
             avatar.delete()
             db.session.commit()
-
     user = User.query.get_or_404(user_id)
     if user.avatar is None:
         abort(404)