Skip to content
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.

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

4845 pray-and-pray revisions pt. 5 #5109

Open
wants to merge 27 commits into
base: main
Choose a base branch
from

Conversation

v-anne
Copy link
Contributor

@v-anne v-anne commented Feb 19, 2025

This PR tackles #5111. It builds on #4956 by doing the following:

  • Adding pagination to both tables on the user page
  • Adding navigation buttons to the user page
  • Modifying the modals, as requested by @mlissner
  • Shifting buttons on the top bar a tad to the left
  • Adding spacing above the leaderboard table
  • Labeling the two tables on the user page. This is a temporary change; a longterm solution will be implemented after collecting some user feedback after launch.

@v-anne v-anne marked this pull request as ready for review February 19, 2025 22:33
@mlissner mlissner requested a review from ERosendo February 19, 2025 23:29
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend implementing tabbed navigation, mirroring the profile page structure, to better organize the prayer lists. Consequently, we would need to develop two separate views:

prayers/{username}/ -> pending prayers list
prayers/{username}/granted -> granted prayer list

This separation offers several advantages, most notably addressing the current pagination problem. The existing pagination template relies on a single 'page' query parameter, which fails when attempting to paginate two tables on the same page. Implementing tabs allows us to use accurate and independent pagination for both 'Pending' and 'Granted' prayer lists.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you recommend I use the structure in nav.html?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you can definitely use that template, or any approach that achieves a split view. Another option is a button in the new nav bar that redirects to the 'Granted Prayers' list, though we'll need to create an appropriate icon for that. 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the button option better. Creation of the new tab seems difficult because we need to feed the username into the context for the parent template.

Copy link
Contributor

@ERosendo ERosendo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The style refactors are looking good overall. I've refined the footer for the first prayers modal. We need to resolve the two remaining comments before we proceed with the merge.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: In review
Development

Successfully merging this pull request may close these issues.

3 participants