From 81033bf91d8933f992876eda49ea79a4825d6224 Mon Sep 17 00:00:00 2001 From: "gpt-engineer-app[bot]" <159125892+gpt-engineer-app[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 02:18:30 +0000 Subject: [PATCH 1/5] Changes Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com> --- ...7_6a1deb9c-e973-4d19-a627-676375c049ca.sql | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 supabase/migrations/20260417021827_6a1deb9c-e973-4d19-a627-676375c049ca.sql diff --git a/supabase/migrations/20260417021827_6a1deb9c-e973-4d19-a627-676375c049ca.sql b/supabase/migrations/20260417021827_6a1deb9c-e973-4d19-a627-676375c049ca.sql new file mode 100644 index 0000000..e022faf --- /dev/null +++ b/supabase/migrations/20260417021827_6a1deb9c-e973-4d19-a627-676375c049ca.sql @@ -0,0 +1,26 @@ + +INSERT INTO public.document_templates (name, description, kind, font_family, font_size_pt, fields, body) +VALUES ( + 'Correspondence', + 'Firm letterhead correspondence with optional Re: and certified mail / FedEx tracking lines.', + 'correspondence', + 'Times New Roman', + 12, + '[ + {"key":"recipient_name","label":"Recipient name","type":"text"}, + {"key":"recipient_title","label":"Recipient title","type":"text"}, + {"key":"recipient_company","label":"Recipient company","type":"text"}, + {"key":"recipient_address1","label":"Recipient address line 1","type":"text"}, + {"key":"recipient_address2","label":"Recipient address line 2","type":"text"}, + {"key":"recipient_city_state_zip","label":"Recipient city, state, ZIP","type":"text"}, + {"key":"certified_mail_no","label":"Certified Mail No. (optional)","type":"text"}, + {"key":"fedex_no","label":"FedEx Tracking No. (optional)","type":"text"}, + {"key":"re","label":"Re: (optional)","type":"text"}, + {"key":"salutation","label":"Salutation","type":"text"}, + {"key":"body","label":"Letter body","type":"textarea"}, + {"key":"closing","label":"Closing","type":"text"}, + {"key":"sender_name","label":"Sender name","type":"text"}, + {"key":"sender_title","label":"Sender title","type":"text"} + ]'::jsonb, + E'{{firm_header}}\n\n{{today}}\n\n{{certified_mail_line}}{{fedex_line}}{{recipient_name}}\n{{recipient_title}}\n{{recipient_company}}\n{{recipient_address1}}\n{{recipient_address2}}\n{{recipient_city_state_zip}}\n\n{{re_line}}Dear {{salutation}}:\n\n{{body}}\n\n{{closing}},\n\n\n\n{{sender_name}}\n{{sender_title}}' +); From dc4cdf221c6f8e8dc966572a6911572f8fc57ee4 Mon Sep 17 00:00:00 2001 From: "gpt-engineer-app[bot]" <159125892+gpt-engineer-app[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 02:18:44 +0000 Subject: [PATCH 2/5] Changes Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com> --- .../documents.templates.$templateId.tsx | 35 ++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/src/routes/documents.templates.$templateId.tsx b/src/routes/documents.templates.$templateId.tsx index 31bd404..c038710 100644 --- a/src/routes/documents.templates.$templateId.tsx +++ b/src/routes/documents.templates.$templateId.tsx @@ -21,7 +21,40 @@ export const Route = createFileRoute("/documents/templates/$templateId")({ interface FieldDef { key: string; label: string; type: "text" | "textarea" | "date" | "number" } function mergeBody(body: string, values: Record) { - return body.replace(/\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g, (_, k) => values[k] ?? `{{${k}}}`); + // Replace tokens, treating unknown tokens as empty so optional fields don't leak + const merged = body.replace(/\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g, (_, k) => values[k] ?? ""); + // Collapse runs of 3+ blank lines down to 2 (one blank line of separation) + return merged.replace(/\n{3,}/g, "\n\n").replace(/[ \t]+\n/g, "\n"); +} + +function formatToday() { + return new Date().toLocaleDateString("en-US", { year: "numeric", month: "long", day: "numeric" }); +} + +interface FirmSettings { + company_name?: string | null; + address_line1?: string | null; + address_line2?: string | null; + city?: string | null; + state?: string | null; + postal_code?: string | null; + contact_phone?: string | null; + contact_email?: string | null; + website?: string | null; +} + +function buildFirmHeader(f: FirmSettings | null): string { + if (!f) return ""; + const lines: string[] = []; + if (f.company_name) lines.push(f.company_name); + if (f.address_line1) lines.push(f.address_line1); + if (f.address_line2) lines.push(f.address_line2); + const csz = [f.city, f.state, f.postal_code].filter(Boolean).join(", ").replace(/, (\d)/, " $1"); + if (csz) lines.push(csz); + const contact = [f.contact_phone, f.contact_email].filter(Boolean).join(" • "); + if (contact) lines.push(contact); + if (f.website) lines.push(f.website); + return lines.join("\n"); } function TemplateDetailPage() { From 38b3680730708c63ce0404890f5d503596e4c514 Mon Sep 17 00:00:00 2001 From: "gpt-engineer-app[bot]" <159125892+gpt-engineer-app[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 02:19:02 +0000 Subject: [PATCH 3/5] Changes Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com> --- src/routes/documents.templates.$templateId.tsx | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/routes/documents.templates.$templateId.tsx b/src/routes/documents.templates.$templateId.tsx index c038710..94a0859 100644 --- a/src/routes/documents.templates.$templateId.tsx +++ b/src/routes/documents.templates.$templateId.tsx @@ -70,6 +70,7 @@ function TemplateDetailPage() { const [docName, setDocName] = useState("Document"); const [saving, setSaving] = useState(false); const [generating, setGenerating] = useState(false); + const [firm, setFirm] = useState(null); useEffect(() => { supabase.from("document_templates").select("*").eq("id", templateId).single().then(({ data }) => { @@ -81,9 +82,21 @@ function TemplateDetailPage() { setFields(Array.isArray(data.fields) ? (data.fields as unknown as FieldDef[]) : []); setDocName(data.name); }); + supabase.from("firm_settings").select("*").maybeSingle().then(({ data }) => setFirm(data as FirmSettings | null)); }, [templateId]); - const merged = useMemo(() => mergeBody(body, values), [body, values]); + const autoValues = useMemo>(() => { + const v: Record = { + today: formatToday(), + firm_header: buildFirmHeader(firm), + re_line: values.re?.trim() ? `Re: ${values.re.trim()}\n\n` : "", + certified_mail_line: values.certified_mail_no?.trim() ? `VIA CERTIFIED MAIL NO. ${values.certified_mail_no.trim()}\n` : "", + fedex_line: values.fedex_no?.trim() ? `VIA FEDEX TRACKING NO. ${values.fedex_no.trim()}\n` : "", + }; + return v; + }, [firm, values.re, values.certified_mail_no, values.fedex_no]); + + const merged = useMemo(() => mergeBody(body, { ...autoValues, ...values }), [body, values, autoValues]); const saveTemplate = async () => { setSaving(true); From 05226cb82f6cc53f2ca340ef1a9735d464a284c8 Mon Sep 17 00:00:00 2001 From: "gpt-engineer-app[bot]" <159125892+gpt-engineer-app[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 02:19:14 +0000 Subject: [PATCH 4/5] Changes Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com> --- src/routes/documents.templates.$templateId.tsx | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/routes/documents.templates.$templateId.tsx b/src/routes/documents.templates.$templateId.tsx index 94a0859..6a2783a 100644 --- a/src/routes/documents.templates.$templateId.tsx +++ b/src/routes/documents.templates.$templateId.tsx @@ -115,19 +115,30 @@ function TemplateDetailPage() { navigate({ to: "/documents/templates" }); }; + const isLetter = tpl?.kind === "correspondence"; + const fontFamily: string = tpl?.font_family || "Bookman Old Style"; + const fontSizePt: number = tpl?.font_size_pt || 12; + const downloadOnly = async () => { - await downloadGeneric({ title: docName, body: merged }, docName || "Document"); + await downloadGeneric( + { title: isLetter ? undefined : docName, body: merged, fontFamily, fontSizePt }, + docName || "Document", + ); }; const generateAndSave = async () => { setGenerating(true); try { const { Document, Paragraph, TextRun, AlignmentType } = await import("docx"); - const font = "Bookman Old Style", size = 24; + const font = fontFamily; + const size = fontSizePt * 2; const mkP = (text: string, bold = false, center = false) => new Paragraph({ alignment: center ? AlignmentType.CENTER : undefined, children: [new TextRun({ text, bold, font, size })] }); const children: any[] = []; - if (docName) { children.push(mkP(docName, true, true)); children.push(new Paragraph({ children: [new TextRun({ text: "", font, size })] })); } + if (docName && !isLetter) { + children.push(mkP(docName, true, true)); + children.push(new Paragraph({ children: [new TextRun({ text: "", font, size })] })); + } merged.split("\n").forEach((line) => children.push(mkP(line))); const doc = new Document({ styles: { default: { document: { run: { font, size } } } }, From 6c6c90e570cbb00003599621dbf1ec7be8cbe585 Mon Sep 17 00:00:00 2001 From: "gpt-engineer-app[bot]" <159125892+gpt-engineer-app[bot]@users.noreply.github.com> Date: Fri, 17 Apr 2026 02:19:27 +0000 Subject: [PATCH 5/5] Changes Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com> --- src/routes/documents.templates.$templateId.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/documents.templates.$templateId.tsx b/src/routes/documents.templates.$templateId.tsx index 6a2783a..0e324bd 100644 --- a/src/routes/documents.templates.$templateId.tsx +++ b/src/routes/documents.templates.$templateId.tsx @@ -233,7 +233,7 @@ function TemplateDetailPage() {
-
+
{merged || Empty}