@hutusi/amytis 1.9.0 → 1.11.0

package/src/app/posts/page/[page]/page.tsx

@@ -1,16 +1,18 @@
-import { getAllPosts } from '@/lib/markdown';
+import { getListingPosts } from '@/lib/markdown';
 import PostList from '@/components/PostList';
 import Pagination from '@/components/Pagination';
 import { siteConfig } from '../../../../../site.config';
 import { Metadata } from 'next';
 import { notFound } from 'next/navigation';
-import { t, resolveLocale } from '@/lib/i18n';
+import { t, resolveLocale, tWith } from '@/lib/i18n';
 import PageHeader from '@/components/PageHeader';
+import { getPostsBasePath } from '@/lib/urls';
 
 const PAGE_SIZE = siteConfig.pagination.posts;
 
 export function generateStaticParams() {
-  const allPosts = getAllPosts();
+  if (getPostsBasePath() !== 'posts') return [{ page: '_' }]; // Route disabled; custom path handles this
+  const allPosts = getListingPosts();
   const totalPages = Math.ceil(allPosts.length / PAGE_SIZE);
 
   // Generate params for page 2 to totalPages (page 1 is handled by /posts/page.tsx)
@@ -25,15 +27,17 @@ export const dynamicParams = false;
 
 export async function generateMetadata({ params }: { params: Promise<{ page: string }> }): Promise<Metadata> {
   const { page } = await params;
+  const allPosts = getListingPosts();
+  const totalPages = Math.ceil(allPosts.length / PAGE_SIZE);
   return {
-    title: `${t('posts')} - ${page} | ${resolveLocale(siteConfig.title)}`,
+    title: `${t('posts')} - ${tWith('page_of_total', { page: parseInt(page), total: totalPages })} | ${resolveLocale(siteConfig.title)}`,
   };
 }
 
 export default async function PostsPage({ params }: { params: Promise<{ page: string }> }) {
   const { page: pageStr } = await params;
   const page = parseInt(pageStr);
-  const allPosts = getAllPosts();
+  const allPosts = getListingPosts();
   const totalPages = Math.ceil(allPosts.length / PAGE_SIZE);
 
   if (isNaN(page) || page < 2 || page > totalPages) notFound();

package/src/app/posts/page.tsx

@@ -1,20 +1,26 @@
-import { getAllPosts } from '@/lib/markdown';
+import { getListingPosts } from '@/lib/markdown';
 import PostList from '@/components/PostList';
 import Pagination from '@/components/Pagination';
 import { siteConfig } from '../../../site.config';
 import { Metadata } from 'next';
-import { t, resolveLocale } from '@/lib/i18n';
+import { t, resolveLocale, tWith } from '@/lib/i18n';
 import PageHeader from '@/components/PageHeader';
+import { getPostsBasePath } from '@/lib/urls';
+import { notFound } from 'next/navigation';
 
 const PAGE_SIZE = siteConfig.pagination.posts;
 
-export const metadata: Metadata = {
-  title: `${t('posts')} | ${resolveLocale(siteConfig.title)}`,
-  description: 'Browse the complete archive of articles.',
-};
+export async function generateMetadata(): Promise<Metadata> {
+  const allPosts = getListingPosts();
+  return {
+    title: `${t('posts')} | ${resolveLocale(siteConfig.title)}`,
+    description: tWith('posts_subtitle', { count: allPosts.length }),
+  };
+}
 
 export default function AllPostsPage() {
-  const allPosts = getAllPosts();
+  if (getPostsBasePath() !== 'posts') notFound();
+  const allPosts = getListingPosts();
   const page = 1;
   const totalPages = Math.ceil(allPosts.length / PAGE_SIZE);
   const posts = allPosts.slice(0, PAGE_SIZE);

package/src/app/series/[slug]/page/[page]/page.tsx

@@ -1,4 +1,4 @@
-import { getSeriesData, getSeriesPosts, getAllSeries, getSeriesAuthors, getAuthorSlug } from '@/lib/markdown';
+import { getSeriesData, getSeriesPosts, getAllSeries, resolveSeriesAuthors, getAuthorSlug } from '@/lib/markdown';
 import { notFound } from 'next/navigation';
 import SeriesCatalog from '@/components/SeriesCatalog';
 import Pagination from '@/components/Pagination';
@@ -6,7 +6,7 @@ import { Metadata } from 'next';
 import { siteConfig } from '../../../../../../site.config';
 import CoverImage from '@/components/CoverImage';
 import Link from 'next/link';
-import { t, resolveLocale } from '@/lib/i18n';
+import { t, resolveLocale, tWith } from '@/lib/i18n';
 
 const PAGE_SIZE = siteConfig.pagination.series;
 
@@ -34,8 +34,10 @@ export async function generateMetadata({ params }: { params: Promise<{ slug: str
   const slug = decodeURIComponent(rawSlug);
   const seriesData = getSeriesData(slug);
   const title = seriesData?.title || slug;
+  const allPosts = getSeriesPosts(slug);
+  const totalPages = Math.ceil(allPosts.length / PAGE_SIZE);
   return {
-    title: `${title} - ${page} | ${resolveLocale(siteConfig.title)}`,
+    title: `${title} - ${tWith('page_of_total', { page, total: totalPages })} | ${resolveLocale(siteConfig.title)}`,
   };
 }
 
@@ -61,24 +63,7 @@ export default async function SeriesPage({ params }: { params: Promise<{ slug: s
   const description = seriesData?.excerpt;
   const coverImage = seriesData?.coverImage;
 
-  // Use explicitly configured series authors, or aggregate top authors from posts
-  const explicitAuthors = getSeriesAuthors(slug);
-  let authors: string[];
-  if (explicitAuthors) {
-    authors = explicitAuthors;
-  } else if (allPosts.length > 0) {
-    const counts = new Map<string, number>();
-    for (const post of allPosts) {
-      for (const author of post.authors) {
-        counts.set(author, (counts.get(author) || 0) + 1);
-      }
-    }
-    authors = [...counts.entries()]
-      .sort((a, b) => b[1] - a[1])
-      .map(([name]) => name);
-  } else {
-    authors = [];
-  }
+  const authors = resolveSeriesAuthors(slug, allPosts);
 
   // Calculate the starting index for this page
   const startIndex = (page - 1) * PAGE_SIZE;
@@ -103,10 +88,8 @@ export default async function SeriesPage({ params }: { params: Promise<{ slug: s
           <span className="badge-accent mb-4">
             {t('series')} • {allPosts.length} {t('parts')}
           </span>
-          <h1 className="page-title mb-4">
-            {title}
-            <span className="block text-lg text-muted font-sans font-normal mt-2">{page} / {totalPages}</span>
-          </h1>
+          <h1 className="page-title mb-2">{title}</h1>
+          <p className="text-base text-muted font-sans mt-1 mb-4">{tWith('page_of_total', { page, total: totalPages })}</p>
           {description && (
             <p className="text-lg text-muted font-serif italic leading-relaxed">
               {description}

package/src/app/series/[slug]/page.tsx

@@ -1,4 +1,4 @@
-import { getSeriesData, getSeriesPosts, getAllSeries, getSeriesAuthors, getAuthorSlug } from '@/lib/markdown';
+import { getSeriesData, getSeriesPosts, getAllSeries, resolveSeriesAuthors, getAuthorSlug } from '@/lib/markdown';
 import { notFound } from 'next/navigation';
 import SeriesCatalog from '@/components/SeriesCatalog';
 import Pagination from '@/components/Pagination';
@@ -7,6 +7,7 @@ import { siteConfig } from '../../../../site.config';
 import CoverImage from '@/components/CoverImage';
 import Link from 'next/link';
 import { t, resolveLocale } from '@/lib/i18n';
+import { getPostUrl } from '@/lib/urls';
 
 const PAGE_SIZE = siteConfig.pagination.series;
 
@@ -78,24 +79,7 @@ export default async function SeriesPage({ params }: { params: Promise<{ slug: s
   const title = seriesData?.title || slug.charAt(0).toUpperCase() + slug.slice(1);
   const description = seriesData?.excerpt;
   const coverImage = seriesData?.coverImage;
-  // Use explicitly configured series authors, or aggregate top authors from posts
-  const explicitAuthors = getSeriesAuthors(slug);
-  let authors: string[];
-  if (explicitAuthors) {
-    authors = explicitAuthors;
-  } else if (allPosts.length > 0) {
-    const counts = new Map<string, number>();
-    for (const post of allPosts) {
-      for (const author of post.authors) {
-        counts.set(author, (counts.get(author) || 0) + 1);
-      }
-    }
-    authors = [...counts.entries()]
-      .sort((a, b) => b[1] - a[1])
-      .map(([name]) => name);
-  } else {
-    authors = [];
-  }
+  const authors = resolveSeriesAuthors(slug, allPosts);
 
   return (
     <div className="layout-main">
@@ -125,6 +109,24 @@ export default async function SeriesPage({ params }: { params: Promise<{ slug: s
               {description}
             </p>
           )}
+          {allPosts.length > 0 && (() => {
+            // Pick the first installment respecting sort order:
+            // date-desc (default) → oldest is last; date-asc/manual → oldest/first is [0]
+            const firstPost = (seriesData?.sort === 'date-asc' || seriesData?.sort === 'manual')
+              ? allPosts[0]
+              : allPosts[allPosts.length - 1];
+            return (
+            <Link
+              href={getPostUrl(firstPost)}
+              className="mt-6 inline-flex items-center gap-2 px-5 py-2.5 rounded-full bg-accent text-white text-sm font-medium hover:bg-accent/90 transition-colors no-underline"
+            >
+              {t('start_reading')}
+              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round" aria-hidden="true">
+                <polyline points="9 18 15 12 9 6" />
+              </svg>
+            </Link>
+            );
+          })()}
           {authors.length > 0 && (
             <p className="mt-4 text-sm text-muted">
               <span className="mr-1">{t('written_by')}</span>

package/src/app/series/page.tsx

@@ -1,15 +1,19 @@
-import { getAllSeries, getSeriesData, getSeriesAuthors } from '@/lib/markdown';
+import { getAllSeries, getSeriesData, resolveSeriesAuthors } from '@/lib/markdown';
 import Link from 'next/link';
 import { siteConfig } from '../../../site.config';
 import { Metadata } from 'next';
 import CoverImage from '@/components/CoverImage';
-import { t, resolveLocale } from '@/lib/i18n';
+import { t, resolveLocale, tWith } from '@/lib/i18n';
 import PageHeader from '@/components/PageHeader';
 
-export const metadata: Metadata = {
-  title: `${t('series')} | ${resolveLocale(siteConfig.title)}`,
-  description: 'Curated collections of articles and thoughts.',
-};
+export async function generateMetadata(): Promise<Metadata> {
+  const allSeries = getAllSeries();
+  const count = Object.keys(allSeries).length;
+  return {
+    title: `${t('series')} | ${resolveLocale(siteConfig.title)}`,
+    description: tWith('series_subtitle', { count }),
+  };
+}
 
 export default function SeriesIndexPage() {
   const allSeries = getAllSeries();
@@ -26,7 +30,7 @@ export default function SeriesIndexPage() {
   return (
     <div className="layout-main">
       <PageHeader
-        titleKey="all_series"
+        titleKey="series"
         subtitleKey="series_subtitle"
         subtitleOneKey="series_subtitle_one"
         count={totalSeries}
@@ -38,26 +42,8 @@ export default function SeriesIndexPage() {
           const posts = allSeries[slug];
           const seriesData = getSeriesData(slug);
           const title = seriesData?.title || slug.charAt(0).toUpperCase() + slug.slice(1);
-          const description = seriesData?.excerpt || `${posts.length} articles in this collection.`;
-
-          // Resolve authors: explicit series authors, then aggregate from posts
-          const explicitAuthors = getSeriesAuthors(slug);
-          let authors: string[];
-          if (explicitAuthors) {
-            authors = explicitAuthors;
-          } else if (posts.length > 0) {
-            const counts = new Map<string, number>();
-            for (const post of posts) {
-              for (const author of post.authors) {
-                counts.set(author, (counts.get(author) || 0) + 1);
-              }
-            }
-            authors = [...counts.entries()]
-              .sort((a, b) => b[1] - a[1])
-              .map(([name]) => name);
-          } else {
-            authors = [];
-          }
+          const description = seriesData?.excerpt || t('series_default_excerpt');
+          const authors = resolveSeriesAuthors(slug, posts);
 
           return (
             <Link key={slug} href={`/series/${slug}`} className="group block no-underline">
@@ -72,7 +58,7 @@ export default function SeriesIndexPage() {
                 </div>
                 <div className="p-8">
                   <span className="badge-accent mb-4 inline-block">
-                    {posts.length} {t('posts')}
+                    {posts.length} {t('parts')}
                   </span>
                   <h2 className="mb-3 font-serif text-2xl font-bold text-heading group-hover:text-accent transition-colors">
                     {title}

package/src/app/sitemap.ts

@@ -1,6 +1,7 @@
 import { MetadataRoute } from 'next';
 import { getAllPosts, getAllPages, getAllBooks, getAllFlows } from '@/lib/markdown';
 import { siteConfig } from '../../site.config';
+import { getPostUrl } from '@/lib/urls';
 
 export const dynamic = 'force-static';
 
@@ -12,7 +13,7 @@ export default function sitemap(): MetadataRoute.Sitemap {
   const baseUrl = siteConfig.baseUrl;
 
   const postUrls = posts.map((post) => ({
-    url: `${baseUrl}/posts/${post.slug}`,
+    url: `${baseUrl}${getPostUrl(post)}`,
     lastModified: post.date,
     changeFrequency: 'monthly' as const,
     priority: 0.7,

package/src/app/tags/[tag]/page.tsx

@@ -50,7 +50,7 @@ export default async function TagPage({
         <TagSidebar key={decodedTag} tags={allTags} activeTag={decodedTag} />
 
         <div className="flex-1 min-w-0">
-          <TagPageHeader tag={decodedTag} />
+          <TagPageHeader tag={decodedTag} postCount={posts.length} flowCount={flows.length} />
           <TagContentTabs posts={posts} flows={flows} />
         </div>
       </div>

package/src/app/tags/page.tsx

@@ -7,7 +7,7 @@ import TagsIndexClient from '@/components/TagsIndexClient';
 
 export const metadata: Metadata = {
   title: `${t('tags')} | ${resolveLocale(siteConfig.title)}`,
-  description: 'Explore topics in the garden.',
+  description: t('tags_description'),
 };
 
 export default function TagsPage() {

package/src/components/Analytics.tsx

@@ -4,46 +4,44 @@ import Script from 'next/script';
 import { siteConfig } from '../../site.config';
 
 export default function Analytics() {
-  const { provider, umami, plausible, google } = siteConfig.analytics;
+  const { providers, umami, plausible, google } = siteConfig.analytics;
 
-  if (provider === 'umami' && umami.websiteId) {
-    return (
-      <Script
-        src={umami.src}
-        data-website-id={umami.websiteId}
-        strategy="afterInteractive"
-      />
-    );
-  }
+  if (!providers || providers.length === 0) return null;
 
-  if (provider === 'plausible' && plausible.domain) {
-    return (
-      <Script
-        src={plausible.src}
-        data-domain={plausible.domain}
-        strategy="afterInteractive"
-      />
-    );
-  }
-  
-  if (provider === 'google' && google.measurementId) {
-    return (
-      <>
+  return (
+    <>
+      {providers.includes('umami') && umami.websiteId && (
         <Script
-          src={`https://www.googletagmanager.com/gtag/js?id=${google.measurementId}`}
+          src={umami.src}
+          data-website-id={umami.websiteId}
           strategy="afterInteractive"
         />
-        <Script id="google-analytics" strategy="afterInteractive">
-          {`
-            window.dataLayer = window.dataLayer || [];
-            function gtag(){dataLayer.push(arguments);}
-            gtag('js', new Date());
-            gtag('config', '${google.measurementId}');
-          `}
-        </Script>
-      </>
-    );
-  }
+      )}
 
-  return null;
+      {providers.includes('plausible') && plausible.domain && (
+        <Script
+          src={plausible.src}
+          data-domain={plausible.domain}
+          strategy="afterInteractive"
+        />
+      )}
+
+      {providers.includes('google') && google.measurementId && (
+        <>
+          <Script
+            src={`https://www.googletagmanager.com/gtag/js?id=${google.measurementId}`}
+            strategy="afterInteractive"
+          />
+          <Script id="google-analytics" strategy="afterInteractive">
+            {`
+              window.dataLayer = window.dataLayer || [];
+              function gtag(){dataLayer.push(arguments);}
+              gtag('js', new Date());
+              gtag('config', '${google.measurementId}');
+            `}
+          </Script>
+        </>
+      )}
+    </>
+  );
 }

package/src/components/AuthorCard.tsx

@@ -1,30 +1,51 @@
 import Link from 'next/link';
+import ExportedImage from 'next-image-export-optimizer';
 import { getAuthorSlug } from '@/lib/markdown';
 import { siteConfig } from '../../site.config';
 import { t } from '@/lib/i18n';
 
+const isDev = process.env.NODE_ENV === 'development';
+const isExternal = (src: string) => src.startsWith('http') || src.startsWith('//');
+
 export default function AuthorCard({ authors }: { authors: string[] }) {
   if (!authors || authors.length === 0) return null;
 
   return (
-    <div className="mt-12 pt-12 border-t border-muted/20">
-      <div className="flex flex-col gap-6">
-        {authors.map((author) => {
-          const slug = getAuthorSlug(author);
-          const profile = siteConfig.authors?.[author];
+    <div className="mt-12 flex flex-col gap-4">
+      {authors.map((author) => {
+        const slug = getAuthorSlug(author);
+        const profile = siteConfig.authors?.[author];
+        const hasSocial = profile?.social && profile.social.length > 0;
+
+        return (
+          <div
+            key={author}
+            className="flex flex-col sm:flex-row sm:items-center gap-5 rounded-2xl border border-muted/15 bg-muted/[0.04] px-6 py-5 transition-colors hover:bg-muted/[0.08]"
+          >
+            {/* Left — avatar + author info */}
+            <div className="flex items-start gap-4 flex-1 min-w-0">
+              {profile?.avatar ? (
+                <ExportedImage
+                  src={profile.avatar}
+                  alt={author}
+                  width={56}
+                  height={56}
+                  className="w-14 h-14 rounded-full object-cover flex-shrink-0 ring-2 ring-muted/20"
+                  unoptimized={isDev || isExternal(profile.avatar)}
+                />
+              ) : (
+                <div className="w-14 h-14 rounded-full bg-accent/10 flex items-center justify-center flex-shrink-0 text-accent font-serif font-bold text-2xl select-none">
+                  {author.charAt(0).toUpperCase()}
+                </div>
+              )}
 
-          return (
-            <div key={author} className="flex items-start gap-4">
-              <div className="w-10 h-10 rounded-full bg-accent/10 flex items-center justify-center flex-shrink-0 text-accent font-serif font-bold text-lg select-none">
-                {author.charAt(0).toUpperCase()}
-              </div>
               <div className="min-w-0">
                 <p className="text-[10px] font-sans font-bold uppercase tracking-widest text-muted mb-1">
                   {t('written_by')}
                 </p>
                 <Link
                   href={`/authors/${slug}`}
-                  className="font-serif font-semibold text-heading hover:text-accent transition-colors no-underline"
+                  className="font-serif font-semibold text-lg text-heading hover:text-accent transition-colors no-underline"
                 >
                   {author}
                 </Link>
@@ -35,9 +56,30 @@ export default function AuthorCard({ authors }: { authors: string[] }) {
                 )}
               </div>
             </div>
-          );
-        })}
-      </div>
+
+            {/* Right — social images (e.g. QR codes) */}
+            {hasSocial && (
+              <div className="flex justify-center gap-5 flex-shrink-0 border-t border-muted/15 pt-4 sm:border-t-0 sm:border-l sm:pt-0 sm:pl-6 sm:justify-start">
+                {profile.social!.map((item, index) => (
+                  <figure key={index} className="flex flex-col items-center gap-1.5">
+                    <ExportedImage
+                      src={item.image}
+                      alt={item.description}
+                      width={72}
+                      height={72}
+                      className="w-[72px] h-[72px] object-contain rounded-lg bg-white p-0.5"
+                      unoptimized={isDev || isExternal(item.image)}
+                    />
+                    <figcaption className="text-[10px] font-sans text-muted text-center leading-tight max-w-[72px]">
+                      {item.description}
+                    </figcaption>
+                  </figure>
+                ))}
+              </div>
+            )}
+          </div>
+        );
+      })}
     </div>
   );
 }

package/src/components/BookMobileNav.tsx

@@ -4,6 +4,8 @@ import { useState } from 'react';
 import Link from 'next/link';
 import { BookTocItem, BookChapterEntry } from '@/lib/markdown';
 import { useLanguage } from './LanguageProvider';
+import PrevNextNav from './PrevNextNav';
+import { getBookChapterUrl } from '@/lib/urls';
 
 interface BookMobileNavProps {
   bookSlug: string;
@@ -48,39 +50,11 @@ export default function BookMobileNav({ bookSlug, bookTitle, toc, chapters, curr
       </div>
 
       {/* Prev / Next */}
-      <div className="flex gap-3 mb-3">
-        {prevChapter ? (
-          <Link
-            href={`/books/${bookSlug}/${prevChapter.id}`}
-            className="flex-1 flex items-center gap-2 py-2.5 px-3 rounded-lg bg-muted/5 hover:bg-muted/10 no-underline transition-colors group"
-          >
-            <svg className="w-4 h-4 flex-shrink-0 text-muted group-hover:text-accent transition-colors" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
-              <path strokeLinecap="round" strokeLinejoin="round" d="M15 19l-7-7 7-7" />
-            </svg>
-            <div className="min-w-0">
-              <span className="block text-[10px] font-sans font-bold uppercase tracking-widest text-muted mb-0.5">{t('prev')}</span>
-              <span className="block text-sm text-foreground/80 group-hover:text-foreground truncate transition-colors">{prevChapter.title}</span>
-            </div>
-          </Link>
-        ) : (
-          <div className="flex-1" />
-        )}
-        {nextChapter ? (
-          <Link
-            href={`/books/${bookSlug}/${nextChapter.id}`}
-            className="flex-1 flex items-center justify-end gap-2 py-2.5 px-3 rounded-lg bg-muted/5 hover:bg-muted/10 no-underline transition-colors group text-right"
-          >
-            <div className="min-w-0">
-              <span className="block text-[10px] font-sans font-bold uppercase tracking-widest text-muted mb-0.5">{t('next')}</span>
-              <span className="block text-sm text-foreground/80 group-hover:text-foreground truncate transition-colors">{nextChapter.title}</span>
-            </div>
-            <svg className="w-4 h-4 flex-shrink-0 text-muted group-hover:text-accent transition-colors" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
-              <path strokeLinecap="round" strokeLinejoin="round" d="M9 5l7 7-7 7" />
-            </svg>
-          </Link>
-        ) : (
-          <div className="flex-1" />
-        )}
+      <div className="mb-3">
+        <PrevNextNav
+          prev={prevChapter ? { href: getBookChapterUrl(bookSlug, prevChapter.id), title: prevChapter.title } : null}
+          next={nextChapter ? { href: getBookChapterUrl(bookSlug, nextChapter.id), title: nextChapter.title } : null}
+        />
       </div>
 
       {/* Toggle to expand full chapter list */}
@@ -125,7 +99,7 @@ export default function BookMobileNav({ bookSlug, bookTitle, toc, chapters, curr
                             </div>
                           ) : (
                             <Link
-                              href={`/books/${bookSlug}/${ch.id}`}
+                              href={getBookChapterUrl(bookSlug, ch.id)}
                               className={`block py-1.5 px-2 rounded-lg text-sm no-underline hover:bg-muted/5 transition-colors ${
                                 isPast ? 'text-foreground/70 hover:text-foreground' : 'text-muted hover:text-foreground'
                               }`}