stack-site-builder 1.16.0 → 1.17.0

package/CHANGELOG.md

@@ -11,6 +11,45 @@ content schema, while a consuming site supplies only content, taxonomy data and
 config. Sites track the theme with `pnpm up stack-site-builder`, so each release
 here is a plain version bump they pull in.
 
+## [1.17.0] - 2026-07-22
+
+### Changed
+
+- **`apps` → `products` (breaking for 1.16.0 `apps` users)** — the day-old
+  apps section is renamed and generalized before real adoption: "apps" was
+  too narrow an umbrella for what a studio offers, so the section is now
+  **products** with a site-side mini-taxonomy (apps, services, education, …).
+  Content moves to `src/content/products/`, routes to `/products/…`, the
+  section key becomes `products` and — because the index needs
+  `src/data/product-categories.ts` (exporting `productTree` /
+  `productCatOf`) — it is now opt-IN (`sections: { products: true }`).
+  Schemas gain an optional `category` (validated via the optional
+  `productCategoryMap` argument to `defineAasCollections`); the landing/page
+  templates, nested subpages and automatic header link carry over unchanged
+  as `ProductLanding` / `ProductsIndex`.
+
+### Added
+
+- **Products index + header link** — `/products/` lists the top-level
+  products (icon, name, subtitle, description) grouped by the site's
+  category tree, and the header gains a Products link automatically once a
+  locale has at least one product. Per-product header links (`nav: true`)
+  still work for sites that prefer direct items.
+- **Configurable browser icons** — `site.icons = { favicon, appleTouch,
+  manifest }` in site.ts; `favicon` may be SVG, PNG or ICO (type inferred
+  from the extension) so a site can keep its existing logo as the tab icon.
+  Defaults to the theme's `/favicon.svg`.
+- **Hideable GitHub link** — `repoNav: false` in site.ts removes the
+  header's GitHub item (for private-repo sites); it also disappears when no
+  `repoUrl` is declared.
+
+### Fixed
+
+- **Cards home links lost the locale** — card and CTA hrefs on the cards
+  home are written locale-less ("/apps/foo/") and now get the current
+  locale's prefix at render, so the `/en/` home links to `/en/…` pages
+  instead of the default locale's.
+
 ## [1.16.0] - 2026-07-22
 
 ### Added
@@ -186,6 +225,7 @@ catalog sites from a thin content-only repository.
 - **Standalone development setup** — a devcontainer and a minimal `playground/`
   consuming site for developing and previewing the theme on its own.
 
+[1.17.0]: https://github.com/CodeCompose7/stack-site-builder/compare/v1.16.0...v1.17.0
 [1.16.0]: https://github.com/CodeCompose7/stack-site-builder/compare/v1.15.0...v1.16.0
 [1.15.0]: https://github.com/CodeCompose7/stack-site-builder/compare/v1.14.0...v1.15.0
 [1.14.0]: https://github.com/CodeCompose7/stack-site-builder/compare/v1.13.0...v1.14.0

package/README.md

@@ -36,11 +36,11 @@ export const collections = defineAasCollections({ categoryMap });
 
 | Where | What |
 | --- | --- |
-| `src/data/site.ts` | Site identity: name, repo URL, the `locales` it ships, optional `sections` toggles, per-locale UI string overrides |
+| `src/data/site.ts` | Site identity: name, repo URL (`repoNav: false` hides the header's GitHub link), the `locales` it ships, optional `sections` toggles, browser icons (`icons: { favicon, appleTouch, manifest }`), the `home` template, per-locale UI string overrides |
 | `src/data/categories.ts` | The tool-catalog category tree (validated against content) |
-| `src/data/concept-categories.ts` · `article-categories.ts` · `course-categories.ts` (opt-in) | Taxonomies for concepts / articles / courses |
+| `src/data/concept-categories.ts` · `article-categories.ts` · `course-categories.ts` · `product-categories.ts` (opt-in) | Taxonomies for concepts / articles / courses / products |
 | `src/data/glossary.mjs` | `[[Term]]` wikilink targets |
-| `src/content/{stacks,concepts,courses,articles,slides}/` | The content, one MDX file per locale |
+| `src/content/{stacks,concepts,courses,products,articles,slides}/` | The content, one MDX file per locale |
 | `src/content/pages/` | Standalone top-level pages (e.g. an About/소개), rendered at `/<slug>/` and optionally linked in the header nav |
 | `public/` · `samples/` | Logos/favicons and runnable sample projects |
 
@@ -72,7 +72,7 @@ The rest are opt-out — **concepts, articles, samples, slides, glossary** and t
 standalone **pages** collection (About/소개, …) — so a site can ship only what it
 needs. Turning one off removes both its routes and its header-nav item. (`pages`
 also has finer control: each page's `nav` / `draft` frontmatter, or simply not
-authoring it.) **courses** is the one opt-IN section — see below.
+authoring it.) **courses** and **products** are the opt-IN sections — see below.
 
 Declare the toggles once in `src/data/site.ts` and forward them to the theme in
 astro.config (which needs them to skip route injection). Import `SectionKey` from
