Add support for new config.yaml

src/pages/404.astro

@@ -1,11 +1,11 @@
 ---
-import Layout from '~/layouts/BaseLayout.astro';
+import Layout from '~/layouts/Layout.astro';
 import { getHomePermalink } from '~/utils/permalinks';
 
 const title = `Error 404`;
 ---
 
-<Layout meta={{ title }}>
+<Layout metadata={{ title }}>
   <section class="flex items-center h-full p-16">
     <div class="container flex flex-col items-center justify-center px-5 mx-auto my-8">
       <div class="max-w-md text-center">

src/pages/[...blog]/[...page].astro

@@ -1,23 +1,13 @@
 ---
-import { SITE, BLOG } from '~/config.mjs';
-
 import Layout from '~/layouts/PageLayout.astro';
 import BlogList from '~/components/blog/List.astro';
 import Headline from '~/components/blog/Headline.astro';
 import Pagination from '~/components/blog/Pagination.astro';
 // import PostTags from "~/components/blog/Tags.astro";
 
-import { fetchPosts } from '~/utils/blog';
-// import { findTags, findCategories } from '~/utils/blog';
-import { BLOG_BASE } from '~/utils/permalinks';
+import { blogListRobots, getStaticPathsBlogList } from '~/utils/blog';
 
-export async function getStaticPaths({ paginate }) {
-  if (BLOG?.disabled || BLOG?.list?.disabled) return [];
-  return paginate(await fetchPosts(), {
-    params: { blog: BLOG_BASE || undefined },
-    pageSize: BLOG.postsPerPage,
-  });
-}
+export const getStaticPaths = getStaticPathsBlogList();
 
 const { page } = Astro.props;
 const currentPage = page.currentPage ?? 1;
@@ -25,15 +15,19 @@ const currentPage = page.currentPage ?? 1;
 // const allCategories = await findCategories();
 // const allTags = await findTags();
 
