Merge branch 'feat/refresh' into feat/redirect-signed-document

.devcontainer/devcontainer.json

@@ -1,32 +1,20 @@
 {
-  "name": "Documenso",
-  "image": "mcr.microsoft.com/devcontainers/base:bullseye",
-  "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {
-      "version": "latest",
-      "enableNonRootDocker": "true",
-      "moby": "true"
-    },
-    "ghcr.io/devcontainers/features/node:1": {}
-  },
+	"name": "Documenso",
+	"image": "mcr.microsoft.com/devcontainers/base:bullseye",
+	"features": {
+		"ghcr.io/devcontainers/features/docker-in-docker:2": {
+			"version": "latest",
+			"enableNonRootDocker": "true",
+			"moby": "true"
+		},
+		"ghcr.io/devcontainers/features/node:1": {}
+	},
   "onCreateCommand": "./.devcontainer/on-create.sh",
-  "forwardPorts": [3000, 54320, 9000, 2500, 1100],
-  "customizations": {
-    "vscode": {
-      "extensions": [
-        "aaron-bond.better-comments",
-        "bradlc.vscode-tailwindcss",
-        "dbaeumer.vscode-eslint",
-        "esbenp.prettier-vscode",
-        "mikestead.dotenv",
-        "unifiedjs.vscode-mdx",
-        "GitHub.copilot-chat",
-        "GitHub.copilot-labs",
-        "GitHub.copilot",
-        "GitHub.vscode-pull-request-github",
-        "Prisma.prisma",
-        "VisualStudioExptTeam.vscodeintellicode",
-      ]
-    }
-  }
+	"forwardPorts": [
+    3000,
+    54320,
+    9000,
+    2500,
+    1100
+  ]
 }

.env.example

@@ -7,8 +7,8 @@ NEXT_PRIVATE_GOOGLE_CLIENT_ID=""
 NEXT_PRIVATE_GOOGLE_CLIENT_SECRET=""
 
 # [[APP]]
-NEXT_PUBLIC_WEBAPP_URL="http://localhost:3000"
-NEXT_PUBLIC_MARKETING_URL="http://localhost:3001"
+NEXT_PUBLIC_SITE_URL="http://localhost:3000"
+NEXT_PUBLIC_APP_URL="http://localhost:3000"
 
 # [[DATABASE]]
 NEXT_PRIVATE_DATABASE_URL="postgres://documenso:password@127.0.0.1:54320/documenso"

.eslintignore

