From af722a89e847e1ca38d486695f9410bd7b6e19f7 Mon Sep 17 00:00:00 2001
From: Tdxdxoz <tdxdxoz@gmail.com>
Date: Sun, 27 Dec 2020 19:29:18 +0800
Subject: [PATCH] feat: my_upload and my_fav

---
 app.py              | 11 ++++++++++-
 templates/list.html | 25 ++++++++++++++++++++-----
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/app.py b/app.py
index baa60c5..604ce9e 100644
--- a/app.py
+++ b/app.py
@@ -129,10 +129,13 @@ def list(username):
     year = request.args.get('year')
     year = year and year.isdigit() and int(year)
 
+    is_my_upload = request.args.get('my_upload')
+    is_my_fav = request.args.get('my_fav')
+
     has_course = course is not None
     has_teacher = teacher is not None
     has_year = year is not None
-    ept = not (has_course or has_teacher or has_year) and 'page' not in request.args
+    ept = not (has_course or has_teacher or has_year) and is_my_fav is None and is_my_upload is None and 'page' not in request.args
 
     ps = Paper.query
 
@@ -143,6 +146,12 @@ def list(username):
     if year or year==0:
         ps = ps.filter_by(year=year)
 
+    if is_my_upload:
+        ps = ps.filter_by(author=username)
+    if is_my_fav:
+        ps = ps.join(LikeRelation, Paper.id==LikeRelation.paper_id and LikeRelation.username==username)
+
+
     ps = ps.order_by(db.desc('like_num'))
     pagination = ps.paginate(max_per_page=100)
     curr_year = date.today().year
diff --git a/templates/list.html b/templates/list.html
index f0138cf..d7980c0 100644
--- a/templates/list.html
+++ b/templates/list.html
@@ -177,6 +177,13 @@
       margin-bottom: 8px;
     }
 
+    .user-info {
+      position: fixed;
+      top: 0;
+      right: 0;
+      z-index: 1030
+    }
+
     .user-info:not(:hover) div:not(.show) .username{
       display: none;
     }
@@ -209,7 +216,7 @@
       <h1>华清大学<br>&nbsp;课程攻略<br>&nbsp;&nbsp;共享计划</h1>
     </div>
 
-    <div class="fixed-top text-right user-info">
+    <div class="user-info">
       <div class="btn-group">
         <button type="button" class="btn btn-dark rounded-0 p-1 pl-2">
           <img class="rounded-circle" src="{{avatar}}" width="24">
@@ -219,8 +226,8 @@
       <span class="sr-only">Toggle Dropdown</span>
     </button>
     <div class="dropdown-menu">
-      <a class="dropdown-item" href="#">我的上传</a>
-      <a class="dropdown-item" href="#">我的点赞</a>
+      <a class="dropdown-item" href="?my_upload=1#part2">我的上传</a>
+      <a class="dropdown-item" href="?my_fav=1#part2">我的点赞</a>
       <div class="dropdown-divider"></div>
       <a class="dropdown-item" href="login">切换帐号</a>
     </div>
@@ -240,7 +247,7 @@
           <div class="form-group row">
             <label class="col-sm-3 col-form-label">任课教师</label>
             <div class="col-sm-9">
-              <input type="text" class="form-control" name="teacher" required placeholder="教师名" maxlength="30">
+              <input type="text" class="form-control" name="teacher" required placeholder="教师名或“不适用”" maxlength="30">
             </div>
           </div>
           <div class="form-group row">
@@ -333,10 +340,18 @@
           </div>
         </div>
       </div>
-      <div class="ml-2 mt-2 mb-4">
+      <div class="ml-2 mt-2 mb-5">
         <p>*点击某一课程/教师/年份进行筛选</p>
       </div>
 
+      <div class="mb-2">
+        {% if is_my_upload %}
+        <span class="cate selected"><a href="?my_upload=#part2">我的上传</a></span>
+        {% endif %}
+        {% if is_my_fav %}
+        <span class="cate selected"><a href="?my_fav=#part2">我的点赞</a></span>
+        {% endif %}
+      </div>
 
       {% for p in pagination.items %}
       <div class="qbox">