显示当前登录用户；修正explore页面显示用户信息的错误

t7160304 · May 20, 2019 · e18235b · e18235b
1 parent 5c0bd83
commit e18235b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/handlers/main.py b/handlers/main.py
@@ -2,7 +2,7 @@
 from PIL import Image
 from pycket.session import SessionMixin
 
-from utils.account import add_post, get_all_posts, get_post
+from utils.account import add_post, get_all_posts, get_post, get_posts_for
 from utils.photo import UploadImage
 
 
@@ -11,16 +11,17 @@ def get_current_user(self):
         return self.session.get('tudo_user', None)
 
 
-class IndexHandler(tornado.web.RequestHandler):
+class IndexHandler(BaseHandler):
     """
     首页，用户上传图片的展示
     """
+    @tornado.web.authenticated
     def get(self):
-        posts = get_all_posts()
+        posts = get_posts_for(self.current_user)
         self.render('index.html', posts=posts)
 
 
-class ExploreHandler(tornado.web.RequestHandler):
+class ExploreHandler(BaseHandler):
     """
     最近上传的缩略图片页面
     """
@@ -35,10 +36,11 @@ class PostHanlder(BaseHandler):
     """
     def get(self, post_id):
         post = get_post(post_id)
+        user = post.user
         if not post:
             self.write('wrong id {}'.format(post_id))
         else:
-            self.render('post.html', post=post)
+            self.render('post.html', post=post, user=user)
 
 
 class UploadHandler(BaseHandler):

diff --git a/templates/base.html b/templates/base.html
@@ -7,6 +7,11 @@
 </head>
 
 <body>
+
+{% if current_user %}
+<h2>当前登录用户： {{ current_user }} </h2>
+<hr>
+{% end %}
 {% block body %} this is tornado{% end %}
 </body>
 

diff --git a/templates/explore.html b/templates/explore.html
@@ -6,6 +6,8 @@
 {% block body %}
 explore page <br>
 {% for p in posts %}
-<img src="{{ static_url(p.thumb_url) }}" />
+<a href="{{ '/post/{}'.format(p.id) }}">
+    <img src="{{ static_url(p.thumb_url) }}" />
+</a>
 {% end %}
 {% end %}
diff --git a/templates/index.html b/templates/index.html
@@ -6,6 +6,6 @@
 {% block body %}
 index <br>
 {% for p in posts %}
-<img src="{{ static_url(p.image_url) }}" /> <br>
+<a href="{{ '/post/{}'.format(p.id) }}"><img src="{{ static_url(p.image_url) }}" /></a> <br>
 {% end %}
 {% end %}
diff --git a/templates/post.html b/templates/post.html
@@ -4,6 +4,6 @@
 
 
 {% block body %}
-post id {{ post.id }} upload by {{ post.user.name }}<br>
+post id {{ post.id }} upload by {{ user.name }}<br>
 <img src="{{ static_url(post.image_url) }}" />
 {% end %}
diff --git a/utils/account.py b/utils/account.py
@@ -3,6 +3,7 @@
 from models.auth import User, Post
 from models.db import Session
 
+db_session = Session()
 
 def hashed(text):
     return hashlib.md5(text.encode('utf8')).hexdigest()
@@ -34,8 +35,12 @@ def add_post(image_url, thumb_url, username):
     return post_id
 
 def get_all_posts():
-    session = Session()
-    posts = session.query(Post).all()
+    posts = db_session.query(Post).all()
+    return posts
+
+def get_posts_for(username):
+    user = db_session.query(User).filter_by(name=username).first()
+    posts = db_session.query(Post).filter_by(user=user).all()
     return posts
 
 def get_post(post_id):