@@ -5,4 +5,3 @@
 # Statically hosted javascript files
 apps/*/public/*.js
 apps/*/public/*.cjs
-scripts/

.github/workflows/ci.yml

@@ -22,18 +22,12 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 2
-
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 18
           cache: npm
-
       - name: Install dependencies
         run: npm ci
-
-      - name: Copy env
-        run: cp .env.example .env
-
       - name: Build
         run: npm run build

.github/workflows/codeql-analysis.yml

@@ -32,10 +32,7 @@ jobs:
 
     - name: Install Dependencies
       run: npm ci
-
-    - name: Copy env
-      run: cp .env.example .env
-
+      
     - name: Build Documenso
       run: npm run build
 
@@ -45,4 +42,4 @@ jobs:
         languages: ${{ matrix.language }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v2

apps/marketing/content/blog/deploy-with-vercel-supabase-resend.mdx

@@ -1,198 +0,0 @@
----
-title: 'Deploying Documenso with Vercel, Supabase and Resend'
-description: This is the first part of the new Building Documenso series, where I describe the challenges and design choices that we make while building the world’s most open signing platform.
-authorName: 'Ephraim Atta-Duncan'
-authorImage: '/blog/blog-author-duncan.jpeg'
-authorRole: 'Software Engineer Intern'
-date: 2023-09-08
-tags:
-  - Open Source
-  - Self Hosting
-  - Tutorial
----
-
-In this article, we'll walk you through how to deploy and self-host Documenso using Vercel, Supabase, and Resend.
-
-You'll learn:
-
-- How to set up a Postgres database using Supabase,
-- How to install SMTP with Resend,
-- How to deploy your project with Vercel.
-
-If you don't know what [Documenso](https://documenso.com/) is, it's an open-source alternative to DocuSign, with the mission to create an open signing infrastructure while embracing openness, cooperation, and transparency.
-
-## Prerequisites
-
-Before we start, make sure you have a [GitHub](https://github.com/signup) account. You also need [Node.js](https://nodejs.org/en) and [npm](https://www.npmjs.com/) installed on your local machine (note: you also have the option to host it on a cloud environment using Gitpod for example; that would be another post). If you need accounts on Vercel, Supabase, and Resend, create them by visiting the [Vercel](https://vercel.com/), [Supabase](https://supabase.com/), and [Resend](https://resend.com/) websites.
-
-Checklist:
-
-- [ ] Have a GitHub account
-- [ ] Install Node.js
-- [ ] Install npm
-- [ ] Have a Vercel account
-- [ ] Have a Supabase account
-- [ ] Have a Resend account
-
-## Step-by-Step guide to deploying Documenso with Vercel, Supabase, and Resend
-
-To deploy Documenso, we'll take the following steps:
-
-1. Fork the Documenso repository
-2. Clone the forked repository and install dependencies
-3. Create a new project on Supabase
-4. Copy the Supabase Postgres database connection URL
-5. Create a `.env` file
-6. Run the migration on the Supabase Postgres Database
-7. Get your SMTP Keys on Resend
-8. Create a new project on Vercel
-9. Add Environment Variables to your Vercel project
-
-So, you're ready? Let’s dive in!
-
-### Step 1: Fork the Documenso repository
-
-Start by creating a fork of Documenso on GitHub. You can do this by visiting the [Documenso repository](https://github.com/documenso/documenso) and clicking on the 'Fork' button. (Also, star the repo!)
-
-![Documenso](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/wkcujctpf86p56bju3mq.png)
-
-Choose your GitHub profile as the owner and click on 'Create fork' to create a fork of the repo.
-
-![Fork the Documenso repository on GitHub](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/xf49r2byu9nnd1465niy.png)
-
-### Step 2: Clone the forked repository and install dependencies
-
-Clone the forked repository to your local machine in any directory of your choice. Open your terminal and enter the following commands:
-
-```bash
-# Clone the repo using Github CLI
-gh repo clone [your_github_username]/documenso
-
-# Clone the repo using Git
-git clone <https://github.com/[your_github_username]/documenso.git>
-```
-
-You can now navigate into the directory and install the project’s dependencies:
-
-```bash
-cd documenso
-npm install
-```
-
-### Step 3: Create a new project on Supabase
-
-Now, let's set up the database.
-
-If you haven't already, create a new project on Supabase. This will automatically create a new Postgres database for you.
-
-On your Supabase dashboard, click the '**New project**' button and choose your organization.
-
-On the '**Create a new project**' page, set a database name of **documenso** and a secure password for your database. Choose a region closer to you, a pricing plan, and click on '**Create new project**' to create your project.
-
-![Create a new project on Supabase](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/w5lqz771iupjyi1ekfdz.png)
-
-### Step 4: Copy the Supabase Postgres database connection URL
-
-In your project, click the '**Settings**' icon at the bottom left.
-
-Under the '**Project Settings**' section, click '**Database**' and scroll down to the '**Connection string**' section. Copy the '**URI**' and update it with the password you chose in the previous step.
-
-![Copy the Supabase Postgres database connection URL](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/y1ldu3qrg9moednbzjij.png)
-
-### Step 5: Create a `.env` file
-
-Create a `.env` file in the root of your project by copying the contents of the `.env.example` file.
-
-Add the connection string you copied from your Supabase dashboard to the `DATABASE_URL` variable in the `.env` file.
-
-The `.env` should look like this:
-
-```bash
-DATABASE_URL="postgres://postgres:[YOUR-PASSWORD]@db.[YOUR-PROJECT-REF].supabase.co:5432/postgres"
-```
-
-### Step 6: Run the migration on the Supabase Postgres Database
-
-Run the migration on the Supabase Postgres Database using the following command:
-
-```bash
-npx prisma migrate deploy
-```
-
-### Step 7: Get your SMTP Keys on Resend
-
-So, you've just cloned Documenso, installed dependencies on your local machine, and set your database using Supabase. Now, SMTP is missing. Emails won't go out! Let's fix it with Resend.
-
-In the **[Resend](https://resend.com/)** dashboard, click 'Add API Key' to create a key for Resend SMTP.
-
-![Create a key for Resend SMTP](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/uh2rztgn09mlvecl34i5.png)
-
-Next, add and verify your domain in the '**Domains**' section on the sidebar. This will allow you to send emails from any address associated with your domain.
-
-![Verify your domain on Resend](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/nxgie0esz530vq5a494o.png)
-
-You can update your `.env` file with the following:
-
-```jsx
-SMTP_MAIL_HOST = 'smtp.resend.com';
-SMTP_MAIL_PORT = '25';
-SMTP_MAIL_USER = 'resend';
-SMTP_MAIL_PASSWORD = 'YOUR_RESEND_API_KEY';
-MAIL_FROM = 'noreply@[YOUR_DOMAIN]';
-```
-
-### Step 8: Create a new project on Vercel
-
-You set the database with Supabase and are SMTP-ready with Resend. Almost there! The next step is to deploy the project — we'll use Vercel for that.
-
-On your Vercel dashboard, create a new project using the forked project from your GitHub repositories. Select the project among the options and click '**Import**' to start running Documenso.
-
-![Create a new project on Vercel](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/gdy97tltpnu7vf4fc11f.png)
-
-### Step 9: Add Environment Variables to your Vercel project
-
-In the '**Configure Project**' page, adding the required Environmental Variables is essential to ensure the application deploys without any errors.
-
-Specifically, for the `NEXT_PUBLIC_WEBAPP_URL` and `NEXTAUTH_URL` variables, you must add `.vercel.app` to your Project Name. This will form the deployment URL, which will be in the format: `https://[project_name].vercel.app`.
-
-For example, in my case, the deployment URL is `https://documenso-supabase-web.vercel.app`.
-
-![Add Environment Variables to your Vercel project](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/aru33fk1i19h0valffow.png)
-
-This is a sample `.env` to deploy. Copy and paste it to auto-populate the fields and click ‘**Deploy.’** Now, you only need to wait for your project to deploy. You’re going live — enjoy!
-
-```bash
-DATABASE_URL='postgresql://postgres:typeinastrongpassword@db.njuigobjlbteahssqbtw.supabase.co:5432/postgres'
-
-NEXT_PUBLIC_WEBAPP_URL='https://documenso-supabase-web.vercel.app'
-NEXTAUTH_SECRET='something gibrish to encrypt your jwt tokens'
-NEXTAUTH_URL='https://documenso-supabase-web.vercel.app'
-
-# Get a Sendgrid Api key here: <https://signup.sendgrid.com>
-SENDGRID_API_KEY=''
-
-# Set SMTP credentials to use SMTP instead of the Sendgrid API.
-SMTP_MAIL_HOST='smtp.resend.com'
-SMTP_MAIL_PORT='25'
-SMTP_MAIL_USER='resend'
-SMTP_MAIL_PASSWORD='YOUR_RESEND_API_KEY'
-MAIL_FROM='noreply@[YOUR_DOMAIN]'
-
-NEXT_PUBLIC_ALLOW_SIGNUP=true
-```
-
-## Wrapping up
-
-![Deploying Documenso](https://dev-to-uploads.s3.amazonaws.com/uploads/articles/secg29j9j40o4u2oa8o8.png)
-
-Congratulations! 🎉 You've successfully deployed Documenso using Vercel, Supabase, and Resend. You're now ready to create and sign your own documents with your self-hosted Documenso!
-
-In this step-by-step guide, you learned how to:
-
-- set up a Postgres database using Supabase,
-- install SMTP with Resend,
-- deploy your project with Vercel.
-
-Over to you! How was the tutorial? If you enjoyed it, [please do share](https://twitter.com/documenso/status/1700141802693480482)! And if you have any questions or comments, please reach out to me on [Twitter / X](https://twitter.com/EphraimDuncan_) (DM open) or [Discord](https://documen.so/discord).
-
-We're building an open-source alternative to DocuSign and welcome every contribution. Head over to the GitHub repository and [leave us a Star](https://github.com/documenso/documenso)!

apps/marketing/content/blog/next.mdx

@@ -20,11 +20,11 @@ Today, I'm pleased to share with you a preview of the next Documenso.
 
 We redesigned the whole signing flow to make it more appealing and more convenient.
 
-We improved the overall look and feel by making it more elegant and appropriately playful. Focused on the task at hand, but explicitly enjoying doing it. 
+We improved the overall look and feel by making it more elegant and appropriately playful. Focused on the task at hand, but explicitly enjoying doing it.
 
 **We call it happy minimalism.**
 
-We paid particular attention to the moment of signing, which should be celebrated. 
+We paid particular attention to the moment of signing, which should be celebrated.
 
 The image below is the final bloom of the completion celebration we added:
 

apps/marketing/next.config.js

@@ -18,40 +18,6 @@ const config = {
       transform: 'lucide-react/dist/esm/icons/{{ kebabCase member }}',
     },
   },
-  async headers() {
-    return [
-      {
-        source: '/:path*',
-        headers: [
-          {
-            key: 'x-dns-prefetch-control',
-            value: 'on',
-          },
-          {
-            key: 'strict-transport-security',
-            value: 'max-age=31536000; includeSubDomains; preload',
-          },
-          {
-            key: 'x-frame-options',
-            value: 'SAMEORIGIN',
-          },
-          {
-            key: 'x-content-type-options',
-            value: 'nosniff',
-          },
-          {
-            key: 'referrer-policy',
-            value: 'strict-origin-when-cross-origin',
-          },
-          {
-            key: 'permissions-policy',
-            value:
-              'accelerometer=(), camera=(), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), payment=(), usb=()',
-          },
-        ],
-      },
-    ];
-  },
 };
 
 module.exports = withContentlayer(config);

apps/marketing/package.json

@@ -8,7 +8,6 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "clean": "rimraf .next && rimraf node_modules",
     "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
   },
   "dependencies": {
@@ -19,9 +18,9 @@
     "@hookform/resolvers": "^3.1.0",
     "contentlayer": "^0.3.4",
     "framer-motion": "^10.12.8",
-    "lucide-react": "^0.279.0",
+    "lucide-react": "^0.214.0",
     "micro": "^10.0.1",
-    "next": "13.4.19",
+    "next": "13.4.12",
     "next-auth": "4.22.3",
     "next-contentlayer": "^0.3.4",
     "next-plausible": "^3.10.1",

apps/marketing/process-env.d.ts

@@ -1,7 +1,6 @@
 declare namespace NodeJS {
   export interface ProcessEnv {
-    NEXT_PUBLIC_WEBAPP_URL?: string;
-    NEXT_PUBLIC_MARKETING_URL?: string;
+    NEXT_PUBLIC_SITE_URL?: string;
 
     NEXT_PRIVATE_DATABASE_URL: string;
 

apps/marketing/src/app/(marketing)/blog/[post]/page.tsx

@@ -19,7 +19,6 @@ export const generateMetadata = ({ params }: { params: { post: string } }) => {
 
   return {
     title: `Documenso - ${blogPost.title}`,
-    description: blogPost.description,
   };
 };
 

apps/marketing/src/app/(marketing)/claimed/page.tsx

@@ -161,7 +161,7 @@ export default async function ClaimedPlanPage({ searchParams = {} }: ClaimedPlan
         </p>
 
         <Link
-          href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`}
+          href={`${process.env.NEXT_PUBLIC_APP_URL}/login`}
           target="_blank"
           className="mt-4 block"
         >

apps/marketing/src/app/layout.tsx

@@ -21,12 +21,12 @@ export const metadata = {
     description:
       'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.',
     type: 'website',
-    images: [`${process.env.NEXT_PUBLIC_MARKETING_URL}/opengraph-image.jpg`],
+    images: [`${process.env.NEXT_PUBLIC_SITE_URL}/opengraph-image.jpg`],
   },
   twitter: {
     site: '@documenso',
     card: 'summary_large_image',
-    images: [`${process.env.NEXT_PUBLIC_MARKETING_URL}/opengraph-image.jpg`],
+    images: [`${process.env.NEXT_PUBLIC_SITE_URL}/opengraph-image.jpg`],
     description:
       'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.',
   },

apps/marketing/src/app/not-found.tsx

@@ -1,65 +0,0 @@
-'use client';
-
-import Image from 'next/image';
-import Link from 'next/link';
-import { useRouter } from 'next/navigation';
-
-import { motion } from 'framer-motion';
-import { ChevronLeft } from 'lucide-react';
-
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-
-import backgroundPattern from '~/assets/background-pattern.png';
-
-export default function NotFound() {
-  const router = useRouter();
-
-  return (
-    <div className={cn('relative max-w-[100vw] overflow-hidden')}>
-      <div className="absolute -inset-24 -z-10">
-        <motion.div
-          className="flex h-full w-full items-center justify-center"
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 0.8, transition: { duration: 0.5, delay: 0.5 } }}
-        >
-          <Image
-            src={backgroundPattern}
-            alt="background pattern"
-            className="-mr-[50vw] -mt-[15vh] h-full scale-100 object-cover md:scale-100 lg:scale-[100%]"
-            priority
-          />
-        </motion.div>
-      </div>
-
-      <div className="container mx-auto flex h-full min-h-screen items-center px-6 py-32">
-        <div>
-          <p className="text-muted-foreground font-semibold">404 Page not found</p>
-
-          <h1 className="mt-3 text-2xl font-bold md:text-3xl">Oops! Something went wrong.</h1>
-
-          <p className="text-muted-foreground mt-4 text-sm">
-            The page you are looking for was moved, removed, renamed or might never have existed.
-          </p>
-
-          <div className="mt-6 flex gap-x-2.5 gap-y-4 md:items-center">
-            <Button
-              variant="ghost"
-              className="w-32"
-              onClick={() => {
-                void router.back();
-              }}
-            >
-              <ChevronLeft className="mr-2 h-4 w-4" />
-              Go Back
-            </Button>
-
-            <Button className="w-32" asChild>
-              <Link href="/">Home</Link>
-            </Button>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/marketing/src/app/robots.ts

@@ -4,11 +4,11 @@ import { getBaseUrl } from '@documenso/lib/universal/get-base-url';
 
 export default function robots(): MetadataRoute.Robots {
   return {
-    rules: [
-      {
-        userAgent: '*',
-      },
-    ],
+    rules: {
+      userAgent: '*',
+      allow: '/*',
+      disallow: ['/_next/*'],
+    },
     sitemap: `${getBaseUrl()}/sitemap.xml`,
   };
 }

apps/marketing/src/pages/api/claim-plan/index.ts

@@ -43,7 +43,7 @@ export default async function handler(
 
     if (user && user.Subscription.length > 0) {
       return res.status(200).json({
-        redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`,
+        redirectUrl: `${process.env.NEXT_PUBLIC_APP_URL}/login`,
       });
     }
 
@@ -103,8 +103,8 @@ export default async function handler(
       mode: 'subscription',
       metadata,
       allow_promotion_codes: true,
-      success_url: `${process.env.NEXT_PUBLIC_MARKETING_URL}/claimed?sessionId={CHECKOUT_SESSION_ID}`,
-      cancel_url: `${process.env.NEXT_PUBLIC_MARKETING_URL}/pricing?email=${encodeURIComponent(
+      success_url: `${process.env.NEXT_PUBLIC_SITE_URL}/claimed?sessionId={CHECKOUT_SESSION_ID}`,
+      cancel_url: `${process.env.NEXT_PUBLIC_SITE_URL}/pricing?email=${encodeURIComponent(
         email,
       )}&name=${encodeURIComponent(name)}&planId=${planId}&cancelled=true`,
     });

apps/web/package.json

@@ -8,7 +8,6 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "clean": "rimraf .next && rimraf node_modules",
     "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
   },
   "dependencies": {
@@ -22,10 +21,10 @@
     "@tanstack/react-query": "^4.29.5",
     "formidable": "^2.1.1",
     "framer-motion": "^10.12.8",
-    "lucide-react": "^0.279.0",
+    "lucide-react": "^0.214.0",
     "luxon": "^3.4.0",
     "micro": "^10.0.1",
-    "next": "13.4.19",
+    "next": "13.4.12",
     "next-auth": "4.22.3",
     "next-plausible": "^3.10.1",
     "next-themes": "^0.2.1",

apps/web/process-env.d.ts

@@ -1,7 +1,6 @@
 declare namespace NodeJS {
   export interface ProcessEnv {
-    NEXT_PUBLIC_WEBAPP_URL?: string;
-    NEXT_PUBLIC_MARKETING_URL?: string;
+    NEXT_PUBLIC_SITE_URL?: string;
 
     NEXT_PRIVATE_DATABASE_URL: string;
 

apps/web/public/next.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

apps/web/public/vercel.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>

apps/web/src/app/(dashboard)/documents/data-table-action-button.tsx

@@ -7,11 +7,7 @@ import { useSession } from 'next-auth/react';
 import { match } from 'ts-pattern';
 
 import { Document, DocumentStatus, Recipient, SigningStatus, User } from '@documenso/prisma/client';
-import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
 
 export type DataTableActionButtonProps = {
   row: Document & {
@@ -22,16 +18,11 @@ export type DataTableActionButtonProps = {
 
 export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => {
   const { data: session } = useSession();
-  const { toast } = useToast();
-  const [, copyToClipboard] = useCopyToClipboard();
 
   if (!session) {
     return null;
   }
 
-  const { mutateAsync: createOrGetShareLink, isLoading: isCreatingShareLink } =
-    trpc.shareLink.createOrGetShareLink.useMutation();
-
   const recipient = row.Recipient.find((recipient) => recipient.email === session.user.email);
 
   const isOwner = row.User.id === session.user.id;
@@ -41,20 +32,6 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => {
   const isComplete = row.status === DocumentStatus.COMPLETED;
   const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
 
-  const onShareClick = async () => {
-    const { slug } = await createOrGetShareLink({
-      token: recipient?.token,
-      documentId: row.id,
-    });
-
-    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
-
-    toast({
-      title: 'Copied to clipboard',
-      description: 'The sharing link has been copied to your clipboard.',
-    });
-  };
-
   return match({
     isOwner,
     isRecipient,
@@ -80,8 +57,8 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => {
       </Button>
     ))
     .otherwise(() => (
-      <Button className="w-24" loading={isCreatingShareLink} onClick={onShareClick}>
-        {!isCreatingShareLink && <Share className="-ml-1 mr-2 h-4 w-4" />}
+      <Button className="w-24" disabled>
+        <Share className="-ml-1 mr-2 h-4 w-4" />
         Share
       </Button>
     ));

apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx

@@ -7,7 +7,6 @@ import {
   Download,
   Edit,
   History,
-  Loader,
   MoreHorizontal,
   Pencil,
   Share,
@@ -19,8 +18,7 @@ import { useSession } from 'next-auth/react';
 import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { Document, DocumentStatus, Recipient, User } from '@documenso/prisma/client';
 import { DocumentWithData } from '@documenso/prisma/types/document-with-data';
-import { trpc as trpcClient } from '@documenso/trpc/client';
-import { trpc as trpcReact } from '@documenso/trpc/react';
+import { trpc } from '@documenso/trpc/client';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -28,9 +26,6 @@ import {
   DropdownMenuLabel,
   DropdownMenuTrigger,
 } from '@documenso/ui/primitives/dropdown-menu';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
 
 export type DataTableActionDropdownProps = {
   row: Document & {
@@ -41,16 +36,11 @@ export type DataTableActionDropdownProps = {
 
 export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) => {
   const { data: session } = useSession();
-  const { toast } = useToast();
-  const [, copyToClipboard] = useCopyToClipboard();
 
   if (!session) {
     return null;
   }
 
-  const { mutateAsync: createOrGetShareLink, isLoading: isCreatingShareLink } =
-    trpcReact.shareLink.createOrGetShareLink.useMutation();
-
   const recipient = row.Recipient.find((recipient) => recipient.email === session.user.email);
 
   const isOwner = row.User.id === session.user.id;
@@ -60,29 +50,15 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
   const isComplete = row.status === DocumentStatus.COMPLETED;
   // const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
 
-  const onShareClick = async () => {
-    const { slug } = await createOrGetShareLink({
-      token: recipient?.token,
-      documentId: row.id,
-    });
-
-    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
-
-    toast({
-      title: 'Copied to clipboard',
-      description: 'The sharing link has been copied to your clipboard.',
-    });
-  };
-
   const onDownloadClick = async () => {
     let document: DocumentWithData | null = null;
 
     if (!recipient) {
-      document = await trpcClient.document.getDocumentById.query({
+      document = await trpc.document.getDocumentById.query({
         id: row.id,
       });
     } else {
-      document = await trpcClient.document.getDocumentByToken.query({
+      document = await trpc.document.getDocumentByToken.query({
         token: recipient.token,
       });
     }
@@ -159,12 +135,8 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
           Resend
         </DropdownMenuItem>
 
-        <DropdownMenuItem onClick={onShareClick}>
-          {isCreatingShareLink ? (
-            <Loader className="mr-2 h-4 w-4" />
-          ) : (
-            <Share className="mr-2 h-4 w-4" />
-          )}
+        <DropdownMenuItem disabled>
+          <Share className="mr-2 h-4 w-4" />
           Share
         </DropdownMenuItem>
       </DropdownMenuContent>

apps/web/src/app/(dashboard)/documents/empty-state.tsx

@@ -1,50 +0,0 @@
-import { Bird, CheckCircle2 } from 'lucide-react';
-import { match } from 'ts-pattern';
-
-import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
-
-export type EmptyDocumentProps = { status: ExtendedDocumentStatus };
-
-export const EmptyDocumentState = ({ status }: EmptyDocumentProps) => {
-  const {
-    title,
-    message,
-    icon: Icon,
-  } = match(status)
-    .with(ExtendedDocumentStatus.COMPLETED, () => ({
-      title: 'Nothing to do',
-      message:
-        'There are no completed documents yet. Documents that you have created or received that become completed will appear here later.',
-      icon: CheckCircle2,
-    }))
-    .with(ExtendedDocumentStatus.DRAFT, () => ({
-      title: 'No active drafts',
-      message:
-        'There are no active drafts at then current moment. You can upload a document to start drafting.',
-      icon: CheckCircle2,
-    }))
-    .with(ExtendedDocumentStatus.ALL, () => ({
-      title: "We're all empty",
-      message:
-        'You have not yet created or received any documents. To create a document please upload one.',
-      icon: Bird,
-    }))
-    .otherwise(() => ({
-      title: 'Nothing to do',
-      message:
-        'All documents are currently actioned. Any new documents are sent or recieved they will start to appear here.',
-      icon: CheckCircle2,
-    }));
-
-  return (
-    <div className="text-muted-foreground/60 flex h-60 flex-col items-center justify-center gap-y-4">
-      <Icon className="h-12 w-12" strokeWidth={1.5} />
-
-      <div className="text-center">
-        <h3 className="text-lg font-semibold">{title}</h3>
-
-        <p className="mt-2 max-w-[60ch]">{message}</p>
-      </div>
-    </div>
-  );
-};

apps/web/src/app/(dashboard)/documents/page.tsx

@@ -12,7 +12,6 @@ import { PeriodSelectorValue } from '~/components/(dashboard)/period-selector/ty
 import { DocumentStatus } from '~/components/formatter/document-status';
 
 import { DocumentsDataTable } from './data-table';
-import { EmptyDocumentState } from './empty-state';
 import { UploadDocument } from './upload-document';
 
 export type DocumentsPageProps = {
@@ -97,8 +96,7 @@ export default async function DocumentsPage({ searchParams = {} }: DocumentsPage
       </div>
 
       <div className="mt-8">
-        {results.count > 0 && <DocumentsDataTable results={results} />}
-        {results.count === 0 && <EmptyDocumentState status={status} />}
+        <DocumentsDataTable results={results} />
       </div>
     </div>
   );

apps/web/src/app/(dashboard)/documents/upload-document.tsx

@@ -68,7 +68,7 @@ export const UploadDocument = ({ className }: UploadDocumentProps) => {
 
       {isLoading && (
         <div className="absolute inset-0 flex items-center justify-center bg-white/50">
-          <Loader className="text-muted-foreground h-12 w-12 animate-spin" />
+          <Loader className="h-12 w-12 animate-spin text-slate-500" />
         </div>
       )}
     </div>

apps/web/src/app/(dashboard)/settings/billing/page.tsx

@@ -35,7 +35,7 @@ export default async function BillingSettingsPage() {
   if (subscription.customerId) {
     billingPortalUrl = await getPortalSession({
       customerId: subscription.customerId,
-      returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,
+      returnUrl: `${process.env.NEXT_PUBLIC_SITE_URL}/settings/billing`,
     });
   }
 
@@ -43,7 +43,7 @@ export default async function BillingSettingsPage() {
     <div>
       <h3 className="text-lg font-medium">Billing</h3>
 
-      <p className="text-muted-foreground mt-2 text-sm">
+      <p className="mt-2 text-sm text-slate-500">
         Your subscription is{' '}
         {subscription.status !== SubscriptionStatus.INACTIVE ? 'active' : 'inactive'}.
         {subscription?.periodEnd && (
@@ -67,7 +67,7 @@ export default async function BillingSettingsPage() {
       )}
 
       {!billingPortalUrl && (
-        <p className="text-muted-foreground max-w-[60ch] text-base">
+        <p className="max-w-[60ch] text-base text-slate-500">
           You do not currently have a customer record, this should not happen. Please contact
           support for assistance.
         </p>

apps/web/src/app/(dashboard)/settings/password/page.tsx

@@ -9,7 +9,7 @@ export default async function PasswordSettingsPage() {
     <div>
       <h3 className="text-lg font-medium">Password</h3>
 
-      <p className="text-muted-foreground mt-2 text-sm">Here you can update your password.</p>
+      <p className="mt-2 text-sm text-slate-500">Here you can update your password.</p>
 
       <hr className="my-4" />
 

apps/web/src/app/(dashboard)/settings/profile/page.tsx

@@ -9,7 +9,7 @@ export default async function ProfileSettingsPage() {
     <div>
       <h3 className="text-lg font-medium">Profile</h3>
 
-      <p className="text-muted-foreground mt-2 text-sm">Here you can edit your personal details.</p>
+      <p className="mt-2 text-sm text-slate-500">Here you can edit your personal details.</p>
 
       <hr className="my-4" />
 

apps/web/src/app/(share)/share/[slug]/opengraph-image.tsx

@@ -1,153 +0,0 @@
-import { ImageResponse } from 'next/server';
-
-import { P, match } from 'ts-pattern';
-
-import { getRecipientOrSenderByShareLinkSlug } from '@documenso/lib/server-only/share/get-recipient-or-sender-by-share-link-slug';
-
-import { Logo } from '~/components/branding/logo';
-import { getAssetBuffer } from '~/helpers/get-asset-buffer';
-
-const CARD_OFFSET_TOP = 152;
-const CARD_OFFSET_LEFT = 350;
-const CARD_WIDTH = 500;
-const CARD_HEIGHT = 250;
-
-const size = {
-  width: 1200,
-  height: 630,
-};
-
-type SharePageOpenGraphImageProps = {
-  params: { slug: string };
-};
-
-export default async function Image({ params: { slug } }: SharePageOpenGraphImageProps) {
-  const [interSemiBold, interRegular, caveatRegular, shareFrameImage] = await Promise.all([
-    getAssetBuffer('/fonts/inter-semibold.ttf'),
-    getAssetBuffer('/fonts/inter-regular.ttf'),
-    getAssetBuffer('/fonts/caveat-regular.ttf'),
-    getAssetBuffer('/static/og-share-frame.png'),
-  ]);
-
-  const recipientOrSender = await getRecipientOrSenderByShareLinkSlug({ slug }).catch(() => null);
-
-  if (!recipientOrSender) {
-    return null;
-  }
-
-  const isRecipient = 'Signature' in recipientOrSender;
-
-  const signatureImage = match(recipientOrSender)
-    .with({ Signature: P.array(P._) }, (recipient) => {
-      return recipient.Signature?.[0]?.signatureImageAsBase64 || null;
-    })
-    .otherwise((sender) => {
-      return sender.signature || null;
-    });
-
-  const signatureName = match(recipientOrSender)
-    .with({ Signature: P.array(P._) }, (recipient) => {
-      return recipient.name || recipient.email;
-    })
-    .otherwise((sender) => {
-      return sender.name || sender.email;
-    });
-
-  return new ImageResponse(
-    (
-      <div tw="relative flex h-full w-full">
-        {/* @ts-expect-error Lack of typing from ImageResponse */}
-        <img src={shareFrameImage} alt="og-share-frame" tw="absolute inset-0 w-full h-full" />
-
-        <div tw="absolute top-20 flex w-full items-center justify-center">
-          {/* @ts-expect-error Lack of typing from ImageResponse */}
-          <Logo tw="h-8 w-60" />
-        </div>
-
-        {signatureImage ? (
-          <div
-            tw="absolute py-6 px-12 flex items-center justify-center text-center"
-            style={{
-              top: `${CARD_OFFSET_TOP}px`,
-              left: `${CARD_OFFSET_LEFT}px`,
-              width: `${CARD_WIDTH}px`,
-              height: `${CARD_HEIGHT}px`,
-            }}
-          >
-            <img src={signatureImage} alt="signature" tw="opacity-60 h-full max-w-[100%]" />
-          </div>
-        ) : (
-          <p
-            tw="absolute py-6 px-12 -mt-2 flex items-center justify-center text-center text-slate-500"
-            style={{
-              fontFamily: 'Caveat',
-              fontSize: `${Math.max(
-                Math.min((CARD_WIDTH * 1.5) / signatureName.length, 80),
-                36,
-              )}px`,
-              top: `${CARD_OFFSET_TOP}px`,
-              left: `${CARD_OFFSET_LEFT}px`,
-              width: `${CARD_WIDTH}px`,
-              height: `${CARD_HEIGHT}px`,
-            }}
-          >
-            {signatureName}
-          </p>
-        )}
-
-        {/* <div
-          tw="absolute flex items-center justify-center text-slate-500"
-          style={{
-            top: `${CARD_OFFSET_TOP + CARD_HEIGHT - 45}px`,
-            left: `${CARD_OFFSET_LEFT}`,
-            width: `${CARD_WIDTH}px`,
-            fontSize: '30px',
-          }}
-        >
-          {signatureName}
-        </div> */}
-
-        <div
-          tw="absolute flex flex-col items-center justify-center pt-12 w-full"
-          style={{
-            top: `${CARD_OFFSET_TOP + CARD_HEIGHT}px`,
-          }}
-        >
-          <h2
-            tw="text-3xl text-slate-500"
-            style={{
-              fontFamily: 'Inter',
-              fontWeight: 600,
-            }}
-          >
-            {isRecipient
-              ? 'I just signed with Documenso and you can too!'
-              : 'I just sent a document with Documenso and you can too!'}
-          </h2>
-        </div>
-      </div>
-    ),
-    {
-      ...size,
-      fonts: [
-        {
-          name: 'Caveat',
-          data: caveatRegular,
-          style: 'italic',
-        },
-        {
-          name: 'Inter',
-          data: interRegular,
-          style: 'normal',
-          weight: 400,
-        },
-        {
-          name: 'Inter',
-          data: interSemiBold,
-          style: 'normal',
-          weight: 600,
-        },
-      ],
-    },
-  );
-}

