y.value === parseInt(year, 10)); diff --git a/src/pages/feeds/all.json.js b/src/pages/feeds/all.json.js index 808c81b..2c00506 100644 --- a/src/pages/feeds/all.json.js +++ b/src/pages/feeds/all.json.js @@ -2,8 +2,6 @@ import { generateJsonFeed } from "@utils/generateJsonFeed.js"; import { fetchGlobals } from "@utils/data/globals.js"; import { fetchActivity } from "@utils/data/activity.js"; -export const prerender = true; - export async function GET() { const globals = await fetchGlobals(); const activity = await fetchActivity(); @@ -15,11 +13,7 @@ export async function GET() { data: activity, }); - const filePath = path.resolve("public/feeds/all.json"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, feed); - - return new Response(feed, { + return new Response(feed, { status: 200, headers: { "Content-Type": "application/json", diff --git a/src/pages/feeds/all.xml.js b/src/pages/feeds/all.xml.js index 80ce914..261eb49 100644 --- a/src/pages/feeds/all.xml.js +++ b/src/pages/feeds/all.xml.js @@ -2,8 +2,6 @@ import { generateRssFeed } from "@utils/generateRssFeed"; import { fetchGlobals } from "@utils/data/globals.js"; import { fetchActivity } from "@utils/data/activity.js"; -export const prerender = true; - export async function GET() { const globals = await fetchGlobals(); const activity = await fetchActivity(); @@ -15,10 +13,6 @@ export async function GET() { data: activity, }); - const filePath = path.resolve("public/feeds/all.xml"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, rss); - return new Response(rss, { status: 200, headers: { diff --git a/src/pages/feeds/books.json.js b/src/pages/feeds/books.json.js index 2f5c736..ffe4d4f 100644 --- a/src/pages/feeds/books.json.js +++ b/src/pages/feeds/books.json.js @@ -2,8 +2,6 @@ import { generateJsonFeed } from "@utils/generateJsonFeed.js"; import { fetchGlobals } from "@utils/data/globals.js"; import { fetchBooks } from "@utils/data/books.js"; -export const prerender = true; - export async function GET() { const globals = await fetchGlobals(); const books = await fetchBooks(); @@ -15,10 +13,6 @@ export async function GET() { data: books.feed, }); - const filePath = path.resolve("public/feeds/books.json"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, feed); - return new Response(feed, { status: 200, headers: { diff --git a/src/pages/feeds/books.xml.js b/src/pages/feeds/books.xml.js index e516410..41ca1ae 100644 --- a/src/pages/feeds/books.xml.js +++ b/src/pages/feeds/books.xml.js @@ -2,8 +2,6 @@ import { generateRssFeed } from "@utils/generateRssFeed"; import { fetchGlobals } from "@utils/data/globals.js"; import { fetchBooks } from "@utils/data/books.js"; -export const prerender = true; - export async function GET() { const globals = await fetchGlobals(); const books = await fetchBooks(); @@ -15,10 +13,6 @@ export async function GET() { data: books.feed, }); - const filePath = path.resolve("public/feeds/books.xml"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, rss); - return new Response(rss, { status: 200, headers: { diff --git a/src/pages/feeds/links.json.js b/src/pages/feeds/links.json.js index cdd8930..80d03a9 100644 --- a/src/pages/feeds/links.json.js +++ b/src/pages/feeds/links.json.js @@ -2,8 +2,6 @@ import { generateJsonFeed } from "@utils/generateJsonFeed.js"; import { fetchGlobals } from "@utils/data/globals.js"; import { fetchLinks } from "@utils/data/links.js"; -export const prerender = true; - export async function GET() { const globals = await fetchGlobals(); const links = await fetchLinks(); @@ -15,10 +13,6 @@ export async function GET() { data: links, }); - const filePath = path.resolve("public/feeds/links.json"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, feed); - return new Response(feed, { status: 200, headers: { diff --git a/src/pages/feeds/links.xml.js b/src/pages/feeds/links.xml.js index f083bcc..a6d235f 100644 --- a/src/pages/feeds/links.xml.js +++ b/src/pages/feeds/links.xml.js @@ -2,8 +2,6 @@ import { generateRssFeed } from "@utils/generateRssFeed"; import { fetchGlobals } from "@utils/data/globals.js"; import { fetchLinks } from "@utils/data/links"; -export const prerender = true; - export async function GET() { const globals = await fetchGlobals(); const links = await fetchLinks(); @@ -15,10 +13,6 @@ export async function GET() { data: links, }); - const filePath = path.resolve("public/feeds/links.xml"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, rss); - return new Response(rss, { status: 200, headers: { diff --git a/src/pages/feeds/movies.json.js b/src/pages/feeds/movies.json.js index 52e4f3a..9416343 100644 --- a/src/pages/feeds/movies.json.js +++ b/src/pages/feeds/movies.json.js @@ -2,8 +2,6 @@ import { generateJsonFeed } from '@utils/generateJsonFeed.js'; import { fetchGlobals } from '@utils/data/globals.js'; import { fetchMovies } from '@utils/data/movies'; -export const prerender = true; - export async function GET() { const globals = await fetchGlobals(); const movies = await fetchMovies(); @@ -14,11 +12,6 @@ export async function GET() { globals, data: movies.feed, }); - - const filePath = path.resolve("public/feeds/movies.json"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, feed); - return new Response(feed, { status: 200, headers: { diff --git a/src/pages/feeds/movies.xml.js b/src/pages/feeds/movies.xml.js index 7b6b482..b5e6417 100644 --- a/src/pages/feeds/movies.xml.js +++ b/src/pages/feeds/movies.xml.js @@ -2,23 +2,17 @@ import { generateRssFeed } from "@utils/generateRssFeed"; import { fetchGlobals } from "@utils/data/globals.js"; import { fetchMovies } from "@utils/data/movies.js"; -export const prerender = true; - -export async function getStaticPaths() { +export async function GET() { const globals = await fetchGlobals(); const movies = await fetchMovies(); - const rss = GET({ + const rss = generateRssFeed({ permalink: "/feeds/movies.xml", title: "Movies feed", globals, data: movies.feed, }); - const filePath = path.resolve("public/feeds/movies.xml"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, rss); - return new Response(rss, { status: 200, headers: { diff --git a/src/pages/feeds/posts.json.js b/src/pages/feeds/posts.json.js index 4694954..1ab8b66 100644 --- a/src/pages/feeds/posts.json.js +++ b/src/pages/feeds/posts.json.js @@ -2,8 +2,6 @@ import { generateJsonFeed } from "@utils/generateJsonFeed.js"; import { fetchGlobals } from "@utils/data/globals.js"; import { fetchAllPosts } from "@utils/data/posts.js"; -export const prerender = true; - export async function GET() { const globals = await fetchGlobals(); const posts = await fetchAllPosts(); @@ -15,10 +13,6 @@ export async function GET() { data: posts, }); - const filePath = path.resolve("public/feeds/posts.json"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, feed); - return new Response(feed, { status: 200, headers: { diff --git a/src/pages/feeds/posts.xml.js b/src/pages/feeds/posts.xml.js index 7a757ab..fda623b 100644 --- a/src/pages/feeds/posts.xml.js +++ b/src/pages/feeds/posts.xml.js @@ -2,23 +2,17 @@ import { generateRssFeed } from "@utils/generateRssFeed"; import { fetchGlobals } from "@utils/data/globals.js"; import { fetchAllPosts } from "@utils/data/posts.js"; -export const prerender = true; - -export async function getStaticPaths() { +export async function GET() { const globals = await fetchGlobals(); const posts = await fetchAllPosts(); - const rss = GET({ + const rss = generateRssFeed({ permalink: "/feeds/posts.xml", title: "Posts feed", globals, data: posts, }); - const filePath = path.resolve("public/feeds/posts.xml"); - await fs.mkdir(path.dirname(filePath), { recursive: true }); - await fs.writeFile(filePath, rss); - return new Response(rss, { status: 200, headers: { diff --git a/src/pages/feeds/syndication.xml.js b/src/pages/feeds/syndication.xml.js index 4135729..345ff8d 100644 --- a/src/pages/feeds/syndication.xml.js +++ b/src/pages/feeds/syndication.xml.js @@ -3,10 +3,7 @@ import fetchSyndication from '@utils/data/syndication.js'; import { fetchGlobals } from '@utils/data/globals.js'; import { dateToRFC822, encodeAmp, md } from '@utils/helpers/general.js'; -const generateSyndicationRSS = async () => { - const globals = await fetchGlobals(); - const entries = await fetchSyndication(); - +const generateSyndicationRSS = async (globals, entries) => { if (!entries.length) throw new Error('No feed entries found.'); const title = globals.site_name || 'Syndicated Content Feed'; @@ -48,15 +45,17 @@ const generateSyndicationRSS = async () => { export async function GET() { try { - const rss = await generateSyndicationRSS(); + const globals = await fetchGlobals(); + const entries = await fetchSyndication(); + + const rss = await generateSyndicationRSS(globals, entries); + return new Response(rss, { status: 200, headers: { 'Content-Type': 'application/rss+xml' }, }); } catch (error) { - console.error(error.message); + console.error('Error generating syndication feed:', error); return new Response('Error generating syndication feed.', { status: 500 }); } } - -export const prerender = true; diff --git a/src/pages/links.astro b/src/pages/links.astro index 995e004..6d52bf1 100644 --- a/src/pages/links.astro +++ b/src/pages/links.astro @@ -3,11 +3,9 @@ import Layout from "@layouts/Layout.astro"; import Paginator from "@components/nav/Paginator.astro"; import RssBanner from "@components/blocks/banners/Rss.astro"; import { fetchLinks } from "@utils/data/links.js"; -import { fetchGlobalData } from "@utils/data/global/index.js"; export const prerender = true; -const { globals } = await fetchGlobalData(Astro); const links = await fetchLinks(); const title = "Links"; const description = diff --git a/src/pages/music/genres/[slug].astro b/src/pages/music/genres/[slug].astro new file mode 100644 index 0000000..4ee6dcd --- /dev/null +++ b/src/pages/music/genres/[slug].astro @@ -0,0 +1,71 @@ +--- +import Layout from "@layouts/Layout.astro"; +import AssociatedMedia from "@components/blocks/AssociatedMedia.astro"; +import { IconArrowLeft } from "@tabler/icons-react"; +import { fetchGenreByUrl } from "@utils/data/dynamic/genreByUrl.js"; +import { mediaLinks } from "@utils/helpers/media.js"; +import { md } from "@utils/helpers/general.js"; + +const genre = await fetchGenreByUrl(Astro.url.pathname); +if (!genre) return Astro.redirect("/404", 404); + +const artistCount = genre.artists?.length || 0; +const connectingWords = artistCount > 1 ? "artists are" : "artist is"; +const genreMediaLinks = mediaLinks(genre.artists, "artist", 5); +const pageTitle = `${genre.name} / Music`; +const description = `Discover the music genre ${genre.name}, featuring ${artistCount} artists and ${genre.total_plays} total track plays.`; +--- + + + + Back to music + + {genre.name} + + { + genreMediaLinks && ( + <> + + My top {genre.name}{" "} + {connectingWords} I've listened to{" "} + {genre.total_plays}{" "} + tracks from this genre. + + + + ) + } + + { + genre.description && ( + <> + Overview + + + + Continue reading at Wikipedia. + + + + Wikipedia content provided under the terms of the{" "} + + Creative Commons BY-SA license + + + + + Show more + + ) + } + + diff --git a/src/pages/posts/[...page].astro b/src/pages/posts/[...page].astro index f4ea7b9..f0940d0 100644 --- a/src/pages/posts/[...page].astro +++ b/src/pages/posts/[...page].astro @@ -1,8 +1,6 @@ --- -import { getCollection } from "astro:content"; import { IconStar } from "@tabler/icons-react"; import { fetchAllPosts } from "@data/posts.js"; -import { fetchGlobalData } from "@utils/data/global/index.js"; import Layout from "@layouts/Layout.astro"; import Paginator from "@components/nav/Paginator.astro"; import { md } from "@utils/helpers/general.js"; @@ -10,13 +8,22 @@ import { DateTime } from "luxon"; export const prerender = true; -const posts = await fetchAllPosts(); -const { page } = Astro.props; -const { globals } = await fetchGlobalData(Astro); -const currentUrl = Astro.url.pathname; +export async function getStaticPaths() { + const pageSize = 15; // Declare inside this function + const posts = await fetchAllPosts(); + + const totalPages = Math.ceil(posts.length / pageSize); + const paths = Array.from({ length: totalPages }, (_, i) => ({ + params: { page: (i + 1).toString() }, + })); + + return paths; +} -const currentPage = Astro.params.page ? parseInt(Astro.params.page, 10) : 1; const pageSize = 15; +const currentUrl = Astro.url.pathname; +const currentPage = Astro.params.page ? parseInt(Astro.params.page, 10) : 1; +const posts = await fetchAllPosts(); const totalPosts = posts.length; const totalPages = Math.ceil(totalPosts / pageSize); const start = (currentPage - 1) * pageSize; diff --git a/src/styles/base/index.css b/src/styles/base/index.css index 2508a0d..10225ca 100644 --- a/src/styles/base/index.css +++ b/src/styles/base/index.css @@ -318,9 +318,8 @@ article { } } -sup.footnote-ref { - line-height: var(--line-height-xs); - padding: var(--spacing-xs); +.footnotes #footnote-label { + display: none; } /* tables */ diff --git a/src/utils/data/dynamic/artistByUrl.js b/src/utils/data/dynamic/artistByUrl.js index b8c24d9..07b26fc 100644 --- a/src/utils/data/dynamic/artistByUrl.js +++ b/src/utils/data/dynamic/artistByUrl.js @@ -1,4 +1,5 @@ import { createClient } from "@supabase/supabase-js"; +import { removeTrailingSlash } from "@utils/helpers/general.js"; const SUPABASE_URL = import.meta.env.SUPABASE_URL; const SUPABASE_KEY = import.meta.env.SUPABASE_KEY; @@ -12,7 +13,7 @@ export async function fetchArtistByUrl(url) { const { data: artist, error } = await supabase .from("optimized_artists") .select("*") - .eq("url", url) + .eq("url", removeTrailingSlash(url)) .limit(1); if (error) { diff --git a/src/utils/data/dynamic/bookByUrl.js b/src/utils/data/dynamic/bookByUrl.js index 1a289b1..172ad33 100644 --- a/src/utils/data/dynamic/bookByUrl.js +++ b/src/utils/data/dynamic/bookByUrl.js @@ -1,4 +1,5 @@ import { createClient } from "@supabase/supabase-js"; +import { removeTrailingSlash } from "@utils/helpers/general.js"; const SUPABASE_URL = import.meta.env.SUPABASE_URL; const SUPABASE_KEY = import.meta.env.SUPABASE_KEY; @@ -11,7 +12,7 @@ export async function fetchBookByUrl(url) { const { data: book, error } = await supabase .from("optimized_books") .select("*") - .eq("url", url) + .eq("url", removeTrailingSlash(url)) .limit(1); if (error || !book || book.length === 0) { diff --git a/src/utils/data/dynamic/genreByUrl.js b/src/utils/data/dynamic/genreByUrl.js new file mode 100644 index 0000000..64cf71f --- /dev/null +++ b/src/utils/data/dynamic/genreByUrl.js @@ -0,0 +1,26 @@ +import { createClient } from "@supabase/supabase-js"; +import { removeTrailingSlash } from "@utils/helpers/general.js"; + +const SUPABASE_URL = import.meta.env.SUPABASE_URL; +const SUPABASE_KEY = import.meta.env.SUPABASE_KEY; +const supabase = createClient(SUPABASE_URL, SUPABASE_KEY); + +const genreCache = {}; + +export async function fetchGenreByUrl(url) { + if (import.meta.env.MODE === "development" && genreCache[url]) return genreCache[url]; + + const { data: genre, error } = await supabase + .from("optimized_genres") + .select("*") + .eq("url", removeTrailingSlash(url)) + .limit(1); + + if (error) { + console.error("Error fetching genre:", error); + return null; + } + if (import.meta.env.MODE === "development") genreCache[url] = genre[0]; + + return genre[0]; +} diff --git a/src/utils/helpers/general.js b/src/utils/helpers/general.js index 14d3795..cf8adfb 100644 --- a/src/utils/helpers/general.js +++ b/src/utils/helpers/general.js @@ -1,20 +1,11 @@ import { DateTime } from "luxon"; -import markdownIt from "markdown-it"; -import markdownItAnchor from "markdown-it-anchor"; -import markdownItFootnote from "markdown-it-footnote"; -import markdownItPrism from "markdown-it-prism"; +import { remark } from "remark"; +import footnotes from "remark-footnotes"; +import remarkRehype from "remark-rehype"; +import rehypePrism from "rehype-prism-plus"; +import rehypeStringify from "rehype-stringify"; import truncateHtml from "truncate-html"; -const markdown = markdownIt({ html: true, linkify: true }); -markdown.use(markdownItAnchor, { - level: [1, 2], - permalink: markdownItAnchor.permalink.headerLink({ - safariReaderFix: true, - }), -}); -markdown.use(markdownItFootnote); -markdown.use(markdownItPrism); - // arrays export const shuffleArray = (array) => { const shuffled = [...array]; @@ -47,7 +38,16 @@ export const parseCountryField = (countryField) => { }; // markdown -export const md = (string) => markdown.render(string); +export const md = async (string) => { + const processed = await remark() + .use(footnotes, { inlineNotes: true }) + .use(remarkRehype) + .use(rehypePrism, { ignoreMissing: true }) + .use(rehypeStringify) + .process(string); + + return processed.toString(); +}; // html export const htmlTruncate = (content, limit = 50) => @@ -66,11 +66,12 @@ export const escapeHtml = (str) => "&": "&", "<": "<", ">": ">", - }[char] || char) + })[char] || char ); // urls export const encodeAmp = (url) => url.replace(/&/g, "&"); +export const removeTrailingSlash = (url) => url.replace(/\/$/, ''); // dates export const dateToRFC822 = (date) =>
+ { + genreMediaLinks && ( + <> + + My top {genre.name}{" "} + {connectingWords} I've listened to{" "} + {genre.total_plays}{" "} + tracks from this genre. + + + + ) + } + + { + genre.description && ( + <> + Overview + + + + Continue reading at Wikipedia. + + + + Wikipedia content provided under the terms of the{" "} + + Creative Commons BY-SA license + + + + + Show more + + ) + } +