astro-accelerator 5.10.41 → 5.10.43

package/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "5.10.41",
+    "version": "5.10.43",
     "author": "Steve Fenton",
     "name": "astro-accelerator",
     "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",

package/src/layouts/Author.astro

@@ -1,17 +1,17 @@
 ---
 // warning: This file is overwritten by Astro Accelerator
 
-import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
-import Author from '@layouts/Author.astro';
+import type { Frontmatter } from "astro-accelerator-utils/types/Frontmatter";
+import AuthorLayout from "@layouts/Author.astro";
 
 // Properties
 type Props = {
-    frontmatter: Frontmatter
-    headings: { depth: number; slug: string; text: string; }[];
-}
+    frontmatter: Frontmatter;
+    headings: { depth: number; slug: string; text: string }[];
+};
 const { frontmatter, headings } = Astro.props satisfies Props;
-
 ---
-<Author frontmatter={ frontmatter } headings={ headings }>
+
+<AuthorLayout frontmatter={frontmatter} headings={headings}>
     <slot />
-</Author>
+</AuthorLayout>

package/src/layouts/Default.astro

@@ -1,17 +1,21 @@
 ---
 // warning: This file is overwritten by Astro Accelerator
 
-import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
-import Default from '@layouts/Default.astro';
+import type { Frontmatter } from "astro-accelerator-utils/types/Frontmatter";
+import DefaultLayout from "@layouts/Default.astro";
 
 // Properties
 type Props = {
-    frontmatter: Frontmatter
-    headings: { depth: number; slug: string; text: string; }[];
-    breadcrumbs?: { url: string; title: string; ariaCurrent?: string; }[] | null;
-}
+    frontmatter: Frontmatter;
+    headings: { depth: number; slug: string; text: string }[];
+    breadcrumbs?: { url: string; title: string; ariaCurrent?: string }[] | null;
+};
 const { frontmatter, headings, breadcrumbs } = Astro.props satisfies Props;
 ---
-<Default frontmatter={ frontmatter } headings={ headings } breadcrumbs={ breadcrumbs }>
+
+<DefaultLayout
+    frontmatter={frontmatter}
+    headings={headings}
+    breadcrumbs={breadcrumbs}>
     <slot />
-</Default>
+</DefaultLayout>

package/src/layouts/Events.astro

@@ -0,0 +1,21 @@
+---
+import type { Frontmatter } from "astro-accelerator-utils/types/Frontmatter";
+import { SITE } from "@config";
+import { Lang } from "@util/Languages";
+import EventsLayout from "@layouts/Events.astro";
+
+// Properties
+type Props = {
+    frontmatter: Frontmatter;
+    headings: { depth: number; slug: string; text: string }[];
+};
+const { frontmatter, headings } = Astro.props satisfies Props;
+const lang = frontmatter.lang ?? SITE.default.lang;
+
+// Language
+const _ = Lang(lang);
+---
+
+<EventsLayout frontmatter={frontmatter} headings={headings}>
+    <slot />
+</EventsLayout>

package/src/layouts/Redirect.astro

@@ -1,16 +1,17 @@
 ---
 // warning: This file is overwritten by Astro Accelerator
 
-import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
-import Redirect from '@layouts/Redirect.astro';
+import type { Frontmatter } from "astro-accelerator-utils/types/Frontmatter";
+import RedirectLayout from "@layouts/Redirect.astro";
 
 // Properties
 type Props = {
-    frontmatter: Frontmatter
-    headings: { depth: number; slug: string; text: string; }[];
-}
+    frontmatter: Frontmatter;
+    headings: { depth: number; slug: string; text: string }[];
+};
 const { frontmatter, headings } = Astro.props satisfies Props;
 ---
-<Redirect frontmatter={ frontmatter } headings={ headings }>
+
+<RedirectLayout frontmatter={frontmatter} headings={headings}>
     <slot />
-</Redirect>
+</RedirectLayout>

package/src/layouts/Search.astro

@@ -1,22 +1,23 @@
 ---
-import type { Frontmatter } from 'astro-accelerator-utils/types/Frontmatter';
-import { SITE } from '@config';
-import { Lang } from '@util/Languages';
-import Default from './Default.astro';
-import Search from '../themes/accelerator/components/Search.astro';
+import type { Frontmatter } from "astro-accelerator-utils/types/Frontmatter";
+import { SITE } from "@config";
+import { Lang } from "@util/Languages";
+import DefaultLayout from "./Default.astro";
+import SearchComponent from "../themes/accelerator/components/Search.astro";
 
 // Properties
 type Props = {
-    frontmatter: Frontmatter
-    headings: { depth: number; slug: string; text: string; }[];
-}
+    frontmatter: Frontmatter;
+    headings: { depth: number; slug: string; text: string }[];
+};
 const { frontmatter, headings } = Astro.props satisfies Props;
 const lang = frontmatter.lang ?? SITE.default.lang;
 
 // Language
 const _ = Lang(lang);
 ---
-<Default frontmatter={ frontmatter } headings={ headings }>
+
+<DefaultLayout frontmatter={frontmatter} headings={headings}>
     <slot />
-    <Search lang={ lang }/>
-</Default>
+    <SearchComponent lang={lang} showSearch={true} />
+</DefaultLayout>

package/src/themes/accelerator/components/TimelineEvent.astro

@@ -51,7 +51,7 @@ const displayDate = formatDate(date);
                 </Fragment>
             )
         }
-        <h3>{title}</h3>
+        <h2>{title}</h2>
         <span class="timeline-location">{location}</span>
         {description && <p>{description}</p>}
         <slot />

package/src/themes/accelerator/layouts/Events.astro

@@ -0,0 +1,67 @@
+---
+// warning: This file is overwritten by Astro Accelerator
+
+import { getCollection, render } from "astro:content";
+import type { Frontmatter } from "astro-accelerator-utils/types/Frontmatter";
+import TimelineEvent from "@components/TimelineEvent.astro";
+import Default from "./Default.astro";
+
+type Props = {
+    frontmatter: Frontmatter & { isArchive?: boolean };
+    headings: { depth: number; slug: string; text: string }[];
+};
+
+const { frontmatter, headings } = Astro.props;
+const isArchive = frontmatter.isArchive === true;
+
+const events = await (async () => {
+    const now = new Date();
+    const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+    const collection = await getCollection("events", ({ data }) => {
+        return isArchive ? data.startDate < today : data.startDate >= today;
+    });
+
+    return collection.sort((a, b) => {
+        const aTime = a.data.startDate.getTime();
+        const bTime = b.data.startDate.getTime();
+        return isArchive ? bTime - aTime : aTime - bTime;
+    });
+})();
+---
+
+<Default frontmatter={frontmatter} headings={headings}>
+    <slot />
+
+    <div class="timeline" data-timeline>
+        {
+            await Promise.all(
+                events.map(async (event) => {
+                    const { Content } = await render(event);
+                    return (
+                        <TimelineEvent
+                            date={event.data.startDate}
+                            endDate={event.data.endDate}
+                            title={event.data.title}
+                            location={event.data.location}
+                            linkHref={event.data.linkHref}
+                            linkText={event.data.linkText}>
+                            <Content />
+                        </TimelineEvent>
+                    );
+                }),
+            )
+        }
+    </div>
+
+    {
+        isArchive ? (
+            <p>
+                <a href="/events/">Return to upcoming events</a>
+            </p>
+        ) : (
+            <p>
+                <a href="/events-archive/">View the events archive</a>
+            </p>
+        )
+    }
+</Default>