Pagination

Author: jabbate19

quotefault/__init__.py

@@ -186,13 +186,13 @@ def submit():
     ), 200
 
 
-def get_quote_query(speaker: str = "", submitter: str = "", include_hidden: bool = False):
+def get_quote_query(speaker: str = "", submitter: str = "", last_id = None, include_hidden: bool = False):
     """Return a query based on the args, with vote count attached to the quotes"""
     # Get all the quotes with their votes
     quote_query = db.session.query(Quote, 
         func.sum(Vote.direction).label('votes')).outerjoin(Vote).group_by(Quote)
     # Put the most recent first
-    quote_query = quote_query.order_by(Quote.quote_time.desc())
+    quote_query = quote_query.order_by(Quote.id.desc())
     # Filter hidden quotes
     if not include_hidden:
         quote_query = quote_query.filter(Quote.hidden == False)
@@ -201,6 +201,8 @@ def get_quote_query(speaker: str = "", submitter: str = "", include_hidden: bool
         quote_query = quote_query.filter(Quote.speaker == request.args.get('speaker'))
     if request.args.get('submitter'):
         quote_query = quote_query.filter(Quote.submitter == request.args.get('submitter'))
+    if last_id:
+        quote_query = quote_query.filter(Quote.id < last_id)
     return quote_query
 
 # display first 20 stored quotes
@@ -216,38 +218,42 @@ def get():
     quotes = get_quote_query(speaker = request.args.get('speaker'),
         submitter = request.args.get('submitter')).limit(20).all()
 
+    last_id = list(quotes)[-1][0].id
+
     #tie any votes the user has made to their uid
     user_votes = Vote.query.filter(Vote.voter == metadata['uid']).all()
     return render_template(
         'bootstrap/storage.html',
         quotes=quotes,
         metadata=metadata,
-        user_votes=user_votes
+        user_votes=user_votes,
+        last_id = last_id
     )
 
 
 # display ALL stored quotes
-@app.route('/additional', methods=['GET'])
+@app.route('/storage/<last_id>', methods=['GET'])
 @auth.oidc_auth
-def additional_quotes():
+def additional_quotes(last_id):
     """
     Show beyond the first 20 quotes
     """
-
     metadata = get_metadata()
 
-    # Get all the quotes
+    # Get the most recent 20 quotes
     quotes = get_quote_query(speaker = request.args.get('speaker'),
-        submitter = request.args.get('submitter')).all()
+        submitter = request.args.get('submitter'), last_id = last_id).limit(20).all()
 
-    #tie any votes the user has made to their uid
-    user_votes = db.session.query(Vote).filter(Vote.voter == metadata['uid']).all()
+    last_id = list(quotes)[-1][0].id
 
+    #tie any votes the user has made to their uid
+    user_votes = Vote.query.filter(Vote.voter == metadata['uid']).all()
     return render_template(
-        'bootstrap/additional_quotes.html',
-        quotes=quotes[20:],
+        'bootstrap/storage.html',
+        quotes=quotes,
         metadata=metadata,
-        user_votes=user_votes
+        user_votes=user_votes,
+        last_id = last_id
     )
 
 @app.route('/report/<quote_id>', methods=['POST'])

quotefault/static/js/load_more.js

@@ -18,16 +18,18 @@
             {% endif %}
         {% endwith %}
         {{ display( quotes ) }}
-        <button href="#moreQuotes" id="get_more" data-toggle="collapse" class="btn btn-default center-block">But wait, there's more!</button>
-        <br>
-        <div id="moreQuotes" class="collapse" aria-expanded="false">
-        </div>
+        <a href="/storage/{{ last_id }}">
+        <button id="get_more"  class="btn btn-default center-block">But wait, there's more!</button>
+        </a>
     </div>
 {% endblock %}
 
 {% block scripts %}
     <script src="{{ url_for('static', filename='js/load_more.js') }}"></script>
     <script src="{{ url_for('static', filename='css/votes/upvote.js') }}"></script>
     <script src="{{ url_for('static', filename='js/vote.js') }}"></script>
+    <script>
+        localStorage.setItem("last_id", {{ last_id }});
+    </script>
 {% endblock %}