The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
feat: use server-actions for authoring flow
Mythie12d8cebd4c9a
diff --git a/.env.example b/.env.exampleindex fea246621..3ce57722b 100644--- a/.env.example+++ b/.env.example@@ -1,19 +1,56 @@+# [[AUTH]]NEXTAUTH_URL="http://localhost:3000"NEXTAUTH_SECRET="secret"+# [[APP]]NEXT_PUBLIC_SITE_URL="http://localhost:3000"NEXT_PUBLIC_APP_URL="http://localhost:3000"+# [[DATABASE]]NEXT_PRIVATE_DATABASE_URL="postgres://documenso:[email protected]:54320/documenso"-NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID=-NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID=+# [[SMTP]]+# OPTIONAL: Defines the transport to use for sending emails. Available options: smtp-auth (default) | smtp-api | mailchannels+NEXT_PRIVATE_SMTP_TRANSPORT="smtp-auth"+# OPTIONAL: Defines the host to use for sending emails.+NEXT_PRIVATE_SMTP_HOST="127.0.0.1"+# OPTIONAL: Defines the port to use for sending emails.+NEXT_PRIVATE_SMTP_PORT=2500+# OPTIONAL: Defines the username to use with the SMTP server.+NEXT_PRIVATE_SMTP_USERNAME="documenso"+# OPTIONAL: Defines the password to use with the SMTP server.+NEXT_PRIVATE_SMTP_PASSWORD="password"+# OPTIONAL: Defines the API key user to use with the SMTP server.+NEXT_PRIVATE_SMTP_APIKEY_USER=+# OPTIONAL: Defines the API key to use with the SMTP server.+NEXT_PRIVATE_SMTP_APIKEY=+# OPTIONAL: Defines whether to force the use of TLS.+NEXT_PRIVATE_SMTP_SECURE=+# REQUIRED: Defines the sender name to use for the from address.+NEXT_PRIVATE_SMTP_FROM_NAME="No Reply @ Documenso"+# REQUIRED: Defines the email address to use as the from address.+NEXT_PRIVATE_SMTP_FROM_ADDRESS="[email protected]"+# OPTIONAL: The API key to use for the MailChannels proxy endpoint.+NEXT_PRIVATE_MAILCHANNELS_API_KEY=+# OPTIONAL: The endpoint to use for the MailChannels API if using a proxy.+NEXT_PRIVATE_MAILCHANNELS_ENDPOINT=+# OPTIONAL: The domain to use for DKIM signing.+NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN=+# OPTIONAL: The selector to use for DKIM signing.+NEXT_PRIVATE_MAILCHANNELS_DKIM_SELECTOR=+# OPTIONAL: The private key to use for DKIM signing.+NEXT_PRIVATE_MAILCHANNELS_DKIM_PRIVATE_KEY=+# [[STRIPE]]NEXT_PRIVATE_STRIPE_API_KEY=NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET=+NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID=+NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID=+# [[FEATURES]]NEXT_PUBLIC_SUBSCRIPTIONS_ENABLED=false# This is only required for the marketing site+# [[REDIS]]NEXT_PRIVATE_REDIS_URL=NEXT_PRIVATE_REDIS_TOKEN=diff --git a/apps/marketing/package.json b/apps/marketing/package.jsonindex e34c66b99..523a23a90 100644--- a/apps/marketing/package.json+++ b/apps/marketing/package.json@@ -18,7 +18,7 @@"framer-motion": "^10.12.8","lucide-react": "^0.214.0","micro": "^10.0.1",- "next": "13.4.1",+ "next": "13.4.9","next-auth": "^4.22.1","next-plausible": "^3.7.2","perfect-freehand": "^1.2.0",diff --git a/apps/web/next.config.js b/apps/web/next.config.jsindex b57b41780..09760f806 100644--- a/apps/web/next.config.js+++ b/apps/web/next.config.js@@ -7,9 +7,23 @@ const { parsed: env } = require('dotenv').config({/** @type {import('next').NextConfig} */const config = {+ experimental: {+ serverActions: true,+ },reactStrictMode: true,- transpilePackages: ['@documenso/lib', '@documenso/prisma', '@documenso/trpc', '@documenso/ui'],+ transpilePackages: [+ '@documenso/lib',+ '@documenso/prisma',+ '@documenso/trpc',+ '@documenso/ui',+ '@documenso/email',+ ],env,+ modularizeImports: {+ 'lucide-react': {+ transform: 'lucide-react/dist/esm/icons/{{ kebabCase member }}',+ },+ },};module.exports = config;diff --git a/apps/web/package.json b/apps/web/package.jsonindex d493b92d9..32d0d61b3 100644--- a/apps/web/package.json+++ b/apps/web/package.json@@ -22,7 +22,7 @@"lucide-react": "^0.214.0","micro": "^10.0.1","nanoid": "^4.0.2",- "next": "13.4.1",+ "next": "13.4.9","next-auth": "^4.22.1","next-plausible": "^3.7.2","next-themes": "^0.2.1",diff --git a/apps/web/public/static/clock.png b/apps/web/public/static/clock.pngnew file mode 100644index 000000000..ce8ee6481Binary files /dev/null and b/apps/web/public/static/clock.png differdiff --git a/apps/web/public/static/completed.png b/apps/web/public/static/completed.pngnew file mode 100644index 000000000..11a10f445Binary files /dev/null and b/apps/web/public/static/completed.png differdiff --git a/apps/web/public/static/document.png b/apps/web/public/static/document.pngnew file mode 100644index 000000000..8baa22639Binary files /dev/null and b/apps/web/public/static/document.png differdiff --git a/apps/web/public/static/download.png b/apps/web/public/static/download.pngnew file mode 100644index 000000000..c376d6051Binary files /dev/null and b/apps/web/public/static/download.png differdiff --git a/apps/web/public/static/logo.png b/apps/web/public/static/logo.pngnew file mode 100644index 000000000..4813aaaefBinary files /dev/null and b/apps/web/public/static/logo.png differdiff --git a/apps/web/public/static/review.png b/apps/web/public/static/review.pngnew file mode 100644index 000000000..84bec4f62Binary files /dev/null and b/apps/web/public/static/review.png differdiff --git a/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsxnew file mode 100644index 000000000..b79c46671--- /dev/null+++ b/apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx@@ -0,0 +1,111 @@+'use client';++import { useState } from 'react';++import dynamic from 'next/dynamic';++import { Loader } from 'lucide-react';++import { Document, Field, Recipient, User } from '@documenso/prisma/client';+import { cn } from '@documenso/ui/lib/utils';+import { Card, CardContent } from '@documenso/ui/primitives/card';++import { AddFieldsFormPartial } from '~/components/forms/edit-document/add-fields';+import { AddSignersFormPartial } from '~/components/forms/edit-document/add-signers';+import { AddSubjectFormPartial } from '~/components/forms/edit-document/add-subject';++const PDFViewer = dynamic(async () => import('~/components/(dashboard)/pdf-viewer/pdf-viewer'), {+ ssr: false,+ loading: () => (+ <div className="dark:bg-background flex-col flex min-h-[80vh] items-center justify-center bg-white/50">+ <Loader className="text-documenso h-12 w-12 animate-spin" />++ <p className="text-muted-foreground mt-4">Loading document...</p>+ </div>+ ),+});++export type EditDocumentFormProps = {+ className?: string;+ user: User;+ document: Document;+ recipients: Recipient[];+ fields: Field[];+};++export const EditDocumentForm = ({+ className,+ document,+ recipients,+ fields,+ user: _user,+}: EditDocumentFormProps) => {+ const [step, setStep] = useState<'signers' | 'fields' | 'subject'>('signers');++ const documentUrl = `data:application/pdf;base64,${document.document}`;++ const onNextStep = () => {+ if (step === 'signers') {+ setStep('fields');+ }++ if (step === 'fields') {+ setStep('subject');+ }+ };++ const onPreviousStep = () => {+ if (step === 'fields') {+ setStep('signers');+ }++ if (step === 'subject') {+ setStep('fields');+ }+ };++ return (+ <div className={cn('grid w-full grid-cols-12 gap-8', className)}>+ <Card+ className="col-span-12 rounded-xl before:rounded-xl lg:col-span-6 xl:col-span-7"+ gradient+ >+ <CardContent className="p-2">+ <PDFViewer document={documentUrl} />+ </CardContent>+ </Card>++ <div className="col-span-12 lg:col-span-6 xl:col-span-5">+ {step === 'signers' && (+ <AddSignersFormPartial+ recipients={recipients}+ fields={fields}+ document={document}+ onContinue={onNextStep}+ onGoBack={onPreviousStep}+ />+ )}++ {step === 'fields' && (+ <AddFieldsFormPartial+ recipients={recipients}+ fields={fields}+ document={document}+ onContinue={onNextStep}+ onGoBack={onPreviousStep}+ />+ )}++ {step === 'subject' && (+ <AddSubjectFormPartial+ recipients={recipients}+ fields={fields}+ document={document}+ onContinue={onNextStep}+ onGoBack={onPreviousStep}+ />+ )}+ </div>+ </div>+ );+};diff --git a/apps/web/src/app/(dashboard)/documents/[id]/loadable-pdf-card.tsx b/apps/web/src/app/(dashboard)/documents/[id]/loadable-pdf-card.tsxindex b2008c921..5daa07e9e 100644--- a/apps/web/src/app/(dashboard)/documents/[id]/loadable-pdf-card.tsx+++ b/apps/web/src/app/(dashboard)/documents/[id]/loadable-pdf-card.tsx@@ -16,7 +16,7 @@ export type LoadablePDFCard = PDFViewerProps & {const PDFViewer = dynamic(async () => import('~/components/(dashboard)/pdf-viewer/pdf-viewer'), {ssr: false,loading: () => (- <div className="flex min-h-[80vh] flex-col items-center justify-center bg-white/50">+ <div className="flex-col flex min-h-[80vh] items-center justify-center bg-white/50"><Loader className="h-12 w-12 animate-spin text-slate-500" /><p className="mt-4 text-slate-500">Loading document...</p>diff --git a/apps/web/src/app/(dashboard)/documents/[id]/loading.tsx b/apps/web/src/app/(dashboard)/documents/[id]/loading.tsxindex e68b149dc..e97489a6e 100644--- a/apps/web/src/app/(dashboard)/documents/[id]/loading.tsx+++ b/apps/web/src/app/(dashboard)/documents/[id]/loading.tsx@@ -4,7 +4,7 @@ import { ChevronLeft, Loader } from 'lucide-react';export default function Loading() {return (- <div className="mx-auto -mt-4 flex w-full max-w-screen-xl flex-col px-4 md:px-8">+ <div className="flex-col mx-auto -mt-4 flex w-full max-w-screen-xl px-4 md:px-8"><Link href="/documents" className="flex grow-0 items-center text-[#7AC455] hover:opacity-80"><ChevronLeft className="mr-2 inline-block h-5 w-5" />Documents@@ -13,15 +13,15 @@ export default function Loading() {Loading Document...</h1><div className="mt-8 grid min-h-[80vh] w-full grid-cols-12 gap-x-8">- <div className="dark:bg-background border-documenso col-span-7 rounded-xl border-2 bg-white/50 p-2 before:rounded-xl">- <div className="flex min-h-[80vh] flex-col items-center justify-center">+ <div className="dark:bg-background border-border col-span-12 rounded-xl border-2 bg-white/50 p-2 before:rounded-xl lg:col-span-6 xl:col-span-7">+ <div className="flex-col flex min-h-[80vh] items-center justify-center"><Loader className="text-documenso h-12 w-12 animate-spin" /><p className="text-muted-foreground mt-4">Loading document...</p></div></div>- <div className="bg-background border-documenso col-span-5 rounded-xl border-2 before:rounded-xl" />+ <div className="bg-background border-border col-span-12 rounded-xl border-2 before:rounded-xl lg:col-span-6 xl:col-span-5" /></div></div>);diff --git a/apps/web/src/app/(dashboard)/documents/[id]/page.tsx b/apps/web/src/app/(dashboard)/documents/[id]/page.tsxindex 7f3b76909..94fb8ad96 100644--- a/apps/web/src/app/(dashboard)/documents/[id]/page.tsx+++ b/apps/web/src/app/(dashboard)/documents/[id]/page.tsx@@ -1,14 +1,15 @@import Link from 'next/link';import { redirect } from 'next/navigation';-import { ChevronLeft } from 'lucide-react';+import { ChevronLeft, Users2 } from 'lucide-react';import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';-import { EditDocumentForm } from '~/components/forms/edit-document';+import { EditDocumentForm } from '~/app/(dashboard)/documents/[id]/edit-document';+import { DocumentStatus } from '~/components/formatter/document-status';export type DocumentPageProps = {params: {@@ -61,6 +62,18 @@ export default async function DocumentPage({ params }: DocumentPageProps) {{document.title}</h1>+ <div className="mt-2.5 flex items-center gap-x-6">+ <DocumentStatus inheritColor status={document.status} className="text-muted-foreground" />++ {recipients.length > 0 && (+ <div className="text-muted-foreground flex items-center">+ <Users2 className="mr-2 h-5 w-5" />++ <span>{recipients.length} Recipient(s)</span>+ </div>+ )}+ </div>+<EditDocumentFormclassName="mt-8"document={document}diff --git a/apps/web/src/app/(dashboard)/documents/[id]/sent/page.tsx b/apps/web/src/app/(dashboard)/documents/[id]/sent/page.tsxnew file mode 100644index 000000000..c2f90ae7a--- /dev/null+++ b/apps/web/src/app/(dashboard)/documents/[id]/sent/page.tsx@@ -0,0 +1,18 @@+import Link from 'next/link';++import { ChevronLeft } from 'lucide-react';++export default function DocumentSentPage() {+ return (+ <div className="flex-col mx-auto -mt-4 flex w-full max-w-screen-xl px-4 md:px-8">+ <Link href="/documents" className="flex grow-0 items-center text-[#7AC455] hover:opacity-80">+ <ChevronLeft className="mr-2 inline-block h-5 w-5" />+ Documents+ </Link>++ <h1 className="mt-4 max-w-xs grow-0 truncate text-2xl font-semibold md:text-3xl">+ Loading Document...+ </h1>+ </div>+ );+}diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsxindex 9ce82a4c0..9c60bbadf 100644--- a/apps/web/src/app/layout.tsx+++ b/apps/web/src/app/layout.tsx@@ -2,6 +2,7 @@ import { Inter } from 'next/font/google';import { TrpcProvider } from '@documenso/trpc/react';import { Toaster } from '@documenso/ui/primitives/toaster';+import { TooltipProvider } from '@documenso/ui/primitives/tooltip';import { ThemeProvider } from '~/providers/next-theme';import { PlausibleProvider } from '~/providers/plausible';@@ -47,7 +48,9 @@ export default function RootLayout({ children }: { children: React.ReactNode })<body><PlausibleProvider><ThemeProvider attribute="class" defaultTheme="system" enableSystem>- <TrpcProvider>{children}</TrpcProvider>+ <TooltipProvider>+ <TrpcProvider>{children}</TrpcProvider>+ </TooltipProvider></ThemeProvider></PlausibleProvider><Toaster />diff --git a/apps/web/src/components/(dashboard)/document-dropzone/document-dropzone.tsx b/apps/web/src/components/(dashboard)/document-dropzone/document-dropzone.tsxindex 3688bdfca..0cc8dd22a 100644--- a/apps/web/src/components/(dashboard)/document-dropzone/document-dropzone.tsx+++ b/apps/web/src/components/(dashboard)/document-dropzone/document-dropzone.tsx@@ -2,7 +2,6 @@import { Variants, motion } from 'framer-motion';import { Plus } from 'lucide-react';-import { useTheme } from 'next-themes';import { useDropzone } from 'react-dropzone';import { cn } from '@documenso/ui/lib/utils';@@ -92,8 +91,6 @@ export const DocumentDropzone = ({ className, onDrop, ...props }: DocumentDropzo},});- const { theme } = useTheme();-return (<motion.divclassName={cn('flex', className)}@@ -105,20 +102,19 @@ export const DocumentDropzone = ({ className, onDrop, ...props }: DocumentDropzo<Cardrole="button"className={cn(- 'focus-visible:ring-ring ring-offset-background flex flex-1 cursor-pointer flex-col items-center justify-center focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2',+ 'focus-visible:ring-ring ring-offset-background flex-col flex flex-1 cursor-pointer items-center justify-center focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2',className,)}gradient={true}degrees={120}-{...getRootProps()}{...props}>- <CardContent className="text-muted-foreground/40 flex flex-col items-center justify-center p-6">+ <CardContent className="text-muted-foreground/40 flex-col flex items-center justify-center p-6">{/* <FilePlus strokeWidth="1px" className="h-16 w-16"/> */}<div className="flex"><motion.div- className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 z-10 flex aspect-[3/4] w-24 origin-top-right -rotate-[22deg] flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"+ className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 flex-col z-10 flex aspect-[3/4] w-24 origin-top-right -rotate-[22deg] gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"variants={DocumentDropzoneCardLeftVariants}><div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />@@ -127,7 +123,7 @@ export const DocumentDropzone = ({ className, onDrop, ...props }: DocumentDropzo</motion.div><motion.div- className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 z-20 flex aspect-[3/4] w-24 flex-col items-center justify-center gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"+ className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 flex-col z-20 flex aspect-[3/4] w-24 items-center justify-center gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"variants={DocumentDropzoneCardCenterVariants}><Plus@@ -137,7 +133,7 @@ export const DocumentDropzone = ({ className, onDrop, ...props }: DocumentDropzo</motion.div><motion.div- className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 z-10 flex aspect-[3/4] w-24 origin-top-left rotate-[22deg] flex-col gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"+ className="border-muted-foreground/20 group-hover:border-documenso/80 dark:bg-muted/80 flex-col z-10 flex aspect-[3/4] w-24 origin-top-left rotate-[22deg] gap-y-1 rounded-lg border bg-white/80 px-2 py-4 backdrop-blur-sm"variants={DocumentDropzoneCardRightVariants}><div className="bg-muted-foreground/20 group-hover:bg-documenso h-2 w-full rounded-[2px]" />diff --git a/apps/web/src/components/(dashboard)/metric-card/metric-card.tsx b/apps/web/src/components/(dashboard)/metric-card/metric-card.tsxindex 9e5b1db0e..f59d42096 100644--- a/apps/web/src/components/(dashboard)/metric-card/metric-card.tsx+++ b/apps/web/src/components/(dashboard)/metric-card/metric-card.tsx@@ -1,6 +1,4 @@-import React from 'react';--import { LucideIcon } from 'lucide-react';+import type { LucideIcon } from 'lucide-react/dist/lucide-react';import { cn } from '@documenso/ui/lib/utils';@@ -15,7 +13,7 @@ export const CardMetric = ({ icon: Icon, title, value, className }: CardMetricPrreturn (<divclassName={cn(- 'border-border bg-background overflow-hidden rounded-lg border shadow shadow-transparent duration-200 hover:shadow-slate-100',+ 'border-border bg-background hover:shadow-border/80 overflow-hidden rounded-lg border shadow shadow-transparent duration-200',className,)}>diff --git a/apps/web/src/components/formatter/document-status.tsx b/apps/web/src/components/formatter/document-status.tsxindex 54feb3bd5..fbe1e1a3b 100644--- a/apps/web/src/components/formatter/document-status.tsx+++ b/apps/web/src/components/formatter/document-status.tsx@@ -1,6 +1,7 @@import { HTMLAttributes } from 'react';-import { CheckCircle2, Clock, File, LucideIcon } from 'lucide-react';+import { CheckCircle2, Clock, File } from 'lucide-react';+import type { LucideIcon } from 'lucide-react/dist/lucide-react';import { DocumentStatus as InternalDocumentStatus } from '@documenso/prisma/client';import { cn } from '@documenso/ui/lib/utils';@@ -31,14 +32,24 @@ const FRIENDLY_STATUS_MAP: Record<InternalDocumentStatus, FriendlyStatus> = {export type DocumentStatusProps = HTMLAttributes<HTMLSpanElement> & {status: InternalDocumentStatus;+ inheritColor?: boolean;};-export const DocumentStatus = ({ className, status, ...props }: DocumentStatusProps) => {+export const DocumentStatus = ({+ className,+ status,+ inheritColor,+ ...props+}: DocumentStatusProps) => {const { label, icon: Icon, color } = FRIENDLY_STATUS_MAP[status];return (<span className={cn('flex items-center', className)} {...props}>- <Icon className={cn('mr-2 inline-block h-4 w-4', color)} />+ <Icon+ className={cn('mr-2 inline-block h-4 w-4', {+ [color]: !inheritColor,+ })}+ />{label}</span>);diff --git a/apps/web/src/components/forms/edit-document.tsx b/apps/web/src/components/forms/edit-document.tsxdeleted file mode 100644index 482c63fae..000000000--- a/apps/web/src/components/forms/edit-document.tsx+++ /dev/null@@ -1,251 +0,0 @@-'use client';--import { useId, useState } from 'react';--import dynamic from 'next/dynamic';--import { zodResolver } from '@hookform/resolvers/zod';-import { Loader } from 'lucide-react';-import { useForm } from 'react-hook-form';--import { Document, Field, Recipient, User } from '@documenso/prisma/client';-import { trpc } from '@documenso/trpc/react';-import { cn } from '@documenso/ui/lib/utils';-import { Button } from '@documenso/ui/primitives/button';-import { Card, CardContent } from '@documenso/ui/primitives/card';--import { AddFieldsFormPartial } from './edit-document/add-fields';-import { AddSignersFormPartial } from './edit-document/add-signers';-import { AddSubjectFormPartial } from './edit-document/add-subject';-import { TEditDocumentFormSchema, ZEditDocumentFormSchema } from './edit-document/types';--const PDFViewer = dynamic(async () => import('~/components/(dashboard)/pdf-viewer/pdf-viewer'), {- ssr: false,- loading: () => (- <div className="dark:bg-background flex min-h-[80vh] flex-col items-center justify-center bg-white/50">- <Loader className="text-documenso h-12 w-12 animate-spin" />-- <p className="text-muted-foreground mt-4">Loading document...</p>- </div>- ),-});--const MAX_STEP = 2;--export type EditDocumentFormProps = {- className?: string;- user: User;- document: Document;- recipients: Recipient[];- fields: Field[];-};--export const EditDocumentForm = ({- className,- document,- recipients,- fields,- user: _user,-}: EditDocumentFormProps) => {- const initialId = useId();-- const [step, setStep] = useState(0);- const [nextStepLoading, setNextStepLoading] = useState(false);-- const documentUrl = `data:application/pdf;base64,${document.document}`;- const defaultSigners =- recipients.length > 0- ? recipients.map((recipient) => ({- nativeId: recipient.id,- formId: `${recipient.id}-${recipient.documentId}`,- name: recipient.name,- email: recipient.email,- }))- : [- {- formId: initialId,- name: '',- email: '',- },- ];-- const defaultFields = fields.map((field) => ({- nativeId: field.id,- formId: `${field.id}-${field.documentId}`,- pageNumber: field.page,- type: field.type,- pageX: Number(field.positionX),- pageY: Number(field.positionY),- pageWidth: Number(field.width),- pageHeight: Number(field.height),- signerEmail: recipients.find((recipient) => recipient.id === field.recipientId)?.email ?? '',- }));-- const { mutateAsync: setRecipientsForDocument } =- trpc.document.setRecipientsForDocument.useMutation();-- const { mutateAsync: setFieldsForDocument } = trpc.document.setFieldsForDocument.useMutation();-- const {- control,- handleSubmit,- watch,- trigger,- formState: { errors, isSubmitting },- } = useForm<TEditDocumentFormSchema>({- mode: 'onBlur',- defaultValues: {- signers: defaultSigners,- fields: defaultFields,- email: {- subject: '',- message: '',- },- },- resolver: zodResolver(ZEditDocumentFormSchema),- });-- const signersFormValue = watch('signers');- const fieldsFormValue = watch('fields');-- console.log({ state: watch(), errors });-- const canGoBack = step > 0;- const canGoNext = step < MAX_STEP;-- const onGoBackClick = () => setStep((prev) => Math.max(0, prev - 1));- const onGoNextClick = async () => {- setNextStepLoading(true);-- const passes = await trigger();-- if (step === 0) {- await setRecipientsForDocument({- documentId: document.id,- recipients: signersFormValue.map((signer) => ({- id: signer.nativeId ?? undefined,- name: signer.name,- email: signer.email,- })),- }).catch((err: unknown) => console.error(err));- }-- if (step === 1) {- await setFieldsForDocument({- documentId: document.id,- fields: fieldsFormValue.map((field) => ({- id: field.nativeId ?? undefined,- type: field.type,- signerEmail: field.signerEmail,- pageNumber: field.pageNumber,- pageX: field.pageX,- pageY: field.pageY,- pageWidth: field.pageWidth,- pageHeight: field.pageHeight,- })),- }).catch((err: unknown) => console.error(err));- }-- if (passes) {- setStep((prev) => Math.min(MAX_STEP, prev + 1));- }-- console.log({ passes });-- setNextStepLoading(false);- };-- return (- <div className={cn('grid w-full grid-cols-12 gap-x-8', className)}>- <Card className="col-span-7 rounded-xl before:rounded-xl" gradient>- <CardContent className="p-2">- <PDFViewer document={documentUrl} />- </CardContent>- </Card>-- <div className="col-span-5">- <form- className="dark:bg-background border-border sticky top-20 flex h-[calc(100vh-6rem)] max-h-screen flex-col rounded-xl border bg-[hsl(var(--widget))] px-4 py-6"- onSubmit={handleSubmit(console.log)}- >- {step === 0 && (- <AddSignersFormPartial- className="-mx-2 flex-1 overflow-y-hidden px-2"- control={control}- watch={watch}- errors={errors}- isSubmitting={isSubmitting}- />- )}-- {step === 1 && (- <AddFieldsFormPartial- className="-mx-2 flex-1 overflow-y-hidden px-2"- control={control}- watch={watch}- errors={errors}- isSubmitting={isSubmitting}- />- )}-- {step === 2 && (- <AddSubjectFormPartial- className="-mx-2 flex-1 overflow-y-hidden px-2"- control={control}- watch={watch}- errors={errors}- isSubmitting={isSubmitting}- />- )}-- <div className="mt-4 flex-shrink-0">- <p className="text-muted-foreground text-sm">- Add Signers ({step + 1}/{MAX_STEP + 1})- </p>-- <div className="bg-muted relative mt-4 h-[2px] rounded-md">- <div- className="bg-documenso absolute inset-y-0 left-0"- style={{- width: `${(100 / (MAX_STEP + 1)) * (step + 1)}%`,- }}- />- </div>-- <div className="mt-4 flex gap-x-4">- <Button- type="button"- className="dark:bg-muted dark:hover:bg-muted/80 flex-1 bg-black/5 hover:bg-black/10"- size="lg"- variant="secondary"- disabled={!canGoBack}- onClick={onGoBackClick}- >- Go Back- </Button>-- {step < MAX_STEP && (- <Button- type="button"- className="bg-documenso flex-1"- size="lg"- disabled={!canGoNext}- onClick={onGoNextClick}- >- {nextStepLoading && <Loader className="mr-2 h-5 w-5 animate-spin" />}- Continue- </Button>- )}-- {step === MAX_STEP && (- <Button type="submit" className="bg-documenso flex-1" size="lg">- Complete- </Button>- )}- </div>- </div>- </form>- </div>- </div>- );-};diff --git a/apps/web/src/components/forms/edit-document/add-fields.action.ts b/apps/web/src/components/forms/edit-document/add-fields.action.tsnew file mode 100644index 000000000..022c593de--- /dev/null+++ b/apps/web/src/components/forms/edit-document/add-fields.action.ts@@ -0,0 +1,31 @@+'use server';++import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';+import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document';++import { TAddFieldsFormSchema } from './add-fields.types';++export type AddFieldsActionInput = TAddFieldsFormSchema & {+ documentId: number;+};++export const addFields = async ({ documentId, fields }: AddFieldsActionInput) => {+ 'use server';++ const { id: userId } = await getRequiredServerComponentSession();++ await setFieldsForDocument({+ userId,+ documentId,+ fields: fields.map((field) => ({+ id: field.nativeId,+ signerEmail: field.signerEmail,+ type: field.type,+ pageNumber: field.pageNumber,+ pageX: field.pageX,+ pageY: field.pageY,+ pageWidth: field.pageWidth,+ pageHeight: field.pageHeight,+ })),+ });+};diff --git a/apps/web/src/components/forms/edit-document/add-fields.tsx b/apps/web/src/components/forms/edit-document/add-fields.tsxindex cf48b1f1d..889cdbf29 100644--- a/apps/web/src/components/forms/edit-document/add-fields.tsx+++ b/apps/web/src/components/forms/edit-document/add-fields.tsx@@ -3,12 +3,13 @@import { useCallback, useEffect, useRef, useState } from 'react';import { Caveat } from 'next/font/google';+import { useRouter } from 'next/navigation';-import { Check, ChevronsUpDown } from 'lucide-react';+import { Check, ChevronsUpDown, Info } from 'lucide-react';import { nanoid } from 'nanoid';-import { Control, FieldErrors, UseFormWatch, useFieldArray } from 'react-hook-form';+import { useFieldArray, useForm } from 'react-hook-form';-import { FieldType } from '@documenso/prisma/client';+import { Document, Field, FieldType, Recipient, SendStatus } from '@documenso/prisma/client';import { cn } from '@documenso/ui/lib/utils';import { Button } from '@documenso/ui/primitives/button';import { Card, CardContent } from '@documenso/ui/primitives/card';@@ -20,11 +21,23 @@ import {CommandItem,} from '@documenso/ui/primitives/command';import { Popover, PopoverContent, PopoverTrigger } from '@documenso/ui/primitives/popover';+import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';+import { useToast } from '@documenso/ui/primitives/use-toast';import { PDF_VIEWER_PAGE_SELECTOR } from '~/components/(dashboard)/pdf-viewer/types';+import { getBoundingClientRect } from '~/helpers/getBoundingClientRect';+import { addFields } from './add-fields.action';+import { TAddFieldsFormSchema } from './add-fields.types';+import {+ EditDocumentFormContainer,+ EditDocumentFormContainerActions,+ EditDocumentFormContainerContent,+ EditDocumentFormContainerFooter,+ EditDocumentFormContainerStep,+} from './container';import { FieldItem } from './field-item';-import { FRIENDLY_FIELD_TYPE, TEditDocumentFormSchema } from './types';+import { FRIENDLY_FIELD_TYPE } from './types';const fontCaveat = Caveat({weight: ['500'],@@ -40,31 +53,58 @@ const MIN_HEIGHT_PX = 60;const MIN_WIDTH_PX = 200;export type AddFieldsFormProps = {- className?: string;- control: Control<TEditDocumentFormSchema>;- watch: UseFormWatch<TEditDocumentFormSchema>;- errors: FieldErrors<TEditDocumentFormSchema>;- isSubmitting: boolean;+ recipients: Recipient[];+ fields: Field[];+ document: Document;+ onContinue?: () => void;+ onGoBack?: () => void;};export const AddFieldsFormPartial = ({- className,- control: control,- watch,- errors: _errors,- isSubmitting: _isSubmitting,+ recipients,+ fields,+ document,+ onContinue,+ onGoBack,}: AddFieldsFormProps) => {- const signers = watch('signers');- const fields = watch('fields');+ const { toast } = useToast();+ const router = useRouter();- const { append, remove, update } = useFieldArray({+ const {control,- name: 'fields',+ handleSubmit,+ formState: { isSubmitting },+ } = useForm<TAddFieldsFormSchema>({+ defaultValues: {+ fields: fields.map((field) => ({+ nativeId: field.id,+ formId: `${field.id}-${field.documentId}`,+ pageNumber: field.page,+ type: field.type,+ pageX: Number(field.positionX),+ pageY: Number(field.positionY),+ pageWidth: Number(field.width),+ pageHeight: Number(field.height),+ signerEmail:+ recipients.find((recipient) => recipient.id === field.recipientId)?.email ?? '',+ })),+ },});- const [selectedSigner, setSelectedSigner] = useState(() => signers[0]);+ const {+ append,+ remove,+ update,+ fields: localFields,+ } = useFieldArray({+ control,+ name: 'fields',+ });const [selectedField, setSelectedField] = useState<FieldType | null>(null);+ const [selectedSigner, setSelectedSigner] = useState<Recipient | null>(null);++ const hasSelectedSignerBeenSent = selectedSigner?.sendStatus === SendStatus.SENT;const [visible, setVisible] = useState(false);const [coords, setCoords] = useState({@@ -77,14 +117,60 @@ export const AddFieldsFormPartial = ({width: 0,});- const isWithinPageBounds = useCallback((event: MouseEvent) => {+ /**+ * Given a mouse event, find the nearest pdf page element.+ */+ const getPage = (event: MouseEvent) => {if (!(event.target instanceof HTMLElement)) {- return false;+ return null;}const target = event.target;+const $page =- target.closest(PDF_VIEWER_PAGE_SELECTOR) ?? target.querySelector(PDF_VIEWER_PAGE_SELECTOR);+ target.closest<HTMLElement>(PDF_VIEWER_PAGE_SELECTOR) ??+ target.querySelector<HTMLElement>(PDF_VIEWER_PAGE_SELECTOR);++ if (!$page) {+ return null;+ }++ return $page;+ };++ /**+ * Provided a page and a field, calculate the position of the field+ * as a percentage of the page width and height.+ */+ const getFieldPosition = (page: HTMLElement, field: HTMLElement) => {+ const {+ top: pageTop,+ left: pageLeft,+ height: pageHeight,+ width: pageWidth,+ } = getBoundingClientRect(page);++ const {+ top: fieldTop,+ left: fieldLeft,+ height: fieldHeight,+ width: fieldWidth,+ } = getBoundingClientRect(field);++ return {+ x: ((fieldLeft - pageLeft) / pageWidth) * 100,+ y: ((fieldTop - pageTop) / pageHeight) * 100,+ width: (fieldWidth / pageWidth) * 100,+ height: (fieldHeight / pageHeight) * 100,+ };+ };++ /**+ * Given a mouse event, determine if the mouse is within the bounds of the+ * nearest pdf page element.+ */+ const isWithinPageBounds = useCallback((event: MouseEvent) => {+ const $page = getPage(event);if (!$page) {return false;@@ -121,28 +207,17 @@ export const AddFieldsFormPartial = ({const onMouseClick = useCallback((event: MouseEvent) => {- if (!selectedField) {+ if (!selectedField || !selectedSigner) {return;}- if (!(event.target instanceof HTMLElement)) {- return;- }-- const target = event.target;-- const $page =- target.closest<HTMLElement>(PDF_VIEWER_PAGE_SELECTOR) ??- target.querySelector<HTMLElement>(PDF_VIEWER_PAGE_SELECTOR);+ const $page = getPage(event);if (!$page || !isWithinPageBounds(event)) {return;}- const { height, width } = $page.getBoundingClientRect();-- const top = $page.offsetTop;- const left = $page.offsetLeft;+ const { top, left, height, width } = getBoundingClientRect($page);const pageNumber = parseInt($page.getAttribute('data-page-number') ?? '1', 10);@@ -172,14 +247,14 @@ export const AddFieldsFormPartial = ({setVisible(false);setSelectedField(null);},- [append, isWithinPageBounds, selectedField, selectedSigner.email],+ [append, isWithinPageBounds, selectedField, selectedSigner],);const onFieldResize = useCallback((node: HTMLElement, index: number) => {- const field = fields[index];+ const field = localFields[index];- const $page = document.querySelector<HTMLElement>(+ const $page = window.document.querySelector<HTMLElement>(`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${field.pageNumber}"]`,);@@ -187,71 +262,69 @@ export const AddFieldsFormPartial = ({return;}- const { height: pageHeight, width: pageWidth } = $page.getBoundingClientRect();-- const pageTop = $page.offsetTop;- const pageLeft = $page.offsetLeft;-- let { top: nodeTop, left: nodeLeft } = node.getBoundingClientRect();- const { height, width } = node.getBoundingClientRect();-- nodeTop += window.scrollY;- nodeLeft += window.scrollX;-- // Calculate width and height as a percentage of the page width and height- const newWidth = (width / pageWidth) * 100;- const newHeight = (height / pageHeight) * 100;-- // Calculate the new position as a percentage of the page width and height- const newX = ((nodeLeft - pageLeft) / pageWidth) * 100;- const newY = ((nodeTop - pageTop) / pageHeight) * 100;+ const {+ x: pageX,+ y: pageY,+ width: pageWidth,+ height: pageHeight,+ } = getFieldPosition($page, node);update(index, {...field,- pageX: newX,- pageY: newY,- pageWidth: newWidth,- pageHeight: newHeight,+ pageX,+ pageY,+ pageWidth,+ pageHeight,});},- [fields, update],+ [localFields, update],);const onFieldMove = useCallback((node: HTMLElement, index: number) => {- const field = fields[index];+ const field = localFields[index];- const $page = document.querySelector(+ const $page = window.document.querySelector<HTMLElement>(`${PDF_VIEWER_PAGE_SELECTOR}[data-page-number="${field.pageNumber}"]`,);- if (!$page || !($page instanceof HTMLElement)) {+ if (!$page) {return;}- const { height: pageHeight, width: pageWidth } = $page.getBoundingClientRect();-- const pageTop = $page.offsetTop;- const pageLeft = $page.offsetLeft;-- let { top: nodeTop, left: nodeLeft } = node.getBoundingClientRect();-- nodeTop += window.scrollY;- nodeLeft += window.scrollX;-- // Calculate the new position as a percentage of the page width and height- const newX = ((nodeLeft - pageLeft) / pageWidth) * 100;- const newY = ((nodeTop - pageTop) / pageHeight) * 100;+ const { x: pageX, y: pageY } = getFieldPosition($page, node);update(index, {...field,- pageX: newX,- pageY: newY,+ pageX,+ pageY,});},- [fields, update],+ [localFields, update],);+ const onFormSubmit = handleSubmit(async (data: TAddFieldsFormSchema) => {+ try {+ // Custom invocation server action+ await addFields({+ documentId: document.id,+ fields: data.fields,+ });++ router.refresh();++ onContinue?.();+ } catch (err) {+ console.error(err);++ toast({+ title: 'Error',+ description: 'An error occurred while adding signers.',+ variant: 'destructive',+ });+ }+ });+useEffect(() => {if (selectedField) {window.addEventListener('mousemove', onMouseMove);@@ -265,7 +338,7 @@ export const AddFieldsFormPartial = ({}, [onMouseClick, onMouseMove, selectedField]);useEffect(() => {- const $page = document.querySelector(PDF_VIEWER_PAGE_SELECTOR);+ const $page = window.document.querySelector(PDF_VIEWER_PAGE_SELECTOR);if (!$page) {return;@@ -279,183 +352,226 @@ export const AddFieldsFormPartial = ({};}, []);+ useEffect(() => {+ setSelectedSigner(recipients.find((r) => r.sendStatus !== SendStatus.SENT) ?? recipients[0]);+ }, [recipients]);+return (- <div className={cn('flex flex-col', className)}>- {selectedField && visible && (- <Card- className="border-primary pointer-events-none fixed z-50 cursor-pointer bg-white"- style={{- top: coords.y,- left: coords.x,- height: fieldBounds.current.height,- width: fieldBounds.current.width,- }}- >- <CardContent className="text-foreground flex h-full w-full items-center justify-center p-2">- {FRIENDLY_FIELD_TYPE[selectedField]}- </CardContent>- </Card>- )}-- {fields.map((field, index) => (- <FieldItem- key={index}- field={field}- disabled={selectedSigner.email !== field.signerEmail}- minHeight={fieldBounds.current.height}- minWidth={fieldBounds.current.width}- passive={visible && !!selectedField}- onResize={(options) => onFieldResize(options, index)}- onMove={(options) => onFieldMove(options, index)}- onRemove={() => remove(index)}- />- ))}-- <h3 className="text-2xl font-semibold">Add Fields</h3>-- <p className="text-muted-foreground mt-2 text-sm">- Add all relevant fields for each recipient.- </p>-- <hr className="mb-8 mt-4" />-- <Popover>- <PopoverTrigger asChild>- <Button- type="button"- variant="outline"- role="combobox"- className="bg-background text-muted-foreground justify-between font-normal"- >- {selectedSigner.name && (- <span>- {selectedSigner.name} ({selectedSigner.email})- </span>- )}-- {!selectedSigner.name && <span>{selectedSigner.email}</span>}-- <ChevronsUpDown className="ml-2 h-4 w-4" />- </Button>- </PopoverTrigger>-- <PopoverContent className="p-0" align="start">- <Command>- <CommandInput />- <CommandEmpty />-- <CommandGroup>- {signers.map((signer, index) => (- <CommandItem key={index} onSelect={() => setSelectedSigner(signer)}>- <Check- aria-hidden={signer !== selectedSigner}- className={cn('mr-2 h-4 w-4', {- 'opacity-0': signer !== selectedSigner,- 'opacity-100': signer === selectedSigner,- })}- />- {signer.name && (- <span>- {signer.name} ({signer.email})- </span>- )}-- {!signer.name && <span>{signer.email}</span>}- </CommandItem>- ))}- </CommandGroup>- </Command>- </PopoverContent>- </Popover>-- <div className="-mx-2 mt-8 flex-1 overflow-y-scroll px-2">- <div className="mt-4 grid grid-cols-2 gap-x-4 gap-y-8">- <button- type="button"- className="group h-full w-full"- onClick={() => setSelectedField(FieldType.SIGNATURE)}- data-selected={selectedField === FieldType.SIGNATURE ? true : undefined}- >- <Card className="group-data-[selected]:border-documenso h-full w-full cursor-pointer">- <CardContent className="flex flex-col items-center justify-center px-6 py-4">- <p- className={cn(- 'text-muted-foreground group-data-[selected]:text-foreground text-3xl font-medium',- fontCaveat.className,- )}- >- {selectedSigner.name || 'Signature'}- </p>-- <p className="text-muted-foreground mt-2 text-center text-xs">Signature</p>- </CardContent>- </Card>- </button>-- <button- type="button"- className="group h-full w-full"- onClick={() => setSelectedField(FieldType.EMAIL)}- data-selected={selectedField === FieldType.EMAIL ? true : undefined}- >- <Card className="group-data-[selected]:border-documenso h-full w-full cursor-pointer">- <CardContent className="flex flex-col items-center justify-center px-6 py-4">- <p- className={cn(- 'text-muted-foreground group-data-[selected]:text-foreground text-xl font-medium',- )}- >- {'Email'}- </p>-- <p className="text-muted-foreground mt-2 text-xs">Email</p>+ <EditDocumentFormContainer>+ <EditDocumentFormContainerContent+ title="Add Fields"+ description="Add all relevant fields for each recipient."+ >+ <div className="flex-col flex">+ {selectedField && visible && (+ <Card+ className="border-primary pointer-events-none fixed z-50 cursor-pointer bg-white"+ style={{+ top: coords.y,+ left: coords.x,+ height: fieldBounds.current.height,+ width: fieldBounds.current.width,+ }}+ >+ <CardContent className="text-foreground flex h-full w-full items-center justify-center p-2">+ {FRIENDLY_FIELD_TYPE[selectedField]}</CardContent></Card>- </button>-- <button- type="button"- className="group h-full w-full"- onClick={() => setSelectedField(FieldType.NAME)}- data-selected={selectedField === FieldType.NAME ? true : undefined}- >- <Card className="group-data-[selected]:border-documenso h-full w-full cursor-pointer">- <CardContent className="flex flex-col items-center justify-center px-6 py-4">- <p- className={cn(- 'text-muted-foreground group-data-[selected]:text-foreground text-xl font-medium',- )}- >- {'Name'}- </p>-- <p className="text-muted-foreground mt-2 text-xs">Name</p>- </CardContent>- </Card>- </button>-- <button- type="button"- className="group h-full w-full"- onClick={() => setSelectedField(FieldType.DATE)}- data-selected={selectedField === FieldType.DATE ? true : undefined}- >- <Card className="group-data-[selected]:border-documenso h-full w-full cursor-pointer">- <CardContent className="flex flex-col items-center justify-center px-6 py-4">- <p- className={cn(- 'text-muted-foreground group-data-[selected]:text-foreground text-xl font-medium',- )}- >- {'Date'}- </p>-- <p className="text-muted-foreground mt-2 text-xs">Date</p>- </CardContent>- </Card>- </button>+ )}++ {localFields.map((field, index) => (+ <FieldItem+ key={index}+ field={field}+ disabled={selectedSigner?.email !== field.signerEmail || hasSelectedSignerBeenSent}+ minHeight={fieldBounds.current.height}+ minWidth={fieldBounds.current.width}+ passive={visible && !!selectedField}+ onResize={(options) => onFieldResize(options, index)}+ onMove={(options) => onFieldMove(options, index)}+ onRemove={() => remove(index)}+ />+ ))}++ <Popover>+ <PopoverTrigger asChild>+ <Button+ type="button"+ variant="outline"+ role="combobox"+ className="bg-background text-muted-foreground justify-between font-normal"+ >+ {selectedSigner?.email && (+ <span className="flex-1 truncate text-left">+ {selectedSigner?.email} ({selectedSigner?.email})+ </span>+ )}++ {!selectedSigner?.email && (+ <span className="flex-1 truncate text-left">{selectedSigner?.email}</span>+ )}++ <ChevronsUpDown className="ml-2 h-4 w-4" />+ </Button>+ </PopoverTrigger>++ <PopoverContent className="p-0" align="start">+ <Command>+ <CommandInput />+ <CommandEmpty />++ <CommandGroup>+ {recipients.map((recipient, index) => (+ <CommandItem+ key={index}+ className={cn({+ 'text-muted-foreground': recipient.sendStatus === SendStatus.SENT,+ })}+ onSelect={() => setSelectedSigner(recipient)}+ >+ {recipient.sendStatus !== SendStatus.SENT ? (+ <Check+ aria-hidden={recipient !== selectedSigner}+ className={cn('mr-2 h-4 w-4 flex-shrink-0', {+ 'opacity-0': recipient !== selectedSigner,+ 'opacity-100': recipient === selectedSigner,+ })}+ />+ ) : (+ <Tooltip>+ <TooltipTrigger>+ <Info className="mr-2 h-4 w-4" />+ </TooltipTrigger>+ <TooltipContent className="max-w-xs">+ This document has already been sent to this recipient. You can no longer+ edit this recipient.+ </TooltipContent>+ </Tooltip>+ )}++ {recipient.name && (+ <span className="truncate" title={`${recipient.name} (${recipient.email})`}>+ {recipient.name} ({recipient.email})+ </span>+ )}++ {!recipient.name && (+ <span className="truncate" title={recipient.email}>+ {recipient.email}+ </span>+ )}+ </CommandItem>+ ))}+ </CommandGroup>+ </Command>+ </PopoverContent>+ </Popover>++ <div className="-mx-2 mt-8 flex-1 overflow-y-scroll px-2">+ <div className="mt-4 grid grid-cols-2 gap-x-4 gap-y-8">+ <button+ type="button"+ className="group h-full w-full"+ disabled={!selectedSigner || selectedSigner?.sendStatus === SendStatus.SENT}+ onClick={() => setSelectedField(FieldType.SIGNATURE)}+ data-selected={selectedField === FieldType.SIGNATURE ? true : undefined}+ >+ <Card className="group-data-[selected]:border-documenso h-full w-full cursor-pointer group-disabled:opacity-50">+ <CardContent className="flex-col flex items-center justify-center px-6 py-4">+ <p+ className={cn(+ 'text-muted-foreground group-data-[selected]:text-foreground text-3xl font-medium',+ fontCaveat.className,+ )}+ >+ {selectedSigner?.name || 'Signature'}+ </p>++ <p className="text-muted-foreground mt-2 text-center text-xs">Signature</p>+ </CardContent>+ </Card>+ </button>++ <button+ type="button"+ className="group h-full w-full"+ disabled={!selectedSigner || selectedSigner?.sendStatus === SendStatus.SENT}+ onClick={() => setSelectedField(FieldType.EMAIL)}+ data-selected={selectedField === FieldType.EMAIL ? true : undefined}+ >+ <Card className="group-data-[selected]:border-documenso h-full w-full cursor-pointer group-disabled:opacity-50">+ <CardContent className="flex-col flex items-center justify-center px-6 py-4">+ <p+ className={cn(+ 'text-muted-foreground group-data-[selected]:text-foreground text-xl font-medium',+ )}+ >+ {'Email'}+ </p>++ <p className="text-muted-foreground mt-2 text-xs">Email</p>+ </CardContent>+ </Card>+ </button>++ <button+ type="button"+ className="group h-full w-full"+ disabled={!selectedSigner || selectedSigner?.sendStatus === SendStatus.SENT}+ onClick={() => setSelectedField(FieldType.NAME)}+ data-selected={selectedField === FieldType.NAME ? true : undefined}+ >+ <Card className="group-data-[selected]:border-documenso h-full w-full cursor-pointer group-disabled:opacity-50">+ <CardContent className="flex-col flex items-center justify-center px-6 py-4">+ <p+ className={cn(+ 'text-muted-foreground group-data-[selected]:text-foreground text-xl font-medium',+ )}+ >+ {'Name'}+ </p>++ <p className="text-muted-foreground mt-2 text-xs">Name</p>+ </CardContent>+ </Card>+ </button>++ <button+ type="button"+ className="group h-full w-full"+ disabled={!selectedSigner || selectedSigner?.sendStatus === SendStatus.SENT}+ onClick={() => setSelectedField(FieldType.DATE)}+ data-selected={selectedField === FieldType.DATE ? true : undefined}+ >+ <Card className="group-data-[selected]:border-documenso h-full w-full cursor-pointer group-disabled:opacity-50">+ <CardContent className="flex-col flex items-center justify-center px-6 py-4">+ <p+ className={cn(+ 'text-muted-foreground group-data-[selected]:text-foreground text-xl font-medium',+ )}+ >+ {'Date'}+ </p>++ <p className="text-muted-foreground mt-2 text-xs">Date</p>+ </CardContent>+ </Card>+ </button>+ </div>+ </div></div>- </div>- </div>+ </EditDocumentFormContainerContent>++ <EditDocumentFormContainerFooter>+ <EditDocumentFormContainerStep title="Add Fields" step={2} maxStep={3} />++ <EditDocumentFormContainerActions+ loading={isSubmitting}+ disabled={isSubmitting}+ onGoNextClick={() => onFormSubmit()}+ onGoBackClick={onGoBack}+ />+ </EditDocumentFormContainerFooter>+ </EditDocumentFormContainer>);};diff --git a/apps/web/src/components/forms/edit-document/add-fields.types.ts b/apps/web/src/components/forms/edit-document/add-fields.types.tsnew file mode 100644index 000000000..e7a509632--- /dev/null+++ b/apps/web/src/components/forms/edit-document/add-fields.types.ts@@ -0,0 +1,21 @@+import { z } from 'zod';++import { FieldType } from '@documenso/prisma/client';++export const ZAddFieldsFormSchema = z.object({+ fields: z.array(+ z.object({+ formId: z.string().min(1),+ nativeId: z.number().optional(),+ type: z.nativeEnum(FieldType),+ signerEmail: z.string().min(1),+ pageNumber: z.number().min(1),+ pageX: z.number().min(0),+ pageY: z.number().min(0),+ pageWidth: z.number().min(0),+ pageHeight: z.number().min(0),+ }),+ ),+});++export type TAddFieldsFormSchema = z.infer<typeof ZAddFieldsFormSchema>;diff --git a/apps/web/src/components/forms/edit-document/add-signers.action.ts b/apps/web/src/components/forms/edit-document/add-signers.action.tsnew file mode 100644index 000000000..a37c12af8--- /dev/null+++ b/apps/web/src/components/forms/edit-document/add-signers.action.ts@@ -0,0 +1,26 @@+'use server';++import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';+import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document';++import { TAddSignersFormSchema } from './add-signers.types';++export type AddSignersActionInput = TAddSignersFormSchema & {+ documentId: number;+};++export const addSigners = async ({ documentId, signers }: AddSignersActionInput) => {+ 'use server';++ const { id: userId } = await getRequiredServerComponentSession();++ await setRecipientsForDocument({+ userId,+ documentId,+ recipients: signers.map((signer) => ({+ id: signer.nativeId,+ email: signer.email,+ name: signer.name,+ })),+ });+};diff --git a/apps/web/src/components/forms/edit-document/add-signers.tsx b/apps/web/src/components/forms/edit-document/add-signers.tsxindex 88427eee2..08cdeb4cb 100644--- a/apps/web/src/components/forms/edit-document/add-signers.tsx+++ b/apps/web/src/components/forms/edit-document/add-signers.tsx@@ -1,35 +1,76 @@'use client';-import React from 'react';+import React, { useId } from 'react';++import { useRouter } from 'next/navigation';import { AnimatePresence, motion } from 'framer-motion';import { Plus, Trash } from 'lucide-react';import { nanoid } from 'nanoid';-import { Control, Controller, FieldErrors, UseFormWatch, useFieldArray } from 'react-hook-form';+import { Controller, useFieldArray, useForm } from 'react-hook-form';-import { cn } from '@documenso/ui/lib/utils';+import { Document, Field, Recipient, SendStatus } from '@documenso/prisma/client';import { Button } from '@documenso/ui/primitives/button';import { Input } from '@documenso/ui/primitives/input';import { Label } from '@documenso/ui/primitives/label';+import { useToast } from '@documenso/ui/primitives/use-toast';import { FormErrorMessage } from '~/components/form/form-error-message';-import { TEditDocumentFormSchema } from './types';+import { addSigners } from './add-signers.action';+import { TAddSignersFormSchema } from './add-signers.types';+import {+ EditDocumentFormContainer,+ EditDocumentFormContainerActions,+ EditDocumentFormContainerContent,+ EditDocumentFormContainerFooter,+ EditDocumentFormContainerStep,+} from './container';export type AddSignersFormProps = {- className?: string;- control: Control<TEditDocumentFormSchema>;- watch: UseFormWatch<TEditDocumentFormSchema>;- errors: FieldErrors<TEditDocumentFormSchema>;- isSubmitting: boolean;+ recipients: Recipient[];+ fields: Field[];+ document: Document;+ onContinue?: () => void;+ onGoBack?: () => void;};export const AddSignersFormPartial = ({- className,- control,- errors,- isSubmitting,+ recipients,+ fields: _fields,+ document: document,+ onContinue,+ onGoBack,}: AddSignersFormProps) => {+ const { toast } = useToast();+ const router = useRouter();++ const initialId = useId();++ const {+ control,+ handleSubmit,+ formState: { errors, isSubmitting },+ } = useForm<TAddSignersFormSchema>({+ defaultValues: {+ signers:+ recipients.length > 0+ ? recipients.map((recipient) => ({+ nativeId: recipient.id,+ formId: String(recipient.id),+ name: recipient.name,+ email: recipient.email,+ }))+ : [+ {+ formId: initialId,+ name: '',+ email: '',+ },+ ],+ },+ });+const {append: appendSigner,fields: signers,@@ -39,10 +80,15 @@ export const AddSignersFormPartial = ({name: 'signers',});- const { remove: removeField, fields: fields } = useFieldArray({- name: 'fields',- control,- });+ const hasBeenSentToRecipientId = (id?: number) => {+ if (!id) {+ return false;+ }++ return recipients.some(+ (recipient) => recipient.id === id && recipient.sendStatus === SendStatus.SENT,+ );+ };const onAddSigner = () => {appendSigner({@@ -55,17 +101,17 @@ export const AddSignersFormPartial = ({const onRemoveSigner = (index: number) => {const signer = signers[index];- removeSigner(index);-- const fieldsToRemove: number[] = [];+ if (hasBeenSentToRecipientId(signer.nativeId)) {+ toast({+ title: 'Cannot remove signer',+ description: 'This signer has already received the document.',+ variant: 'destructive',+ });- fields.forEach((field, fieldIndex) => {- if (field.signerEmail === signer.email) {- fieldsToRemove.push(fieldIndex);- }- });+ return;+ }- removeField(fieldsToRemove);+ removeSigner(index);};const onKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {@@ -74,21 +120,42 @@ export const AddSignersFormPartial = ({}};- return (- <div className={cn('flex flex-col', className)}>- <h3 className="text-foreground text-2xl font-semibold">Add Signers</h3>-- <p className="text-muted-foreground mt-2 text-sm">- Add the people who will sign the document.- </p>-- <hr className="border-border mb-8 mt-4" />+ const onFormSubmit = handleSubmit(async (data: TAddSignersFormSchema) => {+ try {+ // Custom invocation server action+ await addSigners({+ documentId: document.id,+ signers: data.signers,+ });++ router.refresh();++ onContinue?.();+ } catch (err) {+ console.error(err);++ toast({+ title: 'Error',+ description: 'An error occurred while adding signers.',+ variant: 'destructive',+ });+ }+ });- <div className="-mx-2 flex flex-1 flex-col overflow-y-auto px-2">- <div className="flex w-full flex-col gap-y-4">+ return (+ <EditDocumentFormContainer onSubmit={onFormSubmit}>+ <EditDocumentFormContainerContent+ title="Add Signers"+ description="Add the people who will sign the document."+ >+ <div className="flex-col flex w-full gap-y-4"><AnimatePresence>{signers.map((signer, index) => (- <motion.div key={signer.formId} className="flex flex-wrap items-end gap-x-4">+ <motion.div+ key={signer.formId}+ data-native-id={signer.nativeId}+ className="flex flex-wrap items-end gap-x-4"+ ><div className="flex-1"><Label htmlFor={`signer-${signer.formId}-email`}>@@ -103,7 +170,7 @@ export const AddSignersFormPartial = ({id={`signer-${signer.formId}-email`}type="email"className="bg-background mt-2"- disabled={isSubmitting}+ disabled={isSubmitting || hasBeenSentToRecipientId(signer.nativeId)}onKeyDown={onKeyDown}{...field}/>@@ -122,7 +189,7 @@ export const AddSignersFormPartial = ({id={`signer-${signer.formId}-name`}type="text"className="bg-background mt-2"- disabled={isSubmitting}+ disabled={isSubmitting || hasBeenSentToRecipientId(signer.nativeId)}onKeyDown={onKeyDown}{...field}/>@@ -134,7 +201,11 @@ export const AddSignersFormPartial = ({<buttontype="button"className="inline-flex h-10 w-10 items-center justify-center text-slate-500 hover:opacity-80 disabled:cursor-not-allowed disabled:opacity-50"- disabled={isSubmitting || signers.length === 1}+ disabled={+ isSubmitting ||+ hasBeenSentToRecipientId(signer.nativeId) ||+ signers.length === 1+ }onClick={() => onRemoveSigner(index)}><Trash className="h-5 w-5" />@@ -158,7 +229,18 @@ export const AddSignersFormPartial = ({Add Signer</Button></div>- </div>- </div>+ </EditDocumentFormContainerContent>++ <EditDocumentFormContainerFooter>+ <EditDocumentFormContainerStep title="Add Signers" step={1} maxStep={3} />++ <EditDocumentFormContainerActions+ loading={isSubmitting}+ disabled={isSubmitting}+ onGoNextClick={() => onFormSubmit()}+ onGoBackClick={onGoBack}+ />+ </EditDocumentFormContainerFooter>+ </EditDocumentFormContainer>);};diff --git a/apps/web/src/components/forms/edit-document/add-signers.types.ts b/apps/web/src/components/forms/edit-document/add-signers.types.tsnew file mode 100644index 000000000..2b1418934--- /dev/null+++ b/apps/web/src/components/forms/edit-document/add-signers.types.ts@@ -0,0 +1,19 @@+import { z } from 'zod';++export const ZAddSignersFormSchema = z.object({+ signers: z+ .array(+ z.object({+ formId: z.string().min(1),+ nativeId: z.number().optional(),+ email: z.string().min(1).email(),+ name: z.string(),+ }),+ )+ .refine((signers) => {+ const emails = signers.map((signer) => signer.email);+ return new Set(emails).size === emails.length;+ }, 'Signers must have unique emails'),+});++export type TAddSignersFormSchema = z.infer<typeof ZAddSignersFormSchema>;diff --git a/apps/web/src/components/forms/edit-document/add-subject.action.ts b/apps/web/src/components/forms/edit-document/add-subject.action.tsnew file mode 100644index 000000000..3beb166ca--- /dev/null+++ b/apps/web/src/components/forms/edit-document/add-subject.action.ts@@ -0,0 +1,21 @@+'use server';++import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';+import { sendDocument } from '@documenso/lib/server-only/document/send-document';++import { TAddSubjectFormSchema } from './add-subject.types';++export type CompleteDocumentActionInput = TAddSubjectFormSchema & {+ documentId: number;+};++export const completeDocument = async ({ documentId }: CompleteDocumentActionInput) => {+ 'use server';++ const { id: userId } = await getRequiredServerComponentSession();++ await sendDocument({+ userId,+ documentId,+ });+};diff --git a/apps/web/src/components/forms/edit-document/add-subject.tsx b/apps/web/src/components/forms/edit-document/add-subject.tsxindex 2aedb0127..c5c2bdd83 100644--- a/apps/web/src/components/forms/edit-document/add-subject.tsx+++ b/apps/web/src/components/forms/edit-document/add-subject.tsx@@ -1,111 +1,169 @@'use client';-import { Control, Controller, FieldErrors, UseFormWatch } from 'react-hook-form';+import { useRouter } from 'next/navigation';-import { cn } from '@documenso/ui/lib/utils';+import { useForm } from 'react-hook-form';++import { Document, DocumentStatus, Field, Recipient } from '@documenso/prisma/client';import { Input } from '@documenso/ui/primitives/input';import { Label } from '@documenso/ui/primitives/label';import { Textarea } from '@documenso/ui/primitives/textarea';+import { useToast } from '@documenso/ui/primitives/use-toast';import { FormErrorMessage } from '~/components/form/form-error-message';-import { TEditDocumentFormSchema } from './types';+import { completeDocument } from './add-subject.action';+import { TAddSubjectFormSchema } from './add-subject.types';+import {+ EditDocumentFormContainer,+ EditDocumentFormContainerActions,+ EditDocumentFormContainerContent,+ EditDocumentFormContainerFooter,+ EditDocumentFormContainerStep,+} from './container';export type AddSubjectFormProps = {- className?: string;- control: Control<TEditDocumentFormSchema>;- watch: UseFormWatch<TEditDocumentFormSchema>;- errors: FieldErrors<TEditDocumentFormSchema>;- isSubmitting: boolean;+ recipients: Recipient[];+ fields: Field[];+ document: Document;+ onContinue?: () => void;+ onGoBack?: () => void;};export const AddSubjectFormPartial = ({- className,- control,- errors,- isSubmitting,+ recipients: _recipients,+ fields: _fields,+ document,+ onContinue,+ onGoBack,}: AddSubjectFormProps) => {- return (- <div className={cn('flex flex-col', className)}>- <h3 className="text-foreground text-2xl font-semibold">Add Subject</h3>-- <p className="text-muted-foreground mt-2 text-sm">- Add the subject and message you wish to send to signers.- </p>+ const { toast } = useToast();+ const router = useRouter();++ const {+ register,+ handleSubmit,+ formState: { errors, isSubmitting },+ } = useForm<TAddSubjectFormSchema>({+ defaultValues: {+ email: {+ subject: '',+ message: '',+ },+ },+ });++ const onFormSubmit = handleSubmit(async (data: TAddSubjectFormSchema) => {+ const { subject, message } = data.email;++ try {+ await completeDocument({+ documentId: document.id,+ email: {+ subject,+ message,+ },+ });++ router.refresh();++ onContinue?.();+ } catch (err) {+ console.error(err);++ toast({+ title: 'Error',+ description: 'An error occurred while sending the document.',+ variant: 'destructive',+ });+ }+ });- <hr className="border-border mb-8 mt-4" />-- <div className="flex flex-col gap-y-4">- <div>- <Label htmlFor="subject">- Subject <span className="text-muted-foreground">(Optional)</span>- </Label>+ return (+ <EditDocumentFormContainer>+ <EditDocumentFormContainerContent+ title="Add Subject"+ description="Add the subject and message you wish to send to signers."+ >+ <div className="flex-col flex">+ <div className="flex-col flex gap-y-4">+ <div>+ <Label htmlFor="subject">+ Subject <span className="text-muted-foreground">(Optional)</span>+ </Label>- <Controller- control={control}- name="email.subject"- render={({ field }) => (<Inputid="subject"// placeholder="Subject"className="bg-background mt-2"disabled={isSubmitting}- {...field}+ {...register('email.subject')}/>- )}- />- <FormErrorMessage className="mt-2" errors={errors} />- </div>+ <FormErrorMessage className="mt-2" error={errors.email?.subject} />+ </div>- <div>- <Label htmlFor="message">- Message <span className="text-muted-foreground">(Optional)</span>- </Label>+ <div>+ <Label htmlFor="message">+ Message <span className="text-muted-foreground">(Optional)</span>+ </Label>- <Controller- control={control}- name="email.message"- render={({ field }) => (<Textareaid="message"className="bg-background mt-2 h-32 resize-none"disabled={isSubmitting}- {...field}+ {...register('email.message')}/>- )}- />-- <FormErrorMessage className="mt-2" errors={errors} />- </div>- <div>- <p className="text-muted-foreground text-sm">- You can use the following variables in your message:- </p>-- <ul className="mt-2 flex list-inside list-disc flex-col gap-y-2 text-sm">- <li className="text-muted-foreground">- <code className="text-muted-foreground bg-muted-foreground/20 rounded p-1 text-sm">- {'{signer.name}'}- </code>{' '}- - The signer's name- </li>- <li className="text-muted-foreground">- <code className="text-muted-foreground bg-muted-foreground/20 rounded p-1 text-sm">- {'{signer.email}'}- </code>{' '}- - The signer's email- </li>- <li className="text-muted-foreground">- <code className="text-muted-foreground bg-muted-foreground/20 rounded p-1 text-sm">- {'{document.name}'}- </code>{' '}- - The document's name- </li>- </ul>+ <FormErrorMessage+ className="mt-2"+ error={+ typeof errors.email?.message !== 'string' ? errors.email?.message : undefined+ }+ />+ </div>++ <div>+ <p className="text-muted-foreground text-sm">+ You can use the following variables in your message:+ </p>++ <ul className="flex-col mt-2 flex list-inside list-disc gap-y-2 text-sm">+ <li className="text-muted-foreground">+ <code className="text-muted-foreground bg-muted-foreground/20 rounded p-1 text-sm">+ {'{signer.name}'}+ </code>{' '}+ - The signer's name+ </li>+ <li className="text-muted-foreground">+ <code className="text-muted-foreground bg-muted-foreground/20 rounded p-1 text-sm">+ {'{signer.email}'}+ </code>{' '}+ - The signer's email+ </li>+ <li className="text-muted-foreground">+ <code className="text-muted-foreground bg-muted-foreground/20 rounded p-1 text-sm">+ {'{document.name}'}+ </code>{' '}+ - The document's name+ </li>+ </ul>+ </div>+ </div></div>- </div>- </div>+ </EditDocumentFormContainerContent>++ <EditDocumentFormContainerFooter>+ <EditDocumentFormContainerStep title="Add Subject" step={3} maxStep={3} />++ <EditDocumentFormContainerActions+ loading={isSubmitting}+ disabled={isSubmitting}+ goNextLabel={document.status === DocumentStatus.DRAFT ? 'Send' : 'Update'}+ onGoNextClick={() => onFormSubmit()}+ onGoBackClick={onGoBack}+ />+ </EditDocumentFormContainerFooter>+ </EditDocumentFormContainer>);};diff --git a/apps/web/src/components/forms/edit-document/add-subject.types.ts b/apps/web/src/components/forms/edit-document/add-subject.types.tsnew file mode 100644index 000000000..33e2dedfb--- /dev/null+++ b/apps/web/src/components/forms/edit-document/add-subject.types.ts@@ -0,0 +1,10 @@+import { z } from 'zod';++export const ZAddSubjectFormSchema = z.object({+ email: z.object({+ subject: z.string(),+ message: z.string(),+ }),+});++export type TAddSubjectFormSchema = z.infer<typeof ZAddSubjectFormSchema>;diff --git a/apps/web/src/components/forms/edit-document/container.tsx b/apps/web/src/components/forms/edit-document/container.tsxnew file mode 100644index 000000000..8cc7738bd--- /dev/null+++ b/apps/web/src/components/forms/edit-document/container.tsx@@ -0,0 +1,152 @@+import React, { HTMLAttributes } from 'react';++import { Loader } from 'lucide-react';++import { cn } from '@documenso/ui/lib/utils';+import { Button } from '@documenso/ui/primitives/button';++export type EditDocumentFormContainerProps = HTMLAttributes<HTMLFormElement> & {+ children?: React.ReactNode;+};++export const EditDocumentFormContainer = ({+ children,+ id = 'edit-document-form',+ className,+ ...props+}: EditDocumentFormContainerProps) => {+ return (+ <form+ id={id}+ className={cn(+ 'dark:bg-background border-border bg-widget flex-col sticky top-20 flex h-[calc(100vh-6rem)] max-h-screen rounded-xl border px-4 py-6',+ className,+ )}+ {...props}+ >+ <div className={cn('flex-col -mx-2 flex flex-1 overflow-hidden px-2')}>{children}</div>+ </form>+ );+};++export type EditDocumentFormContainerContentProps = HTMLAttributes<HTMLDivElement> & {+ title: string;+ description: string;+ children?: React.ReactNode;+};++export const EditDocumentFormContainerContent = ({+ children,+ title,+ description,+ className,+ ...props+}: EditDocumentFormContainerContentProps) => {+ return (+ <div className={cn('flex-col flex flex-1', className)} {...props}>+ <h3 className="text-foreground text-2xl font-semibold">{title}</h3>++ <p className="text-muted-foreground mt-2 text-sm">{description}</p>++ <hr className="border-border mb-8 mt-4" />++ <div className="flex-col -mx-2 flex flex-1 overflow-y-auto px-2">{children}</div>+ </div>+ );+};++export type EditDocumentFormContainerFooterProps = HTMLAttributes<HTMLDivElement> & {+ children?: React.ReactNode;+};++export const EditDocumentFormContainerFooter = ({+ children,+ className,+ ...props+}: EditDocumentFormContainerFooterProps) => {+ return (+ <div className={cn('mt-4 flex-shrink-0', className)} {...props}>+ {children}+ </div>+ );+};++export type EditDocumentFormContainerStepProps = {+ title: string;+ step: number;+ maxStep: number;+};++export const EditDocumentFormContainerStep = ({+ title,+ step,+ maxStep,+}: EditDocumentFormContainerStepProps) => {+ return (+ <div>+ <p className="text-muted-foreground text-sm">+ {title}{' '}+ <span>+ ({step}/{maxStep})+ </span>+ </p>++ <div className="bg-muted relative mt-4 h-[2px] rounded-md">+ <div+ className="bg-documenso absolute inset-y-0 left-0"+ style={{+ width: `${(100 / maxStep) * step}%`,+ }}+ />+ </div>+ </div>+ );+};++export type EditDocumentFormContainerActionsProps = {+ canGoBack?: boolean;+ canGoNext?: boolean;+ goNextLabel?: string;+ goBackLabel?: string;+ onGoBackClick?: () => void;+ onGoNextClick?: () => void;+ loading?: boolean;+ disabled?: boolean;+};++export const EditDocumentFormContainerActions = ({+ canGoBack = true,+ canGoNext = true,+ goNextLabel = 'Continue',+ goBackLabel = 'Go Back',+ onGoBackClick,+ onGoNextClick,+ loading,+ disabled,+}: EditDocumentFormContainerActionsProps) => {+ return (+ <div className="mt-4 flex gap-x-4">+ <Button+ type="button"+ className="dark:bg-muted dark:hover:bg-muted/80 flex-1 bg-black/5 hover:bg-black/10"+ size="lg"+ variant="secondary"+ disabled={disabled || loading || !canGoBack}+ onClick={onGoBackClick}+ >+ {goBackLabel}+ </Button>++ <Button+ type="button"+ className="bg-documenso flex-1"+ size="lg"+ disabled={disabled || loading || !canGoNext}+ onClick={onGoNextClick}+ >+ {loading && <Loader className="mr-2 h-5 w-5 animate-spin" />}+ {goNextLabel}+ </Button>+ </div>+ );+};diff --git a/apps/web/src/components/forms/edit-document/field-item.tsx b/apps/web/src/components/forms/edit-document/field-item.tsxindex 0f6732a34..aa279e6ca 100644--- a/apps/web/src/components/forms/edit-document/field-item.tsx+++ b/apps/web/src/components/forms/edit-document/field-item.tsx@@ -1,6 +1,6 @@import { useCallback, useEffect, useState } from 'react';-import { X } from 'lucide-react';+import { Trash } from 'lucide-react';import { createPortal } from 'react-dom';import { Rnd } from 'react-rnd';@@ -53,8 +53,8 @@ export const FieldItem = ({const { height, width } = $page.getBoundingClientRect();- const top = $page.offsetTop;- const left = $page.offsetLeft;+ const top = $page.getBoundingClientRect().top + window.scrollY;+ const left = $page.getBoundingClientRect().left + window.scrollX;// X and Y are percentages of the page's height and widthconst pageX = (field.pageX / 100) * width + left;@@ -63,6 +63,24 @@ export const FieldItem = ({const pageHeight = (field.pageHeight / 100) * height;const pageWidth = (field.pageWidth / 100) * width;+ console.log(+ structuredClone({+ field,+ top,+ left,+ height,+ width,+ pageX: coords.pageX,+ pageY: coords.pageY,+ pageHeight: coords.pageHeight,+ pageWidth: coords.pageWidth,+ newPageX: pageX,+ newPageY: pageY,+ newPageHeight: pageHeight,+ newPageWidth: pageWidth,+ }),+ );+setCoords({pageX: pageX,pageY: pageY,@@ -92,10 +110,10 @@ export const FieldItem = ({key={coords.pageX + coords.pageY + coords.pageHeight + coords.pageWidth}className={cn('absolute z-20', {'pointer-events-none': passive,- 'pointer-events-none opacity-75': disabled,+ 'pointer-events-none z-10 opacity-75': disabled,})}- minHeight={minHeight}- minWidth={minWidth}+ // minHeight={minHeight}+ // minWidth={minWidth}default={{x: coords.pageX,y: coords.pageY,@@ -116,16 +134,17 @@ export const FieldItem = ({>{!disabled && (<button- className="bg-destructive absolute -right-2 -top-2 z-[9999] flex h-5 w-5 items-center justify-center rounded-full"+ className="text-muted-foreground/50 hover:text-muted-foreground/80 absolute -right-2 -top-2 z-[9999] flex h-8 w-8 items-center justify-center rounded-full border bg-white shadow-[0_0_0_2px_theme(colors.gray.100/70%)]"onClick={() => onRemove?.()}>- <X className="text-destructive-foreground h-4 w-4" />+ <Trash className="h-4 w-4" /></button>)}<Card- className={cn('hover:border-primary/50 h-full w-full bg-white', {- 'border-primary hover:border-primary': active,+ className={cn('h-full w-full bg-white', {+ 'border-primary': !disabled,+ 'border-primary/80': active,})}><CardContentdiff --git a/apps/web/src/components/forms/edit-document/send-document-action-dialog.tsx b/apps/web/src/components/forms/edit-document/send-document-action-dialog.tsxnew file mode 100644index 000000000..f295dadfc--- /dev/null+++ b/apps/web/src/components/forms/edit-document/send-document-action-dialog.tsx@@ -0,0 +1,64 @@+import { useState } from 'react';++import { Loader } from 'lucide-react';++import { Button, ButtonProps } from '@documenso/ui/primitives/button';+import {+ Dialog,+ DialogContent,+ DialogDescription,+ DialogFooter,+ DialogHeader,+ DialogTitle,+ DialogTrigger,+} from '@documenso/ui/primitives/dialog';++export type SendDocumentActionDialogProps = ButtonProps & {+ loading?: boolean;+};++export const SendDocumentActionDialog = ({+ loading,+ className,+ ...props+}: SendDocumentActionDialogProps) => {+ const [open, setOpen] = useState(false);++ return (+ <Dialog open={open} onOpenChange={setOpen}>+ <DialogTrigger asChild>+ <Button type="button" className={className}>+ {loading && <Loader className="text-documenso mr-2 h-5 w-5 animate-spin" />}+ Send+ </Button>+ </DialogTrigger>++ <DialogContent className="max-w-md">+ <DialogHeader>+ <DialogTitle className="text-center text-lg font-semibold">Send Document</DialogTitle>+ <DialogDescription className="text-center text-base">+ You are about to send this document to the recipients. Are you sure you want to+ continue?+ </DialogDescription>+ </DialogHeader>++ <DialogFooter className="mt-4 flex items-center gap-x-4">+ <Button+ className="dark:bg-muted dark:hover:bg-muted/80 dark:focus-visible:ring-muted/80 flex-1 border-none bg-black/5 hover:bg-black/10 focus-visible:ring-black/10"+ type="button"+ variant="secondary"+ onClick={() => setOpen(false)}+ >+ Cancel+ </Button>++ {/* We would use DialogAction here but it interrupts the submit action */}+ <Button className={className} {...props}>+ {loading && <Loader className="mr-2 h-5 w-5 animate-spin" />}+ Send+ </Button>+ </DialogFooter>+ </DialogContent>+ </Dialog>+ );+};diff --git a/apps/web/src/components/forms/password.tsx b/apps/web/src/components/forms/password.tsxindex eba0c9a43..44304753f 100644--- a/apps/web/src/components/forms/password.tsx+++ b/apps/web/src/components/forms/password.tsx@@ -81,7 +81,7 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {return (<form- className={cn('flex w-full flex-col gap-y-4', className)}+ className={cn('flex-col flex w-full gap-y-4', className)}onSubmit={handleSubmit(onFormSubmit)}><div>diff --git a/apps/web/src/helpers/getBoundingClientRect.ts b/apps/web/src/helpers/getBoundingClientRect.tsnew file mode 100644index 000000000..5d8d3e02f--- /dev/null+++ b/apps/web/src/helpers/getBoundingClientRect.ts@@ -0,0 +1,10 @@+export const getBoundingClientRect = (element: HTMLElement) => {+ const rect = element.getBoundingClientRect();++ const { width, height } = rect;++ const top = rect.top + window.scrollY;+ const left = rect.left + window.scrollX;++ return { top, left, width, height };+};diff --git a/apps/web/src/pages/api/stripe/webhook/index.ts b/apps/web/src/pages/api/stripe/webhook/index.tsindex 5db47c89a..dd15d4d81 100644--- a/apps/web/src/pages/api/stripe/webhook/index.ts+++ b/apps/web/src/pages/api/stripe/webhook/index.ts@@ -124,16 +124,16 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)document.document = await insertImageInPDF(document.document,signatureDataUrl,- field.positionX,- field.positionY,+ field.positionX.toNumber(),+ field.positionY.toNumber(),field.page,);} else {document.document = await insertTextInPDF(document.document,signatureText ?? '',- field.positionX,- field.positionY,+ field.positionX.toNumber(),+ field.positionY.toNumber(),field.page,);}diff --git a/package-lock.json b/package-lock.jsonindex 0a9c8f26d..825bf458d 100644--- a/package-lock.json+++ b/package-lock.json@@ -32,7 +32,7 @@"framer-motion": "^10.12.8","lucide-react": "^0.214.0","micro": "^10.0.1",- "next": "13.4.1",+ "next": "13.4.9","next-auth": "^4.22.1","next-plausible": "^3.7.2","perfect-freehand": "^1.2.0",@@ -66,7 +66,7 @@"lucide-react": "^0.214.0","micro": "^10.0.1","nanoid": "^4.0.2",- "next": "13.4.1",+ "next": "13.4.9","next-auth": "^4.22.1","next-plausible": "^3.7.2","next-themes": "^0.2.1",@@ -1366,22 +1366,22 @@}},"node_modules/@next/env": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.1.tgz",- "integrity": "sha512-eD6WCBMFjLFooLM19SIhSkWBHtaFrZFfg2Cxnyl3vS3DAdFRfnx5TY2RxlkuKXdIRCC0ySbtK9JXXt8qLCqzZg=="+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.9.tgz",+ "integrity": "sha512-vuDRK05BOKfmoBYLNi2cujG2jrYbEod/ubSSyqgmEx9n/W3eZaJQdRNhTfumO+qmq/QTzLurW487n/PM/fHOkw=="},"node_modules/@next/eslint-plugin-next": {- "version": "13.4.2",- "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.4.2.tgz",- "integrity": "sha512-ZeFWgrxwckxTpYM+ANeUL9E7LOGPbZKmI94LJIjbDU69iEIgqd4WD0l2pVbOJMr/+vgoZmJ9Dx1m0WJ7WScXHA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.4.9.tgz",+ "integrity": "sha512-nDtGpa992tNyAkT/KmSMy7QkHfNZmGCBYhHtafU97DubqxzNdvLsqRtliQ4FU04CysRCtvP2hg8rRC1sAKUTUA==","dependencies": {"glob": "7.1.7"}},"node_modules/@next/swc-darwin-arm64": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.1.tgz",- "integrity": "sha512-eF8ARHtYfnoYtDa6xFHriUKA/Mfj/cCbmKb3NofeKhMccs65G6/loZ15a6wYCCx4rPAd6x4t1WmVYtri7EdeBg==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.9.tgz",+ "integrity": "sha512-TVzGHpZoVBk3iDsTOQA/R6MGmFp0+17SWXMEWd6zG30AfuELmSSMe2SdPqxwXU0gbpWkJL1KgfLzy5ReN0crqQ==","cpu": ["arm64"],@@ -1394,9 +1394,9 @@}},"node_modules/@next/swc-darwin-x64": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.1.tgz",- "integrity": "sha512-7cmDgF9tGWTgn5Gw+vP17miJbH4wcraMHDCOHTYWkO/VeKT73dUWG23TNRLfgtCNSPgH4V5B4uLHoZTanx9bAw==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.9.tgz",+ "integrity": "sha512-aSfF1fhv28N2e7vrDZ6zOQ+IIthocfaxuMWGReB5GDriF0caTqtHttAvzOMgJgXQtQx6XhyaJMozLTSEXeNN+A==","cpu": ["x64"],@@ -1409,9 +1409,9 @@}},"node_modules/@next/swc-linux-arm64-gnu": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.1.tgz",- "integrity": "sha512-qwJqmCri2ie8aTtE5gjTSr8S6O8B67KCYgVZhv9gKH44yvc/zXbAY8u23QGULsYOyh1islWE5sWfQNLOj9iryg==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.9.tgz",+ "integrity": "sha512-JhKoX5ECzYoTVyIy/7KykeO4Z2lVKq7HGQqvAH+Ip9UFn1MOJkOnkPRB7v4nmzqAoY+Je05Aj5wNABR1N18DMg==","cpu": ["arm64"],@@ -1424,9 +1424,9 @@}},"node_modules/@next/swc-linux-arm64-musl": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.1.tgz",- "integrity": "sha512-qcC54tWNGDv/VVIFkazxhqH1Bnagjfs4enzELVRlUOoJPD2BGJTPI7z08pQPbbgxLtRiu8gl2mXvpB8WlOkMeA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.9.tgz",+ "integrity": "sha512-OOn6zZBIVkm/4j5gkPdGn4yqQt+gmXaLaSjRSO434WplV8vo2YaBNbSHaTM9wJpZTHVDYyjzuIYVEzy9/5RVZw==","cpu": ["arm64"],@@ -1439,9 +1439,9 @@}},"node_modules/@next/swc-linux-x64-gnu": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.1.tgz",- "integrity": "sha512-9TeWFlpLsBosZ+tsm/rWBaMwt5It9tPH8m3nawZqFUUrZyGRfGcI67js774vtx0k3rL9qbyY6+3pw9BCVpaYUA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.9.tgz",+ "integrity": "sha512-iA+fJXFPpW0SwGmx/pivVU+2t4zQHNOOAr5T378PfxPHY6JtjV6/0s1vlAJUdIHeVpX98CLp9k5VuKgxiRHUpg==","cpu": ["x64"],@@ -1454,9 +1454,9 @@}},"node_modules/@next/swc-linux-x64-musl": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.1.tgz",- "integrity": "sha512-sNDGaWmSqTS4QRUzw61wl4mVPeSqNIr1OOjLlQTRuyInxMxtqImRqdvzDvFTlDfdeUMU/DZhWGYoHrXLlZXe6A==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.9.tgz",+ "integrity": "sha512-rlNf2WUtMM+GAQrZ9gMNdSapkVi3koSW3a+dmBVp42lfugWVvnyzca/xJlN48/7AGx8qu62WyO0ya1ikgOxh6A==","cpu": ["x64"],@@ -1469,9 +1469,9 @@}},"node_modules/@next/swc-win32-arm64-msvc": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.1.tgz",- "integrity": "sha512-+CXZC7u1iXdLRudecoUYbhbsXpglYv8KFYsFxKBPn7kg+bk7eJo738wAA4jXIl8grTF2mPdmO93JOQym+BlYGA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.9.tgz",+ "integrity": "sha512-5T9ybSugXP77nw03vlgKZxD99AFTHaX8eT1ayKYYnGO9nmYhJjRPxcjU5FyYI+TdkQgEpIcH7p/guPLPR0EbKA==","cpu": ["arm64"],@@ -1484,9 +1484,9 @@}},"node_modules/@next/swc-win32-ia32-msvc": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.1.tgz",- "integrity": "sha512-vIoXVVc7UYO68VwVMDKwJC2+HqAZQtCYiVlApyKEeIPIQpz2gpufzGxk1z3/gwrJt/kJ5CDZjlhYDCzd3hdz+g==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.9.tgz",+ "integrity": "sha512-ojZTCt1lP2ucgpoiFgrFj07uq4CZsq4crVXpLGgQfoFq00jPKRPgesuGPaz8lg1yLfvafkU3Jd1i8snKwYR3LA==","cpu": ["ia32"],@@ -1499,9 +1499,9 @@}},"node_modules/@next/swc-win32-x64-msvc": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.1.tgz",- "integrity": "sha512-n8V5ImLQZibKTu10UUdI3nIeTLkliEXe628qxqW9v8My3BAH2a7H0SaCqkV2OgqFnn8sG1wxKYw9/SNJ632kSA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.9.tgz",+ "integrity": "sha512-QbT03FXRNdpuL+e9pLnu+XajZdm/TtIXVYY4lA9t+9l0fLZbHXDYEKitAqxrOj37o3Vx5ufxiRAniaIebYDCgw==","cpu": ["x64"],@@ -3205,6 +3205,15 @@"resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.0.tgz","integrity": "sha512-O+z53uwx64xY7D6roOi4+jApDGFg0qn6WHcxe5QeqjMaTezBO/mxdfFXIVAVVyNWKx84OmPB3L8kbVYOTeN34A=="},+ "node_modules/@types/nodemailer": {+ "version": "6.4.8",+ "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.8.tgz",+ "integrity": "sha512-oVsJSCkqViCn8/pEu2hfjwVO+Gb3e+eTWjg3PcjeFKRItfKpKwHphQqbYmPQrlMk+op7pNNWPbsJIEthpFN/OQ==",+ "dev": true,+ "dependencies": {+ "@types/node": "*"+ }+ },"node_modules/@types/normalize-package-data": {"version": "2.4.1","resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",@@ -4007,6 +4016,15 @@"node": ">= 0.8"}},+ "node_modules/cac": {+ "version": "6.7.14",+ "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",+ "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",+ "dev": true,+ "engines": {+ "node": ">=8"+ }+ },"node_modules/call-bind": {"version": "1.0.2","resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",@@ -5517,11 +5535,11 @@}},"node_modules/eslint-config-next": {- "version": "13.4.2",- "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.4.2.tgz",- "integrity": "sha512-zjLJ9B9bbeWSo5q+iHfdt8gVYyT+y2BpWDfjR6XMBtFRSMKRGjllDKxnuKBV1q2Y/QpwLM2PXHJTMRyblCmRAg==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.4.9.tgz",+ "integrity": "sha512-0fLtKRR268NArpqeXXwnLgMXPvF64YESQvptVg+RMLCaijKm3FICN9Y7Jc1p2o+yrWwE4DufJXDM/Vo53D1L7g==","dependencies": {- "@next/eslint-plugin-next": "13.4.2",+ "@next/eslint-plugin-next": "13.4.9","@rushstack/eslint-patch": "^1.1.3","@typescript-eslint/parser": "^5.42.0","eslint-import-resolver-node": "^0.3.6",@@ -5529,7 +5547,7 @@"eslint-plugin-import": "^2.26.0","eslint-plugin-jsx-a11y": "^6.5.1","eslint-plugin-react": "^7.31.7",- "eslint-plugin-react-hooks": "^4.5.0"+ "eslint-plugin-react-hooks": "5.0.0-canary-7118f5dd7-20230705"},"peerDependencies": {"eslint": "^7.23.0 || ^8.0.0",@@ -5541,6 +5559,17 @@}}},+ "node_modules/eslint-config-next/node_modules/eslint-plugin-react-hooks": {+ "version": "5.0.0-canary-7118f5dd7-20230705",+ "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0-canary-7118f5dd7-20230705.tgz",+ "integrity": "sha512-AZYbMo/NW9chdL7vk6HQzQhT+PvTAEVqWk9ziruUoW2kAOcN5qNyelv70e0F1VNQAbvutOC9oc+xfWycI9FxDw==",+ "engines": {+ "node": ">=10"+ },+ "peerDependencies": {+ "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"+ }+ },"node_modules/eslint-config-prettier": {"version": "8.8.0","resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz",@@ -5803,6 +5832,7 @@"version": "4.6.0","resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz","integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",+ "dev": true,"engines": {"node": ">=10"},@@ -6475,6 +6505,11 @@"node": ">= 6"}},+ "node_modules/glob-to-regexp": {+ "version": "0.4.1",+ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",+ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="+ },"node_modules/globals": {"version": "13.20.0","resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",@@ -7383,6 +7418,15 @@"url": "https://github.com/sponsors/panva"}},+ "node_modules/joycon": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",+ "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",+ "dev": true,+ "engines": {+ "node": ">=10"+ }+ },"node_modules/js-beautify": {"version": "1.14.8","resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.8.tgz",@@ -7604,6 +7648,15 @@"integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==","dev": true},+ "node_modules/load-tsconfig": {+ "version": "0.2.5",+ "resolved": "https://registry.npmjs.org/load-tsconfig/-/load-tsconfig-0.2.5.tgz",+ "integrity": "sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==",+ "dev": true,+ "engines": {+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"+ }+ },"node_modules/locate-path": {"version": "6.0.0","resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",@@ -7628,6 +7681,12 @@"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz","integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="},+ "node_modules/lodash.sortby": {+ "version": "4.7.0",+ "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",+ "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",+ "dev": true+ },"node_modules/lodash.truncate": {"version": "4.4.2","resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",@@ -7933,16 +7992,17 @@}},"node_modules/next": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/next/-/next-13.4.1.tgz",- "integrity": "sha512-JBw2kAIyhKDpjhEWvNVoFeIzNp9xNxg8wrthDOtMctfn3EpqGCmW0FSviNyGgOSOSn6zDaX48pmvbdf6X2W9xA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/next/-/next-13.4.9.tgz",+ "integrity": "sha512-vtefFm/BWIi/eWOqf1GsmKG3cjKw1k3LjuefKRcL3iiLl3zWzFdPG3as6xtxrGO6gwTzzaO1ktL4oiHt/uvTjA==","dependencies": {- "@next/env": "13.4.1",+ "@next/env": "13.4.9","@swc/helpers": "0.5.1","busboy": "1.6.0","caniuse-lite": "^1.0.30001406","postcss": "8.4.14","styled-jsx": "5.1.1",+ "watchpack": "2.4.0","zod": "3.21.4"},"bin": {@@ -7952,20 +8012,19 @@"node": ">=16.8.0"},"optionalDependencies": {- "@next/swc-darwin-arm64": "13.4.1",- "@next/swc-darwin-x64": "13.4.1",- "@next/swc-linux-arm64-gnu": "13.4.1",- "@next/swc-linux-arm64-musl": "13.4.1",- "@next/swc-linux-x64-gnu": "13.4.1",- "@next/swc-linux-x64-musl": "13.4.1",- "@next/swc-win32-arm64-msvc": "13.4.1",- "@next/swc-win32-ia32-msvc": "13.4.1",- "@next/swc-win32-x64-msvc": "13.4.1"+ "@next/swc-darwin-arm64": "13.4.9",+ "@next/swc-darwin-x64": "13.4.9",+ "@next/swc-linux-arm64-gnu": "13.4.9",+ "@next/swc-linux-arm64-musl": "13.4.9",+ "@next/swc-linux-x64-gnu": "13.4.9",+ "@next/swc-linux-x64-musl": "13.4.9",+ "@next/swc-win32-arm64-msvc": "13.4.9",+ "@next/swc-win32-ia32-msvc": "13.4.9",+ "@next/swc-win32-x64-msvc": "13.4.9"},"peerDependencies": {"@opentelemetry/api": "^1.1.0","fibers": ">= 3.1.0",- "node-sass": "^6.0.0 || ^7.0.0","react": "^18.2.0","react-dom": "^18.2.0","sass": "^1.3.0"@@ -7977,9 +8036,6 @@"fibers": {"optional": true},- "node-sass": {- "optional": true- },"sass": {"optional": true}@@ -8098,6 +8154,14 @@"node": ">=8"}},+ "node_modules/nodemailer": {+ "version": "6.9.3",+ "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.3.tgz",+ "integrity": "sha512-fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg==",+ "engines": {+ "node": ">=6.0.0"+ }+ },"node_modules/nopt": {"version": "5.0.0","resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",@@ -9690,6 +9754,22 @@"url": "https://github.com/sponsors/isaacs"}},+ "node_modules/rollup": {+ "version": "3.25.2",+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.2.tgz",+ "integrity": "sha512-VLnkxZMDr3jpxgtmS8pQZ0UvhslmF4ADq/9w4erkctbgjCqLW9oa89fJuXEs4ZmgyoF7Dm8rMDKSS5b5u2hHUg==",+ "dev": true,+ "bin": {+ "rollup": "dist/bin/rollup"+ },+ "engines": {+ "node": ">=14.18.0",+ "npm": ">=8.0.0"+ },+ "optionalDependencies": {+ "fsevents": "~2.3.2"+ }+ },"node_modules/run-applescript": {"version": "5.0.0","resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz",@@ -10596,6 +10676,15 @@"node": "*"}},+ "node_modules/tree-kill": {+ "version": "1.2.2",+ "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",+ "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",+ "dev": true,+ "bin": {+ "tree-kill": "cli.js"+ }+ },"node_modules/tree-node-cli": {"version": "1.6.0","resolved": "https://registry.npmjs.org/tree-node-cli/-/tree-node-cli-1.6.0.tgz",@@ -10611,36 +10700,621 @@"treee": "bin/tree.js"}},- "node_modules/tree-node-cli/node_modules/commander": {- "version": "5.1.0",- "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",- "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",+ "node_modules/tree-node-cli/node_modules/commander": {+ "version": "5.1.0",+ "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",+ "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==",+ "dev": true,+ "engines": {+ "node": ">= 6"+ }+ },+ "node_modules/ts-interface-checker": {+ "version": "0.1.13",+ "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",+ "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="+ },+ "node_modules/tsconfig-paths": {+ "version": "3.14.2",+ "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",+ "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",+ "dependencies": {+ "@types/json5": "^0.0.29",+ "json5": "^1.0.2",+ "minimist": "^1.2.6",+ "strip-bom": "^3.0.0"+ }+ },+ "node_modules/tslib": {+ "version": "2.5.0",+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",+ "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="+ },+ "node_modules/tsup": {+ "version": "7.1.0",+ "resolved": "https://registry.npmjs.org/tsup/-/tsup-7.1.0.tgz",+ "integrity": "sha512-mazl/GRAk70j8S43/AbSYXGgvRP54oQeX8Un4iZxzATHt0roW0t6HYDVZIXMw0ZQIpvr1nFMniIVnN5186lW7w==",+ "dev": true,+ "dependencies": {+ "bundle-require": "^4.0.0",+ "cac": "^6.7.12",+ "chokidar": "^3.5.1",+ "debug": "^4.3.1",+ "esbuild": "^0.18.2",+ "execa": "^5.0.0",+ "globby": "^11.0.3",+ "joycon": "^3.0.1",+ "postcss-load-config": "^4.0.1",+ "resolve-from": "^5.0.0",+ "rollup": "^3.2.5",+ "source-map": "0.8.0-beta.0",+ "sucrase": "^3.20.3",+ "tree-kill": "^1.2.2"+ },+ "bin": {+ "tsup": "dist/cli-default.js",+ "tsup-node": "dist/cli-node.js"+ },+ "engines": {+ "node": ">=16.14"+ },+ "peerDependencies": {+ "@swc/core": "^1",+ "postcss": "^8.4.12",+ "typescript": ">=4.1.0"+ },+ "peerDependenciesMeta": {+ "@swc/core": {+ "optional": true+ },+ "postcss": {+ "optional": true+ },+ "typescript": {+ "optional": true+ }+ }+ },+ "node_modules/tsup/node_modules/@esbuild/android-arm": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.8.tgz",+ "integrity": "sha512-xDncukyW2b/JU04AZJ6cSAp4FaoAMyxFFTgmmNEKbjn2MwThw/ekHwt3d84Nm0fJG2KqKBS3D6uGDo2jzDN/uQ==",+ "cpu": [+ "arm"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/android-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.8.tgz",+ "integrity": "sha512-8N8gkGu8vBq/cRPs8DDQmdwmS097A+XRHC/ay6wJjSEdLV3onTnfIkzew+g86k5bcakbxsE7zynCIhG0IgCT5Q==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/android-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.8.tgz",+ "integrity": "sha512-vLTz/naWZMVY01T0B6gneUmm9RTYBlhRzjSCDuQCZURC1Lp3Fw2gP32ZFTtIaMBK+hfSJilnmgTPuUkCTH6CwA==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "android"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/darwin-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.8.tgz",+ "integrity": "sha512-14oQ5IgillH6K7j750ug0IUfy86ql1CrHx4uxRMlq0lH5NthxEH+QIgqIzUUyDJdw0lOodtr4L905Q9VYIG2+g==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/darwin-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.8.tgz",+ "integrity": "sha512-OyEf+21R32glxR+IJpPhBgcbxSbc7adPe4hYggu2mbjqAAjJJAaYoYjNeojyp+ZKY2ZRX3FimBbeExVoPdEDfg==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "darwin"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/freebsd-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.8.tgz",+ "integrity": "sha512-ur5cFSmlE5YPqD+5X9E32wJ2nBnz/Lk30QuAiotam0kx2e2f9+dgTarqaDhUKt+xJo+6OLhCpHAlogQ1TAvJrw==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/freebsd-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.8.tgz",+ "integrity": "sha512-j0dgVXUyInggnvEgFGS7FXTQncRwAmHkgAy8YE52kOsozkimpapE3Kuuwb6MXbhnqLvJevaFgGSAlseDlkXAlg==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "freebsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/linux-arm": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.8.tgz",+ "integrity": "sha512-moCWasFnLWfVmZjux2wE1YRoJlQ36hlthVD/B+UTic3UgCZ5LvpHTeqnF037JL9zS1W6d+cB0hUwithdIyZ/1w==",+ "cpu": [+ "arm"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/linux-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.8.tgz",+ "integrity": "sha512-Xp8brdqVVSTiN3/GGEAkMN1V2VCUrt11lxqHopYsbAvIf2YAfaW02/NFlekMq7SaAVcReYqbO7LReaOLzHaxgw==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/linux-ia32": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.8.tgz",+ "integrity": "sha512-mUDNdkY8mr4kZrekGLwZBFpvVX1VJLpwYUsbKTM/w0h4xVgsupc440nlsUfyz8OKeE92ZdMUUG8wrdOeZaONiQ==",+ "cpu": [+ "ia32"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/linux-loong64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.8.tgz",+ "integrity": "sha512-wuzn8pABeFielmccZjn44eyVFo9G5rThVT91QdxZ02H7Yxek623ODpZoauAWwdBDFfK1R25RtKkxCvzfeJ1akg==",+ "cpu": [+ "loong64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/linux-mips64el": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.8.tgz",+ "integrity": "sha512-9vIq+bR1PYqTV0Ea38a9h/r2xAecC56eQemOBXyzM3jQ9Bo8f3Q9On7mpiDrXich1eQuo9nna0ZBcaIJxaO58g==",+ "cpu": [+ "mips64el"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/linux-ppc64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.8.tgz",+ "integrity": "sha512-9AFk6CgYytoQ0/RMnmr1zlpTA88g9ksxk0gmo9apY+O8Yzmcjd+Dl9LUX9k89dLnyyLgkHl6uLg1tpEzpQS+yA==",+ "cpu": [+ "ppc64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/linux-riscv64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.8.tgz",+ "integrity": "sha512-AyuhgbWMSbYrgr3Qz8OT6C92PSbSh7X9ckSgz4xnZYUWrBkR6YaRTp5L7zgcouA/cSm1AiOQauHgQb+EOCNBVQ==",+ "cpu": [+ "riscv64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/linux-s390x": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.8.tgz",+ "integrity": "sha512-XU3UTgyFx80B+kCD82kun9usGT1+3YILtGeGx+StNWGT8wjHYCc5ZTsh4g+58kDoGPezquGO+Kso5VSlX2GU2g==",+ "cpu": [+ "s390x"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/linux-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.8.tgz",+ "integrity": "sha512-/zBMV9cAFYFVTiyf7zg4ubMSfH0BGn5IPD+XZT0m2cYhtlMQLRQlNDpkaz5UlAIZBnBTCpjsbnI8X73xP2Zgtw==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "linux"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/netbsd-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.8.tgz",+ "integrity": "sha512-/Aqh6SoP6UpLrgdfgFzi1Von4D5OhnJEYZNdkZA0AREuwSBcZh6X5eUsSCiEszJaeOt/oOZOvSwNR7i2VjmDnA==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "netbsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/openbsd-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.8.tgz",+ "integrity": "sha512-twRW7IQ4ar1BilPDFf/IpsQY77dU50IUKZxs7veZVo4rnQbOXw6FPl2rWVJcVx+I6dkGzmt/yM6YW6FBdqA3DA==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "openbsd"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/sunos-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.8.tgz",+ "integrity": "sha512-DSgYAFzvRisJQPxtTsUTFJ/Kr1KYZxxrKGfHPMnW2f/0KxOdLwRKbzWeG8g15gSBcDuDCZXnuUSFyu3ZyqbCzA==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "sunos"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/win32-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.8.tgz",+ "integrity": "sha512-eWoYo48Hp1yWbe2SSnmMNqnVprNgKtp0mP+aUeX/Lkw3gcsgRju5Qj7psfpA8cR0ULeWkrhmaSS4mgj4wfo97A==",+ "cpu": [+ "arm64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/win32-ia32": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.8.tgz",+ "integrity": "sha512-A5mph1zmf7eEbAKZYqRHUBkO5PRdSO0bjH4XMAnYCXfndk72uHzvMmTNS5ZZ1dVUb55P45MFBBlZyW7SsnXxXw==",+ "cpu": [+ "ia32"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/@esbuild/win32-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.8.tgz",+ "integrity": "sha512-/NKlWmdR5oxLswW/pdMKF8qwwtC7zpeTWvWffXpqNZ4Nib6lmnU2L5ijfSvWy8vxWhwmfR/CXA7GzuRL5nRxow==",+ "cpu": [+ "x64"+ ],+ "dev": true,+ "optional": true,+ "os": [+ "win32"+ ],+ "engines": {+ "node": ">=12"+ }+ },+ "node_modules/tsup/node_modules/bundle-require": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/bundle-require/-/bundle-require-4.0.1.tgz",+ "integrity": "sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==",+ "dev": true,+ "dependencies": {+ "load-tsconfig": "^0.2.3"+ },+ "engines": {+ "node": "^12.20.0 || ^14.13.1 || >=16.0.0"+ },+ "peerDependencies": {+ "esbuild": ">=0.17"+ }+ },+ "node_modules/tsup/node_modules/esbuild": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.8.tgz",+ "integrity": "sha512-3hJ4I81Wp1IT5z29FAlTAlbX+ElIqy4AuIf1GNcFjsRIfyO3linxmEVqoP865KTYT9BWosrCl081RM/35Z+scw==",+ "dev": true,+ "hasInstallScript": true,+ "bin": {+ "esbuild": "bin/esbuild"+ },+ "engines": {+ "node": ">=12"+ },+ "optionalDependencies": {+ "@esbuild/android-arm": "0.18.8",+ "@esbuild/android-arm64": "0.18.8",+ "@esbuild/android-x64": "0.18.8",+ "@esbuild/darwin-arm64": "0.18.8",+ "@esbuild/darwin-x64": "0.18.8",+ "@esbuild/freebsd-arm64": "0.18.8",+ "@esbuild/freebsd-x64": "0.18.8",+ "@esbuild/linux-arm": "0.18.8",+ "@esbuild/linux-arm64": "0.18.8",+ "@esbuild/linux-ia32": "0.18.8",+ "@esbuild/linux-loong64": "0.18.8",+ "@esbuild/linux-mips64el": "0.18.8",+ "@esbuild/linux-ppc64": "0.18.8",+ "@esbuild/linux-riscv64": "0.18.8",+ "@esbuild/linux-s390x": "0.18.8",+ "@esbuild/linux-x64": "0.18.8",+ "@esbuild/netbsd-x64": "0.18.8",+ "@esbuild/openbsd-x64": "0.18.8",+ "@esbuild/sunos-x64": "0.18.8",+ "@esbuild/win32-arm64": "0.18.8",+ "@esbuild/win32-ia32": "0.18.8",+ "@esbuild/win32-x64": "0.18.8"+ }+ },+ "node_modules/tsup/node_modules/execa": {+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",+ "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",+ "dev": true,+ "dependencies": {+ "cross-spawn": "^7.0.3",+ "get-stream": "^6.0.0",+ "human-signals": "^2.1.0",+ "is-stream": "^2.0.0",+ "merge-stream": "^2.0.0",+ "npm-run-path": "^4.0.1",+ "onetime": "^5.1.2",+ "signal-exit": "^3.0.3",+ "strip-final-newline": "^2.0.0"+ },+ "engines": {+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/sindresorhus/execa?sponsor=1"+ }+ },+ "node_modules/tsup/node_modules/human-signals": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",+ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",+ "dev": true,+ "engines": {+ "node": ">=10.17.0"+ }+ },+ "node_modules/tsup/node_modules/is-stream": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",+ "dev": true,+ "engines": {+ "node": ">=8"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/tsup/node_modules/mimic-fn": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",+ "dev": true,+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/tsup/node_modules/npm-run-path": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",+ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",+ "dev": true,+ "dependencies": {+ "path-key": "^3.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/tsup/node_modules/onetime": {+ "version": "5.1.2",+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",+ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",+ "dev": true,+ "dependencies": {+ "mimic-fn": "^2.1.0"+ },+ "engines": {+ "node": ">=6"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/tsup/node_modules/resolve-from": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",+ "dev": true,+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/tsup/node_modules/source-map": {+ "version": "0.8.0-beta.0",+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",+ "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",+ "dev": true,+ "dependencies": {+ "whatwg-url": "^7.0.0"+ },+ "engines": {+ "node": ">= 8"+ }+ },+ "node_modules/tsup/node_modules/strip-final-newline": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",+ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",+ "dev": true,+ "engines": {+ "node": ">=6"+ }+ },+ "node_modules/tsup/node_modules/tr46": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",+ "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==","dev": true,- "engines": {- "node": ">= 6"+ "dependencies": {+ "punycode": "^2.1.0"}},- "node_modules/ts-interface-checker": {- "version": "0.1.13",- "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",- "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="+ "node_modules/tsup/node_modules/webidl-conversions": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",+ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",+ "dev": true},- "node_modules/tsconfig-paths": {- "version": "3.14.2",- "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",- "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",+ "node_modules/tsup/node_modules/whatwg-url": {+ "version": "7.1.0",+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",+ "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",+ "dev": true,"dependencies": {- "@types/json5": "^0.0.29",- "json5": "^1.0.2",- "minimist": "^1.2.6",- "strip-bom": "^3.0.0"+ "lodash.sortby": "^4.7.0",+ "tr46": "^1.0.1",+ "webidl-conversions": "^4.0.2"}},- "node_modules/tslib": {- "version": "2.5.0",- "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",- "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="- },"node_modules/tsutils": {"version": "3.21.0","resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",@@ -11194,6 +11868,18 @@"spdx-expression-parse": "^3.0.0"}},+ "node_modules/watchpack": {+ "version": "2.4.0",+ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",+ "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",+ "dependencies": {+ "glob-to-regexp": "^0.4.1",+ "graceful-fs": "^4.1.2"+ },+ "engines": {+ "node": ">=10.13.0"+ }+ },"node_modules/wcwidth": {"version": "1.0.1","resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",@@ -11426,10 +12112,13 @@"@documenso/tailwind-config": "*","@documenso/tsconfig": "*","@documenso/ui": "*",- "@react-email/components": "^0.0.7"+ "@react-email/components": "^0.0.7",+ "nodemailer": "^6.9.3"},"devDependencies": {- "react-email": "^1.9.4"+ "@types/nodemailer": "^6.4.8",+ "react-email": "^1.9.4",+ "tsup": "^7.1.0"}},"packages/email/.react-email": {@@ -12457,7 +13146,7 @@"@typescript-eslint/eslint-plugin": "^5.59.2","@typescript-eslint/parser": "^5.59.2","eslint": "^8.40.0",- "eslint-config-next": "^13.4.1",+ "eslint-config-next": "^13.4.9","eslint-config-prettier": "^8.8.0","eslint-config-turbo": "^1.9.3","eslint-plugin-prettier": "^4.2.1",@@ -12630,13 +13319,14 @@"version": "1.0.0","license": "MIT","dependencies": {+ "@documenso/email": "*","@documenso/prisma": "*","@next-auth/prisma-adapter": "^1.0.6","@pdf-lib/fontkit": "^1.1.1","@upstash/redis": "^1.20.6","bcrypt": "^5.1.0","nanoid": "^4.0.2",- "next": "13.4.1",+ "next": "13.4.9","next-auth": "^4.22.1","pdf-lib": "^1.17.1","stripe": "^12.7.0"@@ -13019,7 +13709,10 @@"@documenso/tsconfig": "*","@documenso/ui": "*","@react-email/components": "^0.0.7",- "react-email": "^1.9.4"+ "@types/nodemailer": "^6.4.8",+ "nodemailer": "^6.9.3",+ "react-email": "^1.9.4",+ "tsup": "^7.1.0"},"dependencies": {"@eslint/eslintrc": {@@ -13629,7 +14322,7 @@"@typescript-eslint/eslint-plugin": "^5.59.2","@typescript-eslint/parser": "^5.59.2","eslint": "^8.40.0",- "eslint-config-next": "^13.4.1",+ "eslint-config-next": "^13.4.9","eslint-config-prettier": "^8.8.0","eslint-config-turbo": "^1.9.3","eslint-plugin-prettier": "^4.2.1",@@ -13760,6 +14453,7 @@"@documenso/lib": {"version": "file:packages/lib","requires": {+ "@documenso/email": "*","@documenso/prisma": "*","@next-auth/prisma-adapter": "^1.0.6","@pdf-lib/fontkit": "^1.1.1",@@ -13767,7 +14461,7 @@"@upstash/redis": "^1.20.6","bcrypt": "^5.1.0","nanoid": "^4.0.2",- "next": "13.4.1",+ "next": "13.4.9","next-auth": "^4.22.1","pdf-lib": "^1.17.1","stripe": "^12.7.0"@@ -13794,7 +14488,7 @@"framer-motion": "^10.12.8","lucide-react": "^0.214.0","micro": "^10.0.1",- "next": "13.4.1",+ "next": "13.4.9","next-auth": "^4.22.1","next-plausible": "^3.7.2","perfect-freehand": "^1.2.0",@@ -13913,7 +14607,7 @@"lucide-react": "^0.214.0","micro": "^10.0.1","nanoid": "^4.0.2",- "next": "13.4.1",+ "next": "13.4.9","next-auth": "^4.22.1","next-plausible": "^3.7.2","next-themes": "^0.2.1",@@ -14439,70 +15133,70 @@"requires": {}},"@next/env": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.1.tgz",- "integrity": "sha512-eD6WCBMFjLFooLM19SIhSkWBHtaFrZFfg2Cxnyl3vS3DAdFRfnx5TY2RxlkuKXdIRCC0ySbtK9JXXt8qLCqzZg=="+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/env/-/env-13.4.9.tgz",+ "integrity": "sha512-vuDRK05BOKfmoBYLNi2cujG2jrYbEod/ubSSyqgmEx9n/W3eZaJQdRNhTfumO+qmq/QTzLurW487n/PM/fHOkw=="},"@next/eslint-plugin-next": {- "version": "13.4.2",- "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.4.2.tgz",- "integrity": "sha512-ZeFWgrxwckxTpYM+ANeUL9E7LOGPbZKmI94LJIjbDU69iEIgqd4WD0l2pVbOJMr/+vgoZmJ9Dx1m0WJ7WScXHA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-13.4.9.tgz",+ "integrity": "sha512-nDtGpa992tNyAkT/KmSMy7QkHfNZmGCBYhHtafU97DubqxzNdvLsqRtliQ4FU04CysRCtvP2hg8rRC1sAKUTUA==","requires": {"glob": "7.1.7"}},"@next/swc-darwin-arm64": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.1.tgz",- "integrity": "sha512-eF8ARHtYfnoYtDa6xFHriUKA/Mfj/cCbmKb3NofeKhMccs65G6/loZ15a6wYCCx4rPAd6x4t1WmVYtri7EdeBg==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.4.9.tgz",+ "integrity": "sha512-TVzGHpZoVBk3iDsTOQA/R6MGmFp0+17SWXMEWd6zG30AfuELmSSMe2SdPqxwXU0gbpWkJL1KgfLzy5ReN0crqQ==","optional": true},"@next/swc-darwin-x64": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.1.tgz",- "integrity": "sha512-7cmDgF9tGWTgn5Gw+vP17miJbH4wcraMHDCOHTYWkO/VeKT73dUWG23TNRLfgtCNSPgH4V5B4uLHoZTanx9bAw==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-13.4.9.tgz",+ "integrity": "sha512-aSfF1fhv28N2e7vrDZ6zOQ+IIthocfaxuMWGReB5GDriF0caTqtHttAvzOMgJgXQtQx6XhyaJMozLTSEXeNN+A==","optional": true},"@next/swc-linux-arm64-gnu": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.1.tgz",- "integrity": "sha512-qwJqmCri2ie8aTtE5gjTSr8S6O8B67KCYgVZhv9gKH44yvc/zXbAY8u23QGULsYOyh1islWE5sWfQNLOj9iryg==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.4.9.tgz",+ "integrity": "sha512-JhKoX5ECzYoTVyIy/7KykeO4Z2lVKq7HGQqvAH+Ip9UFn1MOJkOnkPRB7v4nmzqAoY+Je05Aj5wNABR1N18DMg==","optional": true},"@next/swc-linux-arm64-musl": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.1.tgz",- "integrity": "sha512-qcC54tWNGDv/VVIFkazxhqH1Bnagjfs4enzELVRlUOoJPD2BGJTPI7z08pQPbbgxLtRiu8gl2mXvpB8WlOkMeA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.4.9.tgz",+ "integrity": "sha512-OOn6zZBIVkm/4j5gkPdGn4yqQt+gmXaLaSjRSO434WplV8vo2YaBNbSHaTM9wJpZTHVDYyjzuIYVEzy9/5RVZw==","optional": true},"@next/swc-linux-x64-gnu": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.1.tgz",- "integrity": "sha512-9TeWFlpLsBosZ+tsm/rWBaMwt5It9tPH8m3nawZqFUUrZyGRfGcI67js774vtx0k3rL9qbyY6+3pw9BCVpaYUA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.4.9.tgz",+ "integrity": "sha512-iA+fJXFPpW0SwGmx/pivVU+2t4zQHNOOAr5T378PfxPHY6JtjV6/0s1vlAJUdIHeVpX98CLp9k5VuKgxiRHUpg==","optional": true},"@next/swc-linux-x64-musl": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.1.tgz",- "integrity": "sha512-sNDGaWmSqTS4QRUzw61wl4mVPeSqNIr1OOjLlQTRuyInxMxtqImRqdvzDvFTlDfdeUMU/DZhWGYoHrXLlZXe6A==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.4.9.tgz",+ "integrity": "sha512-rlNf2WUtMM+GAQrZ9gMNdSapkVi3koSW3a+dmBVp42lfugWVvnyzca/xJlN48/7AGx8qu62WyO0ya1ikgOxh6A==","optional": true},"@next/swc-win32-arm64-msvc": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.1.tgz",- "integrity": "sha512-+CXZC7u1iXdLRudecoUYbhbsXpglYv8KFYsFxKBPn7kg+bk7eJo738wAA4jXIl8grTF2mPdmO93JOQym+BlYGA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.4.9.tgz",+ "integrity": "sha512-5T9ybSugXP77nw03vlgKZxD99AFTHaX8eT1ayKYYnGO9nmYhJjRPxcjU5FyYI+TdkQgEpIcH7p/guPLPR0EbKA==","optional": true},"@next/swc-win32-ia32-msvc": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.1.tgz",- "integrity": "sha512-vIoXVVc7UYO68VwVMDKwJC2+HqAZQtCYiVlApyKEeIPIQpz2gpufzGxk1z3/gwrJt/kJ5CDZjlhYDCzd3hdz+g==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.4.9.tgz",+ "integrity": "sha512-ojZTCt1lP2ucgpoiFgrFj07uq4CZsq4crVXpLGgQfoFq00jPKRPgesuGPaz8lg1yLfvafkU3Jd1i8snKwYR3LA==","optional": true},"@next/swc-win32-x64-msvc": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.1.tgz",- "integrity": "sha512-n8V5ImLQZibKTu10UUdI3nIeTLkliEXe628qxqW9v8My3BAH2a7H0SaCqkV2OgqFnn8sG1wxKYw9/SNJ632kSA==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.4.9.tgz",+ "integrity": "sha512-QbT03FXRNdpuL+e9pLnu+XajZdm/TtIXVYY4lA9t+9l0fLZbHXDYEKitAqxrOj37o3Vx5ufxiRAniaIebYDCgw==","optional": true},"@nodelib/fs.scandir": {@@ -15813,6 +16507,15 @@"resolved": "https://registry.npmjs.org/@types/node/-/node-20.1.0.tgz","integrity": "sha512-O+z53uwx64xY7D6roOi4+jApDGFg0qn6WHcxe5QeqjMaTezBO/mxdfFXIVAVVyNWKx84OmPB3L8kbVYOTeN34A=="},+ "@types/nodemailer": {+ "version": "6.4.8",+ "resolved": "https://registry.npmjs.org/@types/nodemailer/-/nodemailer-6.4.8.tgz",+ "integrity": "sha512-oVsJSCkqViCn8/pEu2hfjwVO+Gb3e+eTWjg3PcjeFKRItfKpKwHphQqbYmPQrlMk+op7pNNWPbsJIEthpFN/OQ==",+ "dev": true,+ "requires": {+ "@types/node": "*"+ }+ },"@types/normalize-package-data": {"version": "2.4.1","resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",@@ -16345,6 +17048,12 @@"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz","integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="},+ "cac": {+ "version": "6.7.14",+ "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",+ "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",+ "dev": true+ },"call-bind": {"version": "1.0.2","resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",@@ -17477,11 +18186,11 @@}},"eslint-config-next": {- "version": "13.4.2",- "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.4.2.tgz",- "integrity": "sha512-zjLJ9B9bbeWSo5q+iHfdt8gVYyT+y2BpWDfjR6XMBtFRSMKRGjllDKxnuKBV1q2Y/QpwLM2PXHJTMRyblCmRAg==",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-13.4.9.tgz",+ "integrity": "sha512-0fLtKRR268NArpqeXXwnLgMXPvF64YESQvptVg+RMLCaijKm3FICN9Y7Jc1p2o+yrWwE4DufJXDM/Vo53D1L7g==","requires": {- "@next/eslint-plugin-next": "13.4.2",+ "@next/eslint-plugin-next": "13.4.9","@rushstack/eslint-patch": "^1.1.3","@typescript-eslint/parser": "^5.42.0","eslint-import-resolver-node": "^0.3.6",@@ -17489,7 +18198,15 @@"eslint-plugin-import": "^2.26.0","eslint-plugin-jsx-a11y": "^6.5.1","eslint-plugin-react": "^7.31.7",- "eslint-plugin-react-hooks": "^4.5.0"+ "eslint-plugin-react-hooks": "5.0.0-canary-7118f5dd7-20230705"+ },+ "dependencies": {+ "eslint-plugin-react-hooks": {+ "version": "5.0.0-canary-7118f5dd7-20230705",+ "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.0.0-canary-7118f5dd7-20230705.tgz",+ "integrity": "sha512-AZYbMo/NW9chdL7vk6HQzQhT+PvTAEVqWk9ziruUoW2kAOcN5qNyelv70e0F1VNQAbvutOC9oc+xfWycI9FxDw==",+ "requires": {}+ }}},"eslint-config-prettier": {@@ -17712,6 +18429,7 @@"version": "4.6.0","resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz","integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==",+ "dev": true,"requires": {}},"eslint-plugin-simple-import-sort": {@@ -18177,6 +18895,11 @@"is-glob": "^4.0.1"}},+ "glob-to-regexp": {+ "version": "0.4.1",+ "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",+ "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="+ },"globals": {"version": "13.20.0","resolved": "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz",@@ -18782,6 +19505,12 @@"resolved": "https://registry.npmjs.org/jose/-/jose-4.14.4.tgz","integrity": "sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g=="},+ "joycon": {+ "version": "3.1.1",+ "resolved": "https://registry.npmjs.org/joycon/-/joycon-3.1.1.tgz",+ "integrity": "sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==",+ "dev": true+ },"js-beautify": {"version": "1.14.8","resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.8.tgz",@@ -18949,6 +19678,12 @@"integrity": "sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==","dev": true},+ "load-tsconfig": {+ "version": "0.2.5",+ "resolved": "https://registry.npmjs.org/load-tsconfig/-/load-tsconfig-0.2.5.tgz",+ "integrity": "sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==",+ "dev": true+ },"locate-path": {"version": "6.0.0","resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",@@ -18967,6 +19702,12 @@"resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz","integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="},+ "lodash.sortby": {+ "version": "4.7.0",+ "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",+ "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==",+ "dev": true+ },"lodash.truncate": {"version": "4.4.2","resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",@@ -19223,25 +19964,26 @@}},"next": {- "version": "13.4.1",- "resolved": "https://registry.npmjs.org/next/-/next-13.4.1.tgz",- "integrity": "sha512-JBw2kAIyhKDpjhEWvNVoFeIzNp9xNxg8wrthDOtMctfn3EpqGCmW0FSviNyGgOSOSn6zDaX48pmvbdf6X2W9xA==",- "requires": {- "@next/env": "13.4.1",- "@next/swc-darwin-arm64": "13.4.1",- "@next/swc-darwin-x64": "13.4.1",- "@next/swc-linux-arm64-gnu": "13.4.1",- "@next/swc-linux-arm64-musl": "13.4.1",- "@next/swc-linux-x64-gnu": "13.4.1",- "@next/swc-linux-x64-musl": "13.4.1",- "@next/swc-win32-arm64-msvc": "13.4.1",- "@next/swc-win32-ia32-msvc": "13.4.1",- "@next/swc-win32-x64-msvc": "13.4.1",+ "version": "13.4.9",+ "resolved": "https://registry.npmjs.org/next/-/next-13.4.9.tgz",+ "integrity": "sha512-vtefFm/BWIi/eWOqf1GsmKG3cjKw1k3LjuefKRcL3iiLl3zWzFdPG3as6xtxrGO6gwTzzaO1ktL4oiHt/uvTjA==",+ "requires": {+ "@next/env": "13.4.9",+ "@next/swc-darwin-arm64": "13.4.9",+ "@next/swc-darwin-x64": "13.4.9",+ "@next/swc-linux-arm64-gnu": "13.4.9",+ "@next/swc-linux-arm64-musl": "13.4.9",+ "@next/swc-linux-x64-gnu": "13.4.9",+ "@next/swc-linux-x64-musl": "13.4.9",+ "@next/swc-win32-arm64-msvc": "13.4.9",+ "@next/swc-win32-ia32-msvc": "13.4.9",+ "@next/swc-win32-x64-msvc": "13.4.9","@swc/helpers": "0.5.1","busboy": "1.6.0","caniuse-lite": "^1.0.30001406","postcss": "8.4.14","styled-jsx": "5.1.1",+ "watchpack": "2.4.0","zod": "3.21.4"},"dependencies": {@@ -19311,6 +20053,11 @@"big-integer": "^1.6.48"}},+ "nodemailer": {+ "version": "6.9.3",+ "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.3.tgz",+ "integrity": "sha512-fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg=="+ },"nopt": {"version": "5.0.0","resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",@@ -20471,6 +21218,15 @@"glob": "^7.1.3"}},+ "rollup": {+ "version": "3.25.2",+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.2.tgz",+ "integrity": "sha512-VLnkxZMDr3jpxgtmS8pQZ0UvhslmF4ADq/9w4erkctbgjCqLW9oa89fJuXEs4ZmgyoF7Dm8rMDKSS5b5u2hHUg==",+ "dev": true,+ "requires": {+ "fsevents": "~2.3.2"+ }+ },"run-applescript": {"version": "5.0.0","resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz",@@ -21249,6 +22005,12 @@"integrity": "sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==","dev": true},+ "tree-kill": {+ "version": "1.2.2",+ "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",+ "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",+ "dev": true+ },"tree-node-cli": {"version": "1.6.0","resolved": "https://registry.npmjs.org/tree-node-cli/-/tree-node-cli-1.6.0.tgz",@@ -21289,6 +22051,323 @@"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz","integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg=="},+ "tsup": {+ "version": "7.1.0",+ "resolved": "https://registry.npmjs.org/tsup/-/tsup-7.1.0.tgz",+ "integrity": "sha512-mazl/GRAk70j8S43/AbSYXGgvRP54oQeX8Un4iZxzATHt0roW0t6HYDVZIXMw0ZQIpvr1nFMniIVnN5186lW7w==",+ "dev": true,+ "requires": {+ "bundle-require": "^4.0.0",+ "cac": "^6.7.12",+ "chokidar": "^3.5.1",+ "debug": "^4.3.1",+ "esbuild": "^0.18.2",+ "execa": "^5.0.0",+ "globby": "^11.0.3",+ "joycon": "^3.0.1",+ "postcss-load-config": "^4.0.1",+ "resolve-from": "^5.0.0",+ "rollup": "^3.2.5",+ "source-map": "0.8.0-beta.0",+ "sucrase": "^3.20.3",+ "tree-kill": "^1.2.2"+ },+ "dependencies": {+ "@esbuild/android-arm": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.8.tgz",+ "integrity": "sha512-xDncukyW2b/JU04AZJ6cSAp4FaoAMyxFFTgmmNEKbjn2MwThw/ekHwt3d84Nm0fJG2KqKBS3D6uGDo2jzDN/uQ==",+ "dev": true,+ "optional": true+ },+ "@esbuild/android-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.8.tgz",+ "integrity": "sha512-8N8gkGu8vBq/cRPs8DDQmdwmS097A+XRHC/ay6wJjSEdLV3onTnfIkzew+g86k5bcakbxsE7zynCIhG0IgCT5Q==",+ "dev": true,+ "optional": true+ },+ "@esbuild/android-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.8.tgz",+ "integrity": "sha512-vLTz/naWZMVY01T0B6gneUmm9RTYBlhRzjSCDuQCZURC1Lp3Fw2gP32ZFTtIaMBK+hfSJilnmgTPuUkCTH6CwA==",+ "dev": true,+ "optional": true+ },+ "@esbuild/darwin-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.8.tgz",+ "integrity": "sha512-14oQ5IgillH6K7j750ug0IUfy86ql1CrHx4uxRMlq0lH5NthxEH+QIgqIzUUyDJdw0lOodtr4L905Q9VYIG2+g==",+ "dev": true,+ "optional": true+ },+ "@esbuild/darwin-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.8.tgz",+ "integrity": "sha512-OyEf+21R32glxR+IJpPhBgcbxSbc7adPe4hYggu2mbjqAAjJJAaYoYjNeojyp+ZKY2ZRX3FimBbeExVoPdEDfg==",+ "dev": true,+ "optional": true+ },+ "@esbuild/freebsd-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.8.tgz",+ "integrity": "sha512-ur5cFSmlE5YPqD+5X9E32wJ2nBnz/Lk30QuAiotam0kx2e2f9+dgTarqaDhUKt+xJo+6OLhCpHAlogQ1TAvJrw==",+ "dev": true,+ "optional": true+ },+ "@esbuild/freebsd-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.8.tgz",+ "integrity": "sha512-j0dgVXUyInggnvEgFGS7FXTQncRwAmHkgAy8YE52kOsozkimpapE3Kuuwb6MXbhnqLvJevaFgGSAlseDlkXAlg==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-arm": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.8.tgz",+ "integrity": "sha512-moCWasFnLWfVmZjux2wE1YRoJlQ36hlthVD/B+UTic3UgCZ5LvpHTeqnF037JL9zS1W6d+cB0hUwithdIyZ/1w==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.8.tgz",+ "integrity": "sha512-Xp8brdqVVSTiN3/GGEAkMN1V2VCUrt11lxqHopYsbAvIf2YAfaW02/NFlekMq7SaAVcReYqbO7LReaOLzHaxgw==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-ia32": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.8.tgz",+ "integrity": "sha512-mUDNdkY8mr4kZrekGLwZBFpvVX1VJLpwYUsbKTM/w0h4xVgsupc440nlsUfyz8OKeE92ZdMUUG8wrdOeZaONiQ==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-loong64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.8.tgz",+ "integrity": "sha512-wuzn8pABeFielmccZjn44eyVFo9G5rThVT91QdxZ02H7Yxek623ODpZoauAWwdBDFfK1R25RtKkxCvzfeJ1akg==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-mips64el": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.8.tgz",+ "integrity": "sha512-9vIq+bR1PYqTV0Ea38a9h/r2xAecC56eQemOBXyzM3jQ9Bo8f3Q9On7mpiDrXich1eQuo9nna0ZBcaIJxaO58g==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-ppc64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.8.tgz",+ "integrity": "sha512-9AFk6CgYytoQ0/RMnmr1zlpTA88g9ksxk0gmo9apY+O8Yzmcjd+Dl9LUX9k89dLnyyLgkHl6uLg1tpEzpQS+yA==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-riscv64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.8.tgz",+ "integrity": "sha512-AyuhgbWMSbYrgr3Qz8OT6C92PSbSh7X9ckSgz4xnZYUWrBkR6YaRTp5L7zgcouA/cSm1AiOQauHgQb+EOCNBVQ==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-s390x": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.8.tgz",+ "integrity": "sha512-XU3UTgyFx80B+kCD82kun9usGT1+3YILtGeGx+StNWGT8wjHYCc5ZTsh4g+58kDoGPezquGO+Kso5VSlX2GU2g==",+ "dev": true,+ "optional": true+ },+ "@esbuild/linux-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.8.tgz",+ "integrity": "sha512-/zBMV9cAFYFVTiyf7zg4ubMSfH0BGn5IPD+XZT0m2cYhtlMQLRQlNDpkaz5UlAIZBnBTCpjsbnI8X73xP2Zgtw==",+ "dev": true,+ "optional": true+ },+ "@esbuild/netbsd-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.8.tgz",+ "integrity": "sha512-/Aqh6SoP6UpLrgdfgFzi1Von4D5OhnJEYZNdkZA0AREuwSBcZh6X5eUsSCiEszJaeOt/oOZOvSwNR7i2VjmDnA==",+ "dev": true,+ "optional": true+ },+ "@esbuild/openbsd-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.8.tgz",+ "integrity": "sha512-twRW7IQ4ar1BilPDFf/IpsQY77dU50IUKZxs7veZVo4rnQbOXw6FPl2rWVJcVx+I6dkGzmt/yM6YW6FBdqA3DA==",+ "dev": true,+ "optional": true+ },+ "@esbuild/sunos-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.8.tgz",+ "integrity": "sha512-DSgYAFzvRisJQPxtTsUTFJ/Kr1KYZxxrKGfHPMnW2f/0KxOdLwRKbzWeG8g15gSBcDuDCZXnuUSFyu3ZyqbCzA==",+ "dev": true,+ "optional": true+ },+ "@esbuild/win32-arm64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.8.tgz",+ "integrity": "sha512-eWoYo48Hp1yWbe2SSnmMNqnVprNgKtp0mP+aUeX/Lkw3gcsgRju5Qj7psfpA8cR0ULeWkrhmaSS4mgj4wfo97A==",+ "dev": true,+ "optional": true+ },+ "@esbuild/win32-ia32": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.8.tgz",+ "integrity": "sha512-A5mph1zmf7eEbAKZYqRHUBkO5PRdSO0bjH4XMAnYCXfndk72uHzvMmTNS5ZZ1dVUb55P45MFBBlZyW7SsnXxXw==",+ "dev": true,+ "optional": true+ },+ "@esbuild/win32-x64": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.8.tgz",+ "integrity": "sha512-/NKlWmdR5oxLswW/pdMKF8qwwtC7zpeTWvWffXpqNZ4Nib6lmnU2L5ijfSvWy8vxWhwmfR/CXA7GzuRL5nRxow==",+ "dev": true,+ "optional": true+ },+ "bundle-require": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/bundle-require/-/bundle-require-4.0.1.tgz",+ "integrity": "sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==",+ "dev": true,+ "requires": {+ "load-tsconfig": "^0.2.3"+ }+ },+ "esbuild": {+ "version": "0.18.8",+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.8.tgz",+ "integrity": "sha512-3hJ4I81Wp1IT5z29FAlTAlbX+ElIqy4AuIf1GNcFjsRIfyO3linxmEVqoP865KTYT9BWosrCl081RM/35Z+scw==",+ "dev": true,+ "requires": {+ "@esbuild/android-arm": "0.18.8",+ "@esbuild/android-arm64": "0.18.8",+ "@esbuild/android-x64": "0.18.8",+ "@esbuild/darwin-arm64": "0.18.8",+ "@esbuild/darwin-x64": "0.18.8",+ "@esbuild/freebsd-arm64": "0.18.8",+ "@esbuild/freebsd-x64": "0.18.8",+ "@esbuild/linux-arm": "0.18.8",+ "@esbuild/linux-arm64": "0.18.8",+ "@esbuild/linux-ia32": "0.18.8",+ "@esbuild/linux-loong64": "0.18.8",+ "@esbuild/linux-mips64el": "0.18.8",+ "@esbuild/linux-ppc64": "0.18.8",+ "@esbuild/linux-riscv64": "0.18.8",+ "@esbuild/linux-s390x": "0.18.8",+ "@esbuild/linux-x64": "0.18.8",+ "@esbuild/netbsd-x64": "0.18.8",+ "@esbuild/openbsd-x64": "0.18.8",+ "@esbuild/sunos-x64": "0.18.8",+ "@esbuild/win32-arm64": "0.18.8",+ "@esbuild/win32-ia32": "0.18.8",+ "@esbuild/win32-x64": "0.18.8"+ }+ },+ "execa": {+ "version": "5.1.1",+ "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",+ "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",+ "dev": true,+ "requires": {+ "cross-spawn": "^7.0.3",+ "get-stream": "^6.0.0",+ "human-signals": "^2.1.0",+ "is-stream": "^2.0.0",+ "merge-stream": "^2.0.0",+ "npm-run-path": "^4.0.1",+ "onetime": "^5.1.2",+ "signal-exit": "^3.0.3",+ "strip-final-newline": "^2.0.0"+ }+ },+ "human-signals": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",+ "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",+ "dev": true+ },+ "is-stream": {+ "version": "2.0.1",+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",+ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",+ "dev": true+ },+ "mimic-fn": {+ "version": "2.1.0",+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",+ "dev": true+ },+ "npm-run-path": {+ "version": "4.0.1",+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",+ "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",+ "dev": true,+ "requires": {+ "path-key": "^3.0.0"+ }+ },+ "onetime": {+ "version": "5.1.2",+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",+ "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",+ "dev": true,+ "requires": {+ "mimic-fn": "^2.1.0"+ }+ },+ "resolve-from": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",+ "dev": true+ },+ "source-map": {+ "version": "0.8.0-beta.0",+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz",+ "integrity": "sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==",+ "dev": true,+ "requires": {+ "whatwg-url": "^7.0.0"+ }+ },+ "strip-final-newline": {+ "version": "2.0.0",+ "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",+ "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",+ "dev": true+ },+ "tr46": {+ "version": "1.0.1",+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",+ "integrity": "sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==",+ "dev": true,+ "requires": {+ "punycode": "^2.1.0"+ }+ },+ "webidl-conversions": {+ "version": "4.0.2",+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",+ "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",+ "dev": true+ },+ "whatwg-url": {+ "version": "7.1.0",+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz",+ "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==",+ "dev": true,+ "requires": {+ "lodash.sortby": "^4.7.0",+ "tr46": "^1.0.1",+ "webidl-conversions": "^4.0.2"+ }+ }+ }+ },"tsutils": {"version": "3.21.0","resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",@@ -21645,6 +22724,15 @@"spdx-expression-parse": "^3.0.0"}},+ "watchpack": {+ "version": "2.4.0",+ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",+ "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",+ "requires": {+ "glob-to-regexp": "^0.4.1",+ "graceful-fs": "^4.1.2"+ }+ },"wcwidth": {"version": "1.0.1","resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",@@ -21816,30 +22904,6 @@"version": "3.21.4","resolved": "https://registry.npmjs.org/zod/-/zod-3.21.4.tgz","integrity": "sha512-m46AKbrzKVzOzs/DZgVnG5H55N1sv1M8qZU3A8RIKbs3mrACDNeIOeilDymVb2HdmP8uwshOCF4uJ8uM9rCqJw=="- },- "@next/swc-android-arm-eabi": {- "version": "13.2.4",- "resolved": "https://registry.npmjs.org/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.2.4.tgz",- "integrity": "sha512-DWlalTSkLjDU11MY11jg17O1gGQzpRccM9Oes2yTqj2DpHndajrXHGxj9HGtJ+idq2k7ImUdJVWS2h2l/EDJOw==",- "optional": true- },- "@next/swc-android-arm64": {- "version": "13.2.4",- "resolved": "https://registry.npmjs.org/@next/swc-android-arm64/-/swc-android-arm64-13.2.4.tgz",- "integrity": "sha512-sRavmUImUCf332Gy+PjIfLkMhiRX1Ez4SI+3vFDRs1N5eXp+uNzjFUK/oLMMOzk6KFSkbiK/3Wt8+dHQR/flNg==",- "optional": true- },- "@next/swc-freebsd-x64": {- "version": "13.2.4",- "resolved": "https://registry.npmjs.org/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.2.4.tgz",- "integrity": "sha512-kkbzKVZGPaXRBPisoAQkh3xh22r+TD+5HwoC5bOkALraJ0dsOQgSMAvzMXKsN3tMzJUPS0tjtRf1cTzrQ0I5vQ==",- "optional": true- },- "@next/swc-linux-arm-gnueabihf": {- "version": "13.2.4",- "resolved": "https://registry.npmjs.org/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.2.4.tgz",- "integrity": "sha512-7qA1++UY0fjprqtjBZaOA6cas/7GekpjVsZn/0uHvquuITFCdKGFCsKNBx3S0Rpxmx6WYo0GcmhNRM9ru08BGg==",- "optional": true}}}diff --git a/packages/email/index.ts b/packages/email/index.tsindex 40a09d7f9..cb0ff5c3b 100644--- a/packages/email/index.ts+++ b/packages/email/index.ts@@ -1 +1 @@-export { render, renderAsync } from '@react-email/components';+export {};diff --git a/packages/email/mailer.ts b/packages/email/mailer.tsnew file mode 100644index 000000000..073f96680--- /dev/null+++ b/packages/email/mailer.ts@@ -0,0 +1,50 @@+import { createTransport } from 'nodemailer';++import { MailChannelsTransport } from './transports/mailchannels';++const getTransport = () => {+ const transport = process.env.NEXT_PRIVATE_SMTP_TRANSPORT ?? 'smtp-auth';++ if (transport === 'mailchannels') {+ return createTransport(+ MailChannelsTransport.makeTransport({+ apiKey: process.env.NEXT_PRIVATE_MAILCHANNELS_API_KEY,+ endpoint: process.env.NEXT_PRIVATE_MAILCHANNELS_ENDPOINT,+ }),+ );+ }++ if (transport === 'smtp-api') {+ if (!process.env.NEXT_PRIVATE_SMTP_HOST || !process.env.NEXT_PRIVATE_SMTP_APIKEY) {+ throw new Error(+ 'SMTP API transport requires NEXT_PRIVATE_SMTP_HOST and NEXT_PRIVATE_SMTP_APIKEY',+ );+ }++ return createTransport({+ host: process.env.NEXT_PRIVATE_SMTP_HOST,+ port: Number(process.env.NEXT_PRIVATE_SMTP_PORT) || 587,+ secure: process.env.NEXT_PRIVATE_SMTP_SECURE === 'true',+ auth: {+ user: process.env.NEXT_PRIVATE_SMTP_APIKEY_USER ?? 'apikey',+ pass: process.env.NEXT_PRIVATE_SMTP_APIKEY ?? '',+ },+ });+ }++ if (!process.env.NEXT_PRIVATE_SMTP_HOST) {+ throw new Error('SMTP transport requires NEXT_PRIVATE_SMTP_HOST');+ }++ return createTransport({+ host: process.env.NEXT_PRIVATE_SMTP_HOST,+ port: Number(process.env.NEXT_PRIVATE_SMTP_PORT) || 587,+ secure: process.env.NEXT_PRIVATE_SMTP_SECURE === 'true',+ auth: {+ user: process.env.NEXT_PRIVATE_SMTP_USERNAME ?? '',+ pass: process.env.NEXT_PRIVATE_SMTP_PASSWORD ?? '',+ },+ });+};++export const mailer = getTransport();diff --git a/packages/email/package.json b/packages/email/package.jsonindex 6697c04b2..d86eac275 100644--- a/packages/email/package.json+++ b/packages/email/package.json@@ -5,18 +5,26 @@"types": "./index.ts","license": "MIT","files": [- "templates/"+ "templates/",+ "transports/",+ "mailer.ts",+ "render.ts",+ "index.ts"],"scripts": {- "dev": "email dev --port 3002 --dir templates"+ "dev": "email dev --port 3002 --dir templates",+ "worker:test": "tsup worker/index.ts --format esm"},"dependencies": {"@documenso/tsconfig": "*","@documenso/tailwind-config": "*","@documenso/ui": "*",- "@react-email/components": "^0.0.7"+ "@react-email/components": "^0.0.7",+ "nodemailer": "^6.9.3"},"devDependencies": {- "react-email": "^1.9.4"+ "@types/nodemailer": "^6.4.8",+ "react-email": "^1.9.4",+ "tsup": "^7.1.0"}}diff --git a/packages/email/render.ts b/packages/email/render.tsnew file mode 100644index 000000000..40a09d7f9--- /dev/null+++ b/packages/email/render.ts@@ -0,0 +1 @@+export { render, renderAsync } from '@react-email/components';diff --git a/packages/email/templates/document-pending.tsx b/packages/email/templates/document-pending.tsxindex 6840e6525..42ecddd72 100644--- a/packages/email/templates/document-pending.tsx+++ b/packages/email/templates/document-pending.tsx@@ -1,6 +1,5 @@import {Body,- Button,Container,Head,Html,diff --git a/packages/email/transports/mailchannels.ts b/packages/email/transports/mailchannels.tsnew file mode 100644index 000000000..3b49695b3--- /dev/null+++ b/packages/email/transports/mailchannels.ts@@ -0,0 +1,154 @@+import { SentMessageInfo, Transport } from 'nodemailer';+import type { Address } from 'nodemailer/lib/mailer';+import type MailMessage from 'nodemailer/lib/mailer/mail-message';++const VERSION = '1.0.0';++type NodeMailerAddress = string | Address | Array<string | Address> | undefined;++interface MailChannelsAddress {+ email: string;+ name?: string;+}++interface MailChannelsTransportOptions {+ apiKey: string;+ endpoint: string;+}++/**+ * Transport for sending email through MailChannels via Cloudflare Workers.+ *+ * Optionally allows specifying a custom endpoint and API key so you can setup a worker+ * to proxy requests to MailChannels with added security.+ *+ * @see https://blog.cloudflare.com/sending-email-from-workers-with-mailchannels/+ */+export class MailChannelsTransport implements Transport<SentMessageInfo> {+ public name = 'CloudflareMailTransport';+ public version = VERSION;++ private _options: MailChannelsTransportOptions;++ public static makeTransport(options: Partial<MailChannelsTransportOptions>) {+ return new MailChannelsTransport(options);+ }++ constructor(options: Partial<MailChannelsTransportOptions>) {+ const { apiKey = '', endpoint = 'https://api.mailchannels.net/tx/v1/send' } = options;++ this._options = {+ apiKey,+ endpoint,+ };+ }++ public send(mail: MailMessage, callback: (_err: Error | null, _info: SentMessageInfo) => void) {+ if (!mail.data.to || !mail.data.from) {+ return callback(new Error('Missing required fields "to" or "from"'), null);+ }++ const mailTo = this.toMailChannelsAddresses(mail.data.to);+ const mailCc = this.toMailChannelsAddresses(mail.data.cc);+ const mailBcc = this.toMailChannelsAddresses(mail.data.bcc);++ const from: MailChannelsAddress =+ typeof mail.data.from === 'string'+ ? { email: mail.data.from }+ : {+ email: mail.data.from?.address,+ name: mail.data.from?.name,+ };++ const requestHeaders: Record<string, string> = {+ 'Content-Type': 'application/json',+ };++ if (this._options.apiKey) {+ requestHeaders['X-Auth-Token'] = this._options.apiKey;+ }++ fetch(this._options.endpoint, {+ method: 'POST',+ headers: requestHeaders,+ body: JSON.stringify({+ from: from,+ subject: mail.data.subject,+ personalizations: [+ {+ to: mailTo,+ cc: mailCc.length > 0 ? mailCc : undefined,+ bcc: mailBcc.length > 0 ? mailBcc : undefined,+ dkim_domain: process.env.NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN || undefined,+ dkim_selector: process.env.NEXT_PRIVATE_MAILCHANNELS_DKIM_SELECTOR || undefined,+ dkim_private_key: process.env.NEXT_PRIVATE_MAILCHANNELS_DKIM_PRIVATE_KEY || undefined,+ },+ ],+ content: [+ {+ type: 'text/plain',+ value: mail.data.text?.toString('utf-8') ?? '',+ },+ {+ type: 'text/html',+ value: mail.data.html?.toString('utf-8') ?? '',+ },+ ],+ }),+ })+ .then((res) => {+ if (res.status >= 200 && res.status <= 299) {+ return callback(null, {+ messageId: '',+ envelope: {+ from: mail.data.from,+ to: mail.data.to,+ },+ accepted: mail.data.to,+ rejected: [],+ pending: [],+ });+ }++ res.json().then((data) => {+ return callback(new Error(`MailChannels error: ${data.message}`), null);+ });+ })+ .catch((err) => {+ return callback(err, null);+ });+ }++ /**+ * Converts a nodemailer address(s) to an array of MailChannel compatible address.+ */+ private toMailChannelsAddresses(address: NodeMailerAddress): Array<MailChannelsAddress> {+ if (!address) {+ return [];+ }++ if (typeof address === 'string') {+ return [{ email: address }];+ }++ if (Array.isArray(address)) {+ return address.map((address) => {+ if (typeof address === 'string') {+ return { email: address };+ }++ return {+ email: address.address,+ name: address.name,+ };+ });+ }++ return [+ {+ email: address.address,+ name: address.name,+ },+ ];+ }+}diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.jsonindex 01a40f4d0..a1f803c1b 100644--- a/packages/eslint-config/package.json+++ b/packages/eslint-config/package.json@@ -7,7 +7,7 @@"@typescript-eslint/eslint-plugin": "^5.59.2","@typescript-eslint/parser": "^5.59.2","eslint": "^8.40.0",- "eslint-config-next": "^13.4.1",+ "eslint-config-next": "^13.4.9","eslint-config-prettier": "^8.8.0","eslint-plugin-prettier": "^4.2.1","eslint-plugin-react": "^7.32.2",diff --git a/packages/lib/package.json b/packages/lib/package.jsonindex 7e1ffc9db..8d4d3e114 100644--- a/packages/lib/package.json+++ b/packages/lib/package.json@@ -13,6 +13,7 @@"scripts": {},"dependencies": {+ "@documenso/email": "*","@documenso/prisma": "*","@pdf-lib/fontkit": "^1.1.1","@next-auth/prisma-adapter": "^1.0.6",@@ -20,8 +21,9 @@"bcrypt": "^5.1.0","pdf-lib": "^1.17.1","nanoid": "^4.0.2",- "next": "13.4.1",+ "next": "13.4.9","next-auth": "^4.22.1",+ "react": "18.2.0","stripe": "^12.7.0"},"devDependencies": {diff --git a/packages/lib/server-only/document/send-document.tsx b/packages/lib/server-only/document/send-document.tsxnew file mode 100644index 000000000..1beed2605--- /dev/null+++ b/packages/lib/server-only/document/send-document.tsx@@ -0,0 +1,94 @@+import { createElement } from 'react';++import { mailer } from '@documenso/email/mailer';+import { render } from '@documenso/email/render';+import { DocumentInviteEmailTemplate } from '@documenso/email/templates/document-invite';+import { prisma } from '@documenso/prisma';+import { DocumentStatus, SendStatus } from '@documenso/prisma/client';++export interface SendDocumentOptions {+ documentId: number;+ userId: number;+}++export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) => {+ const user = await prisma.user.findFirstOrThrow({+ where: {+ id: userId,+ },+ });++ const document = await prisma.document.findUnique({+ where: {+ id: documentId,+ userId,+ },+ include: {+ Recipient: true,+ },+ });++ if (!document) {+ throw new Error('Document not found');+ }++ if (document.Recipient.length === 0) {+ throw new Error('Document has no recipients');+ }++ if (document.status === DocumentStatus.COMPLETED) {+ throw new Error('Can not send completed document');+ }++ await Promise.all([+ document.Recipient.map(async (recipient) => {+ const { email, name } = recipient;++ if (recipient.sendStatus === SendStatus.SENT) {+ return;+ }++ const template = createElement(DocumentInviteEmailTemplate, {+ documentName: document.title,+ assetBaseUrl: process.env.NEXT_PUBLIC_SITE_URL || 'http://localhost:3000',+ inviterName: user.name || undefined,+ inviterEmail: user.email,+ signDocumentLink: 'https://example.com',+ });++ mailer.sendMail({+ to: {+ address: email,+ name,+ },+ from: {+ name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',+ address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || '[email protected]',+ },+ subject: 'Please sign this document',+ html: render(template),+ text: render(template, { plainText: true }),+ });++ await prisma.recipient.update({+ where: {+ id: recipient.id,+ },+ data: {+ sendStatus: SendStatus.SENT,+ },+ });+ }),+ ]);++ const updatedDocument = await prisma.document.update({+ where: {+ id: documentId,+ },+ data: {+ status: DocumentStatus.PENDING,+ },+ });++ return updatedDocument;+};diff --git a/packages/lib/server-only/field/set-fields-for-document.ts b/packages/lib/server-only/field/set-fields-for-document.tsindex 7c2d3d068..c54d35bc1 100644--- a/packages/lib/server-only/field/set-fields-for-document.ts+++ b/packages/lib/server-only/field/set-fields-for-document.ts@@ -48,23 +48,21 @@ export const setFieldsForDocument = async ({),);- const linkedFields = fields.map((field) => {- const existing = existingFields.find((existingField) => existingField.id === field.id);+ const linkedFields = fields+ .map((field) => {+ const existing = existingFields.find((existingField) => existingField.id === field.id);- return {- ...field,- ...existing,- };- });-- for (const field of linkedFields) {- if (- field.Recipient?.sendStatus === SendStatus.SENT ||- field.Recipient?.signingStatus === SigningStatus.SIGNED- ) {- throw new Error('Cannot modify fields after sending');- }- }+ return {+ ...field,+ ...existing,+ };+ })+ .filter((field) => {+ return (+ field.Recipient?.sendStatus !== SendStatus.SENT &&+ field.Recipient?.signingStatus !== SigningStatus.SIGNED+ );+ });const persistedFields = await prisma.$transaction(linkedFields.map((field) =>diff --git a/packages/lib/server-only/recipient/set-recipients-for-document.ts b/packages/lib/server-only/recipient/set-recipients-for-document.tsindex bee6acfc3..15db42084 100644--- a/packages/lib/server-only/recipient/set-recipients-for-document.ts+++ b/packages/lib/server-only/recipient/set-recipients-for-document.ts@@ -43,26 +43,23 @@ export const setRecipientsForDocument = async ({),);- const linkedRecipients = recipients.map((recipient) => {- const existing = existingRecipients.find(- (existingRecipient) =>- existingRecipient.id === recipient.id || existingRecipient.email === recipient.email,- );+ const linkedRecipients = recipients+ .map((recipient) => {+ const existing = existingRecipients.find(+ (existingRecipient) =>+ existingRecipient.id === recipient.id || existingRecipient.email === recipient.email,+ );- return {- ...recipient,- ...existing,- };- });-- for (const recipient of linkedRecipients) {- if (- recipient.sendStatus === SendStatus.SENT ||- recipient.signingStatus === SigningStatus.SIGNED- ) {- throw new Error('Cannot modify recipients after sending');- }- }+ return {+ ...recipient,+ ...existing,+ };+ })+ .filter((recipient) => {+ return (+ recipient.sendStatus !== SendStatus.SENT && recipient.signingStatus !== SigningStatus.SIGNED+ );+ });const persistedRecipients = await prisma.$transaction(linkedRecipients.map((recipient) =>diff --git a/packages/tailwind-config/index.cjs b/packages/tailwind-config/index.cjsindex 2f6e37954..3f414588d 100644--- a/packages/tailwind-config/index.cjs+++ b/packages/tailwind-config/index.cjs@@ -44,6 +44,10 @@ module.exports = {DEFAULT: 'hsl(var(--card))',foreground: 'hsl(var(--card-foreground))',},+ widget: {+ DEFAULT: 'hsl(var(--widget))',+ // foreground: 'hsl(var(--widget-foreground))',+ },documenso: {DEFAULT: '#A2E771',50: '#FFFFFF',diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.tsindex 9d39d631b..f20643327 100644--- a/packages/trpc/server/document-router/router.ts+++ b/packages/trpc/server/document-router/router.ts@@ -1,10 +1,12 @@import { TRPCError } from '@trpc/server';+import { sendDocument } from '@documenso/lib/server-only/document/send-document';import { setFieldsForDocument } from '@documenso/lib/server-only/field/set-fields-for-document';import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/set-recipients-for-document';import { authenticatedProcedure, router } from '../trpc';import {+ ZSendDocumentMutationSchema,ZSetFieldsForDocumentMutationSchema,ZSetRecipientsForDocumentMutationSchema,} from './schema';@@ -52,4 +54,24 @@ export const documentRouter = router({});}}),++ sendDocument: authenticatedProcedure+ .input(ZSendDocumentMutationSchema)+ .mutation(async ({ input, ctx }) => {+ try {+ const { documentId } = input;++ return await sendDocument({+ userId: ctx.user.id,+ documentId,+ });+ } catch (err) {+ console.error(err);++ throw new TRPCError({+ code: 'BAD_REQUEST',+ message: 'We were unable to send this document. Please try again later.',+ });+ }+ }),});diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.tsindex 1d6f7aa7c..18c3a93ae 100644--- a/packages/trpc/server/document-router/schema.ts+++ b/packages/trpc/server/document-router/schema.ts@@ -36,3 +36,9 @@ export const ZSetFieldsForDocumentMutationSchema = z.object({export type TSetFieldsForDocumentMutationSchema = z.infer<typeof ZSetFieldsForDocumentMutationSchema>;++export const ZSendDocumentMutationSchema = z.object({+ documentId: z.number(),+});++export type TSendDocumentMutationSchema = z.infer<typeof ZSendDocumentMutationSchema>;diff --git a/packages/tsconfig/base.json b/packages/tsconfig/base.jsonindex 91807d6a8..2a0d48999 100644--- a/packages/tsconfig/base.json+++ b/packages/tsconfig/base.json@@ -16,7 +16,8 @@"preserveWatchOutput": true,"skipLibCheck": true,"strict": true,- "target": "ES2018"+ "target": "ES2018",+ "types": ["@documenso/tsconfig/process-env.d.ts"]},"exclude": ["node_modules"]}diff --git a/packages/tsconfig/process-env.d.ts b/packages/tsconfig/process-env.d.tsnew file mode 100644index 000000000..a6e1be1e2--- /dev/null+++ b/packages/tsconfig/process-env.d.ts@@ -0,0 +1,36 @@+declare namespace NodeJS {+ export interface ProcessEnv {+ NEXT_PUBLIC_SITE_URL?: string;++ NEXT_PRIVATE_DATABASE_URL: string;++ NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID: string;+ NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID: string;++ NEXT_PRIVATE_STRIPE_API_KEY: string;+ NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET: string;++ NEXT_PUBLIC_SUBSCRIPTIONS_ENABLED: string;++ NEXT_PRIVATE_SMTP_TRANSPORT?: 'mailchannels' | 'smtp-auth' | 'smtp-api';++ NEXT_PRIVATE_MAILCHANNELS_API_KEY?: string;+ NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN?: string;+ NEXT_PRIVATE_MAILCHANNELS_DKIM_SELECTOR?: string;+ NEXT_PRIVATE_MAILCHANNELS_DKIM_PRIVATE_KEY?: string;+ NEXT_PRIVATE_MAILCHANNELS_ENDPOINT?: string;++ NEXT_PRIVATE_SMTP_HOST?: string;+ NEXT_PRIVATE_SMTP_PORT?: string;+ NEXT_PRIVATE_SMTP_USERNAME?: string;+ NEXT_PRIVATE_SMTP_PASSWORD?: string;++ NEXT_PRIVATE_SMTP_APIKEY_USER?: string;+ NEXT_PRIVATE_SMTP_APIKEY?: string;++ NEXT_PRIVATE_SMTP_SECURE?: string;++ NEXT_PRIVATE_SMTP_FROM_NAME?: string;+ NEXT_PRIVATE_SMTP_FROM_ADDRESS?: string;+ }+}diff --git a/packages/ui/primitives/tooltip.tsx b/packages/ui/primitives/tooltip.tsxindex ed8020844..e44fc537e 100644--- a/packages/ui/primitives/tooltip.tsx+++ b/packages/ui/primitives/tooltip.tsx@@ -16,15 +16,17 @@ const TooltipContent = React.forwardRef<React.ElementRef<typeof TooltipPrimitive.Content>,React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>>(({ className, sideOffset = 4, ...props }, ref) => (- <TooltipPrimitive.Content- ref={ref}- sideOffset={sideOffset}- className={cn(- 'bg-popover text-popover-foreground animate-in fade-in-50 data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 z-50 overflow-hidden rounded-md border px-3 py-1.5 text-sm shadow-md',- className,- )}- {...props}- />+ <TooltipPrimitive.Portal>+ <TooltipPrimitive.Content+ ref={ref}+ sideOffset={sideOffset}+ className={cn(+ 'bg-popover text-popover-foreground animate-in fade-in-50 data-[side=bottom]:slide-in-from-top-1 data-[side=left]:slide-in-from-right-1 data-[side=right]:slide-in-from-left-1 data-[side=top]:slide-in-from-bottom-1 z-50 overflow-hidden rounded-md border px-3 py-1.5 text-sm shadow-md',+ className,+ )}+ {...props}+ />+ </TooltipPrimitive.Portal>));TooltipContent.displayName = TooltipPrimitive.Content.displayName;diff --git a/turbo.json b/turbo.jsonindex 1d40fcdbd..50407c2f9 100644--- a/turbo.json+++ b/turbo.json@@ -19,7 +19,20 @@"NEXT_PRIVATE_DATABASE_URL","NEXT_PRIVATE_NEXT_AUTH_SECRET","NEXT_PUBLIC_SUBSCRIPTIONS_ENABLED",- "NEXT_PRIVATE_GOOGLE_CLIENT_ID",- "NEXT_PRIVATE_GOOGLE_CLIENT_SECRET"+ "NEXT_PRIVATE_SMTP_TRANSPORT",+ "NEXT_PRIVATE_MAILCHANNELS_API_KEY",+ "NEXT_PRIVATE_MAILCHANNELS_ENDPOINT",+ "NEXT_PRIVATE_MAILCHANNELS_DKIM_DOMAIN",+ "NEXT_PRIVATE_MAILCHANNELS_DKIM_SELECTOR",+ "NEXT_PRIVATE_MAILCHANNELS_DKIM_PRIVATE_KEY",+ "NEXT_PRIVATE_SMTP_HOST",+ "NEXT_PRIVATE_SMTP_PORT",+ "NEXT_PRIVATE_SMTP_USERNAME",+ "NEXT_PRIVATE_SMTP_PASSWORD",+ "NEXT_PRIVATE_SMTP_APIKEY_USER",+ "NEXT_PRIVATE_SMTP_APIKEY",+ "NEXT_PRIVATE_SMTP_SECURE",+ "NEXT_PRIVATE_SMTP_FROM_NAME",+ "NEXT_PRIVATE_SMTP_FROM_ADDRESS"]}