Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: show details of submission in email #89

Merged
merged 1 commit into from
Jul 15, 2024
Merged

feat: show details of submission in email #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions apps/web/src/app/api/s/[id]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ async function processFileUploads(
}
}

async function handleEmailNotifications(form: Form, formId: string) {
async function handleEmailNotifications(
form: Form,
submissionData: Record<string, unknown>,
) {
if (form.enableEmailNotifications) {
const user = await api.user.getUserById({ userId: form.userId });
if (!user) throw new Error('User not found');
Expand All @@ -68,8 +71,8 @@ async function handleEmailNotifications(form: Form, formId: string) {
to: user.email,
subject: `New Submission for "${form.title}"`,
body: renderNewSubmissionEmail({
link: `http://localhost:3000/form/${formId}`,
formTitle: form.title,
submissionData,
}),
});
}
Expand Down Expand Up @@ -110,8 +113,7 @@ export async function POST(
keys: updatedKeys,
});

void handleEmailNotifications(form, formId);

void handleEmailNotifications(form, formData as Record<string, unknown>);
const { browser } = userAgent(request);

if (!browser.name) {
Expand Down
16 changes: 8 additions & 8 deletions apps/web/src/lib/email/mailer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ import { env } from '@formbase/env';
const smtpConfig = {
host: env.SMTP_HOST,
port: env.SMTP_PORT,
secure: true,
secure: env.NODE_ENV === 'production',
auth: {
user: env.SMTP_USER,
pass: env.SMTP_PASSWORD,
},
};

const nodeMailerTransporter = createTransport(smtpConfig as TransportOptions);
const resendTransporter = createTransport(
ResendTransport.makeTransport({
apiKey: env.RESEND_API_KEY || '',
}),
);

export type MessageInfo = {
to: string;
subject: string;
body: string;
};

const transporter =
env.SMTP_TRANSPORT === 'resend' ? resendTransporter : nodeMailerTransporter;
env.SMTP_TRANSPORT === 'resend'
? createTransport(
ResendTransport.makeTransport({
apiKey: env.RESEND_API_KEY,
}),
)
: nodeMailerTransporter;

export const sendMail = async (message: MessageInfo) => {
const { to, subject, body } = message;
Expand Down
80 changes: 56 additions & 24 deletions apps/web/src/lib/email/templates/new-submission.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,34 @@
import {
Body,
Button,
Column,
Container,
Head,
Html,
Preview,
Row,
Section,
Text,
} from '@react-email/components';
import { render } from '@react-email/render';

interface Props {
link: string;
formTitle: string;
submissionData: Record<string, unknown>;
}

export const NewSubmissionEmail = ({ link, formTitle }: Props) => {
const formatKey = (key: string): string => {
if (key.includes('_')) {
return key
.split('_')
.map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
.join(' ');
}

const result = key.replace(/([A-Z])/g, ' $1');
return result.charAt(0).toUpperCase() + result.slice(1);
};

export const NewSubmissionEmail = ({ formTitle, submissionData }: Props) => {
return (
<Html>
<Head />
Expand All @@ -26,12 +39,17 @@ export const NewSubmissionEmail = ({ link, formTitle }: Props) => {
<Text style={title}>Formbase</Text>
<Text style={text}>Hi,</Text>
<Text style={text}>
Your form <strong>{formTitle}</strong> has a new submission. You
can view it by clicking the button below:
Your form <strong>{formTitle}</strong> has a new submission. Here
are the details:
</Text>
<Button style={button} href={link}>
View Submission
</Button>
<Section style={submissionContainer}>
{Object.entries(submissionData).map(([key, value]) => (
<Row key={key} style={submissionRow}>
<Column style={submissionLabel}>{formatKey(key)}:</Column>
<Column style={submissionValue}>{String(value)}</Column>
</Row>
))}
</Section>
<Text style={text}>Have a nice day!</Text>
</Section>
</Container>
Expand All @@ -40,8 +58,16 @@ export const NewSubmissionEmail = ({ link, formTitle }: Props) => {
);
};

export const renderNewSubmissionEmail = ({ link, formTitle }: Props) =>
render(<NewSubmissionEmail link={link} formTitle={formTitle} />);
export const renderNewSubmissionEmail = ({
formTitle,
submissionData,
}: Props) =>
render(
<NewSubmissionEmail
formTitle={formTitle}
submissionData={submissionData}
/>,
);

const main = {
backgroundColor: '#f6f9fc',
Expand Down Expand Up @@ -70,19 +96,25 @@ const title = {
lineHeight: '32px',
};

const button = {
backgroundColor: '#09090b',
borderRadius: '4px',
color: '#fafafa',
fontFamily: "'Open Sans', 'Helvetica Neue', Arial",
fontSize: '15px',
textDecoration: 'none',
textAlign: 'center' as const,
display: 'block',
width: '210px',
padding: '14px 7px',
const submissionContainer = {
marginTop: '20px',
marginBottom: '20px',
borderTop: '1px solid #f0f0f0',
borderBottom: '1px solid #f0f0f0',
padding: '20px 0',
};

const submissionRow = {
marginBottom: '10px',
};

// const anchor = {
// textDecoration: "underline",
// };
const submissionLabel = {
...text,
fontWeight: '700',
width: '30%',
};

const submissionValue = {
...text,
width: '70%',
};
Loading