From 984773793dee015d292cfe720819390321923372 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Thu, 28 Nov 2024 16:57:52 -0800 Subject: [PATCH] fix: pagination value divisible by 2 and 3 --- package-lock.json | 4 ++-- package.json | 2 +- src/pages/watching/favorites/movies/[...page].astro | 7 ++++--- src/pages/watching/favorites/shows/[...page].astro | 5 +++-- src/pages/watching/recent/movies/[...page].astro | 5 +++-- src/pages/watching/recent/shows/[...page].astro | 5 +++-- src/utils/constants/index.js | 3 ++- 7 files changed, 18 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index bec50df..17c8c4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "1.5.0", + "version": "1.5.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "1.5.0", + "version": "1.5.1", "dependencies": { "@astrojs/check": "0.9.4", "@astrojs/cloudflare": "^11.2.0", diff --git a/package.json b/package.json index 1c58bd4..418dadd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coryd.dev", "type": "module", - "version": "1.5.0", + "version": "1.5.1", "scripts": { "dev": "astro dev", "start": "astro dev", diff --git a/src/pages/watching/favorites/movies/[...page].astro b/src/pages/watching/favorites/movies/[...page].astro index cabff2b..f69a38b 100644 --- a/src/pages/watching/favorites/movies/[...page].astro +++ b/src/pages/watching/favorites/movies/[...page].astro @@ -4,6 +4,7 @@ import Grid from "@components/media/Grid.astro"; import { fetchMovies } from "@utils/data/movies.js"; import { shuffleArray } from "@utils/helpers/general.js"; import icons from "@cdransf/astro-tabler-icons"; +import { WATCHING_PAGE_SIZE } from "@utils/constants/index.js" export const prerender = true; @@ -11,7 +12,7 @@ export const getStaticPaths = async ({ paginate }) => { const movies = await fetchMovies(); const favoriteMovies = movies.favorites; return paginate(favoriteMovies, { - pageSize: 15, + pageSize: WATCHING_PAGE_SIZE, }); }; @@ -54,7 +55,7 @@ const description = "These are my favorite movies. There are many like them, but data={paginatedMovies} pagination={pagination} shape="poster" - count={15} + count={WATCHING_PAGE_SIZE} loading="eager" /> - \ No newline at end of file + diff --git a/src/pages/watching/favorites/shows/[...page].astro b/src/pages/watching/favorites/shows/[...page].astro index cf2c07a..f5565bd 100644 --- a/src/pages/watching/favorites/shows/[...page].astro +++ b/src/pages/watching/favorites/shows/[...page].astro @@ -4,6 +4,7 @@ import Grid from "@components/media/Grid.astro"; import { fetchShows } from "@utils/data/tv.js"; import { shuffleArray } from "@utils/helpers/general.js"; import icons from "@cdransf/astro-tabler-icons"; +import { WATCHING_PAGE_SIZE } from "@utils/constants/index.js" export const prerender = true; @@ -11,7 +12,7 @@ export const getStaticPaths = async ({ paginate }) => { const shows = await fetchShows(); const favoriteShows = shows.favorites; return paginate(favoriteShows, { - pageSize: 15, + pageSize: WATCHING_PAGE_SIZE, }); }; @@ -54,7 +55,7 @@ const description = "These are my favorite TV shows. There are many like them, b data={paginatedShows} pagination={pagination} shape="poster" - count={15} + count={WATCHING_PAGE_SIZE} loading="eager" /> diff --git a/src/pages/watching/recent/movies/[...page].astro b/src/pages/watching/recent/movies/[...page].astro index f8ab3f9..953788a 100644 --- a/src/pages/watching/recent/movies/[...page].astro +++ b/src/pages/watching/recent/movies/[...page].astro @@ -4,6 +4,7 @@ import Grid from "@components/media/Grid.astro"; import { fetchMovies } from "@utils/data/movies.js"; import { shuffleArray } from "@utils/helpers/general.js"; import icons from "@cdransf/astro-tabler-icons"; +import { WATCHING_PAGE_SIZE } from "@utils/constants/index.js" export const prerender = true; @@ -11,7 +12,7 @@ export const getStaticPaths = async ({ paginate }) => { const movies = await fetchMovies(); const recentlyWatchedMovies = movies.recentlyWatched; return paginate(recentlyWatchedMovies, { - pageSize: 15, + pageSize: WATCHING_PAGE_SIZE, }); }; @@ -60,7 +61,7 @@ const description = data={paginatedMovies} pagination={pagination} shape="poster" - count={15} + count={WATCHING_PAGE_SIZE} loading="eager" /> diff --git a/src/pages/watching/recent/shows/[...page].astro b/src/pages/watching/recent/shows/[...page].astro index 9722534..200b3c6 100644 --- a/src/pages/watching/recent/shows/[...page].astro +++ b/src/pages/watching/recent/shows/[...page].astro @@ -4,6 +4,7 @@ import Grid from "@components/media/Grid.astro"; import { fetchShows } from "@utils/data/tv.js"; import { shuffleArray } from "@utils/helpers/general.js"; import icons from "@cdransf/astro-tabler-icons"; +import { WATCHING_PAGE_SIZE } from "@utils/constants/index.js" export const prerender = true; @@ -12,7 +13,7 @@ export const getStaticPaths = async ({ paginate }) => { const recentlyWatchedShows = shows.recentlyWatched || []; return paginate(recentlyWatchedShows, { - pageSize: 15, + pageSize: WATCHING_PAGE_SIZE, }); }; @@ -61,7 +62,7 @@ const description = "All of the shows I've watched recently."; data={paginatedShows} pagination={pagination} shape="poster" - count={15} + count={WATCHING_PAGE_SIZE} loading="eager" /> diff --git a/src/utils/constants/index.js b/src/utils/constants/index.js index b8b5a48..a0ddff7 100644 --- a/src/utils/constants/index.js +++ b/src/utils/constants/index.js @@ -1 +1,2 @@ -export const CACHE_DURATION = 120 * 1000; \ No newline at end of file +export const CACHE_DURATION = 120 * 1000; +export const WATCHING_PAGE_SIZE = 12;