Skip to content

fixes #326 - Improved pagination of Leaderboard #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xnmn merged 1 commit into from
May 22, 2020
Merged

fixes #326 - Improved pagination of Leaderboard #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions routes/root.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,17 @@ route.get('/leaderboard/:year?', async (req, res) => {
row.isColored = true
}
})
for (var i = 1; i <= lastPage; i++) pagination.push(`?page=${i}&size=${options.size}`)
for (var i = 1; i <= lastPage; i++) pagination.push({link: `?page=${i}&size=${options.size}`, index: i})

let newPagination = pagination.slice(Math.max(0, options.page - 3), Math.min(options.page + 2, pagination.length));
if(newPagination[0].index != 1){
newPagination.unshift({link: "#", index: ". . ."});
newPagination.unshift({link: `?page=${1}&size=${options.size}`, index: 1})
}
if(newPagination[newPagination.length -1].index != lastPage){
newPagination.push({link: "#", index: ". . ."});
newPagination.push({link: `?page=${lastPage}&size=${options.size}`, index: lastPage});
}

res.render('pages/leaderboard', {
prevPage: options.page - 1,
Expand All @@ -87,7 +97,7 @@ route.get('/leaderboard/:year?', async (req, res) => {
isLastPage: options.page == lastPage,
size: options.size,
page: options.page,
pagination: pagination,
pagination: newPagination,
userstats: rows,
loggedInUser,
showUserAtTop,
Expand Down
6 changes: 3 additions & 3 deletions views/pages/leaderboard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
<a class="item" href="?page={{prevPage}}&size={{size}}" >Prev </a>
{{/if}}

{{#each pagination as |link index|}}
<a class="item {{#equal (add index 1) ../page}} active {{/equal}} " href="{{link}}" >
{{add index 1}}
{{#each pagination as |link|}}
<a class="item {{#equal link.index ../page}} active {{/equal}} " href="{{link.link}}" >
{{link.index}}
</a>
{{/each}}
{{#if isLastPage}}
Expand Down