Connect, collaborate, and grow with a community of TypeScript developers
feat: add unsubscribe for individuals on waitlist (#715)
bautistaaaae3dfff6adb3
diff --git a/apps/web/src/app/[locale]/(email)/unsubscribe/_actions.ts b/apps/web/src/app/[locale]/(email)/unsubscribe/_actions.tsnew file mode 100644index 00000000..be5badc8--- /dev/null+++ b/apps/web/src/app/[locale]/(email)/unsubscribe/_actions.ts@@ -0,0 +1,13 @@+'use server';++import { prisma } from '@repo/db';++export async function removeFromWaitlist(email: string) {+ // lul we didnt put a unique constraint on the email column+ // we enforce it on the client at least and this table is being deleted anyways+ return prisma.waitlist.deleteMany({+ where: {+ email,+ },+ });+}diff --git a/apps/web/src/app/[locale]/(email)/unsubscribe/page.tsx b/apps/web/src/app/[locale]/(email)/unsubscribe/page.tsxnew file mode 100644index 00000000..6da01d1f--- /dev/null+++ b/apps/web/src/app/[locale]/(email)/unsubscribe/page.tsx@@ -0,0 +1,81 @@+'use client';++import { zodResolver } from '@hookform/resolvers/zod';+import { Button } from '@repo/ui/components/button';+import { DialogFooter } from '@repo/ui/components/dialog';+import {+ Form,+ FormControl,+ FormField,+ FormItem,+ FormLabel,+ FormMessage,+} from '@repo/ui/components/form';+import { Input } from '@repo/ui/components/input';+import { useToast } from '@repo/ui/components/use-toast';+import { useForm } from 'react-hook-form';+import { z } from 'zod';+import { removeFromWaitlist } from './_actions';++const formSchema = z.object({+ email: z.string().email(),+});++export type FormSchema = z.infer<typeof formSchema>;+export default function UnsubscribePage(props: { searchParams: { email?: string } }) {+ const { toast } = useToast();++ const form = useForm<FormSchema>({+ resolver: zodResolver(formSchema),+ defaultValues: {+ email: props.searchParams.email ?? '',+ },+ });++ async function onSubmit(data: FormSchema) {+ try {+ await removeFromWaitlist(data.email);+ toast({+ title: 'Successfully Unsubscribed',+ });+ } catch (e) {+ toast({+ variant: 'destructive',+ title: 'Something went wrong',+ });+ }+ }++ return (+ <div className="container">+ <h1 className="text-3xl font-bold">Unsubscribe</h1>+ <div className="max-w-md">+ <Form {...form}>+ <form onSubmit={form.handleSubmit(onSubmit)}>+ <FormField+ control={form.control}+ name="email"+ render={({ field }) => (+ <FormItem>+ <FormLabel>Email:</FormLabel>+ <FormControl>+ <Input+ className="rounded-xl bg-neutral-200 dark:bg-neutral-800"+ placeholder="Enter a Track Title"+ {...field}+ />+ </FormControl>+ <FormMessage />+ </FormItem>+ )}+ />++ <DialogFooter className="py-3">+ <Button type="submit">Save</Button>+ </DialogFooter>+ </form>+ </Form>+ </div>+ </div>+ );+}diff --git a/apps/web/src/app/[locale]/waitlist/_components/create.action.ts b/apps/web/src/app/[locale]/(email)/waitlist/_components/create.action.tssimilarity index 83%rename from apps/web/src/app/[locale]/waitlist/_components/create.action.tsrename to apps/web/src/app/[locale]/(email)/waitlist/_components/create.action.tsindex 84ca3646..19d1b249 100644--- a/apps/web/src/app/[locale]/waitlist/_components/create.action.ts+++ b/apps/web/src/app/[locale]/(email)/waitlist/_components/create.action.ts@@ -6,6 +6,8 @@ import { UserSignupEmail } from '@repo/emails/emails/index';import type { WaitlistFormSchema } from './waitlist-form';const resend = new Resend(process.env.RESEND_API_KEY);+const baseUrl =+ process.env.NODE_ENV === 'production' ? `https://typehero.dev` : 'http://localhost:3000';/*** send a signup email that will use resend to send an email@@ -16,7 +18,10 @@ export const sendUserSignupEmail = async (to: string) => {from: 'TypeHero <[email protected]>',to: [to],subject: '🔥 Thanks for signing up to TypeHero!',- react: UserSignupEmail(),+ react: UserSignupEmail({ to }),+ headers: {+ 'List-Unsubscribe': `${baseUrl}/unsubscribe?email=${to}`,+ },});return {diff --git a/apps/web/src/app/[locale]/waitlist/_components/index.tsx b/apps/web/src/app/[locale]/(email)/waitlist/_components/index.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/waitlist/_components/index.tsxrename to apps/web/src/app/[locale]/(email)/waitlist/_components/index.tsxdiff --git a/apps/web/src/app/[locale]/waitlist/_components/waitlist-form.tsx b/apps/web/src/app/[locale]/(email)/waitlist/_components/waitlist-form.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/waitlist/_components/waitlist-form.tsxrename to apps/web/src/app/[locale]/(email)/waitlist/_components/waitlist-form.tsxdiff --git a/apps/web/src/app/[locale]/waitlist/_components/waitlist.module.css b/apps/web/src/app/[locale]/(email)/waitlist/_components/waitlist.module.csssimilarity index 90%rename from apps/web/src/app/[locale]/waitlist/_components/waitlist.module.cssrename to apps/web/src/app/[locale]/(email)/waitlist/_components/waitlist.module.cssindex 30353bb0..f718b7fc 100644--- a/apps/web/src/app/[locale]/waitlist/_components/waitlist.module.css+++ b/apps/web/src/app/[locale]/(email)/waitlist/_components/waitlist.module.css@@ -17,7 +17,7 @@}.mybg {- background: url('../../../../assets/images/waitlist-bg.webp');+ background: url('../../../../../assets/images/waitlist-bg.webp');background-position-y: 33%;background-position-x: center;background-repeat: no-repeat;diff --git a/apps/web/src/app/[locale]/waitlist/page.tsx b/apps/web/src/app/[locale]/(email)/waitlist/page.tsxsimilarity index 100%rename from apps/web/src/app/[locale]/waitlist/page.tsxrename to apps/web/src/app/[locale]/(email)/waitlist/page.tsxdiff --git a/packages/email/emails/waitlist-user-signup.tsx b/packages/email/emails/waitlist-user-signup.tsxindex 5579bc1f..61bbaa68 100644--- a/packages/email/emails/waitlist-user-signup.tsx+++ b/packages/email/emails/waitlist-user-signup.tsx@@ -16,11 +16,9 @@ import * as React from 'react';// so that we can access the assets from the typehero vercel app// but when in local most we point to the web app running on localhostconst baseUrl =- process.env.NODE_ENV === 'production'- ? `https://typehero.dev`- : 'http://127.0.0.1:3000';+ process.env.NODE_ENV === 'production' ? `https://typehero.dev` : 'http://localhost:3000';-export const UserSignupEmail = () => {+export const UserSignupEmail = (props: { to: string }) => {return (<Html><Head />@@ -42,7 +40,7 @@ export const UserSignupEmail = () => {We are cooking extremely hard to bring you the best experience for doing typechallenges.</Text>- <Container className="w-fit mx-auto pt-4">+ <Container className="mx-auto w-fit pt-4"><ButtonpX={20}pY={12}@@ -52,11 +50,17 @@ export const UserSignupEmail = () => {Follow us on @X</Button></Container>+ <Container className="mt-6">+ <a+ className="text-[14px] leading-[24px] text-black"+ href={`${baseUrl}/unsubscribe?email=${props.to}`}+ >+ Unsubscribe from the waitlist+ </a>+ </Container></Container></Body></Tailwind></Html>);};--export default UserSignupEmail;