diff --git a/src/routes/blog/+page.svelte b/src/routes/blog/+page.svelte index 17d91ff..888b77d 100644 --- a/src/routes/blog/+page.svelte +++ b/src/routes/blog/+page.svelte @@ -2,17 +2,17 @@ import Banner2 from "$lib/banner2.svelte"; import Content from "$lib/viewport/content.svelte"; import Gallery, { type GalleryEntry } from "$lib/lists/gallery.svelte"; - import { posts, type BlogPostDetails } from "./posts"; + import { posts, type BlogPostLink } from "./posts"; - let entries: GalleryEntry[] = posts.entries().map(mapEntries).toArray(); + let entries: GalleryEntry[] = posts.map(mapEntries); - function mapEntries(m: [String, BlogPostDetails], index: number): GalleryEntry { + function mapEntries(entry: BlogPostLink, index: number): GalleryEntry { return { - title: `${m[1].title}`, - subtitle: `#${posts.size - index} // ${m[1].date}, ${m[1].time}`, - img: `/blog/${m[0]}/${m[1].banner}`, - link: `/blog/${m[0]}/`, - imgAlt: `Preview image for ${m[1].title}`, + title: `${entry.post.title}`, + subtitle: `#${posts.length - index} // ${entry.post.date}, ${entry.post.time}`, + img: `/blog/${entry.key}/${entry.post.banner}`, + link: `/blog/${entry.key}/`, + imgAlt: `Preview image for ${entry.post.title}`, }; } diff --git a/src/routes/blog/[year]/[date]/+page.ts b/src/routes/blog/[year]/[date]/+page.ts index e86e8b1..2b9ddba 100644 --- a/src/routes/blog/[year]/[date]/+page.ts +++ b/src/routes/blog/[year]/[date]/+page.ts @@ -1,10 +1,10 @@ -import { posts, type BlogPostDetails } from '../../posts'; +import { posts, type BlogPostLink } from '../../posts'; export async function load({ params }) { const post = await import(`../../${params.year}/${params.date}.md`); const tag: string = `${params.year}/${params.date}`; - const postValues = posts.get(tag); + const postValues = posts.find((v: BlogPostLink) => v.key == tag)?.post; const content = post.default; const title: string = postValues?.title ?? ""; const date: string = postValues?.date ?? ""; diff --git a/src/routes/blog/posts.ts b/src/routes/blog/posts.ts index 8208186..031ab61 100644 --- a/src/routes/blog/posts.ts +++ b/src/routes/blog/posts.ts @@ -15,7 +15,13 @@ export interface BlogPostDetails { description: string; } -export const posts = new Map([ +export interface BlogPostLink { + key: string; + post: BlogPostDetails; +} + + +export const posts: BlogPostLink[] = [ // ["2026/0128", { // date: "2026-01-05", // time: "13:00", @@ -23,14 +29,17 @@ export const posts = new Map([ // title: "Portsmouth Postmortem", // description: "", // }], - ["2026/0129", { - date: "2026-01-29", - time: "16:42", - banner: "girl.webp", - title: "Limitations", - description: "Something about how boundaries can foster creativity.", - }], -]); + { + key: "2026/0129", + post: { + date: "2026-01-29", + time: "16:42", + banner: "girl.webp", + title: "Limitations", + description: "Something about how boundaries can foster creativity.", + } + }, +]; // export function getDate(post: BlogPostDetails): string { // var s = [post.year, post.date.split()].join(""); diff --git a/src/routes/projects/projectn5/+page.svelte b/src/routes/projects/projectn5/+page.svelte index b6f8a21..75420f5 100644 --- a/src/routes/projects/projectn5/+page.svelte +++ b/src/routes/projects/projectn5/+page.svelte @@ -1,10 +1,10 @@