Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions migrations/0021_starter_contact_page.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
-- Give new and newly upgraded sites an editable public Contact page. The
-- Personal theme renders its built-in contact form on any Page whose slug is
-- "contact" (see themes/personal/web-page.mustache and the is_contact_page
-- hook in src/server/themes/Theme.ts). The page body stays editable in Admin;
-- the form is appended automatically.
-- Preserve an existing /contact/ Page instead of replacing user content.
INSERT INTO pages (
id, slug, title, content_html, content_text, status,
meta_description, show_in_navigation, navigation_label,
navigation_order, published_at, created_at, updated_at
)
SELECT
'starter-contact',
'contact',
'Contact',
'<p>Get in touch. Fill out the form below and I will get back to you.</p>',
'Get in touch. Fill out the form below and I will get back to you.',
1,
'Get in touch with the site owner.',
1,
'Contact',
(
SELECT COALESCE(MAX(navigation_order), 0) + 10
FROM pages
WHERE status != 3 AND show_in_navigation = 1
),
CURRENT_TIMESTAMP,
CURRENT_TIMESTAMP,
CURRENT_TIMESTAMP
WHERE NOT EXISTS (
SELECT 1 FROM page_paths
WHERE slug = 'contact' COLLATE NOCASE
)
AND NOT EXISTS (
SELECT 1 FROM pages
WHERE slug = 'contact' COLLATE NOCASE OR id = 'starter-contact'
);