@@ -125,17 +125,26 @@ teaser: A public one-liner for the login gate.
 
 Routes mirror concepts: `/course/`, `/course/<slug>/`, `/course/category/<id>/`.
 
-## Apps (product landings)
-
-The `apps` collection renders Things-style marketing pages from frontmatter
-alone (`template: 'landing'`): hero with store buttons and an optional Product
-Hunt badge, alternating feature rows (device-frame screenshots, auto-rotating
-carousels), a video themes showcase, a highlights grid, pricing tiers, a
-closing CTA and legal links. Landing media are `public/` paths. Entries nest:
-`apps/<lang>/flowstate.mdx` → `/apps/flowstate/`, and
-`apps/<lang>/flowstate/privacy.mdx` → `/apps/flowstate/privacy/` (a plain
-prose page). `nav: true` adds a header link. See
-`playground/src/content/apps/` for a complete example.
+## Products (opt-in)
+
+The `products` collection is the "what we offer" umbrella — entries grouped
+by a site-side mini-taxonomy (apps, services, education, …) on the
+`/products/` index. Each entry is either a Things-style marketing landing
+(`template: 'landing'`: hero with store buttons and an optional Product Hunt
+badge, alternating feature rows with device-frame screenshots and
+auto-rotating carousels, a video themes showcase, a highlights grid, pricing
+tiers, a closing CTA and legal links — media are `public/` paths) or a plain
+prose page (a service pitch, a legal subpage). Entries nest:
+`products/<lang>/flowstate.mdx` → `/products/flowstate/`, and
+`products/<lang>/flowstate/privacy.mdx` → `/products/flowstate/privacy/`.
+The header gains a Products link automatically once a locale has a product;
+`nav: true` additionally gives an entry its own header item.
+
+Enable with `sections: { products: true }` plus
+`src/data/product-categories.ts` (exporting `productTree` / `productCatOf` —
+copy the playground's), and optionally pass `productCategoryMap` to
+`defineAasCollections` for build-time category validation. See
+`playground/src/content/products/` for a complete example.
 
 ## Homepage
 
@@ -147,7 +156,7 @@ home: {
   template: 'cards',
   hero: { icon: '/img/logo.png', subtitle: { ko: '…', en: '…' } },
   cardsTitle: { ko: '앱', en: 'Apps' },
-  cards: [{ href: '/apps/flowstate/', name: 'FlowState', icon: '/img/icon.png',
+  cards: [{ href: '/products/flowstate/', name: 'FlowState', icon: '/img/icon.png',
             rounded: true, description: { ko: '…', en: '…' }, tags: ['iOS'] }],
   cta: { title: { … }, description: { … }, button: { label: { … }, href: '/course/' } },
 },

package/index.d.ts

@@ -7,7 +7,7 @@ export type SectionKey =
   | 'concepts'
   | 'articles'
   | 'courses'
-  | 'apps'
+  | 'products'
   | 'samples'
   | 'slides'
   | 'glossary'

package/index.mjs

@@ -29,9 +29,11 @@ const PAGES = [
   // Standalone top-level pages (the `pages` collection), e.g. an About/소개
   // page. A single dynamic route per locale renders every entry at `/<slug>/`.
   '[page].astro',
-  // App/product pages (the `apps` collection): marketing landings and their
-  // nested subpages (privacy/terms) via one catch-all.
-  'apps/[...id].astro',
+  // Product pages (the `products` collection): a category-grouped index, plus
+  // the landings/pages and their nested subpages (privacy/terms) via one
+  // catch-all.
+  'products/index.astro',
+  'products/[...id].astro',
   // Per-locale RSS feed of the articles collection (an endpoint, not a page).
   'rss.xml.ts',
   'article/index.astro',
@@ -70,7 +72,7 @@ function sectionOf(file) {
   if (file.startsWith('concept/')) return 'concepts';
   if (file.startsWith('article/')) return 'articles';
   if (file.startsWith('course/')) return 'courses';
-  if (file.startsWith('apps/')) return 'apps';
+  if (file.startsWith('products/')) return 'products';
   if (file.startsWith('sample/')) return 'samples';
   if (file.startsWith('slides/')) return 'slides';
   if (file === 'glossary.astro') return 'glossary';
@@ -80,9 +82,10 @@ function sectionOf(file) {
 }
 
 // Sections that are opt-IN rather than opt-out: their routes are injected only
-// when the site passes `{ <key>: true }`. `courses` needs site-side data
-// (src/data/course-categories.ts), so a theme upgrade alone must not enable it.
-const OPT_IN_SECTIONS = new Set(['courses']);
+// when the site passes `{ <key>: true }`. Both need site-side data
+// (src/data/{course,product}-categories.ts), so a theme upgrade alone must
+// not enable them.
+const OPT_IN_SECTIONS = new Set(['courses', 'products']);
 
 /**
  * @param {object} opts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stack-site-builder",
   "type": "module",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "license": "MIT",
   "description": "The engine behind the awesome-*-stack catalog sites: an Astro theme with the catalog/concepts/articles/slides/samples routes, components, styles and markdown pipeline. Sites provide content, taxonomy data and config.",
   "repository": {

package/src/components/CardsHome.astro

@@ -1,9 +1,10 @@
 ---
 // The data-driven "cards" homepage (see src/lib/home.ts): hero with the site
-// icon/name, a stack of wide link cards (apps, sections, external links — the
+// icon/name, a stack of wide link cards (products, sections, external links — the
 // Things-style studio home), and a closing CTA banner. Everything renders
 // from `site.home`; sections without data simply don't render.
 import { site } from '@aas-data/site';
+import { getRelativeLocaleUrl } from 'astro:i18n';
 import { home, loc, locList } from '../lib/home';
 import { useTranslations, type Lang } from '../i18n/ui';
 
@@ -21,6 +22,10 @@ const heroTitle = loc(h?.hero?.title, lang) ?? site.name;
 const heroSubtitle = loc(h?.hero?.subtitle, lang) ?? t('site.tagline');
 const extAttrs = (external?: boolean) =>
   external ? { target: '_blank', rel: 'noopener noreferrer' } : {};
+// Internal links ("/products/…") are written locale-less in site.home and get the
+// current locale's prefix here, so the en home links to the en pages.
+const resolveHref = (href: string, external?: boolean) =>
+  !external && href.startsWith('/') ? getRelativeLocaleUrl(lang, href.replace(/^\//, '')) : href;
 ---
 
 <section class="py-14 text-center">
@@ -37,7 +42,7 @@ const extAttrs = (external?: boolean) =>
         <div class="flex flex-col gap-5">
           {h?.cards?.map((c) => (
             <a
-              href={c.href}
+              href={resolveHref(c.href, c.external)}
               {...extAttrs(c.external)}
               class="aas-lift flex items-center gap-6 rounded-3xl border border-[var(--aas-border)] bg-[var(--aas-bg)] p-6 no-underline"
             >
@@ -84,7 +89,7 @@ const extAttrs = (external?: boolean) =>
       )}
       {h.cta.button && (
         <a
-          href={h.cta.button.href}
+          href={resolveHref(h.cta.button.href, h.cta.button.external)}
           {...extAttrs(h.cta.button.external)}
           class="mt-7 inline-block rounded-full bg-[var(--aas-accent)] px-7 py-3 font-semibold text-white no-underline"
         >

package/src/components/{AppLanding.astro → ProductLanding.astro}

@@ -1,5 +1,5 @@
 ---
-// Things-style app/product landing, rendered entirely from an `apps` entry's
+// Things-style product landing, rendered entirely from a `products` entry's
 // frontmatter (`template: 'landing'`): hero (icon / store buttons / Product
 // Hunt badge), alternating feature rows (with optional device frame and
 // auto-rotating screenshot carousels), a video "themes" showcase, a highlights
@@ -9,11 +9,11 @@
 // All media (icons, screenshots, videos, the frame art) are `public/` paths;
 // `description`-like strings may carry authored <br> tags (rendered as HTML).
 import { site } from '@aas-data/site';
-import type { AppEntry } from '../lib/apps';
+import type { ProductEntry } from '../lib/products';
 import type { Lang } from '../i18n/ui';
 
 interface Props {
-  entry: AppEntry;
+  entry: ProductEntry;
   lang: Lang;
 }
 

package/src/components/ProductsIndex.astro

@@ -0,0 +1,69 @@
+---
+// The products index — the "what we offer" page. Top-level products (app
+// landings, service pitches, education offers) render as wide cards (icon,
+// name, subtitle, meta description) grouped by the site's mini-taxonomy
+// (src/data/product-categories.ts). Cards mirror the cards-home style so the
+// two read as one system.
+import { getRelativeLocaleUrl } from 'astro:i18n';
+import { productTree, productCatOf } from '@aas-data/product-categories';
+import { getTopProducts, productSlugOf, type ProductEntry } from '../lib/products';
+import { useTranslations, type Lang } from '../i18n/ui';
+
+interface Props {
+  lang: Lang;
+}
+
+const { lang } = Astro.props;
+const t = useTranslations(lang);
+const all = await getTopProducts(lang);
+const base = import.meta.env.BASE_URL.replace(/\/$/, '');
+const withBase = (p?: string) => (p && p.startsWith('/') ? base + p : p);
+
+// One section per root category that has products (subtree rolled up), in
+// tree order — the mini-taxonomy is the page structure.
+const sections = productTree.roots
+  .map((cat) => {
+    const ids = new Set(productTree.descendantIds(cat.id));
+    return { cat, items: all.filter((p) => ids.has(productCatOf(p.data.category))) };
+  })
+  .filter((s) => s.items.length > 0);
+---
+
+<section class="py-6">
+  <h1 class="text-4xl font-bold tracking-tight">{t('products.title')}</h1>
+  <p class="mt-3 max-w-2xl text-lg text-[var(--aas-muted)]">{t('products.tagline')}</p>
+</section>
+
+{all.length === 0 && <p class="mt-8 text-[var(--aas-muted)]">{t('products.empty')}</p>}
+
+{
+  sections.map(({ cat, items }) => (
+    <section class="mt-8">
+      <h2 class="text-2xl font-semibold">{cat.label[lang]}</h2>
+      <p class="mt-1 text-sm text-[var(--aas-muted)]">{cat.description[lang]}</p>
+      <div class="mt-4 flex flex-col gap-5">
+        {items.map((a: ProductEntry) => (
+          <a
+            href={getRelativeLocaleUrl(lang, `products/${productSlugOf(a)}/`)}
+            class="aas-lift flex items-center gap-6 rounded-3xl border border-[var(--aas-border)] bg-[var(--aas-panel)] p-6 no-underline"
+          >
+            {a.data.icon && (
+              <img src={withBase(a.data.icon)} alt="" class="h-20 w-20 shrink-0 rounded-[22%]" loading="lazy" />
+            )}
+            <span class="min-w-0">
+              <span class="block text-xl font-semibold text-[var(--aas-text)]">{a.data.title}</span>
+              {a.data.subtitle && (
+                <span class="mt-1 block leading-relaxed text-[var(--aas-muted)]" set:html={a.data.subtitle} />
+              )}
+              {a.data.description && (
+                <span class="mt-1 block text-sm leading-relaxed text-[var(--aas-muted)] opacity-75">
+                  {a.data.description}
+                </span>
+              )}
+            </span>
+          </a>
+        ))}
+      </div>
+    </section>
+  ))
+}

package/src/content.ts

@@ -18,12 +18,16 @@ import { glob } from 'astro/loaders';
 export function defineAasCollections({
   categoryMap,
   courseCategoryMap,
+  productCategoryMap,
 }: {
   categoryMap: Map<string, unknown>;
   /** The site's course category tree (`src/data/course-categories.ts`). Optional
    *  because `courses` is an opt-in section; when provided, course `category`
    *  ids are validated against it at build time (like stacks). */
   courseCategoryMap?: Map<string, unknown>;
+  /** The site's product category tree (`src/data/product-categories.ts`).
+   *  Optional like `courseCategoryMap` — `products` is opt-in too. */
+  productCategoryMap?: Map<string, unknown>;
 }) {
   /**
    * The `stacks` collection holds one entry per tool/service used to build
@@ -307,26 +311,40 @@ export function defineAasCollections({
   });
 
   /**
-   * The `apps` collection holds product/app pages — a Things-style marketing
-   * landing per app (`template: 'landing'`) plus its plain subpages (privacy,
-   * terms — `template: 'page'`, the default). Entries are locale-partitioned
-   * and may nest: `apps/<lang>/<slug>.mdx` renders at `/apps/<slug>/`,
-   * `apps/<lang>/<slug>/privacy.mdx` at `/apps/<slug>/privacy/`.
+   * The `products` collection is the "what we offer" section — an opt-in
+   * umbrella (`sections: { products: true }`) whose entries are grouped by a
+   * mini-taxonomy (apps, services, education, …) on the `/products/` index.
+   * Each entry is either a Things-style marketing landing
+   * (`template: 'landing'`) or a plain prose page (`template: 'page'`, the
+   * default — an outsourcing pitch, a legal subpage). Entries are
+   * locale-partitioned and may nest: `products/<lang>/<slug>.mdx` renders at
+   * `/products/<slug>/`, `products/<lang>/<slug>/privacy.mdx` at
+   * `/products/<slug>/privacy/`.
    *
    * Landing visuals (icons, screenshots, videos, the phone-frame art) are
    * plain `public/` paths — videos can't go through the image pipeline, so
    * the whole landing keeps one convention instead of two.
    */
-  const apps = defineCollection({
-    loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/apps' }),
+  const products = defineCollection({
+    loader: glob({ pattern: '**/*.{md,mdx}', base: './src/content/products' }),
     schema: z.object({
       title: z.string(),
       description: z.string().optional(), // meta description
       // 'landing' renders the structured marketing page below; 'page' renders
-      // the markdown body like a standalone page (legal subpages).
+      // the markdown body like a standalone page (pitches, legal subpages).
       template: z.enum(['landing', 'page']).default('page'),
+      // Mini-category on the site's src/data/product-categories.ts tree —
+      // groups the index. Validated when the site passes `productCategoryMap`;
+      // unknown/missing ids fall back to uncategorized at render.
+      category: (productCategoryMap
+        ? z.string().refine((id) => productCategoryMap.has(id), {
+            message:
+              'unknown product category id — must match a node in the site data product category tree',
+          })
+        : z.string()
+      ).optional(),
       // Header-nav placement, like the `pages` collection (default off —
-      // landings are usually reached from the home cards).
+      // products are usually reached from the index or the home cards).
       nav: z.boolean().default(false),
       navLabel: z.string().optional(),
       order: z.number().default(0),
@@ -469,5 +487,5 @@ export function defineAasCollections({
       }),
   });
 
-  return { stacks, articles, concepts, courses, slides, apps, pages };
+  return { stacks, articles, concepts, courses, slides, products, pages };
 }

package/src/i18n/ui.ts

@@ -59,6 +59,7 @@ export const ui = {
     'nav.browse': 'Browse',
     'nav.concepts': 'Concepts',
     'nav.courses': 'Courses',
+    'nav.products': 'Products',
     'nav.blog': 'Writing',
     'nav.samples': 'Samples',
     'nav.slides': 'Slides',
@@ -127,6 +128,9 @@ export const ui = {
     'course.updated': 'Updated',
     'course.relatedCourses': 'Related courses',
     'course.slides': 'Slides',
+    'products.title': 'Products',
+    'products.tagline': 'What we build and offer.',
+    'products.empty': 'No products yet.',
     'detail.usedInConcepts': 'Used in concepts',
     'sort.label': 'Sort',
     'sort.alpha': 'A–Z',
@@ -218,6 +222,7 @@ export const ui = {
     'nav.browse': '둘러보기',
     'nav.concepts': '개념',
     'nav.courses': '강의',
+    'nav.products': '제품',
     'nav.blog': '글',
     'nav.samples': '샘플',
     'nav.slides': '슬라이드',
@@ -285,6 +290,9 @@ export const ui = {
     'course.updated': '업데이트',
     'course.relatedCourses': '관련 강의',
     'course.slides': '슬라이드',
+    'products.title': '제품',
+    'products.tagline': '우리가 만들고 제공하는 것.',
+    'products.empty': '아직 제품이 없습니다.',
     'detail.usedInConcepts': '이 도구가 쓰이는 개념',
     'sort.label': '정렬',
     'sort.alpha': '이름순',

package/src/layouts/BaseLayout.astro

@@ -7,7 +7,7 @@ import LanguageSwitcher from '../components/LanguageSwitcher.astro';
 import ThemeToggle from '../components/ThemeToggle.astro';
 import BackToTop from '../components/BackToTop.astro';
 import { getNavPages, pageSlugOf } from '../lib/pages';
-import { getNavApps, appSlugOf } from '../lib/apps';
+import { getNavProducts, getTopProducts, productSlugOf } from '../lib/products';
 import { homeTemplate } from '../lib/home';
 import { sectionEnabled, type SectionKey } from '../lib/sections';
 
@@ -33,6 +33,21 @@ const container = wide ? 'max-w-[81rem]' : 'max-w-[75rem]';
 const home = getRelativeLocaleUrl(lang, '');
 const base = import.meta.env.BASE_URL;
 
+// Site-configurable browser icons (`site.icons`). `favicon` may be any image
+// the browser can render (SVG/PNG/ICO — public/ path); appleTouch/manifest
+// links render only when declared. Defaults to the theme's /favicon.svg.
+const icons =
+  (site as { icons?: { favicon?: string; appleTouch?: string; manifest?: string } }).icons ?? {};
+const faviconHref = icons.favicon ?? '/favicon.svg';
+const faviconType = faviconHref.endsWith('.svg')
+  ? 'image/svg+xml'
+  : faviconHref.endsWith('.png')
+    ? 'image/png'
+    : faviconHref.endsWith('.ico')
+      ? 'image/x-icon'
+      : undefined;
+const baseNoSlash = base.replace(/\/$/, '');
+
 // Home URL per locale, for the language auto-detect redirect on the root home.
 const localeHomes = Object.fromEntries(
   (Object.keys(languages) as Lang[]).map((c) => [c, getRelativeLocaleUrl(c, '')]),
@@ -43,8 +58,14 @@ const isDefaultHome = path === '' && lang === 'en';
 // e.g. an About/소개 page. Rendered as their own nav items alongside the
 // built-in sections; the accessible label comes from the page's own frontmatter.
 const navPages = await getNavPages(lang);
-// App landings that opt into a header link (the `apps` collection's `nav`).
-const navApps = await getNavApps(lang);
+// Products that opt into their own header link (the collection's `nav`), plus
+// the Products-index link, which appears once the locale has any product.
+const navProducts = await getNavProducts(lang);
+const hasProducts = (await getTopProducts(lang)).length > 0;
+// The header's GitHub link — hidden for sites whose repo is private
+// (`repoNav: false` in site.ts) or that declare no repoUrl at all.
+const showRepoLink =
+  !!site.repoUrl && (site as { repoNav?: boolean }).repoNav !== false;
 
 // The header sections, as data — rendered twice from one source so the two
 // layouts never drift: an icon-only row (≥sm) and a labelled dropdown menu
@@ -70,6 +91,16 @@ const allNavItems: {
         },
       ]
     : []),
+  ...(hasProducts
+    ? [
+        {
+          href: getRelativeLocaleUrl(lang, 'products/'),
+          label: t('nav.products'),
+          section: 'products' as SectionKey,
+          svg: '<rect x="2" y="4" width="20" height="16" rx="2"/><path d="M10 4v4"/><path d="M2 8h20"/><path d="M6 4v4"/>',
+        },
+      ]
+    : []),
   {
     href: getRelativeLocaleUrl(lang, 'course/'),
     label: t('nav.courses'),
@@ -106,10 +137,10 @@ const allNavItems: {
     section: 'glossary',
     svg: '<path d="M12 7v14"/><path d="M3 18a1 1 0 0 1-1-1V4a1 1 0 0 1 1-1h5a4 4 0 0 1 4 4 4 4 0 0 1 4-4h5a1 1 0 0 1 1 1v13a1 1 0 0 1-1 1h-6a3 3 0 0 0-3 3 3 3 0 0 0-3-3z"/>',
   },
-  ...navApps.map((a) => ({
-    href: getRelativeLocaleUrl(lang, `apps/${appSlugOf(a)}/`),
+  ...navProducts.map((a) => ({
+    href: getRelativeLocaleUrl(lang, `products/${productSlugOf(a)}/`),
     label: a.data.navLabel ?? a.data.title,
-    section: 'apps' as SectionKey,
+    section: 'products' as SectionKey,
     svg: '<rect width="14" height="20" x="5" y="2" rx="2" ry="2"/><path d="M12 18h.01"/>',
   })),
   ...navPages.map((p) => ({
@@ -118,12 +149,16 @@ const allNavItems: {
     section: 'pages' as SectionKey,
     svg: '<circle cx="12" cy="12" r="10"/><path d="M12 16v-4"/><path d="M12 8h.01"/>',
   })),
-  {
-    href: site.repoUrl,
-    label: 'GitHub',
-    external: true,
-    svg: '<path d="M15 22v-4a4.8 4.8 0 0 0-1-3.5c3 0 6-2 6-5.5.08-1.25-.27-2.48-1-3.5.28-1.15.28-2.35 0-3.5 0 0-1 0-3 1.5-2.64-.5-5.36-.5-8 0C4 2 3 2 3 2c-.3 1.15-.3 2.35 0 3.5A5.4 5.4 0 0 0 2 9c0 3.5 3 5.5 6 5.5-.39.49-.68 1.05-.85 1.65-.17.6-.22 1.23-.15 1.85v4"/><path d="M9 18c-4.51 2-5-2-7-2"/>',
-  },
+  ...(showRepoLink
+    ? [
+        {
+          href: site.repoUrl,
+          label: 'GitHub',
+          external: true,
+          svg: '<path d="M15 22v-4a4.8 4.8 0 0 0-1-3.5c3 0 6-2 6-5.5.08-1.25-.27-2.48-1-3.5.28-1.15.28-2.35 0-3.5 0 0-1 0-3 1.5-2.64-.5-5.36-.5-8 0C4 2 3 2 3 2c-.3 1.15-.3 2.35 0 3.5A5.4 5.4 0 0 0 2 9c0 3.5 3 5.5 6 5.5-.39.49-.68 1.05-.85 1.65-.17.6-.22 1.23-.15 1.85v4"/><path d="M9 18c-4.51 2-5-2-7-2"/>',
+        },
+      ]
+    : []),
 ];
 // Drop the nav links for sections the site turned off (their routes aren't built).
 const navItems = allNavItems.filter((item) => !item.section || sectionEnabled(item.section));
@@ -138,7 +173,9 @@ const navItems = allNavItems.filter((item) => !item.section || sectionEnabled(it
     <title>{title}</title>
     <meta name="description" content={description} />
     {noindex && <meta name="robots" content="noindex" />}
-    <link rel="icon" type="image/svg+xml" href={`${base.replace(/\/$/, '')}/favicon.svg`} />
+    <link rel="icon" {...(faviconType ? { type: faviconType } : {})} href={`${baseNoSlash}${faviconHref}`} />
+    {icons.appleTouch && <link rel="apple-touch-icon" href={`${baseNoSlash}${icons.appleTouch}`} />}
+    {icons.manifest && <link rel="manifest" href={`${baseNoSlash}${icons.manifest}`} />}
     {
       sectionEnabled('articles') && (
         <link

package/src/lib/home.ts

@@ -16,6 +16,8 @@ import { defaultLang, type Lang } from '../i18n/ui';
 export type Localized = string | Record<string, string>;
 
 export interface HomeCard {
+  /** Locale-less internal path ("/products/foo/", prefixed per locale at
+   *  render) or an external URL (set `external`). */
   href: string;
   external?: boolean;
   name: Localized;

package/src/lib/products.ts

@@ -0,0 +1,31 @@
+import { getCollection, type CollectionEntry } from 'astro:content';
+import type { Lang } from '../i18n/ui';
+
+export type ProductEntry = CollectionEntry<'products'>;
+
+/** The url slug of a product page — its id minus the `<lang>/` prefix. May be
+ *  nested (`flowstate-ai/privacy`), which the catch-all route renders at the
+ *  matching subpath. */
+export function productSlugOf(entry: ProductEntry): string {
+  return entry.id.replace(/^[a-z]{2}\//, '');
+}
+
+/** Published product pages for one locale, in `order` (then title) order. */
+export async function getProducts(lang: Lang): Promise<ProductEntry[]> {
+  const all = await getCollection('products');
+  return all
+    .filter((e) => e.id.startsWith(`${lang}/`) && !e.data.draft)
+    .sort((a, b) => a.data.order - b.data.order || a.data.title.localeCompare(b.data.title));
+}
+
+/** The subset of {@link getProducts} that opts into a header-nav link. */
+export async function getNavProducts(lang: Lang): Promise<ProductEntry[]> {
+  return (await getProducts(lang)).filter((e) => e.data.nav);
+}
+
+/** Top-level product pages for one locale — what the products index lists
+ *  (and what makes the header's Products link appear). Landing and plain
+ *  pages both count; nested subpages (privacy/terms) are excluded. */
+export async function getTopProducts(lang: Lang): Promise<ProductEntry[]> {
+  return (await getProducts(lang)).filter((e) => !productSlugOf(e).includes('/'));
+}

package/src/lib/sections.ts

@@ -20,7 +20,7 @@ export type SectionKey =
   | 'concepts'
   | 'articles'
   | 'courses'
-  | 'apps'
+  | 'products'
   | 'samples'
   | 'slides'
   | 'glossary'
@@ -30,7 +30,7 @@ const DEFAULTS: Record<SectionKey, boolean> = {
   concepts: true,
   articles: true,
   courses: false, // opt-in: needs src/data/course-categories.ts on the site
-  apps: true, // no site data needed; an empty collection builds zero pages
+  products: false, // opt-in: needs src/data/product-categories.ts on the site
   samples: true,
   slides: true,
   glossary: true,

package/src/pages/[...lang]/{apps → products}/[...id].astro

@@ -3,26 +3,26 @@ import { site } from '@aas-data/site';
 import { render } from 'astro:content';
 import type { GetStaticPaths } from 'astro';
 import BaseLayout from '../../../layouts/BaseLayout.astro';
-import AppLanding from '../../../components/AppLanding.astro';
+import ProductLanding from '../../../components/ProductLanding.astro';
 import PrivateGate from '../../../components/PrivateGate.astro';
 import TocRail from '../../../components/TocRail.astro';
 import MermaidLoader from '../../../components/MermaidLoader.astro';
-import { getApps, appSlugOf } from '../../../lib/apps';
+import { getProducts, productSlugOf } from '../../../lib/products';
 import { allLocales, langParam } from '../../../lib/locales';
 import { inlineMd } from '../../../lib/inline-md';
 
 export const getStaticPaths = (async () => {
   const paths: Awaited<ReturnType<GetStaticPaths>> = [];
   for (const lang of allLocales) {
-    for (const entry of await getApps(lang)) {
-      paths.push({ params: { lang: langParam(lang), id: appSlugOf(entry) }, props: { lang, entry } });
+    for (const entry of await getProducts(lang)) {
+      paths.push({ params: { lang: langParam(lang), id: productSlugOf(entry) }, props: { lang, entry } });
     }
   }
   return paths;
 }) satisfies GetStaticPaths;
 
 const { lang, entry } = Astro.props;
-const slug = appSlugOf(entry);
+const slug = productSlugOf(entry);
 const priv = entry.data.private;
 const isLanding = entry.data.template === 'landing';
 // Plain 'page' template (privacy/terms subpages) renders the markdown body.
@@ -35,13 +35,13 @@ const bodyHasMermaid = (entry.body ?? '').includes('```mermaid');
   title={`${entry.data.title} — ${site.name}`}
   description={priv ? entry.data.teaser : (entry.data.description ?? entry.data.subtitle)}
   lang={lang}
-  path={`apps/${slug}/`}
+  path={`products/${slug}/`}
   noindex={priv}
 >
   <PrivateGate enabled={priv} lang={lang} title={entry.data.title} teaser={entry.data.teaser}>
     {
       isLanding ? (
-        <AppLanding entry={entry} lang={lang} />
+        <ProductLanding entry={entry} lang={lang} />
       ) : (
         <>
           <header class="pb-6">

package/src/pages/[...lang]/products/index.astro

@@ -0,0 +1,18 @@
+---
+import { site } from '@aas-data/site';
+import type { GetStaticPaths } from 'astro';
+import BaseLayout from '../../../layouts/BaseLayout.astro';
+import ProductsIndex from '../../../components/ProductsIndex.astro';
+import { useTranslations } from '../../../i18n/ui';
+import { allLocales, langParam } from '../../../lib/locales';
+
+export const getStaticPaths = (() =>
+  allLocales.map((lang) => ({ params: { lang: langParam(lang) }, props: { lang } }))) satisfies GetStaticPaths;
+
+const { lang } = Astro.props;
+const t = useTranslations(lang);
+---
+
+<BaseLayout title={`${t('products.title')} — ${site.name}`} lang={lang} path="products/">
+  <ProductsIndex lang={lang} />
+</BaseLayout>

package/src/lib/apps.ts

@@ -1,24 +0,0 @@
-import { getCollection, type CollectionEntry } from 'astro:content';
-import type { Lang } from '../i18n/ui';
-
-export type AppEntry = CollectionEntry<'apps'>;
-
-/** The url slug of an app page — its id minus the `<lang>/` prefix. May be
- *  nested (`flowstate-ai/privacy`), which the catch-all route renders at the
- *  matching subpath. */
-export function appSlugOf(entry: AppEntry): string {
-  return entry.id.replace(/^[a-z]{2}\//, '');
-}
-
-/** Published app pages for one locale, in `order` (then title) order. */
-export async function getApps(lang: Lang): Promise<AppEntry[]> {
-  const all = await getCollection('apps');
-  return all
-    .filter((e) => e.id.startsWith(`${lang}/`) && !e.data.draft)
-    .sort((a, b) => a.data.order - b.data.order || a.data.title.localeCompare(b.data.title));
-}
-
-/** The subset of {@link getApps} that opts into a header-nav link. */
-export async function getNavApps(lang: Lang): Promise<AppEntry[]> {
-  return (await getApps(lang)).filter((e) => e.data.nav);
-}