Skip to content

#107/pagination nav redesign #127

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
merged 4 commits into from
Nov 12, 2024
Merged

#107/pagination nav redesign #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1172488
fix: update pagination when favourites list is reduced to a multiple …
camelPhonso Nov 11, 2024
3abb866
style: re-style pagination nav to match figma updates
camelPhonso Nov 11, 2024
c632ba1
refactor: tweak re-render triggers for deleting favourites and pagina…
camelPhonso Nov 11, 2024
ba76516
fix: extend useEffect dependency array to enforce maximum tile count
camelPhonso Nov 11, 2024
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
4 changes: 3 additions & 1 deletion src/components/PaginationNav/PaginationNav.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
display: flex;
justify-content: space-evenly;
align-items: center;
margin-left: 50%;
margin: 0 auto;
margin-top: 10px;
margin-bottom: -10px;
width: 150px;
}
10 changes: 5 additions & 5 deletions src/components/PaginationNav/PaginationNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ export default function PaginationNav({
return (
<div className="pagination-nav">
<button
className="button--secondary"
className="button--secondary text-md"
onClick={navigateToPrevious}
disabled={pageNumber === 1}
>
previous
{"<<<"}
</button>
<p className="bold">{`${pageNumber} of ${pageCount}`}</p>
<p className="bold text-lg">{`${pageNumber} of ${pageCount}`}</p>
<button
className="button--secondary"
className="button--secondary text-md"
onClick={navigateToNext}
disabled={pageNumber === pageCount}
>
next
{">>>"}
</button>
</div>
)
Expand Down
12 changes: 8 additions & 4 deletions src/components/page-components/FavouritesPage/FavouritesPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,13 @@ export default function FavouritesPage() {

if (error) return showBoundary(error)

setFavouritesList(previous =>
previous.filter(favourite => favourite.id !== givenId)
const newFavourites = favouritesList.filter(
favourite => favourite.id !== givenId
)
if (newFavourites.length === 0)
setPageNumber(previous => previous - 1)

setFavouritesList(newFavourites)
}

useEffect(() => {
Expand Down Expand Up @@ -95,14 +99,14 @@ export default function FavouritesPage() {
})

if (popupError) return showBoundary(popupError)
if (meta.pagination.pageCount !== 1)
if (meta.pagination.pageCount !== pageCount)
setPageCount(meta.pagination.pageCount)

setFavouritesList(popupData)
}

getFavourites()
}, [setFavouritesList, pageNumber])
}, [setFavouritesList, pageNumber, favouritesList.length % 6 === 0])

return (
<div className="favourites-page page">
Expand Down
Loading