astro-accelerator 0.0.8 → 0.0.10

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.8",
+  "version": "0.0.10",
   "author": "Steve Fenton",
   "name": "astro-accelerator",
   "description": "A super-lightweight, accessible, SEO-friendly starter project for Astro",
@@ -36,18 +36,17 @@
     "node": "*"
   },
   "files": [
-    ".gitignore",
     ".npmrc",
     "env.d.ts",
     "tsconfig.json",
     "astro.config.mjs",
     "src/config.ts",
     "src/pages/index.md",
-    "src/pages/authors/[author]/[page].astro",
-    "src/pages/articles/[page].astro",
+    "src/pages/authors/[[]author[]]/[[]page[]].astro",
+    "src/pages/articles/[[]page[]].astro",
     "src/pages/articles/feed.xml.ts",
-    "src/pages/category/[category]/[page].astro",
-    "src/pages/tag/[tag]/[page].astro",
+    "src/pages/category/[[]category[]]/[[]page[]].astro",
+    "src/pages/tag/[[]tag[]]/[[]page[]].astro",
     "src/pages/search.json.ts",
     "src/pages/sitemap.xml.ts",
     "src/pages/report/*",

package/src/pages/articles/[page].astro

@@ -0,0 +1,80 @@
+---
+// For listing all articles in this folder
+import t from '@util/language.json';
+import { Lang } from '@util/Languages.astro';
+
+import type { Page, MarkdownInstance } from 'astro';
+
+import { Frontmatter, SITE } from '@config';
+import { getPageLinks } from '@util/PageLinks.astro';
+import { isListable, sortByPubDateDesc } from '@util/PageTypeFilters.astro';
+import { getItem, setItem } from '@util/Cache.astro';
+
+import Default from '@layouts/Default.astro';
+import ArticleList from '@components/ArticleList.astro';
+import Paging from '@components/Paging.astro';
+
+const lang = SITE.default.lang;
+
+// Props
+type Props = {
+  page: Page<MarkdownInstance<Record<string, any>>>;
+  headings: { depth: number; slug: string; text: string; }[];
+  pubDate: Date;
+};
+const { page, headings, pubDate } = Astro.props as Props;
+
+const frontmatter: Frontmatter = {
+  layout: 'src/layouts/Default.astro',
+  title: 'Articles',
+  keywords: 'articles,astro,accelerator',
+  description: 'Astro Accelerator articles.',
+  pubDate: pubDate,
+  robots: 'noindex, follow'
+};
+
+// Language
+const _ = Lang(lang);
+
+// Logic
+type CacheData = {
+  posts: MarkdownInstance<Record<string, any>>[];
+}
+
+export async function getCacheData() {
+  const key = 'pages_articles_[page]';
+
+  let cacheData: CacheData = await getItem(key);
+
+  if (cacheData == null) {
+    // This uses a relative glob, so we only look in the current collection
+    const sourcePosts = await Astro.glob('./**/*.md');
+    
+    cacheData = { posts: []};
+
+    cacheData.posts = sourcePosts
+      .filter(isListable)
+      .sort(sortByPubDateDesc);
+    
+    await setItem(key, cacheData);
+  }
+
+  return cacheData;
+}
+
+export async function getStaticPaths({ paginate }: any) {
+  let data = await getCacheData();
+  return paginate(data.posts, {
+    props: { pubDate: data.posts[0].frontmatter.pubDate },
+    pageSize: SITE.pageSize
+  });
+}
+
+// Page Links
+const pageLinks = getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+---
+<Default frontmatter={ frontmatter } headings={ headings }>
+  <h2>Page {page.currentPage}</h2>
+  <ArticleList lang={ lang } posts={ page.data } />
+  <Paging lang={ lang } page={ page } pageLinks={ pageLinks } />
+</Default>

package/src/pages/authors/[author]/[page].astro

@@ -0,0 +1,101 @@
+---
+// For listing all articles in this folder
+import t from '@util/language.json';
+import { Lang } from '@util/Languages.astro';
+
+import type { Page, MarkdownInstance } from 'astro';
+
+import { Frontmatter, SITE } from '@config';
+import { getPageLinks } from '@util/PageLinks.astro';
+import { isListable, sortByPubDateDesc } from '@util/PageTypeFilters.astro';
+import { getItem, setItem } from '@util/Cache.astro';
+
+import Default from '@layouts/Default.astro';
+import ArticleList from '@components/ArticleList.astro';
+import Paging from '@components/Paging.astro';
+import { getAuthorInfo } from '@util/PageQueries.astro';
+
+const lang = SITE.default.lang;
+const currentUrl = new URL(Astro.request.url);
+const slug = currentUrl.pathname.split('/')[2];
+
+let authorInfo = await getAuthorInfo(slug);
+
+const frontmatter = authorInfo.frontmatter as Frontmatter;
+
+// Props
+type Props = {
+  page: Page<MarkdownInstance<Record<string, any>>>;
+  headings: { depth: number; slug: string; text: string; }[];
+  pubDate: Date;
+};
+const { page, headings, pubDate } = Astro.props as Props;
+
+frontmatter.pubDate = pubDate;
+
+// Language
+const _ = Lang(lang);
+
+// Logic
+type CacheData = {
+  posts: MarkdownInstance<Record<string, any>>[];
+  authors: string[];
+}
+
+export async function getCacheData() {
+  const key = 'pages_authors_[author]_[page]';
+
+  let cacheData: CacheData = await getItem(key);
+
+  if (cacheData == null) {
+    const sourcePosts = await Astro.glob('../../**/*.md');
+    
+    cacheData = { posts: [], authors: []};
+
+    cacheData.posts = sourcePosts
+      .filter(isListable)
+      .sort(sortByPubDateDesc);
+
+    cacheData.posts.forEach(p => {
+      const auths: string[] = p.frontmatter.authors ?? [];
+      if (auths.length == 0) {
+        console.log('No authors found', p.url);
+      }
+      auths.forEach(a => {
+        if (!cacheData.authors.includes(a)) {
+          cacheData.authors.push(a);
+        }
+      });
+    });
+    
+    await setItem(key, cacheData);
+  }
+
+  return cacheData;
+}
+
+export async function getStaticPaths({ paginate }: any) {
+  let data = await getCacheData();
+
+  return data.authors.map(a => {
+    const filtered = data.posts.filter(p => {
+      const auths: string[] = p.frontmatter.authors ?? [];
+      return auths.includes(a);
+    });
+    return paginate(filtered, { 
+        params: { author: a.toLowerCase() },
+        props: { pubDate: filtered[0].frontmatter.pubDate },
+        pageSize: SITE.pageSize 
+    });
+  });
+}
+
+// Page Links
+const pageLinks = getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+---
+<Default frontmatter={ frontmatter } headings={ headings }>
+  <Fragment set:html={ authorInfo.content }></Fragment>
+  <h2>Page {page.currentPage}</h2>
+  <ArticleList lang={ lang } posts={ page.data } />
+  <Paging lang={ lang } page={ page } pageLinks={ pageLinks } />
+</Default>

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

@@ -0,0 +1,104 @@
+---
+// For listing by frontmatter.categories
+import t from '@util/language.json';
+import { Lang } from '@util/Languages.astro';
+
+import type { Page, MarkdownInstance } from 'astro';
+
+import { Frontmatter, SITE } from '@config';
+import { getPageLinks } from '@util/PageLinks.astro';
+import { isListable, sortByPubDateDesc } from '@util/PageTypeFilters.astro';
+import { getItem, setItem } from '@util/Cache.astro';
+
+import Default from '@layouts/Default.astro';
+import ArticleList from '@components/ArticleList.astro';
+import Paging from '@components/Paging.astro';
+
+const lang = SITE.default.lang;
+const currentUrl = new URL(Astro.request.url);
+const slug = currentUrl.pathname.split('/')[3];
+
+// Props
+type Props = {
+  title: string;
+  page: Page<MarkdownInstance<Record<string, any>>>;
+  headings: { depth: number; slug: string; text: string; }[];
+  pubDate: Date;
+};
+const { title, page, headings, pubDate } = Astro.props as Props;
+
+const frontmatter: Frontmatter = {
+  layout: 'src/layouts/Default.astro',
+  title: title,
+  keywords: `${slug},articles,astro,accelerator`,
+  description: `Astro Accelerator ${slug} articles.`,
+  pubDate: pubDate,
+  robots: 'noindex, follow'
+};
+
+// Language
+const _ = Lang(lang);
+
+// Logic
+type CacheData = {
+  posts: MarkdownInstance<Record<string, any>>[];
+  categories: string[];
+}
+
+export async function getCacheData() {
+  const key = 'pages_articles_[category]_[page]';
+
+  let cacheData: CacheData = await getItem(key);
+
+  if (cacheData == null) {
+    // This uses a relative glob, so we only look in the current collection
+    const sourcePosts = await Astro.glob('../../**/*.md');
+    
+    cacheData = { posts: [], categories: []};
+
+    cacheData.posts = sourcePosts
+      .filter(isListable)
+      .sort(sortByPubDateDesc);
+
+    cacheData.posts.forEach(p => {
+      const auths: string[] = p.frontmatter.categories ?? [];
+      if (auths.length == 0) {
+        console.log('No categories found', p.url);
+      }
+      auths.forEach(a => {
+        if (!cacheData.categories.includes(a)) {
+          cacheData.categories.push(a);
+        }
+      });
+    });
+    
+    await setItem(key, cacheData);
+  }
+
+  return cacheData;
+}
+
+export async function getStaticPaths({ paginate }: any) {
+  let data = await getCacheData();
+
+  return data.categories.map(c => {
+    const filtered = data.posts.filter(p => {
+      const cats: string[] = p.frontmatter.categories ?? [];
+      return cats.includes(c);
+    });
+    return paginate(filtered, {
+      params: { category: c.toLowerCase().replace(/ /g, '-') },
+      props: { title: c, pubDate: filtered[0].frontmatter.pubDate },
+      pageSize: SITE.pageSize 
+    });
+  });
+}
+
+// Page Links
+const pageLinks = getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+---
+<Default frontmatter={ frontmatter } headings={ headings }>
+  <h2>Page {page.currentPage}</h2>
+  <ArticleList lang={ lang } posts={ page.data } />
+  <Paging lang={ lang } page={ page } pageLinks={ pageLinks } />
+</Default>

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

@@ -0,0 +1,104 @@
+---
+// For listing by frontmatter.tags
+import t from '@util/language.json';
+import { Lang } from '@util/Languages.astro';
+
+import type { Page, MarkdownInstance } from 'astro';
+
+import { Frontmatter, SITE } from '@config';
+import { getPageLinks } from '@util/PageLinks.astro';
+import { isListable, sortByPubDateDesc } from '@util/PageTypeFilters.astro';
+import { getItem, setItem } from '@util/Cache.astro';
+
+import Default from '@layouts/Default.astro';
+import ArticleList from '@components/ArticleList.astro';
+import Paging from '@components/Paging.astro';
+
+const lang = SITE.default.lang;
+const currentUrl = new URL(Astro.request.url);
+const slug = currentUrl.pathname.split('/')[3];
+
+// Props
+type Props = {
+  title: string;
+  page: Page<MarkdownInstance<Record<string, any>>>;
+  headings: { depth: number; slug: string; text: string; }[];
+  pubDate: Date;
+};
+const { title, page, headings, pubDate } = Astro.props as Props;
+
+const frontmatter: Frontmatter = {
+  layout: 'src/layouts/Default.astro',
+  title: title,
+  keywords: `${slug},articles,astro,accelerator`,
+  description: `Astro Accelerator ${slug} articles.`,
+  pubDate: pubDate,
+  robots: 'noindex, follow'
+};
+
+// Language
+const _ = Lang(lang);
+
+// Logic
+type CacheData = {
+  posts: MarkdownInstance<Record<string, any>>[];
+  tags: string[];
+}
+
+export async function getCacheData() {
+  const key = 'pages_articles_[tag]_[page]';
+
+  let cacheData: CacheData = await getItem(key);
+
+  if (cacheData == null) {
+    // This uses a relative glob, so we only look in the current collection
+    const sourcePosts = await Astro.glob('../../**/*.md');
+    
+    cacheData = { posts: [], tags: []};
+
+    cacheData.posts = sourcePosts
+      .filter(isListable)
+      .sort(sortByPubDateDesc);
+
+    cacheData.posts.forEach(p => {
+      const auths: string[] = p.frontmatter.tags ?? [];
+      if (auths.length == 0) {
+        console.log('No categories found', p.url);
+      }
+      auths.forEach(a => {
+        if (!cacheData.tags.includes(a)) {
+          cacheData.tags.push(a);
+        }
+      });
+    });
+
+    await setItem(key, cacheData);
+  }
+
+  return cacheData;
+}
+
+export async function getStaticPaths({ paginate }: any) {
+  let data = await getCacheData();
+
+  return data.tags.map(t => {
+    const filtered = data.posts.filter(p => {
+      const tags: string[] = p.frontmatter.tags ?? [];
+      return tags.includes(t);
+    });
+    return paginate(filtered, {
+      params: { tag: t.toLowerCase().replace(/ /g, '-') },
+      props: { title: t, pubDate: filtered[0].frontmatter.pubDate },
+      pageSize: SITE.pageSize 
+    });
+  });
+}
+
+// Page Links
+const pageLinks = getPageLinks(SITE.pageLinks, page.lastPage, page.currentPage, page.url.current);
+---
+<Default frontmatter={ frontmatter } headings={ headings }>
+  <h2>Page {page.currentPage}</h2>
+  <ArticleList lang={ lang } posts={ page.data } />
+  <Paging lang={ lang } page={ page } pageLinks={ pageLinks } />
+</Default>

package/.gitignore

@@ -1,23 +0,0 @@
-# build output
-.cache/
-dist/
-
-# dependencies
-node_modules/
-
-# logs
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-
-# environment variables
-.env
-.env.production
-
-# macOS-specific files
-.DS_Store
-/test-results/
-/playwright-report/
-/playwright/.cache/