Shows only 5 next pages

Fix showing all possible pages
This commit is contained in:
pluja 2020-10-01 10:09:05 +02:00
parent 9d500eb8d9
commit 99b1f23c6e
2 changed files with 20 additions and 7 deletions

View File

@ -72,20 +72,33 @@ def twitter(page=0):
posts.extend(getFeed(followingList)) posts.extend(getFeed(followingList))
posts.sort(key=lambda x: x.timeStamp, reverse=True) posts.sort(key=lambda x: x.timeStamp, reverse=True)
npage = page*10 # Items range per page
tenmore = npage+10 page_items = page*10
pages = int(math.ceil(len(posts)/10)) tenmore = page_items+10
# Pagination logic
init_page = page-3
if init_page < 0:
init_page = 0
print(init_page)
total_pages = page+5
max_pages = int(math.ceil(len(posts)/10)) # Total number of pages.
if total_pages > max_pages:
total_pages = max_pages
# Posts to render
if posts and len(posts) > tenmore: if posts and len(posts) > tenmore:
posts = posts[npage:tenmore] posts = posts[page_items:tenmore]
else: else:
posts = posts[npage:] posts = posts[page_items:]
if not posts: if not posts:
profilePic = avatarPath profilePic = avatarPath
else: else:
profilePic = posts[0].userProfilePic profilePic = posts[0].userProfilePic
print("--- {} seconds fetching twitter feed---".format(time.time() - start_time)) print("--- {} seconds fetching twitter feed---".format(time.time() - start_time))
return render_template('twitter.html', title='Yotter | Twitter', posts=posts, avatar=avatarPath, profilePic = profilePic, followedCount=followCount, form=form, config=config, pages=pages, actual_page=page) return render_template('twitter.html', title='Yotter | Twitter', posts=posts, avatar=avatarPath, profilePic = profilePic, followedCount=followCount, form=form, config=config, pages=total_pages, init_page=init_page)
@app.route('/savePost/<url>', methods=['POST']) @app.route('/savePost/<url>', methods=['POST'])
@login_required @login_required

View File

@ -27,7 +27,7 @@
</div> </div>
<div class="text container center aligned"> <div class="text container center aligned">
<div class="ui centered pagination menu"> <div class="ui centered pagination menu">
{%for page in range(1, pages)%} {%for page in range(init_page, pages)%}
{% if page == actual_page%} {% if page == actual_page%}
<a href="/twitter/{{page}}" class="active item"> <a href="/twitter/{{page}}" class="active item">
{{page}} {{page}}