From 5a73013e374268ceda2294b7856dcac49582e6f9 Mon Sep 17 00:00:00 2001 From: Cory Dransfeldt Date: Wed, 29 May 2024 08:58:30 -0700 Subject: [PATCH] chore: pagination + misc updates --- package-lock.json | 10 +++++----- package.json | 2 +- src/_data/tv.js | 4 ++-- src/_includes/partials/media/grid.liquid | 3 ++- .../watching/{backdrop-grid.liquid => grid.liquid} | 5 +++-- src/assets/styles/components/media-grid.css | 4 ++++ src/assets/styles/pages/watching.css | 4 ++++ src/pages/main/watching/favorites/movies.html | 2 +- src/pages/main/watching/favorites/shows.html | 2 +- src/pages/main/watching/index.html | 4 ++-- src/pages/main/watching/recent/movies.html | 2 +- src/pages/main/watching/recent/shows.html | 2 +- 12 files changed, 27 insertions(+), 17 deletions(-) rename src/_includes/partials/media/watching/{backdrop-grid.liquid => grid.liquid} (87%) diff --git a/package-lock.json b/package-lock.json index 2594715b..3c6b0142 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "coryd.dev", - "version": "17.5.1", + "version": "17.5.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "coryd.dev", - "version": "17.5.1", + "version": "17.5.2", "license": "MIT", "dependencies": { "@cdransf/api-text": "^1.4.0", @@ -2782,9 +2782,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001624", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001624.tgz", - "integrity": "sha512-0dWnQG87UevOCPYaOR49CBcLBwoZLpws+k6W37nLjWUhumP1Isusj0p2u+3KhjNloRWK9OKMgjBBzPujQHw4nA==", + "version": "1.0.30001625", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz", + "integrity": "sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w==", "dev": true, "funding": [ { diff --git a/package.json b/package.json index c50097d3..4117ee4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "coryd.dev", - "version": "17.5.1", + "version": "17.5.2", "description": "The source for my personal site. Built using 11ty.", "type": "module", "scripts": { diff --git a/src/_data/tv.js b/src/_data/tv.js index 2bca2a14..047a177b 100644 --- a/src/_data/tv.js +++ b/src/_data/tv.js @@ -3,6 +3,7 @@ import { createClient } from '@supabase/supabase-js' const SUPABASE_URL = process.env.SUPABASE_URL const SUPABASE_KEY = process.env.SUPABASE_KEY const supabase = createClient(SUPABASE_URL, SUPABASE_KEY) + const PAGE_SIZE = 1000 const fetchAllShows = async () => { @@ -61,8 +62,7 @@ export default async function () { episodes.sort((a, b) => new Date(b['last_watched_at']) - new Date(a['last_watched_at'])) const allEpisodes = episodes - const recentlyWatchedEpisodes = episodes.slice(0, 150) - + const recentlyWatchedEpisodes = episodes.slice(0, 225) const formatEpisodeData = (episodes) => { const episodeData = [] const showEpisodesMap = {} diff --git a/src/_includes/partials/media/grid.liquid b/src/_includes/partials/media/grid.liquid index 1e860047..948c9164 100644 --- a/src/_includes/partials/media/grid.liquid +++ b/src/_includes/partials/media/grid.liquid @@ -1,3 +1,4 @@ +{% assign hidePagination = count or data.pages.size <= 1 %} {% assign media = data.items | default: data | normalizeMedia %}
{% for item in media limit: count | default: media.size %} @@ -24,6 +25,6 @@ {% endfor %}
-{% unless count %} +{% unless hidePagination %} {% render "partials/widgets/paginator.liquid", pagination:data %} {% endunless %} \ No newline at end of file diff --git a/src/_includes/partials/media/watching/backdrop-grid.liquid b/src/_includes/partials/media/watching/grid.liquid similarity index 87% rename from src/_includes/partials/media/watching/backdrop-grid.liquid rename to src/_includes/partials/media/watching/grid.liquid index a7764812..93a8b6f2 100644 --- a/src/_includes/partials/media/watching/backdrop-grid.liquid +++ b/src/_includes/partials/media/watching/grid.liquid @@ -1,4 +1,5 @@ -
+{% assign hidePagination = count or data.pages.size <= 1 %} +
{% assign items = data.items | default: mediaItems %} {% for item in items limit: count %} {% capture alt %}{{ item.title | escape }} ({{ item.year }}){% endcapture %} @@ -25,6 +26,6 @@ {% endfor %}
-{% unless count %} +{% unless hidePagination %} {% render "partials/widgets/paginator.liquid", pagination:data %} {% endunless %} \ No newline at end of file diff --git a/src/assets/styles/components/media-grid.css b/src/assets/styles/components/media-grid.css index 15f4b643..a0c709d5 100644 --- a/src/assets/styles/components/media-grid.css +++ b/src/assets/styles/components/media-grid.css @@ -8,6 +8,10 @@ gap: var(--sizing-sm); margin-bottom: var(--sizing-base); + &.no-pagination { + margin-bottom: 0; + } + &.square { grid-template-columns: var(--grid-square); diff --git a/src/assets/styles/pages/watching.css b/src/assets/styles/pages/watching.css index e67b64e6..04aed775 100644 --- a/src/assets/styles/pages/watching.css +++ b/src/assets/styles/pages/watching.css @@ -53,6 +53,10 @@ grid-template-columns: repeat(2,minmax(0,1fr)); margin-bottom: var(--sizing-base); + &.no-pagination { + margin-bottom: 0; + } + & a, & div { display: flex; diff --git a/src/pages/main/watching/favorites/movies.html b/src/pages/main/watching/favorites/movies.html index f124e03c..3e15001a 100644 --- a/src/pages/main/watching/favorites/movies.html +++ b/src/pages/main/watching/favorites/movies.html @@ -14,4 +14,4 @@ schema: watching

These are my favorite movies. There are many like them, but these are mine.

{% endif %} -{% render "partials/media/watching/backdrop-grid.liquid", data:pagination %} \ No newline at end of file +{% render "partials/media/watching/grid.liquid", data:pagination %} \ No newline at end of file diff --git a/src/pages/main/watching/favorites/shows.html b/src/pages/main/watching/favorites/shows.html index 5807471d..672f6e6c 100644 --- a/src/pages/main/watching/favorites/shows.html +++ b/src/pages/main/watching/favorites/shows.html @@ -14,4 +14,4 @@ schema: watching

These are my favorite shows. There are many like them, but these are mine.

{% endif %} -{% render "partials/media/watching/backdrop-grid.liquid", data:pagination %} \ No newline at end of file +{% render "partials/media/watching/grid.liquid", data:pagination %} \ No newline at end of file diff --git a/src/pages/main/watching/index.html b/src/pages/main/watching/index.html index b1d7331a..802e57a0 100644 --- a/src/pages/main/watching/index.html +++ b/src/pages/main/watching/index.html @@ -33,7 +33,7 @@ schema: watching {% assign favoriteMovies = movies.favorites | featuredWatching: 6 %} -{% render "partials/media/watching/backdrop-grid.liquid", mediaItems:favoriteMovies, count: 6 %} +{% render "partials/media/watching/grid.liquid", mediaItems:favoriteMovies, count: 6 %}

{% tablericon "star" "Favorite shows" %} @@ -41,4 +41,4 @@ schema: watching

{% assign favoriteShows = tv.favorites | featuredWatching: 6 %} -{% render "partials/media/watching/backdrop-grid.liquid", mediaItems:favoriteShows, count: 6 %} \ No newline at end of file +{% render "partials/media/watching/grid.liquid", mediaItems:favoriteShows, count: 6 %} \ No newline at end of file diff --git a/src/pages/main/watching/recent/movies.html b/src/pages/main/watching/recent/movies.html index 25b69246..c35a5dc0 100644 --- a/src/pages/main/watching/recent/movies.html +++ b/src/pages/main/watching/recent/movies.html @@ -14,4 +14,4 @@ schema: watching

These are the movies I've watched recently. There are many like them, but these are mine. (Or well, all the movies I've watched — they're ordered latest watched, descending, hence the recent part).

{% endif %} -{% render "partials/media/watching/backdrop-grid.liquid", data:pagination %} \ No newline at end of file +{% render "partials/media/watching/grid.liquid", data:pagination %} \ No newline at end of file diff --git a/src/pages/main/watching/recent/shows.html b/src/pages/main/watching/recent/shows.html index 96a95cca..0b6df543 100644 --- a/src/pages/main/watching/recent/shows.html +++ b/src/pages/main/watching/recent/shows.html @@ -14,4 +14,4 @@ schema: watching

These are the shows I've watched recently. There are many like them, but these are mine. (Or well, all the movies I've watched — they're ordered latest watched, descending, hence the recent part).

{% endif %} -{% render "partials/media/watching/backdrop-grid.liquid", data:pagination %} \ No newline at end of file +{% render "partials/media/watching/grid.liquid", data:pagination %} \ No newline at end of file