apps/web/src/app/(share)/share/[slug]/page.tsx

@@ -1,11 +0,0 @@
-import { Metadata } from 'next';
-
-import { Redirect } from './redirect';
-
-export const metadata: Metadata = {
-  title: 'Documenso - Share',
-};
-
-export default function SharePage() {
-  return <Redirect />;
-}

apps/web/src/app/(share)/share/[slug]/redirect.tsx

@@ -1,11 +0,0 @@
-'use client';
-
-import { useEffect } from 'react';
-
-export const Redirect = () => {
-  useEffect(() => {
-    window.location.href = process.env.NEXT_PUBLIC_MARKETING_URL ?? 'http://localhost:3001';
-  }, []);
-
-  return null;
-};

apps/web/src/app/(signing)/sign/[token]/complete/page.tsx

@@ -1,16 +1,16 @@
 import Link from 'next/link';
 import { notFound } from 'next/navigation';
 
-import { CheckCircle2, Clock8 } from 'lucide-react';
+import { CheckCircle2, Clock8, Share } from 'lucide-react';
 import { match } from 'ts-pattern';
 
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
 import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { DocumentStatus, FieldType } from '@documenso/prisma/client';
+import { Button } from '@documenso/ui/primitives/button';
 
 import { DownloadButton } from './download-button';
-import { ShareButton } from './share-button';
 import { SigningCard } from './signing-card';
 
 export type CompletedSigningPageProps = {
@@ -88,7 +88,11 @@ export default async function CompletedSigningPage({
         ))}
 
       <div className="mt-8 flex w-full max-w-sm items-center justify-center gap-4">
-        <ShareButton documentId={document.id} token={recipient.token} />
+        {/* TODO: Hook this up */}
+        <Button variant="outline" className="flex-1">
+          <Share className="mr-2 h-5 w-5" />
+          Share
+        </Button>
 
         <DownloadButton
           className="flex-1"

apps/web/src/app/(signing)/sign/[token]/complete/share-button.tsx

@@ -1,51 +0,0 @@
-'use client';
-
-import { HTMLAttributes } from 'react';
-
-import { Share } from 'lucide-react';
-
-import { trpc } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
-
-export type ShareButtonProps = HTMLAttributes<HTMLButtonElement> & {
-  token: string;
-  documentId: number;
-};
-
-export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
-  const { toast } = useToast();
-  const [, copyToClipboard] = useCopyToClipboard();
-
-  const { mutateAsync: createOrGetShareLink, isLoading } =
-    trpc.shareLink.createOrGetShareLink.useMutation();
-
-  const onShareClick = async () => {
-    const { slug } = await createOrGetShareLink({
-      token: token,
-      documentId,
-    });
-
-    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
-
-    toast({
-      title: 'Copied to clipboard',
-      description: 'The sharing link has been copied to your clipboard.',
-    });
-  };
-
-  return (
-    <Button
-      variant="outline"
-      className="flex-1"
-      disabled={!token || !documentId}
-      loading={isLoading}
-      onClick={onShareClick}
-    >
-      {!isLoading && <Share className="mr-2 h-5 w-5" />}
-      Share
-    </Button>
-  );
-};

apps/web/src/app/(signing)/sign/[token]/page.tsx

@@ -1,4 +1,4 @@
-import { notFound } from 'next/navigation';
+import { notFound, redirect } from 'next/navigation';
 
 import { match } from 'ts-pattern';
 
@@ -9,7 +9,7 @@ import { viewedDocument } from '@documenso/lib/server-only/document/viewed-docum
 import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-for-token';
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { getFile } from '@documenso/lib/universal/upload/get-file';
-import { FieldType } from '@documenso/prisma/client';
+import { DocumentStatus, FieldType, SigningStatus } from '@documenso/prisma/client';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { ElementVisible } from '@documenso/ui/primitives/element-visible';
 import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
@@ -38,7 +38,7 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
     }).catch(() => null),
     getFieldsForToken({ token }),
     getRecipientByToken({ token }).catch(() => null),
