Skip to content

Commit 642e12d

Browse files
authored
Merge pull request #17 from stack127labs/refactor/page-structure
Unify page cards and complete directory asset publishing
2 parents 6a97ed0 + e82ce90 commit 642e12d

75 files changed

Lines changed: 1382 additions & 650 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/(site)/(catalogs)/[slug]/page.tsx‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ import { PageTitleIcon } from "@/app/ui/site/page-title-icon";
77
import { ToolCatalog } from "@/app/ui/catalogs/tool-catalog";
88
import { ToolCatalogSidebar } from "@/app/ui/catalogs/tool-catalog-sidebar";
99
import { DomainCatalogReference } from "./domain-catalog-reference";
10-
import { toolCatalogArt } from "@/lib/tool-catalog-art";
11-
import { toolCatalogIcon } from "@/lib/tool-catalog-icons";
10+
import { cardArt } from "@/lib/card-art";
11+
import { cardIcon } from "@/lib/card-icons";
1212
import { getPublishedToolCatalog } from "@/lib/tool-catalogs";
1313

1414
export default async function ToolCatalogPage({ params }: { params: Promise<{ slug: string }> }) {
1515
const { slug } = await params;
1616
const catalog = await getPublishedToolCatalog(slug);
1717
if (!catalog) notFound();
18-
const Icon = toolCatalogIcon(catalog.icon_key);
18+
const Icon = cardIcon(catalog.card_icon_key);
1919

2020
return (
2121
<AppShell
@@ -24,7 +24,7 @@ export default async function ToolCatalogPage({ params }: { params: Promise<{ sl
2424
sidebar={<ToolCatalogSidebar active={slug} />}
2525
sidebarLabel="Tool catalogs sidebar"
2626
>
27-
<EntryHero art={toolCatalogArt(catalog.hero_art_key)}>
27+
<EntryHero art={cardArt(catalog.hero_art_key)}>
2828
<PageHeader>
2929
<h1>
3030
<PageTitleIcon><Icon strokeWidth={2.2} /></PageTitleIcon>{" "}
@@ -34,16 +34,7 @@ export default async function ToolCatalogPage({ params }: { params: Promise<{ sl
3434
</PageHeader>
3535
</EntryHero>
3636
<PageCanvas>
37-
<ToolCatalog
38-
heading={catalog.section_heading}
39-
tools={catalog.tools.map((tool) => ({
40-
href: `/${tool.slug}`,
41-
name: tool.card_name,
42-
description: tool.card_description,
43-
art: toolCatalogArt(tool.card_art_key),
44-
icon: toolCatalogIcon(tool.card_icon_key),
45-
}))}
46-
/>
37+
<ToolCatalog heading={catalog.section_heading} tools={catalog.tools} />
4738
{slug === "domain-tools" ? <DomainCatalogReference /> : null}
4839
</PageCanvas>
4940
</AppShell>

‎app/(site)/(directories)/ad-networks/[slug]/page.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import type { DirectoryIndexSource } from "@/app/ui/directories/directory-index"
77
import { AppShell } from "@/app/ui/site/app-shell";
88
import { PageCanvas } from "@/app/ui/site/page-canvas";
99
import { PageHeader } from "@/app/ui/site/page-header";
10-
import { PageTitleIcon } from "@/app/ui/site/page-title-icon";
10+
import { DirectoryTitleIcon } from "@/app/ui/directories/directory-title-icon";
1111
import { getAdNetwork, listAdNetworks, listAllVerifiedPublishers, publisherPageSize, type VerifiedPublisher } from "@/lib/ad-networks";
12-
import { getRequiredDirectoryPage } from "@/lib/directory-pages";
12+
import { getPublishedDirectoryPage, getRequiredDirectoryPage } from "@/lib/directory-pages";
1313
import { PublisherList } from "../ad-network-view";
1414
import { AdNetworksSidebar } from "../ad-networks-sidebar";
1515
import styles from "../page.module.css";
@@ -22,7 +22,7 @@ export async function generateStaticParams() {
2222
export default async function AdNetworkPage({ params }: { params: Promise<{ slug: string }> }) {
2323
const { slug } = await params;
2424
const directoryPage = await getRequiredDirectoryPage(`ad-networks/${slug}`);
25-
const [network, networks] = await Promise.all([getAdNetwork(slug), listAdNetworks("")]);
25+
const [network, networks, parentPage] = await Promise.all([getAdNetwork(slug), listAdNetworks(""), getPublishedDirectoryPage("ad-networks")]);
2626
if (!network) notFound();
2727
const route = `/ad-networks/${slug}`;
2828
// The full list ships with the page for search and paging. A network with
@@ -34,7 +34,7 @@ export default async function AdNetworkPage({ params }: { params: Promise<{ slug
3434
<AppShell mainLabel={`${network.name} publisher sites`} menuLabel="Networks" sidebar={<AdNetworksSidebar networks={networks} current={slug} />} sidebarLabel="Ad networks">
3535
<PageCanvas flow className={styles.content}>
3636
<PageHeader bordered>
37-
<h1><PageTitleIcon><Network strokeWidth={2.2} /></PageTitleIcon>{" "}<DirectoryPageTitle title={directoryPage.title} /></h1>
37+
<h1><DirectoryTitleIcon iconKey={directoryPage.card_icon_key ?? parentPage?.card_icon_key} fallback={<Network strokeWidth={2.2} />} />{" "}<DirectoryPageTitle title={directoryPage.title} /></h1>
3838
<ContentMarkdown markdown={directoryPage.intro_markdown} />
3939
</PageHeader>
4040
{network.official_url ? <p className={styles.official}><a href={network.official_url} rel="noopener noreferrer" target="_blank">Official {network.name} website ↗</a></p> : null}

‎app/(site)/(directories)/ad-networks/page.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { AppShell } from "@/app/ui/site/app-shell";
77
import { EntryHero } from "@/app/ui/site/entry-hero";
88
import { PageCanvas } from "@/app/ui/site/page-canvas";
99
import { PageHeader } from "@/app/ui/site/page-header";
10-
import { PageTitleIcon } from "@/app/ui/site/page-title-icon";
10+
import { DirectoryTitleIcon } from "@/app/ui/directories/directory-title-icon";
1111
import { listAdNetworks } from "@/lib/ad-networks";
1212
import { getRequiredPublishedPage } from "@/lib/page-registry";
1313
import { AdNetworkList } from "./ad-network-view";
@@ -23,7 +23,7 @@ export default async function AdNetworksPage() {
2323
<AppShell mainLabel="Ad networks directory" menuLabel="Networks" sidebar={<AdNetworksSidebar networks={networks} />} sidebarLabel="Ad networks">
2424
<EntryHero art={null}>
2525
<PageHeader>
26-
<h1><PageTitleIcon><Network strokeWidth={2.2} /></PageTitleIcon>{" "}<DirectoryPageTitle title={directoryPage.title} /></h1>
26+
<h1><DirectoryTitleIcon iconKey={directoryPage.card_icon_key} fallback={<Network strokeWidth={2.2} />} />{" "}<DirectoryPageTitle title={directoryPage.title} /></h1>
2727
<ContentMarkdown markdown={directoryPage.intro_markdown} />
2828
</PageHeader>
2929
</EntryHero>
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import type { PageCardCount } from "@/app/ui/cards/page-card";
2+
import { cardCounts as cliApps } from "./cli-apps/card-counts";
3+
import { cardCounts as eppStatusCodes } from "./epp-status-codes/card-counts";
4+
import { cardCounts as keyboardShortcuts } from "./keyboard-shortcuts/card-counts";
5+
import { cardCounts as launchDirectories } from "./launch-directories/card-counts";
6+
import { cardCounts as platformFees } from "./platform-fees/card-counts";
7+
import { cardCounts as selfHostApps } from "./self-host-apps/card-counts";
8+
import { cardCounts as softwareLicenses } from "./software-licenses-for-self-hosting/card-counts";
9+
import { cardCounts as tldDirectory } from "./tld-directory/card-counts";
10+
11+
/** Live homepage card counts. Each directory computes its own from its records. */
12+
const counts: Record<string, () => Promise<PageCardCount[]>> = {
13+
"cli-apps": cliApps,
14+
"epp-status-codes": eppStatusCodes,
15+
"keyboard-shortcuts": keyboardShortcuts,
16+
"launch-directories": launchDirectories,
17+
"platform-fees": platformFees,
18+
"self-host-apps": selfHostApps,
19+
"software-licenses-for-self-hosting": softwareLicenses,
20+
"tld-directory": tldDirectory,
21+
};
22+
23+
export function directoryCardCounts(slug: string) {
24+
const load = counts[slug];
25+
if (!load) throw new Error(`Directory card counts are missing for ${slug}`);
26+
return load();
27+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import type { PageCardCount } from "@/app/ui/cards/page-card";
2+
import { getTerminalApps } from "@/lib/terminal-apps";
3+
4+
export async function cardCounts(): Promise<PageCardCount[]> {
5+
return [{ label: "apps", value: (await getTerminalApps()).length }];
6+
}

‎app/(site)/(directories)/cli-apps/page.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { getRequiredDirectoryPage } from "@/lib/directory-pages";
22
import { DirectoryPageTitle, DirectoryPageContent } from "@/app/ui/directories/directory-page-content";
33
import { ContentMarkdown } from "@/app/ui/content-markdown";
44
import { PageCanvas } from "@/app/ui/site/page-canvas";
5-
import { SquareTerminal } from "lucide-react";
65
import { getRequiredPublishedPage } from "@/lib/page-registry";
76
import {
87
terminalAppCategories,
@@ -14,7 +13,7 @@ import type { DirectoryFilterOption as FilterOption } from "../../../ui/director
1413
import { DirectoryQueryProvider } from "../../../ui/directories/directory-query";
1514
import { Doodle } from "@/app/ui/site/doodle";
1615
import { siteDoodleStarArt } from "../../art/site--doodle-star";
17-
import { PageTitleIcon } from "@/app/ui/site/page-title-icon";
16+
import { DirectoryTitleIcon } from "@/app/ui/directories/directory-title-icon";
1817
import { PageHeader } from "@/app/ui/site/page-header";
1918
import { EntryHero } from "@/app/ui/site/entry-hero";
2019
import { siteSpotCliAppsArt } from "../../art/site--spot-cli-apps";
@@ -135,9 +134,7 @@ export default async function CliAppsPage() {
135134
>
136135
<EntryHero art={siteSpotCliAppsArt}>
137136
<PageHeader>
138-
<h1><PageTitleIcon>
139-
<SquareTerminal strokeWidth={2.2} />
140-
</PageTitleIcon>{" "}<DirectoryPageTitle title={directoryPage.title} /></h1>
137+
<h1><DirectoryTitleIcon iconKey={directoryPage.card_icon_key} />{" "}<DirectoryPageTitle title={directoryPage.title} /></h1>
141138
<ContentMarkdown markdown={directoryPage.intro_markdown} />
142139
</PageHeader>
143140
</EntryHero>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import type { PageCardCount } from "@/app/ui/cards/page-card";
2+
import { STATUS_CODES } from "@/lib/domain/status-codes";
3+
4+
export async function cardCounts(): Promise<PageCardCount[]> {
5+
return [{ label: "status codes", value: STATUS_CODES.length }];
6+
}

‎app/(site)/(directories)/epp-status-codes/page.tsx‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ import { ContentMarkdown } from "@/app/ui/content-markdown";
44
import type { Components } from "react-markdown";
55
import { PageCanvas } from "@/app/ui/site/page-canvas";
66
import "@/app/(site)/(tools)/(domain)/domain-tools.css";
7-
import { ListChecks } from "lucide-react";
87
import Link from "next/link";
98
import { AppShell } from "../../../ui/site/app-shell";
109
import { DomainToolsSidebar } from "@/app/(site)/(tools)/(domain)/domain-tools-sidebar";
1110
import { STATUS_CODES, STATUS_GROUP_TITLES, type StatusGroup } from "@/lib/domain/status-codes.ts";
1211
import { StatePill } from "@/app/(site)/(tools)/(domain)/domain-lookup-client";
13-
import { PageTitleIcon } from "../../../ui/site/page-title-icon";
12+
import { DirectoryTitleIcon } from "@/app/ui/directories/directory-title-icon";
1413
import { PageHeader } from "../../../ui/site/page-header";
1514
import { proseSectionFlowClassName } from "../../../ui/site/prose";
1615

@@ -69,9 +68,7 @@ export default async function EppStatusCodesPage() {
6968
>
7069
<PageCanvas as="main" className="domain-tool-main">
7170
<PageHeader>
72-
<h1><PageTitleIcon>
73-
<ListChecks strokeWidth={2.2} />
74-
</PageTitleIcon>{" "}<DirectoryPageTitle title={directoryPage.title} /></h1>
71+
<h1><DirectoryTitleIcon iconKey={directoryPage.card_icon_key} />{" "}<DirectoryPageTitle title={directoryPage.title} /></h1>
7572
<ContentMarkdown markdown={directoryPage.intro_markdown} />
7673
</PageHeader>
7774

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import type { PageCardCount } from "@/app/ui/cards/page-card";
2+
import { shortcutAppCatalog } from "@/lib/shortcuts/catalog.generated";
3+
4+
export async function cardCounts(): Promise<PageCardCount[]> {
5+
return [
6+
{ label: "apps", value: shortcutAppCatalog.length },
7+
{ label: "shortcuts", value: shortcutAppCatalog.reduce((total, app) => total + app.shortcutCount, 0) },
8+
];
9+
}
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
import { getRequiredDirectoryPage } from "@/lib/directory-pages";
1+
import { getPublishedDirectoryPage, getRequiredDirectoryPage } from "@/lib/directory-pages";
22
import { AppShell } from "@/app/ui/site/app-shell";
33
import type { AppShortcuts } from "@/lib/shortcuts/types";
44
import { KeyboardShortcutsSidebar } from "@/app/ui/directories/keyboard-shortcuts-sidebar";
55
import { KeyboardShortcutsReference } from "./keyboard-shortcuts-reference";
66

77
export async function KeyboardShortcutsAppPage({ app }: { app: AppShortcuts }) {
8-
const directoryPage = await getRequiredDirectoryPage(`keyboard-shortcuts/${app.slug}`);
8+
const [directoryPage, parentPage] = await Promise.all([
9+
getRequiredDirectoryPage(`keyboard-shortcuts/${app.slug}`),
10+
getPublishedDirectoryPage("keyboard-shortcuts"),
11+
]);
12+
const iconKey = directoryPage.card_icon_key ?? parentPage?.card_icon_key ?? null;
913
return (
1014
<AppShell
1115
mainLabel={app.name + " keyboard shortcuts"}
1216
menuLabel="Shortcuts"
1317
sidebar={<KeyboardShortcutsSidebar activeSlug={app.slug} groups={app.groups} />}
1418
sidebarLabel="Shortcut pages"
1519
>
16-
<KeyboardShortcutsReference app={app} directoryPage={directoryPage} />
20+
<KeyboardShortcutsReference app={app} directoryPage={directoryPage} iconKey={iconKey} />
1721
</AppShell>
1822
);
1923
}

0 commit comments

Comments
 (0)