astro-accelerator 0.0.26 → 0.0.28

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.26",
+  "version": "0.0.28",
   "author": "Steve Fenton",
   "name": "astro-accelerator",
   "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",
@@ -26,7 +26,7 @@
   "dependencies": {
     "@squoosh/lib": "^0.4.0",
     "astro": "^1.6.6",
-    "astro-accelerator-utils": "^0.0.24",
+    "astro-accelerator-utils": "^0.0.26",
     "hast-util-from-selector": "^2.0.0",
     "remark-directive": "^2.0.1"
   },

package/public/css/main.css

@@ -156,7 +156,7 @@ li::marker {
     color: var(--fore-headings);
 }
 
-.page-content ul, .page-content ol {
+.page-content ul:not(.post-list), .page-content ol {
     margin: var(--paragraph-margin) 0 var(--paragraph-margin) 1.2rem;
 }
 
@@ -460,7 +460,7 @@ nav.site-nav h2 {
 
 .content-group nav {
     grid-area: menu;
-    width: 100%;
+    width: calc(100% - 40px);
 }
 
 .content-group main,
@@ -477,13 +477,19 @@ nav.site-nav h2 {
 @media (max-width: 860px) {
     .content-group {
         grid-template-columns: auto; 
-        grid-template-rows: repeat(auto); 
+        grid-template-rows: auto auto auto; 
         gap: var(--grid-gap);
         grid-template-areas: 
           "top"
           "content"
           "menu";
     }
+
+    .content-group article > .page-content {
+        margin: 0 20px;
+        width: calc(100% - 40px);
+        max-width: calc(100vw - 40px);
+    }
 }
 
 /* Table of Contents (TOC) */

package/src/config.ts

@@ -60,10 +60,6 @@ export const HEADER_SCRIPTS = `
 <!-- HEADER SCRIPTS -->
 `.trim();
 
-type Mapped<T> = {
-    [P in keyof T]?: any
-}
-
 export type Frontmatter = {
 	layout: string;
 	title: string;

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

@@ -1,9 +1,9 @@
 ---
-import { Dates, Urls } from 'astro-accelerator-utils';
+import { Dates, Urls, PostQueries } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';
-import { getAuthorList } from '@util/Authors';
 import { getImageInfo } from '@util/custom-markdown.mjs';
+import { fetchPages } from '@util/PageQueries';
 
 // Properties
 type Props = {
@@ -16,11 +16,12 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const authorList = await getAuthorList(frontmatter);
+const authorList = await PostQueries.getAuthors(fetchPages, frontmatter);
 
-const author = authorList.writers.slice(0, 1)[0];
-const authorImage = authorList?.image?.src ? getImageInfo(authorList.image.src, 'author-image', SITE.images.authorSize) : null;
-const contributors = authorList.writers.slice(1);
+// Get image info
+const authorImage = authorList?.image?.src 
+  ? getImageInfo(authorList.image.src, 'author-image', SITE.images.authorSize)
+  : null;
 ---
 {authorList.writers.length > 0 && 
 <div class="post-meta">
@@ -34,9 +35,9 @@ const contributors = authorList.writers.slice(1);
   }
   <div class="author-info">
     <span>{ _(Translations.post.written_by) }
-      {author &&
-        <a href={ Urls.addSlashToAddress(author.url, SITE) + '1/' } itemprop="author">{ author.frontmatter.title }</a>
-      }{contributors.map((writer) => (
+      {authorList.mainAuthor &&
+        <a href={ Urls.addSlashToAddress(authorList.mainAuthor.url, SITE) + '1/' } itemprop="author">{ authorList.mainAuthor.frontmatter.title }</a>
+      }{authorList.contributors.map((writer) => (
         <a href={ Urls.addSlashToAddress(writer.url, SITE) + '1/' } itemprop="contributor">{ writer.frontmatter.title }</a>
       ))}.
       <br /><time datetime={ frontmatter.pubDate.toString() } itemprop="datePublished">

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

@@ -1,8 +1,8 @@
 ---
+import { Dates, PostQueries } from 'astro-accelerator-utils';
 import { SITE, Frontmatter } from '@config';
 import { Translations, Lang } from '@util/Languages';;
-import { Dates } from 'astro-accelerator-utils';
-import { getAuthorList } from '@util/Authors';
+import { fetchPages } from '@util/PageQueries';
 
 // Properties
 type Props = {
@@ -15,7 +15,7 @@ const { lang, frontmatter } = Astro.props as Props;
 const _ = Lang(lang);
 
 // Logic
-const authorList = await getAuthorList(frontmatter);
+const authorList = await PostQueries.getAuthors(fetchPages, frontmatter);
 ---
 {authorList.writers.length > 0 && 
 <div class="post-meta">

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

@@ -17,15 +17,16 @@ const imageAlt = frontmatter.bannerImage?.alt ?? OPEN_GRAPH.image.alt;
 const robots = frontmatter.robots ?? 'index, follow';
 const canonicalImageSrc = new URL(imageSrc, Astro.site);
 const canonicalURL =  Urls.addSlashToUrl(new URL(Astro.url.pathname, Astro.site + SITE.subfolder));
-const title = await getTextFrom( frontmatter.title ? `${ frontmatter.title } | ${ SITE.title }` : SITE.title);
+const socialTitle = await getTextFrom(frontmatter.title);
+const title = `${ socialTitle } | ${ SITE.title }`;
 ---
 <head>
   <meta charset="utf-8" />
   <title>{ title }</title>
-  <meta name="robots" content={ 'max-image-preview:large, ' + robots }>
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="keywords" content={ frontmatter.keywords }>
-  <meta name="description" content={ frontmatter.description }>
+  <meta name="robots" content={ 'max-image-preview:large, ' + robots } />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <meta name="keywords" content={ frontmatter.keywords } />
+  <meta name="description" content={ frontmatter.description } />
   <meta name="theme-color" content={ SITE.themeColor } />
   <link rel="stylesheet" href={ SITE.subfolder + '/css/vars.css' } />
   <link rel="stylesheet" href={ SITE.subfolder + '/css/main.css' } />
@@ -38,14 +39,15 @@ const title = await getTextFrom( frontmatter.title ? `${ frontmatter.title } | $
   <link rel="apple-touch-icon" href={ SITE.subfolder + '/icons/apple-touch-icon.png' } />
   <meta property="og:type" content="website" />
   <meta property="og:url" content={ canonicalURL } />
-  <meta property="og:title" content={ frontmatter.title } />
+  <meta property="og:title" content={ socialTitle } />
   <meta property="og:description" content={ frontmatter.description } />
   <meta property="og:image" content={ canonicalImageSrc } />
   <meta property="og:image:alt" content={ imageAlt } />
-  <meta name="twitter:card" content="summary_large_image">
-  <meta name="twitter:title" content={ frontmatter.title }>
-  <meta name="twitter:description" content={ frontmatter.description }>
-  <meta name="twitter:image" content={ canonicalImageSrc }>
-  <meta name="twitter:image:alt" content={ imageAlt }>
+  <meta name="twitter:card" content="summary_large_image" />
+  <meta name="twitter:title" content={ socialTitle } />
+  <meta name="twitter:description" content={ frontmatter.description } />
+  <meta name="twitter:image" content={ canonicalImageSrc } />
+  <meta name="twitter:image:alt" content={ imageAlt } />
+  <meta name="view-transition" content="same-origin" />
   <Fragment set:html={ HEADER_SCRIPTS }></Fragment>
 </head>

package/src/themes/accelerator/utilities/PageQueries.ts

@@ -2,8 +2,8 @@ import type { MarkdownInstance } from "astro";
 import { SITE } from '@config';
 import { Cache, PostQueries, PostFiltering } from 'astro-accelerator-utils';
 
-export function fetchPages(): Record<string, any> {
-    return import.meta.glob("../../../pages/**/*.md", { eager: true });
+export function fetchPages(): MarkdownInstance<Record<string, any>>[] {
+    return import.meta.glob<any>("../../../pages/**/*.md", { eager: true }) as MarkdownInstance<Record<string, any>>[];
 }
 
 export type PagePredicate = (value: MarkdownInstance<Record<string, any>>, index: number, array: MarkdownInstance<Record<string, any>>[]) => boolean;

package/src/themes/accelerator/utilities/Authors.ts

@@ -1,45 +0,0 @@
-import type { MarkdownInstance } from 'astro';
-import { PostQueries, PostFiltering } from "astro-accelerator-utils";
-import type { Frontmatter } from '@config';
-import { fetchPages } from "@util/PageQueries";
-
-type BannerImage = { src: string; alt: string } | null;
-type AuthorList = {
-    image: BannerImage | null;
-    writers: MarkdownInstance<Record<string, any>>[];
-};
-
-export async function getAuthors () {
-    const authors = await PostQueries.getPages(fetchPages, PostFiltering.isAuthor);
-    return authors;
-}
-
-export async function getAuthorList (frontmatter: Frontmatter) {
-    const authors = await getAuthors();
-
-    const result: AuthorList = {
-        image: null,
-        writers: [],
-    };
-
-    (frontmatter.authors ?? []).forEach((a) => {
-        const matches = authors.filter((x) => x.frontmatter.id == a);
-
-        if (matches.length == 0) {
-            console.warn("Unknown author", a);
-        }
-
-        if (matches.length > 1) {
-            console.warn("Multiple authors with id", a);
-        }
-
-        if (matches.length == 1) {
-            result.writers.push(matches[0]);
-            if (result.image == null) {
-                result.image = matches[0].frontmatter.bannerImage;
-            }
-        }
-    });
-
-    return result;
-}