chore: pagination + misc updates

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",
+      "version": "1.0.30001625",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001624.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz",
-      "integrity": "sha512-0dWnQG87UevOCPYaOR49CBcLBwoZLpws+k6W37nLjWUhumP1Isusj0p2u+3KhjNloRWK9OKMgjBBzPujQHw4nA==",
+      "integrity": "sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w==",
       "dev": true,
       "funding": [
         {

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": {

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 = {}

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 %}
 <div class="media-grid {% if shape == 'square' %}square{% else %}vertical{% endif %}">
   {% for item in media limit: count | default: media.size %}
@@ -24,6 +25,6 @@
     </a>
   {% endfor %}
 </div>
-{% unless count %}
+{% unless hidePagination %}
   {% render "partials/widgets/paginator.liquid", pagination:data %}
 {% endunless %}

src/_includes/partials/media/watching/grid.liquid

@@ -1,4 +1,5 @@
-<div class="watching grid">
+{% assign hidePagination = count or data.pages.size <= 1 %}
+<div class="watching grid{% if hidePagination %} no-pagination {% endif %}">
   {% assign items = data.items | default: mediaItems %}
   {% for item in items limit: count %}
     {% capture alt %}{{ item.title | escape }} ({{ item.year }}){% endcapture %}
@@ -25,6 +26,6 @@
     </a>
   {% endfor %}
 </div>
-{% unless count %}
+{% unless hidePagination %}
   {% render "partials/widgets/paginator.liquid", pagination:data %}
 {% endunless %}

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);
 

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;

src/pages/main/watching/favorites/movies.html

@@ -14,4 +14,4 @@ schema: watching
 <p>These are my favorite movies. There are many like them, but these are mine.</p>
 <hr class="large-spacing" />
 {% endif %}
-{% render "partials/media/watching/backdrop-grid.liquid", data:pagination %}
+{% render "partials/media/watching/grid.liquid", data:pagination %}

src/pages/main/watching/favorites/shows.html

@@ -14,4 +14,4 @@ schema: watching
 <p>These are my favorite shows. There are many like them, but these are mine.</p>
 <hr class="large-spacing" />
 {% endif %}
-{% render "partials/media/watching/backdrop-grid.liquid", data:pagination %}
+{% render "partials/media/watching/grid.liquid", data:pagination %}

src/pages/main/watching/index.html

@@ -33,7 +33,7 @@ schema: watching
   </h2>
 </a>
 {% 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 %}
 <a class="link-icon flex-centered" href="/watching/favorite-shows">
   <h2 id="favorite-shows" class="section-header reduced-margin flex-centered">
     {% tablericon "star" "Favorite shows" %}
@@ -41,4 +41,4 @@ schema: watching
   </h2>
 </a>
 {% assign favoriteShows = tv.favorites | featuredWatching: 6 %}
-{% render "partials/media/watching/backdrop-grid.liquid", mediaItems:favoriteShows, count: 6 %}
+{% render "partials/media/watching/grid.liquid", mediaItems:favoriteShows, count: 6 %}

src/pages/main/watching/recent/movies.html

@@ -14,4 +14,4 @@ schema: watching
 <p>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).</p>
 <hr class="large-spacing" />
 {% endif %}
-{% render "partials/media/watching/backdrop-grid.liquid", data:pagination %}
+{% render "partials/media/watching/grid.liquid", data:pagination %}

src/pages/main/watching/recent/shows.html

@@ -14,4 +14,4 @@ schema: watching
 <p>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).</p>
 <hr class="large-spacing" />
 {% endif %}
-{% render "partials/media/watching/backdrop-grid.liquid", data:pagination %}
+{% render "partials/media/watching/grid.liquid", data:pagination %}