INSERT INTO page_paths (slug, page_id, is_current, created_at)
SELECT 'contact', 'starter-contact', 1, CURRENT_TIMESTAMP
WHERE EXISTS (
SELECT 1 FROM pages
WHERE id = 'starter-contact' AND slug = 'contact' COLLATE NOCASE
)
AND NOT EXISTS (
SELECT 1 FROM page_paths
WHERE slug = 'contact' COLLATE NOCASE
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
import {MailOpenIcon} from "lucide-react";

import {ADMIN_URLS} from "@/shared/StringUtils";
import {
CONTACT_MESSAGE_STATUSES,
type ContactMessageRecord,
} from "@/shared/ContactMessage";

interface Props {
messages: ContactMessageRecord[];
}

function formatDate(value: string): string {
const date = new Date(value);
return Number.isNaN(date.getTime())
? value
: date.toLocaleDateString();
}

/**
* Compact contact-messages summary shown on the Admin home. Lists the most
* recent submissions and links to the full inbox for management.
*/
export default function ContactMessagesHomeApp({messages}: Props) {
const recent = messages.slice(0, 5);
const unread = messages.filter(
(message) => message.status === CONTACT_MESSAGE_STATUSES.NEW,
).length;

return (
<div className="rounded-[14px] border bg-card p-5 text-card-foreground shadow-xs">
<div className="mb-3 flex items-center justify-between">
<div className="text-sm font-semibold text-foreground">
Contact messages
{unread > 0 && (
<span className="ml-2 rounded-full bg-primary/10 px-2 py-0.5 text-xs font-medium text-primary">
{unread} unread
</span>
)}
</div>
<a
className="inline-flex h-8 shrink-0 cursor-pointer items-center justify-center gap-1.5 rounded-[10px] border border-border bg-background px-3 text-xs font-medium whitespace-nowrap transition-all outline-none select-none hover:bg-muted hover:text-foreground"
href={ADMIN_URLS.contactMessages()}
>
View all
</a>
</div>
{recent.length === 0 ? (
<p className="text-sm text-muted-foreground">
No contact messages yet. Messages from the contact form will appear
here.
</p>
) : (
<ul className="divide-y divide-border">
{recent.map((message) => (
<li className="flex items-start justify-between gap-3 py-2" key={message.id}>
<div className="min-w-0">
<div className="flex items-center gap-2">
<span className="truncate text-sm font-medium text-foreground">
{message.name}
</span>
{message.status === CONTACT_MESSAGE_STATUSES.NEW && (
<MailOpenIcon aria-hidden="true" className="size-3.5 shrink-0 text-primary" />
)}
</div>
<div className="truncate text-xs text-muted-foreground">
{message.email} &middot; {formatDate(message.date_created)}
</div>
<div className="mt-1 line-clamp-2 text-sm text-muted-foreground">
{message.message}
</div>
</div>
</li>
))}
</ul>
)}
</div>
);
}
8 changes: 7 additions & 1 deletion src/components/admin/home/AdminHomeApp/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ import AdminPageApp from "@/components/admin/shared/AdminPageApp";
import WhatsNewApp from "./component/WhatsNewApp";
import DistributionApp from "./component/DistributionApp";
import SetupChecklistApp from "./component/SetupChecklistApp";
import ContactMessagesHomeApp from "./component/ContactMessagesHomeApp";
import type {ContactMessageRecord} from "@/shared/ContactMessage";

interface Props {
contactMessages: ContactMessageRecord[];
feedContent: FeedContent;
onboardingResult: OnboardingResult;
}

export default function AdminHomeApp({feedContent, onboardingResult}: Props) {
export default function AdminHomeApp({contactMessages, feedContent, onboardingResult}: Props) {
const [checklistComplete, setChecklistComplete] = useState(
onboardingResult.allOk,
);
Expand Down Expand Up @@ -39,6 +42,9 @@ export default function AdminHomeApp({feedContent, onboardingResult}: Props) {
{primarySections}
</div>
<div className="grid grid-cols-1 gap-4 xl:col-span-4">
<div>
<ContactMessagesHomeApp messages={contactMessages} />
</div>
<div>
<WhatsNewApp />
</div>
Expand Down
6 changes: 5 additions & 1 deletion src/pages/[adminPath]/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import PublicLayout from "@/layouts/PublicLayout.astro";
import {NAV_ITEMS} from "@/shared/Constants";
import {normalizeAdminPath} from "@/shared/AdminPath";
import {loadPublicPageRoute} from "@/server/pages/public";
import {listContactMessages} from "@/server/contact/service";

const routeAdminPath = Astro.params.adminPath ?? "";
const adminRequest = routeAdminPath === normalizeAdminPath(
Expand All @@ -16,6 +17,9 @@ const AdminShell = adminRequest
? (await import("../../layouts/AdminShell.astro")).default
: undefined;
const {feedContent, onboardingResult} = Astro.locals;
const contactMessages = adminRequest
? await listContactMessages(env.FEED_DB)
: [];
let publicPage;
if (adminRequest && (!feedContent || !onboardingResult)) {
throw new Error("Admin feed context was not initialized.");
Expand All @@ -41,7 +45,7 @@ if (!adminRequest) {
onboardingResult={onboardingResult!}
pageTitle="Home"
>
<AdminHomeApp client:only="react" feedContent={feedContent!} onboardingResult={onboardingResult!}>
<AdminHomeApp client:only="react" contactMessages={contactMessages} feedContent={feedContent!} onboardingResult={onboardingResult!}>
<AdminPageFallback slot="fallback" kind="home" />
</AdminHomeApp>
</AdminShell>
Expand Down
28 changes: 27 additions & 1 deletion tests/unit/components/admin-home.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {afterEach, describe, expect, it, vi} from "vitest";

import AdminHomeApp from "@/components/admin/home/AdminHomeApp";
import {ONBOARDING_TYPES} from "@/shared/Constants";
import {CONTACT_MESSAGE_STATUSES, type ContactMessageRecord} from "@/shared/ContactMessage";
import type {OnboardingCheck, OnboardingResult} from "@/types";

function onboardingResult(complete: boolean): OnboardingResult {
Expand Down Expand Up @@ -33,7 +34,7 @@ function onboardingResult(complete: boolean): OnboardingResult {
};
}

function renderHome(complete: boolean): string {
function renderHome(complete: boolean, contactMessages: ContactMessageRecord[] = []): string {
vi.stubGlobal("window", {
location: {
hostname: "feed.example.com",
Expand All @@ -44,6 +45,7 @@ function renderHome(complete: boolean): string {

return renderToStaticMarkup(
React.createElement(AdminHomeApp, {
contactMessages,
feedContent: {},
onboardingResult: onboardingResult(complete),
}),
Expand All @@ -68,4 +70,28 @@ describe("admin home section order", () => {
output.indexOf(">Setup checklist</div>"),
);
});

it("shows an empty state when there are no contact messages", () => {
const output = renderHome(true);

expect(output).toContain("No contact messages yet");
});

it("lists recent contact messages and an unread badge", () => {
const output = renderHome(true, [
{
date_created: "2026-08-14T00:00:00.000Z",
email: "a@example.com",
id: "m1",
message: "Hello there",
name: "Alice",
status: CONTACT_MESSAGE_STATUSES.NEW,
},
]);

expect(output).toContain("Alice");
expect(output).toContain("a@example.com");
expect(output).toContain("1 unread");
expect(output).toContain("View all");
});
});
Loading