From 7a206cd937157f7ad9f29b2065223261e44685a9 Mon Sep 17 00:00:00 2001 From: Xevion Date: Sun, 10 Mar 2024 07:44:20 -0500 Subject: [PATCH] Continue switching to handbook content collection --- src/components/Header.astro | 2 +- src/content/config.ts | 6 +-- src/layouts/BlogPost.astro | 53 ++++++-------------- src/pages/{blog => handbook}/[...slug].astro | 6 +-- src/pages/{blog => handbook}/index.astro | 14 +++--- src/pages/rss.xml.js | 4 +- 6 files changed, 31 insertions(+), 54 deletions(-) rename src/pages/{blog => handbook}/[...slug].astro (70%) rename src/pages/{blog => handbook}/index.astro (82%) diff --git a/src/components/Header.astro b/src/components/Header.astro index 8376150..53246f2 100644 --- a/src/components/Header.astro +++ b/src/components/Header.astro @@ -11,7 +11,7 @@ import ThemeToggle from "@components/ThemeToggle";
Home - Blog + handbook About
diff --git a/src/content/config.ts b/src/content/config.ts index 667a31c..d29604c 100644 --- a/src/content/config.ts +++ b/src/content/config.ts @@ -1,6 +1,6 @@ import { defineCollection, z } from 'astro:content'; -const blog = defineCollection({ +const handbook = defineCollection({ type: 'content', // Type-check frontmatter using a schema schema: z.object({ @@ -8,9 +8,9 @@ const blog = defineCollection({ description: z.string(), // Transform string to Date object pubDate: z.coerce.date(), - updatedDate: z.coerce.date().optional(), + lastModified: z.coerce.date().optional(), heroImage: z.string().optional(), }), }); -export const collections = { blog }; +export const collections = { handbook }; diff --git a/src/layouts/BlogPost.astro b/src/layouts/BlogPost.astro index 5fbf9da..ec31466 100644 --- a/src/layouts/BlogPost.astro +++ b/src/layouts/BlogPost.astro @@ -1,13 +1,14 @@ --- import type { CollectionEntry } from 'astro:content'; -import BaseHead from '../components/BaseHead.astro'; -import Header from '../components/Header.astro'; -import Footer from '../components/Footer.astro'; -import FormattedDate from '../components/FormattedDate.astro'; +import BaseHead from '@components/BaseHead.astro'; +import Header from '@components/Header.astro'; +import Footer from '@components/Footer.astro'; +import FormattedDate from '@components/FormattedDate.astro'; -type Props = CollectionEntry<'blog'>['data']; +type Props = CollectionEntry<'handbook'>['data']; -const { title, description, pubDate, updatedDate, heroImage } = Astro.props; +const { title, description, pubDate, heroImage, lastModified } = Astro.props; +console.log(Astro.props) --- @@ -15,17 +16,6 @@ const { title, description, pubDate, updatedDate, heroImage } = Astro.props;
-
+
-
- {heroImage && } +
+ {heroImage && }
-
-
+
+
{ - updatedDate && ( + lastModified && (
- Last updated on + Last updated on
) }
-

{title}

+

{title}

diff --git a/src/pages/blog/[...slug].astro b/src/pages/handbook/[...slug].astro similarity index 70% rename from src/pages/blog/[...slug].astro rename to src/pages/handbook/[...slug].astro index 07dbce2..d210587 100644 --- a/src/pages/blog/[...slug].astro +++ b/src/pages/handbook/[...slug].astro @@ -1,15 +1,15 @@ --- import { type CollectionEntry, getCollection } from 'astro:content'; -import BlogPost from '../../layouts/BlogPost.astro'; +import BlogPost from '@layouts/BlogPost.astro'; export async function getStaticPaths() { - const posts = await getCollection('blog'); + const posts = await getCollection('handbook') return posts.map((post) => ({ params: { slug: post.slug }, props: post, })); } -type Props = CollectionEntry<'blog'>; +type Props = CollectionEntry<'handbook'>; const post = Astro.props; const { Content } = await post.render(); diff --git a/src/pages/blog/index.astro b/src/pages/handbook/index.astro similarity index 82% rename from src/pages/blog/index.astro rename to src/pages/handbook/index.astro index ebbcd30..45e86e7 100644 --- a/src/pages/blog/index.astro +++ b/src/pages/handbook/index.astro @@ -1,12 +1,12 @@ --- -import BaseHead from '../../components/BaseHead.astro'; -import Header from '../../components/Header.astro'; -import Footer from '../../components/Footer.astro'; -import { SITE_TITLE, SITE_DESCRIPTION } from '../../consts'; +import BaseHead from '@components/BaseHead.astro'; +import Header from '@components/Header.astro'; +import Footer from '@components/Footer.astro'; +import { SITE_TITLE, SITE_DESCRIPTION } from '@/consts'; import { getCollection } from 'astro:content'; -import FormattedDate from '../../components/FormattedDate.astro'; +import FormattedDate from '@components/FormattedDate.astro'; -const posts = (await getCollection('blog')).sort( +const posts = (await getCollection('handbook')).sort( (a, b) => a.data.pubDate.valueOf() - b.data.pubDate.valueOf() ); --- @@ -93,7 +93,7 @@ const posts = (await getCollection('blog')).sort( { posts.map((post) => (
  • - +

    {post.data.title}

    diff --git a/src/pages/rss.xml.js b/src/pages/rss.xml.js index 9ff9801..ea0dbad 100644 --- a/src/pages/rss.xml.js +++ b/src/pages/rss.xml.js @@ -3,14 +3,14 @@ import { getCollection } from 'astro:content'; import { SITE_TITLE, SITE_DESCRIPTION } from '../consts'; export async function GET(context) { - const posts = await getCollection('blog'); + const posts = await getCollection('handbook'); return rss({ title: SITE_TITLE, description: SITE_DESCRIPTION, site: context.site, items: posts.map((post) => ({ ...post.data, - link: `/blog/${post.slug}/`, + link: `/handbook/${post.slug}/`, })), }); }