8000 Add public contact form with admin inbox by kiran-brahma · Pull Request #4 · kiran-brahma/microfeed · GitHub
[go: up one dir, main page]

Skip to content
Merged
8000
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
1 change: 1 addition & 0 deletions manage-cli/lib/snapshot.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ export const SNAPSHOT_TABLES = {
"item_categories",
"series",
"item_series",
"contact_messages",
],
ephemeral: [
"item_create_idempotency",
Expand Down
17 changes: 17 additions & 0 deletions migrations/0019_contact_messages.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
-- Personal-site contact form: public submissions saved for the site owner.
-- The public form accepts name, email, and message; the Admin inbox lists
-- submissions and lets the owner mark them read or delete them.

CREATE TABLE IF NOT EXISTS contact_messages (
id TEXT PRIMARY KEY,
name TEXT NOT NULL,
email TEXT NOT NULL,
message TEXT NOT NULL,
status TEXT NOT NULL DEFAULT 'new' CHECK (status IN ('new', 'read')),
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
);

CREATE INDEX IF NOT EXISTS contact_messages_status
ON contact_messages (status);
CREATE INDEX IF NOT EXISTS contact_messages_created_at
ON contact_messages (created_at);
8 changes: 7 additions & 1 deletion packages/theme-kit/src/cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,13 @@ function contexts(fixture: Record<string, unknown>, packageId: string, version:
return {
context: {...context, navigation_pages},
itemContext: {...context, navigation_pages, item: (fixture.items as Array<Record<string, unknown>> | undefined)?.[0]},
pageContext: {...context, navigation_pages, page},
pageContext: {
...context,
navigation_pages,
page,
is_contact_page: page.slug === "contact",
contact_sent: false,
},
previewResults,
searchContext: {...context, navigation_pages, search: {query: "hello", results: previewResults}},
};
Expand Down
2 changes: 2 additions & 0 deletions src/components/admin/AdminSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
SettingsIcon,
TagsIcon,
LayersIcon,
MailIcon,
} from "lucide-react";

import {
Expand Down Expand Up @@ -40,6 +41,7 @@ const navigationIcons: Record<AdminNavItemId, typeof HomeIcon> = {
[NAV_ITEMS.SITE_FILES]: FileCode2Icon,
[NAV_ITEMS.CATEGORIES]: TagsIcon,
[NAV_ITEMS.SERIES]: LayersIcon,
[NAV_ITEMS.CONTACT_MESSAGES]: MailIcon,
[NAV_ITEMS.API]: Code2Icon,
[NAV_ITEMS.SETTINGS]: SettingsIcon,
};
Expand Down
161 changes: 161 additions & 0 deletions src/components/admin/contact-messages/ContactMessagesApp.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
import {useState} from "react";
import {CheckIcon, MailOpenIcon, Trash2Icon} from "lucide-react";

import {Button} from "@/components/ui/button";
import {showToast} from "@/client/ToastUtils";
import {ADMIN_URLS} from "@/shared/StringUtils";
import {
CONTACT_MESSAGE_STATUSES,
type ContactMessageRecord,
} from "@/shared/ContactMessage";

interface Props {
messages: ContactMessageRecord[];
}

async function responseJson<T>(response: Response): Promise<T> {
const body = await response.json().catch(() => ({})) as T & {error?: string};
if (!response.ok) {
throw new Error(body.error ?? "The request failed.");
}
return body;
}

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

export default function ContactMessagesApp({messages: initialMessages}: 8 Props) 10BC8 {
const [messages, setMessages] = useState(initialMessages);
const [busy, setBusy] = useState(false);

const markRead = async (message: ContactMessageRecord) => {
if (message.status === CONTACT_MESSAGE_STATUSES.READ) return;
setBusy(true);
try {
const updated = await responseJson<ContactMessageRecord>(await fetch(
ADMIN_URLS.ajaxContactMessage(message.id),
{method: "PUT"},
));
setMessages((current) => current.map((entry) =>
entry.id === updated.id ? updated : entry
));
showToast("Message marked as read.", "success");
} catch (error) {
showToast(
error instanceof Error ? error.message : "The request failed.",
"error",
);
} finally {
setBusy(false);
}
};

const remove = async (message: ContactMessageRecord) => {
if (!window.confirm(
`Delete the message from \`${message.name}\`? This cannot be undone.`,
)) {
return;
}
setBusy(true);
try {
await responseJson(await fetch(
ADMIN_URLS.ajaxContactMessage(message.id),
{method: "DELETE"},
));
setMessages((current) => current.filter((entry) =>
entry.id !== message.id
));
showToast("Message deleted.", "success");
} catch (error) {
showToast(
error instanceof Error ? error.message : "The request failed.",
"error",
);
} finally {
setBusy(false);
}
};

const unread = messages.filter(
(message) => message.status === CONTACT_MESSAGE_STATUSES.NEW,
).length;

return (
<div className="grid gap-5">
<div className="flex flex-wrap items-center justify-between gap-3">
<p className="text-sm text-muted-foreground">
Messages sent through the public contact form.
{unread > 0 ? ` ${unread} unread.` : ""}
</p>
</div>
<div className="grid gap-3">
{messages.length === 0 ? (
<p className="rounded-[14px] border bg-card p-5 text-sm text-muted-foreground shadow-xs">
No contact messages yet. Messages from the public contact form
appear here.
</p>
) : messages.map((message) => (
<div
className="grid gap-3 rounded-[14px] border bg-card p-4 text-card-foreground shadow-xs"
key={message.id}
>
<div className="flex flex-wrap items-center justify-between gap-3">
<div className="flex items-center gap-2">
<h2 className="font-semibold">{message.name}</h2>
{message.status === CONTACT_MESSAGE_STATUSES.NEW && (
<span className="rounded-full bg-primary/10 px-2 py-0.5 text-xs font-medium text-primary">
New
</span>
)}
</div>
<div className="flex items-center gap-2">
<span className="text-xs text-muted-foreground">
{formatDate(message.date_created)}
</span>
<Button
disabled={busy}
=> void markRead(message)}
size="sm"
type="button"
variant="outline"
>
{message.status === CONTACT_MESSAGE_STATUSES.READ
? <MailOpenIcon aria-hidden="true" />
: <CheckIcon aria-hidden="true" />}
{message.status === CONTACT_MESSAGE_STATUSES.READ
? "Read"
: "Mark read"}
</Button>
<Button
disabled={busy}
=> void remove(message)}
size="sm"
type="button"
variant="ghost"
className="text-destructive hover:bg-destructive/10 hover:text-destructive"
>
<Trash2Icon aria-hidden="true" /> Delete
</Button>
</div>
</div>
<p className="text-sm">
<a
className="text-primary hover:underline"
href={`mailto:${message.email}`}
>
{message.email}
</a>
</p>
<p className="whitespace-pre-wrap text-sm text-muted-foreground">
{message.message}
</p>
</div>
))}
</div>
</div>
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
export {
deleteAdminContactMessage as DELETE,
getAdminContactMessage as GET,
markAdminContactMessageRead as PUT,
} from "@/server/admin/contact-handlers";
3 changes: 3 additions & 0 deletions src/pages/[adminPath]/ajax/contact-messages/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export {
listAdminContactMessages as GET,
} from "@/server/admin/contact-handlers";
21 changes: 21 additions & 0 deletions src/pages/[adminPath]/contact-messages/index.astro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
import {env} from "cloudflare:workers";

import ContactMessagesApp from "@/components/admin/contact-messages/ContactMessagesApp";
import AdminPageFallback from "@/components/admin/AdminPageFallback.astro";
import AdminShell from "@/layouts/AdminShell.astro";
import {NAV_ITEMS} from "@/shared/Constants";
import {listContactMessages} from "@/server/contact/service";

const {feedContent, onboardingResult} = Astro.locals;
if (!feedContent || !onboardingResult) {
throw new Error("Admin feed context was not initialized.");
}
const messages = await listContactMessages(env.FEED_DB);
---

<AdminShell activeNavItem={NAV_ITEMS.CONTACT_MESSAGES} documentTitle="Contact messages | microfeed.org" {feedContent} {onboardingResult} pageTitle="Contact messages">
<ContactMessagesApp client:load messages={messages}>
<AdminPageFallback slot="fallback" kind="list" />
</ContactMessagesApp>
</AdminShell>
71 changes: 71 additions & 0 deletions src/pages/contact/submit.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import {env} from "cloudflare:workers";
import type {APIRoute} from "astro";

import {createContactMessage, ContactRequestError} from "@/server/contact/service";
import {jsonResponse} from "@/server/http";

/**
* Public contact-form submission endpoint. The theme's contact form POSTs
* name, email, and message here. Submissions are stored in the
* contact_messages table and appear in the Admin inbox. This route is public
* by design: it must never require admin authentication.
*/
export const POST: APIRoute = async ({request}) => {
const url = new URL(request.url);
const wantsJson = request.headers.get("accept")?.includes("application/json") === true;
const referrer = request.headers.get("referer");
const fallback = new URL("/", url).toString();
const backTo = (() => {
if (!referrer) return fallback;
try {
const parsed = new URL(referrer);
return parsed.origin === url.origin ? parsed.toString() : fallback;
} catch {
return fallback;
}
})();

const contentType = request.headers.get("content-type") ?? "";
let name = "";
let email = "";
let message = "";
if (contentType.includes("application/json")) {
const body = await request.clone().json().catch(() => null) as {
email?: unknown;
message?: unknown;
name?: unknown;
} | null;
name = typeof body?.name === "string" ? body.name : "";
email = typeof body?.email === "string" ? body.email : "";
message = typeof body?.message === "string" ? body.message : "";
} else {
const body = await request.clone().formData().catch(() => null);
const bodyName = body?.get("name");
const bodyEmail = body?.get("email");
const bodyMessage = body?.get("message");
name = typeof bodyName === "string" ? bodyName : "";
email = typeof bodyEmail === "string" ? bodyEmail : "";
message = typeof bodyMessage === "string" ? bodyMessage : "";
}

try {
await createContactMessage(env.FEED_DB, {email, message, name});
} catch (error) {
if (error instanceof ContactRequestError) {
if (wantsJson) {
return jsonResponse({error: error.message}, {status: 400});
}
const target = new URL(backTo);
target.searchParams.set("error", "1");
return Response.redirect(target.toString(), 303);
}
throw error;
}

if (wantsJson) {
return jsonResponse({ok: true});
}
const target = new URL(backTo);
target.searchParams.set("sent", "1");
return Response.redirect(target.toString(), 303);
};
42 changes: 42 additions & 0 deletions src/server/admin/contact-handlers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import {env} from "cloudflare:workers";
import type {APIRoute} from "astro";

import {jsonResponse} from "@/server/http";
import {
deleteContactMessage,
getContactMessageById,
listContactMessages,
markContactMessageRead,
} from "@/server/contact/service";

export const listAdminContactMessages: APIRoute = async () =>
jsonResponse({items: await listContactMessages(env.FEED_DB)});

export const getAdminContactMessage: APIRoute = async ({params}) => {
const message = params.messageId
? await getContactMessageById(env.FEED_DB, params.messageId)
: null;
return message
? jsonResponse(message)
: jsonResponse({error: "Contact message not found."}, {status: 404});
};

export const markAdminContactMessageRead: APIRoute = async ({params}) => {
if (!params.messageId) {
return jsonResponse({error: "Invalid contact message."}, {status: 400});
}
const message = await markContactMessageRead(env.FEED_DB, params.messageId);
return message
? jsonResponse(message)
: jsonResponse({error: "Contact message not found."}, {status: 404});
};

export const deleteAdminContactMessage: APIRoute = async ({params}) => {
if (!params.messageId) {
return jsonResponse({error: "Invalid contact message."}, {status: 400});
}
const deleted = await deleteContactMessage(env.FEED_DB, params.messageId);
return deleted
? jsonResponse({})
: jsonResponse({error: "Contact message not found."}, {status: 404});
};
Loading
0