-    viewedDocument({ token }).catch(() => null),
+    viewedDocument({ token }),
   ]);
 
   if (!document || !document.documentData || !recipient) {
@@ -53,6 +53,13 @@ export default async function SigningPage({ params: { token } }: SigningPageProp
 
   const user = await getServerComponentSession();
 
+  if (
+    document.status === DocumentStatus.COMPLETED ||
+    recipient.signingStatus === SigningStatus.SIGNED
+  ) {
+    redirect(`/sign/${token}/complete`);
+  }
+
   return (
     <SigningProvider email={recipient.email} fullName={recipient.name} signature={user?.signature}>
       <div className="mx-auto w-full max-w-screen-xl px-4 md:px-8">

apps/web/src/app/(unauthenticated)/check-email/page.tsx

@@ -1,20 +0,0 @@
-import Link from 'next/link';
-
-import { Button } from '@documenso/ui/primitives/button';
-
-export default function ForgotPasswordPage() {
-  return (
-    <div>
-      <h1 className="text-4xl font-semibold">Email sent!</h1>
-
-      <p className="text-muted-foreground mb-4 mt-2 text-sm">
-        A password reset email has been sent, if you have an account you should see it in your inbox
-        shortly.
-      </p>
-
-      <Button asChild>
-        <Link href="/signin">Return to sign in</Link>
-      </Button>
-    </div>
-  );
-}

apps/web/src/app/(unauthenticated)/forgot-password/page.tsx

@@ -1,25 +0,0 @@
-import Link from 'next/link';
-
-import { ForgotPasswordForm } from '~/components/forms/forgot-password';
-
-export default function ForgotPasswordPage() {
-  return (
-    <div>
-      <h1 className="text-4xl font-semibold">Forgotten your password?</h1>
-
-      <p className="text-muted-foreground mt-2 text-sm">
-        No worries, it happens! Enter your email and we'll email you a special link to reset your
-        password.
-      </p>
-
-      <ForgotPasswordForm className="mt-4" />
-
-      <p className="text-muted-foreground mt-6 text-center text-sm">
-        Remembered your password?{' '}
-        <Link href="/signin" className="text-primary duration-200 hover:opacity-70">
-          Sign In
-        </Link>
-      </p>
-    </div>
-  );
-}

apps/web/src/app/(unauthenticated)/layout.tsx

@@ -1,27 +0,0 @@
-import React from 'react';
-
-import Image from 'next/image';
-
-import backgroundPattern from '~/assets/background-pattern.png';
-
-type UnauthenticatedLayoutProps = {
-  children: React.ReactNode;
-};
-
-export default function UnauthenticatedLayout({ children }: UnauthenticatedLayoutProps) {
-  return (
-    <main className="bg-sand-100 relative flex min-h-screen flex-col items-center justify-center overflow-hidden  px-4 py-12 md:p-12 lg:p-24">
-      <div className="relative flex w-full max-w-md items-center gap-x-24">
-        <div className="absolute -inset-96 -z-[1] flex items-center justify-center opacity-50">
-          <Image
-            src={backgroundPattern}
-            alt="background pattern"
-            className="dark:brightness-95 dark:invert dark:sepia"
-          />
-        </div>
-
-        <div className="w-full">{children}</div>
-      </div>
-    </main>
-  );
-}

apps/web/src/app/(unauthenticated)/reset-password/[token]/page.tsx

@@ -1,37 +0,0 @@
-import Link from 'next/link';
-import { redirect } from 'next/navigation';
-
-import { getResetTokenValidity } from '@documenso/lib/server-only/user/get-reset-token-validity';
-
-import { ResetPasswordForm } from '~/components/forms/reset-password';
-
-type ResetPasswordPageProps = {
-  params: {
-    token: string;
-  };
-};
-
-export default async function ResetPasswordPage({ params: { token } }: ResetPasswordPageProps) {
-  const isValid = await getResetTokenValidity({ token });
-
-  if (!isValid) {
-    redirect('/reset-password');
-  }
-
-  return (
-    <div className="w-full">
-      <h1 className="text-4xl font-semibold">Reset Password</h1>
-
-      <p className="text-muted-foreground mt-2 text-sm">Please choose your new password </p>
-
-      <ResetPasswordForm token={token} className="mt-4" />
-
-      <p className="text-muted-foreground mt-6 text-center text-sm">
-        Don't have an account?{' '}
-        <Link href="/signup" className="text-primary duration-200 hover:opacity-70">
-          Sign up
-        </Link>
-      </p>
-    </div>
-  );
-}

apps/web/src/app/(unauthenticated)/reset-password/page.tsx

@@ -1,20 +0,0 @@
-import Link from 'next/link';
-
-import { Button } from '@documenso/ui/primitives/button';
-
-export default function ResetPasswordPage() {
-  return (
-    <div>
-      <h1 className="text-4xl font-semibold">Unable to reset password</h1>
-
-      <p className="text-muted-foreground mt-2 text-sm">
-        The token you have used to reset your password is either expired or it never existed. If you
-        have still forgotten your password, please request a new reset link.
-      </p>
-
-      <Button className="mt-4" asChild>
-        <Link href="/signin">Return to sign in</Link>
-      </Button>
-    </div>
-  );
-}

apps/web/src/app/(unauthenticated)/signin/page.tsx

@@ -1,33 +1,43 @@
+import Image from 'next/image';
 import Link from 'next/link';
 
+import backgroundPattern from '~/assets/background-pattern.png';
+import connections from '~/assets/card-sharing-figure.png';
 import { SignInForm } from '~/components/forms/signin';
 
 export default function SignInPage() {
   return (
-    <div>
-      <h1 className="text-4xl font-semibold">Sign in to your account</h1>
+    <main className="bg-sand-100 relative flex min-h-screen flex-col items-center justify-center overflow-hidden px-4 py-12 md:p-12 lg:p-24">
+      <div className="relative flex max-w-4xl items-center gap-x-24">
+        <div className="absolute -inset-96 -z-[1] flex items-center justify-center opacity-50">
+          <Image
+            src={backgroundPattern}
+            alt="background pattern"
+            className="dark:brightness-95 dark:invert dark:sepia"
+          />
+        </div>
 
-      <p className="text-muted-foreground/60 mt-2 text-sm">
-        Welcome back, we are lucky to have you.
-      </p>
+        <div className="max-w-md">
+          <h1 className="text-4xl font-semibold">Sign in to your account</h1>
 
-      <SignInForm className="mt-4" />
+          <p className="text-muted-foreground/60 mt-2 text-sm">
+            Welcome back, we are lucky to have you.
+          </p>
 
-      <p className="text-muted-foreground mt-6 text-center text-sm">
-        Don't have an account?{' '}
-        <Link href="/signup" className="text-primary duration-200 hover:opacity-70">
-          Sign up
-        </Link>
-      </p>
+          <SignInForm className="mt-4" />
 
-      <p className="mt-2.5 text-center">
-        <Link
-          href="/forgot-password"
-          className="text-muted-foreground text-sm duration-200 hover:opacity-70"
-        >
-          Forgotten your password?
-        </Link>
-      </p>
-    </div>
+          <p className="text-muted-foreground mt-6 text-center text-sm">
+            Don't have an account?{' '}
+            <Link href="/signup" className="text-primary duration-200 hover:opacity-70">
+              Sign up
+            </Link>
+          </p>
+        </div>
+
+        <div className="hidden flex-1 lg:block">
+          <Image src={connections} alt="documenso connections" />
+        </div>
+      </div>
+    </main>
   );
 }

apps/web/src/app/(unauthenticated)/signup/page.tsx

@@ -1,25 +1,44 @@
+import Image from 'next/image';
 import Link from 'next/link';
 
+import backgroundPattern from '~/assets/background-pattern.png';
+import connections from '~/assets/connections.png';
 import { SignUpForm } from '~/components/forms/signup';
 
 export default function SignUpPage() {
   return (
-    <div>
-      <h1 className="text-4xl font-semibold">Create a new account</h1>
+    <main className="bg-sand-100 relative flex min-h-screen flex-col items-center justify-center overflow-hidden px-4 py-12 md:p-12 lg:p-24">
+      <div className="relative flex max-w-4xl items-center gap-x-24">
+        <div className="absolute -inset-96 -z-[1] flex items-center justify-center opacity-50">
+          <Image
+            src={backgroundPattern}
+            alt="background pattern"
+            className="dark:brightness-95 dark:invert dark:sepia"
+          />
+        </div>
 
-      <p className="text-muted-foreground/60 mt-2 text-sm">
-        Create your account and start using state-of-the-art document signing. Open and beautiful
-        signing is within your grasp.
-      </p>
+        <div className="max-w-md">
+          <h1 className="text-4xl font-semibold">Create a shiny, new Documenso Account ✨</h1>
 
-      <SignUpForm className="mt-4" />
+          <p className="text-muted-foreground/60 mt-2 text-sm">
+            Create your account and start using state-of-the-art document signing. Open and
+            beautiful signing is within your grasp.
+          </p>
 
-      <p className="text-muted-foreground mt-6 text-center text-sm">
-        Already have an account?{' '}
-        <Link href="/signin" className="text-primary duration-200 hover:opacity-70">
-          Sign in instead
-        </Link>
-      </p>
-    </div>
+          <SignUpForm className="mt-4" />
+
+          <p className="text-muted-foreground mt-6 text-center text-sm">
+            Already have an account?{' '}
+            <Link href="/signin" className="text-primary duration-200 hover:opacity-70">
+              Sign in instead
+            </Link>
+          </p>
+        </div>
+
+        <div className="hidden flex-1 lg:block">
+          <Image src={connections} alt="documenso connections" />
+        </div>
+      </div>
+    </main>
   );
 }

apps/web/src/app/layout.tsx

@@ -33,12 +33,12 @@ export const metadata = {
     description:
       'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.',
     type: 'website',
-    images: [`${process.env.NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`],
+    images: [`${process.env.NEXT_PUBLIC_SITE_URL}/opengraph-image.jpg`],
   },
   twitter: {
     site: '@documenso',
     card: 'summary_large_image',
-    images: [`${process.env.NEXT_PUBLIC_WEBAPP_URL}/opengraph-image.jpg`],
+    images: [`${process.env.NEXT_PUBLIC_SITE_URL}/opengraph-image.jpg`],
     description:
       'Join Documenso, the open signing infrastructure, and get a 10x better signing experience. Pricing starts at $30/mo. forever! Sign in now and enjoy a faster, smarter, and more beautiful document signing process. Integrates with your favorite tools, customizable, and expandable. Support our mission and become a part of our open-source community.',
   },

apps/web/src/app/not-found.tsx

@@ -1,26 +0,0 @@
-import Link from 'next/link';
-
-import { getServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
-import { Button } from '@documenso/ui/primitives/button';
-
-import NotFoundPartial from '~/components/partials/not-found';
-
-export default async function NotFound() {
-  const session = await getServerComponentSession();
-
-  return (
-    <NotFoundPartial>
-      {session && (
-        <Button className="w-32" asChild>
-          <Link href="/documents">Documents</Link>
-        </Button>
-      )}
-
-      {!session && (
-        <Button className="w-32" asChild>
-          <Link href="/signin">Sign In</Link>
-        </Button>
-      )}
-    </NotFoundPartial>
-  );
-}

apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx

@@ -10,7 +10,6 @@ import {
   User as LucideUser,
   Monitor,
   Moon,
-  Palette,
   Sun,
   UserCog,
 } from 'lucide-react';
@@ -27,13 +26,7 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuLabel,
-  DropdownMenuPortal,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
   DropdownMenuSeparator,
-  DropdownMenuSub,
-  DropdownMenuSubContent,
-  DropdownMenuSubTrigger,
   DropdownMenuTrigger,
 } from '@documenso/ui/primitives/dropdown-menu';
 
@@ -44,8 +37,8 @@ export type ProfileDropdownProps = {
 };
 
 export const ProfileDropdown = ({ user }: ProfileDropdownProps) => {
-  const { getFlag } = useFeatureFlags();
   const { theme, setTheme } = useTheme();
+  const { getFlag } = useFeatureFlags();
   const isUserAdmin = isAdmin(user);
 
   const isBillingEnabled = getFlag('app_billing');
@@ -105,30 +98,28 @@ export const ProfileDropdown = ({ user }: ProfileDropdownProps) => {
 
         <DropdownMenuSeparator />
 
-        <DropdownMenuSub>
-          <DropdownMenuSubTrigger>
-            <Palette className="mr-2 h-4 w-4" />
-            Themes
-          </DropdownMenuSubTrigger>
-          <DropdownMenuPortal>
-            <DropdownMenuSubContent>
-              <DropdownMenuRadioGroup value={theme} onValueChange={setTheme}>
-                <DropdownMenuRadioItem value="light">
-                  <Sun className="mr-2 h-4 w-4" /> Light
-                </DropdownMenuRadioItem>
-                <DropdownMenuRadioItem value="dark">
-                  <Moon className="mr-2 h-4 w-4" />
-                  Dark
-                </DropdownMenuRadioItem>
-                <DropdownMenuRadioItem value="system">
-                  <Monitor className="mr-2 h-4 w-4" />
-                  System
-                </DropdownMenuRadioItem>
-              </DropdownMenuRadioGroup>
-            </DropdownMenuSubContent>
-          </DropdownMenuPortal>
-        </DropdownMenuSub>
+        {theme === 'light' ? null : (
+          <DropdownMenuItem onClick={() => setTheme('light')}>
+            <Sun className="mr-2 h-4 w-4" />
+            Light Mode
+          </DropdownMenuItem>
+        )}
+        {theme === 'dark' ? null : (
+          <DropdownMenuItem onClick={() => setTheme('dark')}>
+            <Moon className="mr-2 h-4 w-4" />
+            Dark Mode
+          </DropdownMenuItem>
+        )}
+
+        {theme === 'system' ? null : (
+          <DropdownMenuItem onClick={() => setTheme('system')}>
+            <Monitor className="mr-2 h-4 w-4" />
+            System Theme
+          </DropdownMenuItem>
+        )}
+
         <DropdownMenuSeparator />
+
         <DropdownMenuItem asChild>
           <Link href="https://github.com/documenso/documenso" className="cursor-pointer">
             <Github className="mr-2 h-4 w-4" />

apps/web/src/components/(dashboard)/period-selector/period-selector.tsx

@@ -44,7 +44,7 @@ export const PeriodSelector = () => {
 
   return (
     <Select defaultValue={period} onValueChange={onPeriodChange}>
-      <SelectTrigger className="text-muted-foreground max-w-[200px]">
+      <SelectTrigger className="max-w-[200px] text-slate-500">
         <SelectValue />
       </SelectTrigger>
 

apps/web/src/components/forms/edit-document/add-subject.action.ts

@@ -1,7 +1,6 @@
 'use server';
 
 import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
-import { upsertDocumentMeta } from '@documenso/lib/server-only/document-meta/upsert-document-meta';
 import { sendDocument } from '@documenso/lib/server-only/document/send-document';
 import { TAddSubjectFormSchema } from '@documenso/ui/primitives/document-flow/add-subject.types';
 
@@ -9,20 +8,12 @@ export type CompleteDocumentActionInput = TAddSubjectFormSchema & {
   documentId: number;
 };
 
-export const completeDocument = async ({ documentId, email }: CompleteDocumentActionInput) => {
+export const completeDocument = async ({ documentId }: CompleteDocumentActionInput) => {
   'use server';
 
   const { id: userId } = await getRequiredServerComponentSession();
 
-  if (email.message || email.subject) {
-    await upsertDocumentMeta({
-      documentId,
-      subject: email.subject,
-      message: email.message,
-    });
-  }
-
-  return await sendDocument({
+  await sendDocument({
     userId,
     documentId,
   });

apps/web/src/components/forms/forgot-password.tsx

@@ -1,80 +0,0 @@
-'use client';
-
-import { useRouter } from 'next/navigation';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import { trpc } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import { FormErrorMessage } from '@documenso/ui/primitives/form/form-error-message';
-import { Input } from '@documenso/ui/primitives/input';
-import { Label } from '@documenso/ui/primitives/label';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export const ZForgotPasswordFormSchema = z.object({
-  email: z.string().email().min(1),
-});
-
-export type TForgotPasswordFormSchema = z.infer<typeof ZForgotPasswordFormSchema>;
-
-export type ForgotPasswordFormProps = {
-  className?: string;
-};
-
-export const ForgotPasswordForm = ({ className }: ForgotPasswordFormProps) => {
-  const router = useRouter();
-  const { toast } = useToast();
-
-  const {
-    register,
-    handleSubmit,
-    reset,
-    formState: { errors, isSubmitting },
-  } = useForm<TForgotPasswordFormSchema>({
-    values: {
-      email: '',
-    },
-    resolver: zodResolver(ZForgotPasswordFormSchema),
-  });
-
-  const { mutateAsync: forgotPassword } = trpc.profile.forgotPassword.useMutation();
-
-  const onFormSubmit = async ({ email }: TForgotPasswordFormSchema) => {
-    await forgotPassword({ email }).catch(() => null);
-
-    toast({
-      title: 'Reset email sent',
-      description:
-        'A password reset email has been sent, if you have an account you should see it in your inbox shortly.',
-      duration: 5000,
-    });
-
-    reset();
-
-    router.push('/check-email');
-  };
-
-  return (
-    <form
-      className={cn('flex w-full flex-col gap-y-4', className)}
-      onSubmit={handleSubmit(onFormSubmit)}
-    >
-      <div>
-        <Label htmlFor="email" className="text-muted-foreground">
-          Email
-        </Label>
-
-        <Input id="email" type="email" className="bg-background mt-2" {...register('email')} />
-
-        <FormErrorMessage className="mt-1.5" error={errors.email} />
-      </div>
-
-      <Button size="lg" loading={isSubmitting}>
-        Reset Password
-      </Button>
-    </form>
-  );
-};

apps/web/src/components/forms/password.tsx

@@ -1,9 +1,7 @@
 'use client';
 
-import { useState } from 'react';
-
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Eye, EyeOff, Loader } from 'lucide-react';
+import { Loader } from 'lucide-react';
 import { useForm } from 'react-hook-form';
 import { z } from 'zod';
 
@@ -38,9 +36,6 @@ export type PasswordFormProps = {
 export const PasswordForm = ({ className }: PasswordFormProps) => {
   const { toast } = useToast();
 
-  const [showPassword, setShowPassword] = useState(false);
-  const [showConfirmPassword, setShowConfirmPassword] = useState(false);
-
   const {
     register,
     handleSubmit,
@@ -93,69 +88,37 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
       onSubmit={handleSubmit(onFormSubmit)}
     >
       <div>
-        <Label htmlFor="password" className="text-muted-foreground">
+        <Label htmlFor="password" className="text-slate-500">
           Password
         </Label>
 
-        <div className="relative">
-          <Input
-            id="password"
-            type={showPassword ? 'text' : 'password'}
-            minLength={6}
-            maxLength={72}
-            autoComplete="new-password"
-            className="bg-background mt-2 pr-10"
-            {...register('password')}
-          />
-
-          <Button
-            variant="link"
-            type="button"
-            className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
-            aria-label={showPassword ? 'Mask password' : 'Reveal password'}
-            onClick={() => setShowPassword((show) => !show)}
-          >
-            {showPassword ? (
-              <EyeOff className="text-muted-foreground h-5 w-5" />
-            ) : (
-              <Eye className="text-muted-foreground h-5 w-5" />
-            )}
-          </Button>
-        </div>
+        <Input
+          id="password"
+          type="password"
+          minLength={6}
+          maxLength={72}
+          autoComplete="new-password"
+          className="bg-background mt-2"
+          {...register('password')}
+        />
 
         <FormErrorMessage className="mt-1.5" error={errors.password} />
       </div>
 
       <div>
-        <Label htmlFor="repeated-password" className="text-muted-foreground">
+        <Label htmlFor="repeated-password" className="text-slate-500">
           Repeat Password
         </Label>
 
-        <div className="relative">
-          <Input
-            id="repeated-password"
-            type={showConfirmPassword ? 'text' : 'password'}
-            minLength={6}
-            maxLength={72}
-            autoComplete="new-password"
-            className="bg-background mt-2 pr-10"
-            {...register('repeatedPassword')}
-          />
-
-          <Button
-            variant="link"
-            type="button"
-            className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
-            aria-label={showConfirmPassword ? 'Mask password' : 'Reveal password'}
-            onClick={() => setShowConfirmPassword((show) => !show)}
-          >
-            {showConfirmPassword ? (
-              <EyeOff className="text-muted-foreground h-5 w-5" />
-            ) : (
-              <Eye className="text-muted-foreground h-5 w-5" />
-            )}
-          </Button>
-        </div>
+        <Input
+          id="repeated-password"
+          type="password"
+          minLength={6}
+          maxLength={72}
+          autoComplete="new-password"
+          className="bg-background mt-2"
+          {...register('repeatedPassword')}
+        />
 
         <FormErrorMessage className="mt-1.5" error={errors.repeatedPassword} />
       </div>

apps/web/src/components/forms/profile.tsx

@@ -89,7 +89,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
       onSubmit={handleSubmit(onFormSubmit)}
     >
       <div>
-        <Label htmlFor="full-name" className="text-muted-foreground">
+        <Label htmlFor="full-name" className="text-slate-500">
           Full Name
         </Label>
 
@@ -99,7 +99,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
       </div>
 
       <div>
-        <Label htmlFor="email" className="text-muted-foreground">
+        <Label htmlFor="email" className="text-slate-500">
           Email
         </Label>
 
@@ -107,7 +107,7 @@ export const ProfileForm = ({ className, user }: ProfileFormProps) => {
       </div>
 
       <div>
-        <Label htmlFor="signature" className="text-muted-foreground">
+        <Label htmlFor="signature" className="text-slate-500">
           Signature
         </Label>
 

apps/web/src/components/forms/reset-password.tsx

@@ -1,173 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { useRouter } from 'next/navigation';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Eye, EyeOff } from 'lucide-react';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import { TRPCClientError } from '@documenso/trpc/client';
-import { trpc } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import { FormErrorMessage } from '@documenso/ui/primitives/form/form-error-message';
-import { Input } from '@documenso/ui/primitives/input';
-import { Label } from '@documenso/ui/primitives/label';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-export const ZResetPasswordFormSchema = z
-  .object({
-    password: z.string().min(6).max(72),
-    repeatedPassword: z.string().min(6).max(72),
-  })
-  .refine((data) => data.password === data.repeatedPassword, {
-    path: ['repeatedPassword'],
-    message: "Passwords don't match",
-  });
-
-export type TResetPasswordFormSchema = z.infer<typeof ZResetPasswordFormSchema>;
-
-export type ResetPasswordFormProps = {
-  className?: string;
-  token: string;
-};
-
-export const ResetPasswordForm = ({ className, token }: ResetPasswordFormProps) => {
-  const router = useRouter();
-
-  const { toast } = useToast();
-
-  const [showPassword, setShowPassword] = useState(false);
-  const [showConfirmPassword, setShowConfirmPassword] = useState(false);
-
-  const {
-    register,
-    reset,
-    handleSubmit,
-    formState: { errors, isSubmitting },
-  } = useForm<TResetPasswordFormSchema>({
-    values: {
-      password: '',
-      repeatedPassword: '',
-    },
-    resolver: zodResolver(ZResetPasswordFormSchema),
-  });
-
-  const { mutateAsync: resetPassword } = trpc.profile.resetPassword.useMutation();
-
-  const onFormSubmit = async ({ password }: Omit<TResetPasswordFormSchema, 'repeatedPassword'>) => {
-    try {
-      await resetPassword({
-        password,
-        token,
-      });
-
-      reset();
-
-      toast({
-        title: 'Password updated',
-        description: 'Your password has been updated successfully.',
-        duration: 5000,
-      });
-
-      router.push('/signin');
-    } catch (err) {
-      if (err instanceof TRPCClientError && err.data?.code === 'BAD_REQUEST') {
-        toast({
-          title: 'An error occurred',
-          description: err.message,
-          variant: 'destructive',
-        });
-      } else {
-        toast({
-          title: 'An unknown error occurred',
-          variant: 'destructive',
-          description:
-            'We encountered an unknown error while attempting to reset your password. Please try again later.',
-        });
-      }
-    }
-  };
-
-  return (
-    <form
-      className={cn('flex w-full flex-col gap-y-4', className)}
-      onSubmit={handleSubmit(onFormSubmit)}
-    >
-      <div>
-        <Label htmlFor="password" className="text-muted-foreground">
-          <span>Password</span>
-        </Label>
-
-        <div className="relative">
-          <Input
-            id="password"
-            type={showPassword ? 'text' : 'password'}
-            minLength={6}
-            maxLength={72}
-            autoComplete="new-password"
-            className="bg-background mt-2 pr-10"
-            {...register('password')}
-          />
-
-          <Button
-            variant="link"
-            type="button"
-            className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
-            aria-label={showPassword ? 'Mask password' : 'Reveal password'}
-            onClick={() => setShowPassword((show) => !show)}
-          >
-            {showPassword ? (
-              <EyeOff className="text-muted-foreground h-5 w-5" />
-            ) : (
-              <Eye className="text-muted-foreground h-5 w-5" />
-            )}
-          </Button>
-        </div>
-
-        <FormErrorMessage className="mt-1.5" error={errors.password} />
-      </div>
-
-      <div>
-        <Label htmlFor="repeatedPassword" className="text-muted-foreground">
-          <span>Repeat Password</span>
-        </Label>
-
-        <div className="relative">
-          <Input
-            id="repeated-password"
-            type={showConfirmPassword ? 'text' : 'password'}
-            minLength={6}
-            maxLength={72}
-            autoComplete="new-password"
-            className="bg-background mt-2 pr-10"
-            {...register('repeatedPassword')}
-          />
-
-          <Button
-            variant="link"
-            type="button"
-            className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
-            aria-label={showConfirmPassword ? 'Mask password' : 'Reveal password'}
-            onClick={() => setShowConfirmPassword((show) => !show)}
-          >
-            {showConfirmPassword ? (
-              <EyeOff className="text-muted-foreground h-5 w-5" />
-            ) : (
-              <Eye className="text-muted-foreground h-5 w-5" />
-            )}
-          </Button>
-        </div>
-
-        <FormErrorMessage className="mt-1.5" error={errors.repeatedPassword} />
-      </div>
-
-      <Button size="lg" loading={isSubmitting}>
-        Reset Password
-      </Button>
-    </form>
-  );
-};

apps/web/src/components/forms/signin.tsx

@@ -1,11 +1,11 @@
 'use client';
 
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 
 import { useSearchParams } from 'next/navigation';
 
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Eye, EyeOff, Loader } from 'lucide-react';
+import { Loader } from 'lucide-react';
 import { signIn } from 'next-auth/react';
 import { useForm } from 'react-hook-form';
 import { FcGoogle } from 'react-icons/fc';
@@ -14,7 +14,6 @@ import { z } from 'zod';
 import { ErrorCode, isErrorCode } from '@documenso/lib/next-auth/error-codes';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
-import { FormErrorMessage } from '@documenso/ui/primitives/form/form-error-message';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
 import { useToast } from '@documenso/ui/primitives/use-toast';
@@ -43,7 +42,6 @@ export const SignInForm = ({ className }: SignInFormProps) => {
   const searchParams = useSearchParams();
 
   const { toast } = useToast();
-  const [showPassword, setShowPassword] = useState(false);
 
   const {
     register,
@@ -115,47 +113,33 @@ export const SignInForm = ({ className }: SignInFormProps) => {
       onSubmit={handleSubmit(onFormSubmit)}
     >
       <div>
-        <Label htmlFor="email" className="text-muted-forground">
+        <Label htmlFor="email" className="text-slate-500">
           Email
         </Label>
 
         <Input id="email" type="email" className="bg-background mt-2" {...register('email')} />
 
-        <FormErrorMessage className="mt-1.5" error={errors.email} />
+        {errors.email && <span className="mt-1 text-xs text-red-500">{errors.email.message}</span>}
       </div>
 
       <div>
-        <Label htmlFor="password" className="text-muted-forground">
-          <span>Password</span>
+        <Label htmlFor="password" className="text-slate-500">
+          Password
         </Label>
 
-        <div className="relative">
-          <Input
-            id="password"
-            type={showPassword ? 'text' : 'password'}
-            minLength={6}
-            maxLength={72}
-            autoComplete="current-password"
-            className="bg-background mt-2 pr-10"
-            {...register('password')}
-          />
+        <Input
+          id="password"
+          type="password"
+          minLength={6}
+          maxLength={72}
+          autoComplete="current-password"
+          className="bg-background mt-2"
+          {...register('password')}
+        />
 
-          <Button
-            variant="link"
-            type="button"
-            className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
-            aria-label={showPassword ? 'Mask password' : 'Reveal password'}
-            onClick={() => setShowPassword((show) => !show)}
-          >
-            {showPassword ? (
-              <EyeOff className="text-muted-foreground h-5 w-5" />
-            ) : (
-              <Eye className="text-muted-foreground h-5 w-5" />
-            )}
-          </Button>
-        </div>
-
-        <FormErrorMessage className="mt-1.5" error={errors.password} />
+        {errors.password && (
+          <span className="mt-1 text-xs text-red-500">{errors.password.message}</span>
+        )}
       </div>
 
       <Button size="lg" disabled={isSubmitting} className="dark:bg-documenso dark:hover:opacity-90">

apps/web/src/components/forms/signup.tsx

@@ -1,9 +1,7 @@
 'use client';
 
-import { useState } from 'react';
-
 import { zodResolver } from '@hookform/resolvers/zod';
-import { Eye, EyeOff, Loader } from 'lucide-react';
+import { Loader } from 'lucide-react';
 import { signIn } from 'next-auth/react';
 import { Controller, useForm } from 'react-hook-form';
 import { z } from 'zod';
@@ -33,7 +31,6 @@ export type SignUpFormProps = {
 
 export const SignUpForm = ({ className }: SignUpFormProps) => {
   const { toast } = useToast();
-  const [showPassword, setShowPassword] = useState(false);
 
   const {
     control,
@@ -109,31 +106,15 @@ export const SignUpForm = ({ className }: SignUpFormProps) => {
           Password
         </Label>
 
-        <div className="relative">
-          <Input
-            id="password"
-            type={showPassword ? 'text' : 'password'}
-            minLength={6}
-            maxLength={72}
-            autoComplete="new-password"
-            className="bg-background mt-2 pr-10"
-            {...register('password')}
-          />
-
-          <Button
-            variant="link"
-            type="button"
-            className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
-            aria-label={showPassword ? 'Mask password' : 'Reveal password'}
-            onClick={() => setShowPassword((show) => !show)}
-          >
-            {showPassword ? (
-              <EyeOff className="text-muted-foreground h-5 w-5" />
-            ) : (
-              <Eye className="text-muted-foreground h-5 w-5" />
-            )}
-          </Button>
-        </div>
+        <Input
+          id="password"
+          type="password"
+          minLength={6}
+          maxLength={72}
+          autoComplete="new-password"
+          className="bg-background mt-2"
+          {...register('password')}
+        />
       </div>
 
       <div>

apps/web/src/components/motion.tsx

@@ -0,0 +1,7 @@
+'use client';
+
+import { motion } from 'framer-motion';
+
+export * from 'framer-motion';
+
+export const MotionDiv = motion.div;

apps/web/src/components/partials/not-found.tsx

@@ -1,66 +0,0 @@
-'use client';
-
-import Image from 'next/image';
-import { useRouter } from 'next/navigation';
-
-import { motion } from 'framer-motion';
-import { ChevronLeft } from 'lucide-react';
-
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-
-import backgroundPattern from '~/assets/background-pattern.png';
-
-export type NotFoundPartialProps = {
-  children?: React.ReactNode;
-};
-
-export default function NotFoundPartial({ children }: NotFoundPartialProps) {
-  const router = useRouter();
-
-  return (
-    <div className={cn('relative max-w-[100vw] overflow-hidden')}>
-      <div className="absolute -inset-24 -z-10">
-        <motion.div
-          className="flex h-full w-full items-center justify-center"
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 0.8, transition: { duration: 0.5, delay: 0.5 } }}
-        >
-          <Image
-            src={backgroundPattern}
-            alt="background pattern"
-            className="-mr-[50vw] -mt-[15vh] h-full scale-100 object-cover md:scale-100 lg:scale-[100%]"
-            priority
-          />
-        </motion.div>
-      </div>
-
-      <div className="container mx-auto flex h-full min-h-screen items-center px-6 py-32">
-        <div>
-          <p className="text-muted-foreground font-semibold">404 Page not found</p>
-
-          <h1 className="mt-3 text-2xl font-bold md:text-3xl">Oops! Something went wrong.</h1>
-
-          <p className="text-muted-foreground mt-4 text-sm">
-            The page you are looking for was moved, removed, renamed or might never have existed.
-          </p>
-
-          <div className="mt-6 flex gap-x-2.5 gap-y-4 md:items-center">
-            <Button
-              variant="ghost"
-              className="w-32"
-              onClick={() => {
-                void router.back();
-              }}
-            >
-              <ChevronLeft className="mr-2 h-4 w-4" />
-              Go Back
-            </Button>
-
-            {children}
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

apps/web/src/helpers/get-asset-buffer.ts

@@ -1,14 +0,0 @@
-/**
- * getAssetBuffer is used to retrieve array buffers for various assets
- * that are hosted in the `public` folder.
- *
- * This exists due to a breakage with `import.meta.url` imports and open graph images,
- * once we can identify a fix for this, we can remove this helper.
- *
- * @param path The path to the asset, relative to the `public` folder.
- */
-export const getAssetBuffer = async (path: string) => {
-  const baseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';
-
-  return fetch(new URL(path, baseUrl)).then(async (res) => res.arrayBuffer());
-};

apps/web/src/helpers/get-feature-flag.ts

@@ -21,7 +21,7 @@ export const getFlag = async (
     return LOCAL_FEATURE_FLAGS[flag] ?? true;
   }
 
-  const url = new URL(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/api/feature-flag/get`);
+  const url = new URL(`${process.env.NEXT_PUBLIC_SITE_URL}/api/feature-flag/get`);
   url.searchParams.set('flag', flag);
 
   const response = await fetch(url, {
@@ -54,7 +54,7 @@ export const getAllFlags = async (
     return LOCAL_FEATURE_FLAGS;
   }
 
-  const url = new URL(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/api/feature-flag/all`);
+  const url = new URL(`${process.env.NEXT_PUBLIC_SITE_URL}/api/feature-flag/all`);
 
   return fetch(url, {
     headers: {

apps/web/src/pages/api/claim-plan/index.ts

@@ -43,7 +43,7 @@ export default async function handler(
 
     if (user && user.Subscription.length > 0) {
       return res.status(200).json({
-        redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`,
+        redirectUrl: `${process.env.NEXT_PUBLIC_APP_URL}/login`,
       });
     }
 
@@ -103,8 +103,8 @@ export default async function handler(
       mode: 'subscription',
       metadata,
       allow_promotion_codes: true,
-      success_url: `${process.env.NEXT_PUBLIC_MARKETING_URL}/claimed?sessionId={CHECKOUT_SESSION_ID}`,
-      cancel_url: `${process.env.NEXT_PUBLIC_MARKETING_URL}/pricing?email=${encodeURIComponent(
+      success_url: `${process.env.NEXT_PUBLIC_SITE_URL}/claimed?sessionId={CHECKOUT_SESSION_ID}`,
+      cancel_url: `${process.env.NEXT_PUBLIC_SITE_URL}/pricing?email=${encodeURIComponent(
         email,
       )}&name=${encodeURIComponent(name)}&planId=${planId}&cancelled=true`,
     });

package.json

@@ -7,8 +7,7 @@
     "lint": "turbo run lint",
     "format": "prettier --write \"**/*.{js,jsx,cjs,mjs,ts,tsx,cts,mts,mdx}\"",
     "prepare": "husky install",
-    "commitlint": "commitlint --edit",
-    "clean": "turbo run clean && rimraf node_modules"
+    "commitlint": "commitlint --edit"
   },
   "engines": {
     "npm": ">=8.6.0",
@@ -24,7 +23,6 @@
     "husky": "^8.0.0",
     "lint-staged": "^14.0.0",
     "prettier": "^2.5.1",
-    "rimraf": "^5.0.1",
     "turbo": "^1.9.3"
   },
   "name": "@documenso/root",

packages/ee/package.json

@@ -9,9 +9,7 @@
     "server-only/",
     "universal/"
   ],
-  "scripts": {
-    "clean": "rimraf node_modules"
-  },
+  "scripts": {},
   "dependencies": {
     "@documenso/lib": "*",
     "@documenso/prisma": "*"

packages/email/package.json

@@ -13,17 +13,15 @@
   ],
   "scripts": {
     "dev": "email dev --port 3002 --dir templates",
-    "clean": "rimraf node_modules",
     "worker:test": "tsup worker/index.ts --format esm"
   },
   "dependencies": {
     "@react-email/components": "^0.0.7",
-    "nodemailer": "^6.9.3",
-    "react-email": "^1.9.4"
+    "nodemailer": "^6.9.3"
   },
   "devDependencies": {
-    "@documenso/tailwind-config": "*",
     "@documenso/tsconfig": "*",
+    "@documenso/tailwind-config": "*",
     "@types/nodemailer": "^6.4.8",
     "tsup": "^7.1.0"
   }

packages/email/template-components/template-document-completed.tsx

@@ -1,4 +1,4 @@
-import { Button, Column, Img, Row, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
@@ -29,23 +29,11 @@ export const TemplateDocumentCompleted = ({
         },
       }}
     >
-      <Section>
-        <Row className="table-fixed">
-          <Column />
+      <Section className="flex-row items-center justify-center">
+        <div className="flex items-center justify-center p-4">
+          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
+        </div>
 
-          <Column>
-            <Img
-              className="h-42 mx-auto"
-              src={getAssetUrl('/static/document.png')}
-              alt="Documenso"
-            />
-          </Column>
-
-          <Column />
-        </Row>
-      </Section>
-
-      <Section>
         <Text className="mb-4 flex items-center justify-center text-center text-base font-semibold text-[#7AC455]">
           <Img src={getAssetUrl('/static/completed.png')} className="-mb-0.5 mr-2 inline h-7 w-7" />
           Completed

packages/email/template-components/template-document-invite.tsx

@@ -1,4 +1,4 @@
-import { Button, Column, Img, Row, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
@@ -30,26 +30,13 @@ export const TemplateDocumentInvite = ({
         },
       }}
     >
-      <Section className="mt-4">
-        <Row className="table-fixed">
-          <Column />
+      <Section className="mt-4 flex-row items-center justify-center">
+        <div className="flex items-center justify-center p-4">
+          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
+        </div>
 
-          <Column>
-            <Img
-              className="h-42 mx-auto"
-              src={getAssetUrl('/static/document.png')}
-              alt="Documenso"
-            />
-          </Column>
-
-          <Column />
-        </Row>
-      </Section>
-
-      <Section>
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
-          {inviterName} has invited you to sign
-          <br />"{documentName}"
+          {inviterName} has invited you to sign "{documentName}"
         </Text>
 
         <Text className="my-1 text-center text-base text-slate-400">

packages/email/template-components/template-document-pending.tsx

@@ -1,4 +1,4 @@
-import { Column, Img, Row, Section, Tailwind, Text } from '@react-email/components';
+import { Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
@@ -25,23 +25,11 @@ export const TemplateDocumentPending = ({
         },
       }}
     >
-      <Section>
-        <Row className="table-fixed">
-          <Column />
+      <Section className="flex-row items-center justify-center">
+        <div className="flex items-center justify-center p-4">
+          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
+        </div>
 
-          <Column>
-            <Img
-              className="h-42 mx-auto"
-              src={getAssetUrl('/static/document.png')}
-              alt="Documenso"
-            />
-          </Column>
-
-          <Column />
-        </Row>
-      </Section>
-
-      <Section>
         <Text className="mb-4 flex items-center justify-center text-center text-base font-semibold text-blue-500">
           <Img src={getAssetUrl('/static/clock.png')} className="-mb-0.5 mr-2 inline h-7 w-7" />
           Waiting for others

packages/email/template-components/template-footer.tsx

@@ -1,20 +1,14 @@
 import { Link, Section, Text } from '@react-email/components';
 
-export type TemplateFooterProps = {
-  isDocument?: boolean;
-};
-
-export const TemplateFooter = ({ isDocument = true }: TemplateFooterProps) => {
+export const TemplateFooter = () => {
   return (
     <Section>
-      {isDocument && (
-        <Text className="my-4 text-base text-slate-400">
-          This document was sent using{' '}
-          <Link className="text-[#7AC455]" href="https://documenso.com">
-            Documenso.
-          </Link>
-        </Text>
-      )}
+      <Text className="my-4 text-base text-slate-400">
+        This document was sent using{' '}
+        <Link className="text-[#7AC455]" href="https://documenso.com">
+          Documenso.
+        </Link>
+      </Text>
 
       <Text className="my-8 text-sm text-slate-400">
         Documenso

packages/email/template-components/template-forgot-password.tsx

@@ -1,54 +0,0 @@
-import { Button, Img, Section, Tailwind, Text } from '@react-email/components';
-
-import * as config from '@documenso/tailwind-config';
-
-export type TemplateForgotPasswordProps = {
-  resetPasswordLink: string;
-  assetBaseUrl: string;
-};
-
-export const TemplateForgotPassword = ({
-  resetPasswordLink,
-  assetBaseUrl,
-}: TemplateForgotPasswordProps) => {
-  const getAssetUrl = (path: string) => {
-    return new URL(path, assetBaseUrl).toString();
-  };
-
-  return (
-    <Tailwind
-      config={{
-        theme: {
-          extend: {
-            colors: config.theme.extend.colors,
-          },
-        },
-      }}
-    >
-      <Section className="mt-4 flex-row items-center justify-center">
-        <div className="flex items-center justify-center p-4">
-          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
-        </div>
-
-        <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
-          Forgot your password?
-        </Text>
-
-        <Text className="my-1 text-center text-base text-slate-400">
-          That's okay, it happens! Click the button below to reset your password.
-        </Text>
-
-        <Section className="mb-6 mt-8 text-center">
-          <Button
-            className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-            href={resetPasswordLink}
-          >
-            Reset Password
-          </Button>
-        </Section>
-      </Section>
-    </Tailwind>
-  );
-};
-
-export default TemplateForgotPassword;

packages/email/template-components/template-reset-password.tsx

@@ -1,43 +0,0 @@
-import { Img, Section, Tailwind, Text } from '@react-email/components';
-
-import * as config from '@documenso/tailwind-config';
-
-export interface TemplateResetPasswordProps {
-  userName: string;
-  userEmail: string;
-  assetBaseUrl: string;
-}
-
-export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordProps) => {
-  const getAssetUrl = (path: string) => {
-    return new URL(path, assetBaseUrl).toString();
-  };
-
-  return (
-    <Tailwind
-      config={{
-        theme: {
-          extend: {
-            colors: config.theme.extend.colors,
-          },
-        },
-      }}
-    >
-      <Section className="mt-4 flex-row items-center justify-center">
-        <div className="flex items-center justify-center p-4">
-          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
-        </div>
-
-        <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
-          Password updated!
-        </Text>
-
-        <Text className="my-1 text-center text-base text-slate-400">
-          Your password has been updated.
-        </Text>
-      </Section>
-    </Tailwind>
-  );
-};
-
-export default TemplateResetPassword;

packages/email/templates/document-invite.tsx

@@ -20,9 +20,7 @@ import {
 } from '../template-components/template-document-invite';
 import TemplateFooter from '../template-components/template-footer';
 
-export type DocumentInviteEmailTemplateProps = Partial<TemplateDocumentInviteProps> & {
-  customBody?: string;
-};
+export type DocumentInviteEmailTemplateProps = Partial<TemplateDocumentInviteProps>;
 
 export const DocumentInviteEmailTemplate = ({
   inviterName = 'Lucas Smith',
@@ -30,7 +28,6 @@ export const DocumentInviteEmailTemplate = ({
   documentName = 'Open Source Pledge.pdf',
   signDocumentLink = 'https://documenso.com',
   assetBaseUrl = 'http://localhost:3002',
-  customBody,
 }: DocumentInviteEmailTemplateProps) => {
   const previewText = `Completed Document`;
 
@@ -81,11 +78,7 @@ export const DocumentInviteEmailTemplate = ({
                 </Text>
 
                 <Text className="mt-2 text-base text-slate-400">
-                  {customBody ? (
-                    <pre className="font-sans text-base text-slate-400">{customBody}</pre>
-                  ) : (
-                    `${inviterName} has invited you to sign the document "${documentName}".`
-                  )}
+                  {inviterName} has invited you to sign the document "{documentName}".
                 </Text>
               </Section>
             </Container>

packages/email/templates/forgot-password.tsx

@@ -1,74 +0,0 @@
-import {
-  Body,
-  Container,
-  Head,
-  Html,
-  Img,
-  Preview,
-  Section,
-  Tailwind,
-} from '@react-email/components';
-
-import config from '@documenso/tailwind-config';
-
-import TemplateFooter from '../template-components/template-footer';
-import {
-  TemplateForgotPassword,
-  TemplateForgotPasswordProps,
-} from '../template-components/template-forgot-password';
-
-export type ForgotPasswordTemplateProps = Partial<TemplateForgotPasswordProps>;
-
-export const ForgotPasswordTemplate = ({
-  resetPasswordLink = 'https://documenso.com',
-  assetBaseUrl = 'http://localhost:3002',
-}: ForgotPasswordTemplateProps) => {
-  const previewText = `Password Reset Requested`;
-
-  const getAssetUrl = (path: string) => {
-    return new URL(path, assetBaseUrl).toString();
-  };
-
-  return (
-    <Html>
-      <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
-                <Img
-                  src={getAssetUrl('/static/logo.png')}
-                  alt="Documenso Logo"
-                  className="mb-4 h-6"
-                />
-
-                <TemplateForgotPassword
-                  resetPasswordLink={resetPasswordLink}
-                  assetBaseUrl={assetBaseUrl}
-                />
-              </Section>
-            </Container>
-
-            <div className="mx-auto mt-12 max-w-xl" />
-
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
-    </Html>
-  );
-};
-
-export default ForgotPasswordTemplate;

packages/email/templates/reset-password.tsx

@@ -1,102 +0,0 @@
-import {
-  Body,
-  Container,
-  Head,
-  Hr,
-  Html,
-  Img,
-  Link,
-  Preview,
-  Section,
-  Tailwind,
-  Text,
-} from '@react-email/components';
-
-import config from '@documenso/tailwind-config';
-
-import TemplateFooter from '../template-components/template-footer';
-import {
-  TemplateResetPassword,
-  TemplateResetPasswordProps,
-} from '../template-components/template-reset-password';
-
-export type ResetPasswordTemplateProps = Partial<TemplateResetPasswordProps>;
-
-export const ResetPasswordTemplate = ({
-  userName = 'Lucas Smith',
-  userEmail = 'lucas@documenso.com',
-  assetBaseUrl = 'http://localhost:3002',
-}: ResetPasswordTemplateProps) => {
-  const previewText = `Password Reset Successful`;
-
-  const getAssetUrl = (path: string) => {
-    return new URL(path, assetBaseUrl).toString();
-  };
-
-  return (
-    <Html>
-      <Head />
-      <Preview>{previewText}</Preview>
-      <Tailwind
-        config={{
-          theme: {
-            extend: {
-              colors: config.theme.extend.colors,
-            },
-          },
-        }}
-      >
-        <Body className="mx-auto my-auto bg-white font-sans">
-          <Section>
-            <Container className="mx-auto mb-2 mt-8 max-w-xl rounded-lg border border-solid border-slate-200 p-4 backdrop-blur-sm">
-              <Section>
-                <Img
-                  src={getAssetUrl('/static/logo.png')}
-                  alt="Documenso Logo"
-                  className="mb-4 h-6"
-                />
-
-                <TemplateResetPassword
-                  userName={userName}
-                  userEmail={userEmail}
-                  assetBaseUrl={assetBaseUrl}
-                />
-              </Section>
-            </Container>
-
-            <Container className="mx-auto mt-12 max-w-xl">
-              <Section>
-                <Text className="my-4 text-base font-semibold">
-                  Hi, {userName}{' '}
-                  <Link className="font-normal text-slate-400" href={`mailto:${userEmail}`}>
-                    ({userEmail})
-                  </Link>
-                </Text>
-
-                <Text className="mt-2 text-base text-slate-400">
-                  We've changed your password as you asked. You can now sign in with your new
-                  password.
-                </Text>
-                <Text className="mt-2 text-base text-slate-400">
-                  Didn't request a password change? We are here to help you secure your account,
-                  just{' '}
-                  <Link className="text-documenso-700 font-normal" href="mailto:hi@documenso.com">
-                    contact us.
-                  </Link>
-                </Text>
-              </Section>
-            </Container>
-
-            <Hr className="mx-auto mt-12 max-w-xl" />
-
-            <Container className="mx-auto max-w-xl">
-              <TemplateFooter isDocument={false} />
-            </Container>
-          </Section>
-        </Body>
-      </Tailwind>
-    </Html>
-  );
-};
-
-export default ResetPasswordTemplate;

packages/eslint-config/package.json

@@ -3,14 +3,11 @@
   "version": "0.0.0",
   "main": "./index.cjs",
   "license": "MIT",
-  "scripts": {
-    "clean": "rimraf node_modules"
-  },
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.2",
     "@typescript-eslint/parser": "^5.59.2",
     "eslint": "^8.40.0",
-    "eslint-config-next": "13.4.19",
+    "eslint-config-next": "13.4.12",
     "eslint-config-prettier": "^8.8.0",
     "eslint-config-turbo": "^1.9.3",
     "eslint-plugin-package-json": "^0.1.4",

packages/lib/package.json

@@ -10,9 +10,7 @@
     "universal/",
     "next-auth/"
   ],
-  "scripts": {
-    "clean": "rimraf node_modules"
-  },
+  "scripts": {},
   "dependencies": {
     "@aws-sdk/client-s3": "^3.410.0",
     "@aws-sdk/s3-request-presigner": "^3.410.0",
@@ -27,7 +25,7 @@
     "bcrypt": "^5.1.0",
     "luxon": "^3.4.0",
     "nanoid": "^4.0.2",
-    "next": "13.4.19",
+    "next": "13.4.12",
     "next-auth": "4.22.3",
     "pdf-lib": "^1.17.1",
     "react": "18.2.0",

packages/lib/server-only/auth/send-forgot-password.ts

@@ -1,53 +0,0 @@
-import { createElement } from 'react';
-
-import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
-import { ForgotPasswordTemplate } from '@documenso/email/templates/forgot-password';
-import { prisma } from '@documenso/prisma';
-
-export interface SendForgotPasswordOptions {
-  userId: number;
-}
-
-export const sendForgotPassword = async ({ userId }: SendForgotPasswordOptions) => {
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-    include: {
-      PasswordResetToken: {
-        orderBy: {
-          createdAt: 'desc',
-        },
-        take: 1,
-      },
-    },
-  });
-
-  if (!user) {
-    throw new Error('User not found');
-  }
-
-  const token = user.PasswordResetToken[0].token;
-  const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';
-  const resetPasswordLink = `${process.env.NEXT_PUBLIC_WEBAPP_URL}/reset-password/${token}`;
-
-  const template = createElement(ForgotPasswordTemplate, {
-    assetBaseUrl,
-    resetPasswordLink,
-  });
-
-  return await mailer.sendMail({
-    to: {
-      address: user.email,
-      name: user.name || '',
-    },
-    from: {
-      name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
-      address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
-    },
-    subject: 'Forgot Password?',
-    html: render(template),
-    text: render(template, { plainText: true }),
-  });
-};

packages/lib/server-only/auth/send-reset-password.ts

@@ -1,42 +0,0 @@
-import { createElement } from 'react';
-
-import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
-import { ResetPasswordTemplate } from '@documenso/email/templates/reset-password';
-import { prisma } from '@documenso/prisma';
-
-export interface SendResetPasswordOptions {
-  userId: number;
-}
-
-export const sendResetPassword = async ({ userId }: SendResetPasswordOptions) => {
-  const user = await prisma.user.findFirstOrThrow({
-    where: {
-      id: userId,
-    },
-  });
-
-  const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';
-
-  console.log({ assetBaseUrl });
-
-  const template = createElement(ResetPasswordTemplate, {
-    assetBaseUrl,
-    userEmail: user.email,
-    userName: user.name || '',
-  });
-
-  return await mailer.sendMail({
-    to: {
-      address: user.email,
-      name: user.name || '',
-    },
-    from: {
-      name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
-      address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
-    },
-    subject: 'Password Reset Success!',
-    html: render(template),
-    text: render(template, { plainText: true }),
-  });
-};

packages/lib/server-only/document-meta/upsert-document-meta.ts

@@ -1,30 +0,0 @@
-'use server';
-
-import { prisma } from '@documenso/prisma';
-
-export type CreateDocumentMetaOptions = {
-  documentId: number;
-  subject: string;
-  message: string;
-};
-
-export const upsertDocumentMeta = async ({
-  subject,
-  message,
-  documentId,
-}: CreateDocumentMetaOptions) => {
-  return await prisma.documentMeta.upsert({
-    where: {
-      documentId,
-    },
-    create: {
-      subject,
-      message,
-      documentId,
-    },
-    update: {
-      subject,
-      message,
-    },
-  });
-};

packages/lib/server-only/document/complete-document-with-token.ts

@@ -4,7 +4,6 @@ import { prisma } from '@documenso/prisma';
 import { DocumentStatus, SigningStatus } from '@documenso/prisma/client';
 
 import { sealDocument } from './seal-document';
-import { sendPendingEmail } from './send-pending-email';
 
 export type CompleteDocumentWithTokenOptions = {
   token: string;
@@ -70,19 +69,6 @@ export const completeDocumentWithToken = async ({
     },
   });
 
-  const pendingRecipients = await prisma.recipient.count({
-    where: {
-      documentId: document.id,
-      signingStatus: {
-        not: SigningStatus.SIGNED,
-      },
-    },
-  });
-
-  if (pendingRecipients > 0) {
-    await sendPendingEmail({ documentId, recipientId: recipient.id });
-  }
-
   const documents = await prisma.document.updateMany({
     where: {
       id: document.id,

packages/lib/server-only/document/get-document-by-id.ts

@@ -13,7 +13,6 @@ export const getDocumentById = async ({ id, userId }: GetDocumentByIdOptions) =>
     },
     include: {
       documentData: true,
-      documentMeta: true,
     },
   });
 };

packages/lib/server-only/document/seal-document.ts

@@ -9,7 +9,6 @@ import { DocumentStatus, SigningStatus } from '@documenso/prisma/client';
 import { getFile } from '../../universal/upload/get-file';
 import { putFile } from '../../universal/upload/put-file';
 import { insertFieldInPDF } from '../pdf/insert-field-in-pdf';
-import { sendCompletedEmail } from './send-completed-email';
 
 export type SealDocumentOptions = {
   documentId: number;
@@ -87,6 +86,4 @@ export const sealDocument = async ({ documentId }: SealDocumentOptions) => {
       data: newData,
     },
   });
-
-  await sendCompletedEmail({ documentId });
 };

packages/lib/server-only/document/send-completed-email.ts

@@ -1,57 +0,0 @@
-import { createElement } from 'react';
-
-import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
-import { DocumentCompletedEmailTemplate } from '@documenso/email/templates/document-completed';
-import { prisma } from '@documenso/prisma';
-
-export interface SendDocumentOptions {
-  documentId: number;
-}
-
-export const sendCompletedEmail = async ({ documentId }: SendDocumentOptions) => {
-  const document = await prisma.document.findUnique({
-    where: {
-      id: documentId,
-    },
-    include: {
-      Recipient: true,
-    },
-  });
-
-  if (!document) {
-    throw new Error('Document not found');
-  }
-
-  if (document.Recipient.length === 0) {
-    throw new Error('Document has no recipients');
-  }
-
-  await Promise.all([
-    document.Recipient.map(async (recipient) => {
-      const { email, name, token } = recipient;
-
-      const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';
-
-      const template = createElement(DocumentCompletedEmailTemplate, {
-        documentName: document.title,
-        assetBaseUrl,
-        downloadLink: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${token}/complete`,
-      });
-
-      await mailer.sendMail({
-        to: {
-          address: email,
-          name,
-        },
-        from: {
-          name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
-          address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
-        },
-        subject: 'Signing Complete!',
-        html: render(template),
-        text: render(template, { plainText: true }),
-      });
-    }),
-  ]);
-};

packages/lib/server-only/document/send-document.tsx

@@ -3,14 +3,13 @@ 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 { renderCustomEmailTemplate } from '@documenso/lib/utils/render-custom-email-template';
 import { prisma } from '@documenso/prisma';
 import { DocumentStatus, SendStatus } from '@documenso/prisma/client';
 
-export type SendDocumentOptions = {
+export interface SendDocumentOptions {
   documentId: number;
   userId: number;
-};
+}
 
 export const sendDocument = async ({ documentId, userId }: SendDocumentOptions) => {
   const user = await prisma.user.findFirstOrThrow({
@@ -26,12 +25,9 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)
     },
     include: {
       Recipient: true,
-      documentMeta: true,
     },
   });
 
-  const customEmail = document?.documentMeta;
-
   if (!document) {
     throw new Error('Document not found');
   }
@@ -48,18 +44,12 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)
     document.Recipient.map(async (recipient) => {
       const { email, name } = recipient;
 
-      const customEmailTemplate = {
-        'signer.name': name,
-        'signer.email': email,
-        'document.name': document.title,
-      };
-
       if (recipient.sendStatus === SendStatus.SENT) {
         return;
       }
 
-      const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';
-      const signDocumentLink = `${process.env.NEXT_PUBLIC_WEBAPP_URL}/sign/${recipient.token}`;
+      const assetBaseUrl = process.env.NEXT_PUBLIC_SITE_URL || 'http://localhost:3000';
+      const signDocumentLink = `${process.env.NEXT_PUBLIC_SITE_URL}/sign/${recipient.token}`;
 
       const template = createElement(DocumentInviteEmailTemplate, {
         documentName: document.title,
@@ -67,7 +57,6 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)
         inviterEmail: user.email,
         assetBaseUrl,
         signDocumentLink,
-        customBody: renderCustomEmailTemplate(customEmail?.message || '', customEmailTemplate),
       });
 
       await mailer.sendMail({
@@ -79,9 +68,7 @@ export const sendDocument = async ({ documentId, userId }: SendDocumentOptions)
           name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
           address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
         },
-        subject: customEmail?.subject
-          ? renderCustomEmailTemplate(customEmail.subject, customEmailTemplate)
-          : 'Please sign this document',
+        subject: 'Please sign this document',
         html: render(template),
         text: render(template, { plainText: true }),
       });

packages/lib/server-only/document/send-pending-email.ts

@@ -1,64 +0,0 @@
-import { createElement } from 'react';
-
-import { mailer } from '@documenso/email/mailer';
-import { render } from '@documenso/email/render';
-import { DocumentPendingEmailTemplate } from '@documenso/email/templates/document-pending';
-import { prisma } from '@documenso/prisma';
-
-export interface SendPendingEmailOptions {
-  documentId: number;
-  recipientId: number;
-}
-
-export const sendPendingEmail = async ({ documentId, recipientId }: SendPendingEmailOptions) => {
-  const document = await prisma.document.findFirst({
-    where: {
-      id: documentId,
-      Recipient: {
-        some: {
-          id: recipientId,
-        },
-      },
-    },
-    include: {
-      Recipient: {
-        where: {
-          id: recipientId,
-        },
-      },
-    },
-  });
-
-  if (!document) {
-    throw new Error('Document not found');
-  }
-
-  if (document.Recipient.length === 0) {
-    throw new Error('Document has no recipients');
-  }
-
-  const [recipient] = document.Recipient;
-
-  const { email, name } = recipient;
-
-  const assetBaseUrl = process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000';
-
-  const template = createElement(DocumentPendingEmailTemplate, {
-    documentName: document.title,
-    assetBaseUrl,
-  });
-
-  await mailer.sendMail({
-    to: {
-      address: email,
-      name,
-    },
-    from: {
-      name: process.env.NEXT_PRIVATE_SMTP_FROM_NAME || 'Documenso',
-      address: process.env.NEXT_PRIVATE_SMTP_FROM_ADDRESS || 'noreply@documenso.com',
-    },
-    subject: 'Waiting for others to complete signing.',
-    html: render(template),
-    text: render(template, { plainText: true }),
-  });
-};

packages/lib/server-only/document/update-document.ts

@@ -1,21 +0,0 @@
-'use server';
-
-import { Prisma } from '@prisma/client';
-
-import { prisma } from '@documenso/prisma';
-
-export type UpdateDocumentOptions = {
-  documentId: number;
-  data: Prisma.DocumentUpdateInput;
-};
-
-export const updateDocument = async ({ documentId, data }: UpdateDocumentOptions) => {
-  return await prisma.document.update({
-    where: {
-      id: documentId,
-    },
-    data: {
-      ...data,
-    },
-  });
-};

packages/lib/server-only/pdf/insert-field-in-pdf.ts

@@ -50,10 +50,10 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
     let imageWidth = image.width;
     let imageHeight = image.height;
 
-    // const initialDimensions = {
-    //   width: imageWidth,
-    //   height: imageHeight,
-    // };
+    const initialDimensions = {
+      width: imageWidth,
+      height: imageHeight,
+    };
 
     const scalingFactor = Math.min(fieldWidth / imageWidth, fieldHeight / imageHeight, 1);
 
@@ -76,10 +76,10 @@ export const insertFieldInPDF = async (pdf: PDFDocument, field: FieldWithSignatu
     let textWidth = font.widthOfTextAtSize(field.customText, fontSize);
     const textHeight = font.heightAtSize(fontSize);
 
-    // const initialDimensions = {
-    //   width: textWidth,
-    //   height: textHeight,
-    // };
+    const initialDimensions = {
+      width: textWidth,
+      height: textHeight,
+    };
 
     const scalingFactor = Math.min(fieldWidth / textWidth, fieldHeight / textHeight, 1);
 

packages/lib/server-only/share/create-or-get-share-link.ts

@@ -1,58 +0,0 @@
-import { P, match } from 'ts-pattern';
-
-import { prisma } from '@documenso/prisma';
-
-import { alphaid } from '../../universal/id';
-
-export type CreateSharingIdOptions =
-  | {
-      documentId: number;
-      token: string;
-    }
-  | {
-      documentId: number;
-      userId: number;
-    };
-
-export const createOrGetShareLink = async ({ documentId, ...options }: CreateSharingIdOptions) => {
-  const email = await match(options)
-    .with({ token: P.string }, async ({ token }) => {
-      return await prisma.recipient
-        .findFirst({
-          where: {
-            documentId,
-            token,
-          },
-        })
-        .then((recipient) => recipient?.email);
-    })
-    .with({ userId: P.number }, async ({ userId }) => {
-      return await prisma.user
-        .findFirst({
-          where: {
-            id: userId,
-          },
-        })
-        .then((user) => user?.email);
-    })
-    .exhaustive();
-
-  if (!email) {
-    throw new Error('Unable to create share link for document with the given email');
-  }
-
-  return await prisma.documentShareLink.upsert({
-    where: {
-      documentId_email: {
-        email,
-        documentId,
-      },
-    },
-    create: {
-      email,
-      documentId,
-      slug: alphaid(14),
-    },
-    update: {},
-  });
-};

packages/lib/server-only/share/get-recipient-or-sender-by-share-link-slug.ts

@@ -1,42 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-export type GetRecipientOrSenderByShareLinkSlugOptions = {
-  slug: string;
-};
-
-export const getRecipientOrSenderByShareLinkSlug = async ({
-  slug,
-}: GetRecipientOrSenderByShareLinkSlugOptions) => {
-  const { documentId, email } = await prisma.documentShareLink.findFirstOrThrow({
-    where: {
-      slug,
-    },
-  });
-
-  const recipient = await prisma.recipient.findFirst({
-    where: {
-      documentId,
-      email,
-    },
-    include: {
-      Signature: true,
-    },
-  });
-
-  if (recipient) {
-    return recipient;
-  }
-
-  const sender = await prisma.user.findFirst({
-    where: {
-      Document: { some: { id: documentId } },
-      email,
-    },
-  });
-
-  if (sender) {
-    return sender;
-  }
-
-  throw new Error('Recipient or sender not found');
-};

packages/lib/server-only/share/get-share-link-by-slug.ts

@@ -1,13 +0,0 @@
-import { prisma } from '@documenso/prisma';
-
-export type GetShareLinkBySlugOptions = {
-  slug: string;
-};
-
-export const getShareLinkBySlug = async ({ slug }: GetShareLinkBySlugOptions) => {
-  return await prisma.documentShareLink.findFirstOrThrow({
-    where: {
-      slug,
-    },
-  });
-};

packages/lib/server-only/user/forgot-password.ts

@@ -1,53 +0,0 @@
-import crypto from 'crypto';
-
-import { prisma } from '@documenso/prisma';
-import { TForgotPasswordFormSchema } from '@documenso/trpc/server/profile-router/schema';
-
-import { ONE_DAY, ONE_HOUR } from '../../constants/time';
-import { sendForgotPassword } from '../auth/send-forgot-password';
-
-export const forgotPassword = async ({ email }: TForgotPasswordFormSchema) => {
-  const user = await prisma.user.findFirst({
-    where: {
-      email: {
-        equals: email,
-        mode: 'insensitive',
-      },
-    },
-  });
-
-  if (!user) {
-    return;
-  }
-
-  // Find a token that was created in the last hour and hasn't expired
-  const existingToken = await prisma.passwordResetToken.findFirst({
-    where: {
-      userId: user.id,
-      expiry: {
-        gt: new Date(),
-      },
-      createdAt: {
-        gt: new Date(Date.now() - ONE_HOUR),
-      },
-    },
-  });
-
-  if (existingToken) {
-    return;
-  }
-
-  const token = crypto.randomBytes(18).toString('hex');
-
-  await prisma.passwordResetToken.create({
-    data: {
-      token,
-      expiry: new Date(Date.now() + ONE_DAY),
-      userId: user.id,
-    },
-  });
-
-  await sendForgotPassword({
-    userId: user.id,
-  }).catch((err) => console.error(err));
-};