Added Pagination for Activities Page #1688
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
In the file const getUpdatedExpiryTime = (timestamp: number) => {
const date = new Date(timestamp * 1000);
const days = date.getDate();
return days;
}; // Missing closing curly brace hereOther than that, the provided code seems fine. All looks good. |
rohitmalhotra1420
approved these changes
Jul 3, 2024
rohitmalhotra1420
added a commit
that referenced
this pull request
Jul 3, 2024
* added rewards module * added /rewards route and changed the snap section in dashboard (#1647) * added route and layout * added route and layout * added header tag * added review comments * rewards tabs + dashboard tab ui * fixed ui * added leadership board UI * fixed the colors * fixed border radius * Activities tab UI - Rewards page (#1651) * update UI * fix: resolve comments and pull rewardsv1 * chore: add dark mode style * PR fixes done --------- Co-authored-by: rohitmalhotra1420 <[email protected]> * added lozenge and leaderboard tab (#1653) * added lozenge navigation * added navigation on tab switch * added navigation on tab switch * included rewards header in rewards page * added dark mode support for lozenge * added dark mode support for leaderboard * added heading * changed the background color in masterInterface * changed the background color in masterInterface * review fixes * added review fixes * Leaderboard api (#1658) * added api integration * fixed loading state of leaderboard and some refactoring * pagination fix needed * pagination fix needed * added null page * added ens resolution * fixed the infinite scroll issue * fixed order * fixed the components --------- Co-authored-by: rohitmalhotra1420 <[email protected]> * API Integration of Rewards Activities (#1659) * dark-mode implementation * added lozenge and leaderboard tab (#1653) * added lozenge navigation * added navigation on tab switch * added navigation on tab switch * included rewards header in rewards page * added dark mode support for lozenge * added dark mode support for leaderboard * added heading * changed the background color in masterInterface * changed the background color in masterInterface * review fixes * added review fixes * chore: add wallet connect hook * fix: add update icon * Mobile Viewport and Dark Mode feature added to the rewards page * Fixed the width of the reward points * update queries * add ref section * add click to copy * update code * Added API Integration of get all activities, create new activity, create user id and also discord * resolve conflicts and merge image * resolve comments * fixed discord error * resolve all comments * Added Flow for discord * chore: create user api * Update Total Points in header * fixed things --------- Co-authored-by: corlard3y <[email protected]> Co-authored-by: Monalisha Mishra <[email protected]> Co-authored-by: rohitmalhotra1420 <[email protected]> * chore: add image * prop fixed * Update image name * fixed the file name * added none type to border type * mapped the url and name in the response for the activities and also fixed the redirect url * update initial commits * update routes && fix other comments * update rewards page * Fixed some of the comments * add base-url * update unused variables * fix design qa * update design fixes * remove usegenerateuserid files && fixes * fix loader * update text width * added support for align self in box * added custom hook for discird session * replaced custom hook with useSearchParams hook * removed log * fixed types * Twitter Integration in the rewards (#1672) * Twitter Integration in the rewards * Fixed the verify Twitter flow * Fixed the query keys * Removed flex 1 property * Removed the desc in case of discord and twitter * Fixed all the changes related to Reward Activities * Fixed the button UI and made a separate common button component * Changed the files of getRewardsActivityTitle to a new file in utils * fix button min-width * Client Id for discord * Updated Preview.yml file * added support for rewards base URL * add userGenerateUser hook * Fixed the Connect and User Profile Modal on rewards page * fix onboard text * add pagewrapper * add base path * update preview url * add base * remove unused helper * layout and refeactor * fixed dashboard layout * staging URL updated for points * fixed the firebase configs * changed vapid keys for firebase * reverted back to firebase config of the app * fixed export issues * Fixed the URL issue with the discord * added points/vault routes (#1683) * added points/vault routes * removed /login route * Points login page (#1687) * login page changes * login page changes * login page changes * login page changes * fixed review comments * fixed review comments * Removed the loading state in the button and added the disabled label in the verifying state * Added Pagination for Activities Page (#1688) * Add Vault List (#1689) * feat: add vault list * chore: fix search * chore: fix issues and refactor code * chore: update leaderboard skeleton count to 10 * chore: update activity list query keys * fixed the query invalidation for vault listing * bug: fix empty params request --------- Co-authored-by: rohitmalhotra1420 <[email protected]> * added min-width to buttons --------- Co-authored-by: Monalisha Mishra <[email protected]> Co-authored-by: Kolade <[email protected]> Co-authored-by: Abhishek <[email protected]> Co-authored-by: abhishek-01k <[email protected]> Co-authored-by: Monalisha Mishra <[email protected]> Co-authored-by: Kalash Shah <[email protected]>
corlard3y
added a commit
that referenced
this pull request
Jul 3, 2024
* added rewards module * added /rewards route and changed the snap section in dashboard (#1647) * added route and layout * added route and layout * added header tag * added review comments * rewards tabs + dashboard tab ui * fixed ui * added leadership board UI * fixed the colors * fixed border radius * Activities tab UI - Rewards page (#1651) * update UI * fix: resolve comments and pull rewardsv1 * chore: add dark mode style * PR fixes done --------- Co-authored-by: rohitmalhotra1420 <[email protected]> * added lozenge and leaderboard tab (#1653) * added lozenge navigation * added navigation on tab switch * added navigation on tab switch * included rewards header in rewards page * added dark mode support for lozenge * added dark mode support for leaderboard * added heading * changed the background color in masterInterface * changed the background color in masterInterface * review fixes * added review fixes * Leaderboard api (#1658) * added api integration * fixed loading state of leaderboard and some refactoring * pagination fix needed * pagination fix needed * added null page * added ens resolution * fixed the infinite scroll issue * fixed order * fixed the components --------- Co-authored-by: rohitmalhotra1420 <[email protected]> * API Integration of Rewards Activities (#1659) * dark-mode implementation * added lozenge and leaderboard tab (#1653) * added lozenge navigation * added navigation on tab switch * added navigation on tab switch * included rewards header in rewards page * added dark mode support for lozenge * added dark mode support for leaderboard * added heading * changed the background color in masterInterface * changed the background color in masterInterface * review fixes * added review fixes * chore: add wallet connect hook * fix: add update icon * Mobile Viewport and Dark Mode feature added to the rewards page * Fixed the width of the reward points * update queries * add ref section * add click to copy * update code * Added API Integration of get all activities, create new activity, create user id and also discord * resolve conflicts and merge image * resolve comments * fixed discord error * resolve all comments * Added Flow for discord * chore: create user api * Update Total Points in header * fixed things --------- Co-authored-by: corlard3y <[email protected]> Co-authored-by: Monalisha Mishra <[email protected]> Co-authored-by: rohitmalhotra1420 <[email protected]> * chore: add image * prop fixed * Update image name * fixed the file name * added none type to border type * mapped the url and name in the response for the activities and also fixed the redirect url * update initial commits * update routes && fix other comments * update rewards page * Fixed some of the comments * add base-url * update unused variables * fix design qa * update design fixes * remove usegenerateuserid files && fixes * fix loader * update text width * added support for align self in box * added custom hook for discird session * replaced custom hook with useSearchParams hook * removed log * fixed types * Twitter Integration in the rewards (#1672) * Twitter Integration in the rewards * Fixed the verify Twitter flow * Fixed the query keys * Removed flex 1 property * Removed the desc in case of discord and twitter * Fixed all the changes related to Reward Activities * Fixed the button UI and made a separate common button component * Changed the files of getRewardsActivityTitle to a new file in utils * fix button min-width * Client Id for discord * Updated Preview.yml file * added support for rewards base URL * add userGenerateUser hook * Fixed the Connect and User Profile Modal on rewards page * fix onboard text * add pagewrapper * add base path * update preview url * add base * remove unused helper * layout and refeactor * fixed dashboard layout * staging URL updated for points * fixed the firebase configs * changed vapid keys for firebase * reverted back to firebase config of the app * fixed export issues * Fixed the URL issue with the discord * added points/vault routes (#1683) * added points/vault routes * removed /login route * Points login page (#1687) * login page changes * login page changes * login page changes * login page changes * fixed review comments * fixed review comments * Removed the loading state in the button and added the disabled label in the verifying state * Added Pagination for Activities Page (#1688) * Add Vault List (#1689) * feat: add vault list * chore: fix search * chore: fix issues and refactor code * chore: update leaderboard skeleton count to 10 * chore: update activity list query keys * fixed the query invalidation for vault listing * bug: fix empty params request --------- Co-authored-by: rohitmalhotra1420 <[email protected]> * added min-width to buttons --------- Co-authored-by: Monalisha Mishra <[email protected]> Co-authored-by: Kolade <[email protected]> Co-authored-by: Abhishek <[email protected]> Co-authored-by: abhishek-01k <[email protected]> Co-authored-by: Monalisha Mishra <[email protected]> Co-authored-by: Kalash Shah <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Template
Ticket Number
#1686
Description
Pagination is added to the Activities tab in the rewards Page. Also, an Infinite Scroll bar is also added when the user will scroll to the bottom then more activities will be fetched from the API.
Type of Change
Checklist
Frontend Guidelines
Build & Testing
Screenshots/Video with Explanation
Before: Explain the previous behavior
After: What's changed now
Additional Context
Review & Approvals
Notes
RIght now we have very less activity on the dev server. So, it is hard to test this functionality. This should be added to the rewards V1 page when we have good amount of activities. Or In V2 of the rewards.
OR the backend should give an API to make more activities so that we can test the functionalities in future also. Create a new activity and also delete an activity API will help