Update blog post metadata and styles

3 files changed, 23 insertions, 18 deletions

diff --git a/src/pages/[...page].astro b/src/pages/[...page].astro
index cd64d66..6d513b2 100644
--- a/src/pages/[...page].astro
+++ b/src/pages/[...page].astro
@@ -8,7 +8,10 @@ import PostSummary from "../components/PostSummary.astro";
 type Props = InferGetStaticPropsType<typeof getStaticPaths>;
 
 export const getStaticPaths = (async ({ paginate }) => {
-	const posts = await getCollection("blog");
+	const posts = await getCollection("blog", ({ data }) => {
+		return data.draft !== true;
+	});
+
 	posts.sort((a, b) => b.data.pubDate.getTime() - a.data.pubDate.getTime());
 
 	return paginate(posts, {
diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
index bcd5eed..63d2c98 100644
--- a/src/pages/blog/[...slug].astro
+++ b/src/pages/blog/[...slug].astro
@@ -2,11 +2,14 @@
 import { type CollectionEntry, getCollection } from "astro:content";
 import Comments from "../../components/Comments.astro";
 import Layout from "../../layouts/BaseLayout.astro";
+import dayjs from "dayjs";
 
 type Props = CollectionEntry<"blog">;
 
 export async function getStaticPaths() {
-	const posts = await getCollection("blog");
+	const posts = await getCollection("blog", ({ data }) => {
+		return data.draft !== true;
+	});
 
 	return posts.map((post) => ({
 		params: { slug: post.slug },
@@ -15,34 +18,31 @@ export async function getStaticPaths() {
 }
 
 const post = Astro.props;
-const { Content, remarkPluginFrontmatter } = await post.render();
+const { Content } = await post.render();
+const formattedDate = dayjs(post.data.pubDate.toString()).format("MMMM DD, YYYY");
 ---
 
-<style>
-	.header {
-		text-align: center;
-	}
-</style>
-
 <Layout description={post.data.description} title={post.data.title}>
 	<article>
-		<section class="header">
+		<section>
 			<h1>{post.data.title}</h1>
+		</section>
+
+		<section>
+			<Content />
+		</section>
+
+		<section>
 			<p>
 				<small>
 					Posted
-					<time datetime={post.data.pubDate.toISOString()}>{post.data.pubDate.toDateString()}</time>
-					&nbsp;by&nbsp;{post.data.author}&nbsp;‐
-					<strong>{remarkPluginFrontmatter.minutesRead}</strong>
+					<time datetime={post.data.pubDate.toISOString()}>{formattedDate}</time>
+					by&nbsp;{post.data.author}
 				</small>
 			</p>
 		</section>
 
 		<section>
-			<Content />
-		</section>
-
-		<section>
 			<Comments />
 		</section>
 	</article>
diff --git a/src/pages/feed.xml.js b/src/pages/feed.xml.js
index c837202..d71a020 100644
--- a/src/pages/feed.xml.js
+++ b/src/pages/feed.xml.js
@@ -2,7 +2,9 @@ import { getCollection } from "astro:content";
 import rss from "@astrojs/rss";
 
 export async function GET(context) {
-	const posts = await getCollection("blog");
+	const posts = await getCollection("blog", ({ data }) => {
+		return data.draft !== true;
+	});
 
 	return rss({
 		customData: `<language>ru-ru</language>`,