-const meta = {
+const metadata = {
   title: `Blog${currentPage > 1 ? ` — Page ${currentPage}` : ''}`,
-  description: SITE.description,
-  noindex: BLOG?.list?.noindex || currentPage > 1,
-  ogType: 'blog',
+  robots: {
+    index: blogListRobots?.index && currentPage === 1,
+    follow: blogListRobots?.follow,
+  },
+  openGraph: {
+    type: 'blog',
+  },
 };
 ---
 
-<Layout {meta}>
+<Layout metadata={metadata}>
   <section class="px-6 sm:px-6 py-12 sm:py-16 lg:py-20 mx-auto max-w-4xl">
     <Headline
       subtitle="A statically generated blog example with news, tutorials, resources and other interesting content related to AstroWind"

src/pages/[...blog]/[category]/[...page].astro

@@ -1,47 +1,28 @@
 ---
-import { SITE, BLOG } from '~/config.mjs';
+import { blogCategoryRobots, getStaticPathsBlogCategory } from '~/utils/blog';
 
 import Layout from '~/layouts/PageLayout.astro';
 import BlogList from '~/components/blog/List.astro';
 import Headline from '~/components/blog/Headline.astro';
 import Pagination from '~/components/blog/Pagination.astro';
 
-import { fetchPosts } from '~/utils/blog';
-import { CATEGORY_BASE } from '~/utils/permalinks';
-
-export async function getStaticPaths({ paginate }) {
-  if (BLOG?.disabled || BLOG?.category?.disabled) return [];
-
-  const posts = await fetchPosts();
-  const categories = new Set();
-  posts.map((post) => {
-    typeof post.category === 'string' && categories.add(post.category.toLowerCase());
-  });
-
-  return Array.from(categories).map((category: string) =>
-    paginate(
-      posts.filter((post) => typeof post.category === 'string' && category === post.category.toLowerCase()),
-      {
-        params: { category: category, blog: CATEGORY_BASE || undefined },
-        pageSize: BLOG.postsPerPage,
-        props: { category },
-      }
-    )
-  );
-}
+export const getStaticPaths = getStaticPathsBlogCategory();
 
 const { page, category } = Astro.props;
 
 const currentPage = page.currentPage ?? 1;
-const meta = {
-  title: `Category'${category}' ${currentPage > 1 ? ` — Page ${currentPage}` : ''}`,
-  description: SITE.description,
-  noindex: BLOG?.category?.noindex,
+
+const metadata = {
+  title: `Category '${category}' ${currentPage > 1 ? ` — Page ${currentPage}` : ''}`,
+  robots: {
+    index: blogCategoryRobots?.index,
+    follow: blogCategoryRobots?.follow,
+  },
 };
 ---
 
-<Layout meta={meta}>
-  <section class="px-6 sm:px-6 py-12 sm:py-16 lg:py-20 mx-auto max-w-4xl">
+<Layout metadata={metadata}>
+  <section class="px-4 md:px-6 py-12 sm:py-16 lg:py-20 mx-auto max-w-4xl">
     <Headline><span class="capitalize">{category.replaceAll('-', ' ')}</span></Headline>
     <BlogList posts={page.data} />
     <Pagination prevUrl={page.url.prev} nextUrl={page.url.next} />

src/pages/[...blog]/[tag]/[...page].astro

@@ -1,47 +1,28 @@
 ---
-import { SITE, BLOG } from '~/config.mjs';
+import { blogTagRobots, getStaticPathsBlogTag } from '~/utils/blog';
 
 import Layout from '~/layouts/PageLayout.astro';
 import BlogList from '~/components/blog/List.astro';
+import Headline from '~/components/blog/Headline.astro';
 import Pagination from '~/components/blog/Pagination.astro';
 
-import { fetchPosts } from '~/utils/blog';
-import { TAG_BASE } from '~/utils/permalinks';
-import Headline from '~/components/blog/Headline.astro';
-
-export async function getStaticPaths({ paginate }) {
-  if (BLOG?.disabled || BLOG?.tag?.disabled) return [];
-
-  const posts = await fetchPosts();
-  const tags = new Set();
-  posts.map((post) => {
-    Array.isArray(post.tags) && post.tags.map((tag) => tags.add(tag.toLowerCase()));
-  });
-
-  return Array.from(tags).map((tag: string) =>
-    paginate(
-      posts.filter((post) => Array.isArray(post.tags) && post.tags.find((elem) => elem.toLowerCase() === tag)),
-      {
-        params: { tag: tag, blog: TAG_BASE || undefined },
-        pageSize: BLOG.postsPerPage,
-        props: { tag },
-      }
-    )
-  );
-}
+export const getStaticPaths = getStaticPathsBlogTag();
 
 const { page, tag } = Astro.props;
 
 const currentPage = page.currentPage ?? 1;
-const meta = {
+
+const metadata = {
   title: `Posts by tag '${tag}'${currentPage > 1 ? ` — Page ${currentPage} ` : ''}`,
-  description: SITE.description,
-  noindex: BLOG?.tag?.noindex,
+  robots: {
+    index: blogTagRobots?.index,
+    follow: blogTagRobots?.follow,
+  },
 };
 ---
 
-<Layout meta={meta}>
-  <section class="px-6 sm:px-6 py-12 sm:py-16 lg:py-20 mx-auto max-w-4xl">
+<Layout metadata={metadata}>
+  <section class="px-4 md:px-6 py-12 sm:py-16 lg:py-20 mx-auto max-w-4xl">
     <Headline>Tag: {tag}</Headline>
     <BlogList posts={page.data} />
     <Pagination prevUrl={page.url.prev} nextUrl={page.url.next} />

src/pages/[...blog]/index.astro

@@ -1,38 +1,39 @@
 ---
-import { BLOG } from '~/config.mjs';
-
+import merge from 'lodash.merge';
+import type { ImageMetadata } from 'astro';
 import Layout from '~/layouts/PageLayout.astro';
 import SinglePost from '~/components/blog/SinglePost.astro';
 import ToBlogLink from '~/components/blog/ToBlogLink.astro';
 
 import { getCanonical, getPermalink } from '~/utils/permalinks';
-import { fetchPosts } from '~/utils/blog';
+import { getStaticPathsBlogPost, blogPostRobots } from '~/utils/blog';
 import { findImage } from '~/utils/images';
 
-export async function getStaticPaths() {
-  if (BLOG?.disabled || BLOG?.post?.disabled) return [];
-  return (await fetchPosts()).map((post) => ({
-    params: {
-      blog: post.permalink,
-    },
-    props: { post },
-  }));
-}
+export const getStaticPaths = getStaticPathsBlogPost();
 
 const { post } = Astro.props;
-const url = getCanonical(getPermalink(post.permalink, 'post'));
 
-const meta = {
-  title: post.title,
-  description: post.description,
-  canonical: post.canonical || url,
-  image: await findImage(post.image),
-  noindex: BLOG?.post?.noindex,
-  ogType: 'article',
-};
+const url = getCanonical(getPermalink(post.permalink, 'post'));
+const image = (await findImage(post.image)) as ImageMetadata | undefined;
+
+const metadata = merge(
+  {
+    title: post.title,
+    description: post.excerpt,
+    robots: {
+      index: blogPostRobots?.index,
+      follow: blogPostRobots?.follow,
+    },
+    openGraph: {
+      type: 'article',
+      ...(image ? { images: [{ url: image?.src, width: image?.width, height: image?.height }] } : {}),
+    },
+  },
+  { ...(post?.metadata ? { ...post.metadata, canonical: post.metadata?.canonical || url } : {}) }
+);
 ---
 
-<Layout {meta}>
-  <SinglePost post={{ ...post, image: meta.image }} url={url} />
+<Layout metadata={metadata}>
+  <SinglePost post={{ ...post, image: image }} url={url} />
   <ToBlogLink />
 </Layout>

src/pages/about.astro

@@ -1,11 +1,11 @@
 ---
 import Layout from '~/layouts/PageLayout.astro';
 
-const meta = {
+const metadata = {
   title: "About us",
 };
 ---
 
-<Layout {meta}>
+<Layout metadata={metadata}>
   About us
 </Layout>

src/pages/contact.astro

@@ -1,11 +1,11 @@
 ---
 import Layout from '~/layouts/PageLayout.astro';
 
-const meta = {
+const metadata = {
   title: "Contact",
 };
 ---
 
-<Layout {meta}>
+<Layout metadata={metadata}>
   Contact
 </Layout>

src/pages/index.astro

@@ -1,5 +1,4 @@
 ---
-import { SITE } from '~/config.mjs';
 import Layout from '~/layouts/PageLayout.astro';
 
 import Hero from '~/components/widgets/Hero.astro';
@@ -8,19 +7,18 @@ import Features from '~/components/widgets/Features.astro';
 import Features2 from '~/components/widgets/Features2.astro';
 import Steps from '~/components/widgets/Steps.astro';
 import Content from '~/components/widgets/Content.astro';
-import LatestPosts from '~/components/blog/LatestPosts.astro';
+import BlogLatestPosts from '~/components/widgets/BlogLatestPosts.astro';
 import FAQs from '~/components/widgets/FAQs.astro';
 import Stats from '~/components/widgets/Stats.astro';
 import CallToAction from '~/components/widgets/CallToAction.astro';
 
-const meta = {
-  title: SITE.title,
-  description: SITE.description,
+const metadata = {
+  title: "AstroWind — Free template for create a website with Astro + Tailwind CSS",
   dontUseTitleTemplate: true,
 };
 ---
 
-<Layout {meta}>
+<Layout metadata={metadata}>
   <!-- Hero Widget ******************* -->
 
   <Hero
@@ -262,7 +260,7 @@ const meta = {
 
   <!-- HighlightedPosts Widget ******* -->
 
-  <LatestPosts
+  <BlogLatestPosts
     title="Find out more content in our Blog"
     information={`The blog is used to display AstroWind documentation.
                         Each new article will be an important step that you will need to know to be an expert in creating a website using Astro + Tailwind CSS.

src/pages/landing/mobile-app.astro

@@ -5,12 +5,12 @@ import Header from '~/components/widgets/Header.astro';
 import Hero2 from '~/components/widgets/Hero2.astro';
 import CallToAction from '~/components/widgets/CallToAction.astro';
 
-const meta = {
+const metadata = {
   title: "Mobile App Landing Page",
 };
 ---
 
-<Layout {meta}>
+<Layout metadata={metadata}>
   <Fragment slot="announcement"></Fragment>
   <Fragment slot="header">
     <Header

src/pages/landing/saas.astro

@@ -9,12 +9,12 @@ import CallToAction from '~/components/widgets/CallToAction.astro';
 
 import { headerData } from '~/navigation';
 
-const meta = {
+const metadata = {
   title: 'Saas Landing Page',
 };
 ---
 
-<Layout {meta}>
+<Layout metadata={metadata}>
   <Fragment slot="header">
     <Header
       {...headerData}

src/pages/landing/startup.astro

@@ -7,12 +7,12 @@ import CallToAction from '~/components/widgets/CallToAction.astro';
 
 import { headerData } from '~/navigation';
 
-const meta = {
+const metadata = {
   title: "Startup Landing Page",
 };
 ---
 
-<Layout {meta}>
+<Layout metadata={metadata}>
   <Fragment slot="header">
     <Header
       {...headerData}

src/pages/pricing.astro

@@ -3,12 +3,12 @@ import Layout from '~/layouts/PageLayout.astro';
 
 import Pricing from '~/components/widgets/Pricing.astro';
 
-const meta = {
+const metadata = {
   title: "Pricing",
 };
 ---
 
-<Layout {meta}>
+<Layout metadata={metadata}>
   <Pricing
     title="Basic Pricing"
     tagline="Pricing"

src/pages/rss.xml.ts

@@ -1,11 +1,11 @@
 import rss from '@astrojs/rss';
 
-import { SITE, BLOG } from '~/config.mjs';
+import { SITE_CONFIG, METADATA_CONFIG, APP_BLOG_CONFIG } from '~/utils/config';
 import { fetchPosts } from '~/utils/blog';
 import { getPermalink } from '~/utils/permalinks';
 
 export const get = async () => {
-  if (BLOG.disabled) {
+  if (!APP_BLOG_CONFIG.isEnabled) {
     return new Response(null, {
       status: 404,
       statusText: 'Not found',
@@ -15,17 +15,17 @@ export const get = async () => {
   const posts = await fetchPosts();
 
   return rss({
-    title: `${SITE.name}’s Blog`,
-    description: SITE.description,
+    title: `${SITE_CONFIG.name}’s Blog`,
+    description: METADATA_CONFIG?.description,
     site: import.meta.env.SITE,
 
     items: posts.map((post) => ({
       link: getPermalink(post.permalink, 'post'),
       title: post.title,
-      description: post.description,
+      description: post.excerpt,
       pubDate: post.publishDate,
     })),
 
-    trailingSlash: SITE.trailingSlash,
+    trailingSlash: SITE_CONFIG.trailingSlash,
   });
 };

src/pages/services.astro

@@ -1,11 +1,11 @@
 ---
 import Layout from '~/layouts/PageLayout.astro';
 
-const meta = {
+const metadata = {
   title: "Services",
 };
 ---
 
-<Layout {meta}>
+<Layout metadata={metadata}>
   Services
 </Layout>