From f637381198f014adb5d0fed2d47105924b1d6a0c Mon Sep 17 00:00:00 2001
From: "Aditya @ArchLinux" <132184385+adityadeshlahre@users.noreply.github.com>
Date: Wed, 4 Oct 2023 01:39:16 +0530
Subject: [PATCH 01/13] style(ui/ux): added margin to dialogprimitive.content &
 dialogprimitive.close (m-4)

---
 packages/ui/primitives/dialog.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ui/primitives/dialog.tsx b/packages/ui/primitives/dialog.tsx
index 8a0d8b21e..90e856466 100644
--- a/packages/ui/primitives/dialog.tsx
+++ b/packages/ui/primitives/dialog.tsx
@@ -56,13 +56,13 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'bg-background animate-in data-[state=open]:fade-in-90 sm:zoom-in-90 data-[state=open]:slide-in-from-bottom-10 data-[state=open]:sm:slide-in-from-bottom-0 fixed z-50 grid w-full gap-4 rounded-b-lg border p-6 shadow-lg sm:max-w-lg sm:rounded-lg',
+        'bg-background animate-in data-[state=open]:fade-in-90 sm:zoom-in-90 data-[state=open]:slide-in-from-bottom-10 data-[state=open]:sm:slide-in-from-bottom-0 z-50 m-4 grid w-full gap-4 rounded-b-lg border p-6 shadow-lg sm:max-w-lg sm:rounded-lg',
         className,
       )}
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
+      <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 m-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
         <X className="h-4 w-4" />
         <span className="sr-only">Close</span>
       </DialogPrimitive.Close>

From 68458b50d2ab76173319286f8fb810613d24f221 Mon Sep 17 00:00:00 2001
From: "Aditya @ArchLinux" <132184385+adityadeshlahre@users.noreply.github.com>
Date: Wed, 4 Oct 2023 20:04:07 +0530
Subject: [PATCH 02/13] fix(script): added script envprisma in root
 package.json

dotenv loads all environment variable before running prisma:migrate-dev script
---
 package.json                 | 7 ++++---
 packages/prisma/helper.ts    | 1 +
 packages/prisma/package.json | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index bb574f3ca..8f1b31211 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
     "commitlint": "commitlint --edit",
     "clean": "turbo run clean && rimraf node_modules",
     "d": "npm run dx && npm run dev",
-    "dx": "npm i && npm run dx:up && npm run prisma:migrate-dev -w @documenso/prisma",
+    "envprisma": "npm run prisma:migrate-dev -w @documenso/prisma",
+    "dx": "npm i && npm run dx:up && dotenv -e .env npm run envprisma",
     "dx:up": "docker compose -f docker/compose-services.yml up -d",
     "dx:down": "docker compose -f docker/compose-services.yml down"
   },
@@ -21,8 +22,8 @@
   "devDependencies": {
     "@commitlint/cli": "^17.7.1",
     "@commitlint/config-conventional": "^17.7.0",
-    "dotenv": "^16.0.3",
-    "dotenv-cli": "^7.2.1",
+    "dotenv": "^16.3.1",
+    "dotenv-cli": "^7.3.0",
     "eslint": "^8.40.0",
     "eslint-config-custom": "*",
     "husky": "^8.0.0",
diff --git a/packages/prisma/helper.ts b/packages/prisma/helper.ts
index 865e16239..38f61cb79 100644
--- a/packages/prisma/helper.ts
+++ b/packages/prisma/helper.ts
@@ -1,4 +1,5 @@
 /// <reference types="@documenso/tsconfig/process-env.d.ts" />
+require('dotenv').config();
 
 export const getDatabaseUrl = () => {
   if (process.env.NEXT_PRIVATE_DATABASE_URL) {
diff --git a/packages/prisma/package.json b/packages/prisma/package.json
index 1b12a18a4..efd494ed6 100644
--- a/packages/prisma/package.json
+++ b/packages/prisma/package.json
@@ -18,6 +18,8 @@
   },
   "dependencies": {
     "@prisma/client": "5.3.1",
+    "dotenv": "^16.3.1",
+    "dotenv-cli": "^7.3.0",
     "prisma": "5.3.1"
   },
   "devDependencies": {

From 7c54913bf5d7360edfdd10765f8288fa445ec627 Mon Sep 17 00:00:00 2001
From: Sachin <mittalsam98@gmail.com>
Date: Thu, 5 Oct 2023 00:09:30 +0530
Subject: [PATCH 03/13] fix: non responsiveness of Add your sign modal

---
 apps/marketing/src/components/(marketing)/widget.tsx | 2 +-
 packages/ui/primitives/dialog.tsx                    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/apps/marketing/src/components/(marketing)/widget.tsx b/apps/marketing/src/components/(marketing)/widget.tsx
index ba30833ab..51a6843a5 100644
--- a/apps/marketing/src/components/(marketing)/widget.tsx
+++ b/apps/marketing/src/components/(marketing)/widget.tsx
@@ -377,7 +377,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
       </Card>
 
       <Dialog open={showSigningDialog} onOpenChange={setShowSigningDialog}>
-        <DialogContent>
+        <DialogContent position="center">
           <DialogHeader>
             <DialogTitle>Add your signature</DialogTitle>
           </DialogHeader>
diff --git a/packages/ui/primitives/dialog.tsx b/packages/ui/primitives/dialog.tsx
index 8a0d8b21e..a67e35b03 100644
--- a/packages/ui/primitives/dialog.tsx
+++ b/packages/ui/primitives/dialog.tsx
@@ -16,12 +16,13 @@ const DialogPortal = ({
   children,
   position = 'start',
   ...props
-}: DialogPrimitive.DialogPortalProps & { position?: 'start' | 'end' }) => (
+}: DialogPrimitive.DialogPortalProps & { position?: 'start' | 'end' | 'center' }) => (
   <DialogPrimitive.Portal className={cn(className)} {...props}>
     <div
       className={cn('fixed inset-0 z-50 flex justify-center sm:items-center', {
         'items-start': position === 'start',
         'items-end': position === 'end',
+        'items-center': position === 'center',
       })}
     >
       {children}
@@ -49,7 +50,9 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName;
 
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & { position?: 'start' | 'end' }
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {
+    position?: 'start' | 'end' | 'center';
+  }
 >(({ className, children, position = 'start', ...props }, ref) => (
   <DialogPortal position={position}>
     <DialogOverlay />

From b6f9d70fec3393234d1999f423c7e7471b165545 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 4 Oct 2023 19:58:07 +0000
Subject: [PATCH 04/13] docs: add render one click deploy for refresh

---
 package.json                   |   1 +
 packages/trpc/server/router.ts |   4 +-
 render.yaml                    | 103 +++++++++++++++++++++++++++++++++
 3 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 render.yaml

diff --git a/package.json b/package.json
index bb574f3ca..9f77b4aa3 100644
--- a/package.json
+++ b/package.json
@@ -2,6 +2,7 @@
   "private": true,
   "scripts": {
     "build": "turbo run build",
+    "build:web": "turbo run build --filter=@documenso/web",
     "dev": "turbo run dev --filter=@documenso/web --filter=@documenso/marketing",
     "start": "cd apps && cd web && next start",
     "lint": "turbo run lint",
diff --git a/packages/trpc/server/router.ts b/packages/trpc/server/router.ts
index 6f9fc7660..b4c65b1d4 100644
--- a/packages/trpc/server/router.ts
+++ b/packages/trpc/server/router.ts
@@ -6,7 +6,9 @@ import { shareLinkRouter } from './share-link-router/router';
 import { procedure, router } from './trpc';
 
 export const appRouter = router({
-  hello: procedure.query(() => 'Hello, world!'),
+  health: procedure.query(() => {
+    return { status: 'ok' };
+  }),
   auth: authRouter,
   profile: profileRouter,
   document: documentRouter,
diff --git a/render.yaml b/render.yaml
new file mode 100644
index 000000000..eb213c32c
--- /dev/null
+++ b/render.yaml
@@ -0,0 +1,103 @@
+services:
+  - type: web
+    name: documenso-app
+    env: node
+    plan: free
+    buildCommand: npm i && npm run build:web
+    startCommand: npx prisma migrate deploy --schema packages/prisma/schema.prisma && npm run start
+    healthCheckPath: /api/trpc/health
+
+    envVars:
+      # Node Version
+      - key: NODE_VERSION
+        value: 18.17.0
+
+      - key: PORT
+        value: 10000
+
+      # Auth
+      - key: NEXTAUTH_URL
+        fromService:
+          name: documenso-app
+          type: web
+          envVarKey: RENDER_EXTERNAL_URL
+      - key: NEXTAUTH_SECRET
+        generateValue: true
+
+      # Database
+      - key: NEXT_PRIVATE_DATABASE_URL
+        fromDatabase:
+          name: documenso-db
+          property: connectionString
+
+      - key: NEXT_PRIVATE_DIRECT_DATABASE_URL
+        fromDatabase:
+          name: documenso-db
+          property: connectionString
+
+      # URLs
+      - key: NEXT_PUBLIC_WEBAPP_URL
+        fromService:
+          name: documenso-app
+          type: web
+          envVarKey: RENDER_EXTERNAL_URL
+      - key: NEXT_PUBLIC_MARKETING_URL
+        value: 'http://localhost:3001'
+
+      # SMTP
+      - key: NEXT_PRIVATE_SMTP_TRANSPORT
+        value: 'smtp-auth'
+      - key: NEXT_PRIVATE_SMTP_HOST
+        sync: false
+      - key: NEXT_PRIVATE_SMTP_PORT
+        sync: false
+      - key: NEXT_PRIVATE_SMTP_USERNAME
+        sync: false
+      - key: NEXT_PRIVATE_SMTP_PASSWORD
+        sync: false
+      - key: NEXT_PRIVATE_SMTP_FROM_NAME
+        sync: false
+      - key: NEXT_PRIVATE_SMTP_FROM_ADDRESS
+        sync: false
+
+      # Stripe
+      - key: NEXT_PRIVATE_STRIPE_API_KEY
+        sync: false
+      - key: NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET
+        sync: false
+      - key: NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID
+        sync: false
+      - key: NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID
+        sync: false
+
+      # Features
+      - key: NEXT_PUBLIC_POSTHOG_KEY
+        sync: false
+      - key: NEXT_PUBLIC_POSTHOG_HOST
+        value: 'https://eu.posthog.com'
+      - key: NEXT_PUBLIC_FEATURE_BILLING_ENABLED
+        sync: false
+
+      # Redis (Only required for marketing site, but added for completeness)
+      - key: NEXT_PRIVATE_REDIS_URL
+        sync: false
+      - key: NEXT_PRIVATE_REDIS_TOKEN
+        sync: false
+
+      # Storage
+      - key: NEXT_PUBLIC_UPLOAD_TRANSPORT
+        value: 'database'
+      - key: NEXT_PRIVATE_UPLOAD_ENDPOINT
+        sync: false
+      - key: NEXT_PRIVATE_UPLOAD_REGION
+        sync: false
+      - key: NEXT_PRIVATE_UPLOAD_BUCKET
+        sync: false
+      - key: NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID
+        sync: false
+      - key: NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY
+        sync: false
+
+databases:
+  - name: documenso-db
+    plan: free

From 1814bd4167cb20ab077d6280ada97ae011663d96 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 4 Oct 2023 20:04:10 +0000
Subject: [PATCH 05/13] chore: add issue template

---
 .github/ISSUE_TEMPLATE/bug-report.md      | 50 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature-request.md | 41 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/improvement.md     | 41 +++++++++++++++++++
 3 files changed, 132 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug-report.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature-request.md
 create mode 100644 .github/ISSUE_TEMPLATE/improvement.md

diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 000000000..d12bdad59
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,50 @@
+---
+name: Bug Report
+about: Create a bug report to help us improve
+---
+
+<!--- Please provide a general summary of the issue in the Title above -->
+
+## Issue Description
+
+<!--- Please provide a clear and concise description of the problem. -->
+
+## Steps to Reproduce
+
+<!--- Please provide step-by-step instructions to reproduce the issue. -->
+<!--- Include code snippets, error messages, and any other relevant information. -->
+
+1. Step 1
+2. Step 2
+3. ...
+
+## Expected Behavior
+
+<!--- Describe what you expected to happen. -->
+
+## Current Behavior
+
+<!--- Describe what is currently happening. -->
+
+## Screenshots (optional)
+
+<!--- If applicable, add screenshots to help explain the issue. -->
+
+## Environment
+
+<!--- Please provide information about your environment, such as operating system, browser, version, etc. -->
+
+- OS: [e.g., Windows 10]
+- Browser: [e.g., Chrome, Firefox]
+- Version: [e.g., 2.0.1]
+
+## Checklist
+
+<!--- Please check the boxes that apply to this issue report. -->
+<!--- You can add or remove items as needed. -->
+
+- [ ] I have searched the existing issues to make sure this is not a duplicate.
+- [ ] I have provided steps to reproduce the issue.
+- [ ] I have included relevant environment information.
+- [ ] I have included any relevant screenshots.
+- [ ] I understand that this is a voluntary contribution and that there is no guarantee of resolution.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 000000000..a850a7a9a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,41 @@
+---
+name: Feature Request
+about: Suggest a new idea or enhancement for this project
+---
+
+<!--- Please provide a clear and concise title for your feature request -->
+
+## Feature Description
+
+<!--- Describe the feature you are requesting in detail. -->
+<!--- Explain what problem it solves or what value it adds to the project. -->
+
+## Use Case
+
+<!--- Provide a scenario or use case where this feature would be beneficial. -->
+<!--- Explain how users would interact with this feature and why it's important. -->
+
+## Proposed Solution
+
+<!--- If you have an idea of how this feature could be implemented, describe it here. -->
+<!--- Include any technical details, UI/UX considerations, or design suggestions. -->
+
+## Alternatives (optional)
+
+<!--- Are there any alternative ways to achieve the same goal? -->
+<!--- Describe other approaches that could be considered if this feature is not implemented. -->
+
+## Additional Context
+
+<!--- Add any additional context or information that might be relevant to the feature request. -->
+
+## Checklist
+
+<!--- Please check the boxes that apply to this feature request. -->
+<!--- You can add or remove items as needed. -->
+
+- [ ] I have searched the existing feature requests to make sure this is not a duplicate.
+- [ ] I have provided a detailed description of the requested feature.
+- [ ] I have explained the use case or scenario for this feature.
+- [ ] I have included any relevant technical details or design suggestions.
+- [ ] I understand that this is a suggestion and that there is no guarantee of implementation.
diff --git a/.github/ISSUE_TEMPLATE/improvement.md b/.github/ISSUE_TEMPLATE/improvement.md
new file mode 100644
index 000000000..709d3441f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/improvement.md
@@ -0,0 +1,41 @@
+---
+name: General Improvement
+about: Suggest a minor enhancement or improvement for this project
+---
+
+<!--- Please provide a clear and concise title for your improvement suggestion -->
+
+## Improvement Description
+
+<!--- Describe the improvement you are suggesting in detail. -->
+<!--- Explain what specific aspect of the project it addresses or enhances. -->
+
+## Rationale
+
+<!--- Explain why this improvement would be beneficial. -->
+<!--- Share any context, pain points, or reasons for suggesting this change. -->
+
+## Proposed Solution
+
+<!--- If you have a suggestion for how this improvement could be implemented, describe it here. -->
+<!--- Include any technical details, design suggestions, or other relevant information. -->
+
+## Alternatives (optional)
+
+<!--- Are there any alternative approaches to achieve the same improvement? -->
+<!--- Describe other ways to address the issue or enhance the project. -->
+
+## Additional Context
+
+<!--- Add any additional context or information that might be relevant to the improvement suggestion. -->
+
+## Checklist
+
+<!--- Please check the boxes that apply to this improvement suggestion. -->
+<!--- You can add or remove items as needed. -->
+
+- [ ] I have searched the existing issues and improvement suggestions to avoid duplication.
+- [ ] I have provided a clear description of the improvement being suggested.
+- [ ] I have explained the rationale behind this improvement.
+- [ ] I have included any relevant technical details or design suggestions.
+- [ ] I understand that this is a suggestion and that there is no guarantee of implementation.

From b854f0eedc63a68c807f775f413d8a5b7ce44580 Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Wed, 4 Oct 2023 20:05:55 +0000
Subject: [PATCH 06/13] chore: add pull request templates

---
 .github/PULL_REQUEST_TEMPLATE/generic.md      | 49 +++++++++++++++++++
 .../PULL_REQUEST_TEMPLATE/test-addition.md    | 40 +++++++++++++++
 2 files changed, 89 insertions(+)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/generic.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE/test-addition.md

diff --git a/.github/PULL_REQUEST_TEMPLATE/generic.md b/.github/PULL_REQUEST_TEMPLATE/generic.md
new file mode 100644
index 000000000..70b668b5c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/generic.md
@@ -0,0 +1,49 @@
+---
+name: Pull Request
+about: Submit changes to the project for review and inclusion
+---
+
+## Description
+
+<!--- Describe the changes introduced by this pull request. -->
+<!--- Explain what problem it solves or what feature/fix it adds. -->
+
+## Related Issue
+
+<!--- If this pull request is related to a specific issue, reference it here using #issue_number. -->
+<!--- For example, "Fixes #123" or "Addresses #456". -->
+
+## Changes Made
+
+<!--- Provide a summary of the changes made in this pull request. -->
+<!--- Include any relevant technical details or architecture changes. -->
+
+- Change 1
+- Change 2
+- ...
+
+## Testing Performed
+
+<!--- Describe the testing that you have performed to validate these changes. -->
+<!--- Include information about test cases, testing environments, and results. -->
+
+- Tested feature X in scenario Y.
+- Ran unit tests for component Z.
+- Tested on browsers A, B, and C.
+- ...
+
+## Checklist
+
+<!--- Please check the boxes that apply to this pull request. -->
+<!--- You can add or remove items as needed. -->
+
+- [ ] I have tested these changes locally and they work as expected.
+- [ ] I have added/updated tests that prove the effectiveness of these changes.
+- [ ] I have updated the documentation to reflect these changes, if applicable.
+- [ ] I have followed the project's coding style guidelines.
+- [ ] I have addressed the code review feedback from the previous submission, if applicable.
+
+## Additional Notes
+
+<!--- Provide any additional context or notes for the reviewers. -->
+<!--- This might include details about design decisions, potential concerns, or anything else relevant. -->
diff --git a/.github/PULL_REQUEST_TEMPLATE/test-addition.md b/.github/PULL_REQUEST_TEMPLATE/test-addition.md
new file mode 100644
index 000000000..f93c81493
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/test-addition.md
@@ -0,0 +1,40 @@
+---
+name: Test Addition
+about: Submit a new test, either unit or end-to-end (E2E), for review and inclusion
+---
+
+## Description
+
+<!--- Provide a clear and concise description of the new test you are adding. -->
+<!--- Explain the purpose of the test and what it aims to validate. -->
+
+## Related Issue
+
+<!--- If this test addition is related to a specific issue, reference it here using #issue_number. -->
+<!--- For example, "Fixes #123" or "Addresses #456". -->
+
+## Test Details
+
+<!--- Describe the details of the test you're adding. -->
+<!--- Include information about inputs, expected outputs, and any specific scenarios. -->
+
+- Test Name: Name of the test
+- Type: [Unit / E2E]
+- Description: Brief description of what the test checks
+- Inputs: What inputs the test uses (if applicable)
+- Expected Output: What output or behavior the test expects
+
+## Checklist
+
+<!--- Please check the boxes that apply to this pull request. -->
+<!--- You can add or remove items as needed. -->
+
+- [ ] I have written the new test and ensured it works as intended.
+- [ ] I have added necessary documentation to explain the purpose of the test.
+- [ ] I have followed the project's testing guidelines and coding style.
+- [ ] I have addressed any review feedback from previous submissions, if applicable.
+
+## Additional Notes
+
+<!--- Provide any additional context or notes for the reviewers. -->
+<!--- This might include explanations about the testing approach or any potential concerns. -->

From 0dadec3b8d79dc6e9a057680dc6bfa7d554117a4 Mon Sep 17 00:00:00 2001
From: "Aditya @ArchLinux" <132184385+adityadeshlahre@users.noreply.github.com>
Date: Thu, 5 Oct 2023 15:26:53 +0530
Subject: [PATCH 07/13] fix(script): minor change on scipt

---
 packages/prisma/helper.ts         | 1 -
 packages/ui/primitives/dialog.tsx | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/prisma/helper.ts b/packages/prisma/helper.ts
index 38f61cb79..865e16239 100644
--- a/packages/prisma/helper.ts
+++ b/packages/prisma/helper.ts
@@ -1,5 +1,4 @@
 /// <reference types="@documenso/tsconfig/process-env.d.ts" />
-require('dotenv').config();
 
 export const getDatabaseUrl = () => {
   if (process.env.NEXT_PRIVATE_DATABASE_URL) {
diff --git a/packages/ui/primitives/dialog.tsx b/packages/ui/primitives/dialog.tsx
index 90e856466..8a0d8b21e 100644
--- a/packages/ui/primitives/dialog.tsx
+++ b/packages/ui/primitives/dialog.tsx
@@ -56,13 +56,13 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        'bg-background animate-in data-[state=open]:fade-in-90 sm:zoom-in-90 data-[state=open]:slide-in-from-bottom-10 data-[state=open]:sm:slide-in-from-bottom-0 z-50 m-4 grid w-full gap-4 rounded-b-lg border p-6 shadow-lg sm:max-w-lg sm:rounded-lg',
+        'bg-background animate-in data-[state=open]:fade-in-90 sm:zoom-in-90 data-[state=open]:slide-in-from-bottom-10 data-[state=open]:sm:slide-in-from-bottom-0 fixed z-50 grid w-full gap-4 rounded-b-lg border p-6 shadow-lg sm:max-w-lg sm:rounded-lg',
         className,
       )}
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 m-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
+      <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
         <X className="h-4 w-4" />
         <span className="sr-only">Close</span>
       </DialogPrimitive.Close>

From 49d55227e8ad166319ead07204bc2e1c1434335b Mon Sep 17 00:00:00 2001
From: Anjy Gupta <92802904+anjy7@users.noreply.github.com>
Date: Thu, 5 Oct 2023 15:29:43 +0530
Subject: [PATCH 08/13] fix: sign up with existing account email bug (#517)

* fix: sign up with existing account email bug
---
 packages/trpc/server/auth-router/router.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/trpc/server/auth-router/router.ts b/packages/trpc/server/auth-router/router.ts
index ecb01cca3..f66f44325 100644
--- a/packages/trpc/server/auth-router/router.ts
+++ b/packages/trpc/server/auth-router/router.ts
@@ -12,12 +12,16 @@ export const authRouter = router({
 
       return await createUser({ name, email, password, signature });
     } catch (err) {
-      console.error(err);
+      let message =
+        'We were unable to create your account. Please review the information you provided and try again.';
+
+      if (err instanceof Error && err.message === 'User already exists') {
+        message = 'User with this email already exists. Please use a different email address.';
+      }
 
       throw new TRPCError({
         code: 'BAD_REQUEST',
-        message:
-          'We were unable to create your account. Please review the information you provided and try again.',
+        message,
       });
     }
   }),

From 2470aeee1f9e4bdf9565d7649b85cb5c0d3a38b1 Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Sun, 8 Oct 2023 21:51:15 +1100
Subject: [PATCH 09/13] fix: update script, docs and devcontainer

---
 .devcontainer/on-create.sh |  7 +------
 README.md                  | 18 +++++++++++++++++-
 package.json               |  8 +++++---
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/.devcontainer/on-create.sh b/.devcontainer/on-create.sh
index a66491ef7..fbd5351f2 100755
--- a/.devcontainer/on-create.sh
+++ b/.devcontainer/on-create.sh
@@ -9,10 +9,5 @@ npm install
 # Copy the env file
 cp .env.example .env
 
-# Source the env file, export the variables
-set -a
-source .env
-set +a
-
 # Run the migrations
-npm run -w @documenso/prisma prisma:migrate-dev
+npm run prisma:migrate-dev
diff --git a/README.md b/README.md
index 2795d206d..f488b4a63 100644
--- a/README.md
+++ b/README.md
@@ -179,7 +179,7 @@ git clone https://github.com/documenso/documenso
    - NEXT_PRIVATE_SMTP_FROM_NAME
    - NEXT_PRIVATE_SMTP_FROM_ADDRESS
 
-5. Create the database schema by running `npm run prisma:migrate-dev -w @documenso/prisma`
+5. Create the database schema by running `npm run prisma:migrate-dev`
 
 6. Run `npm run dev` root directory to start
 
@@ -254,6 +254,22 @@ containers:
       - '::'
 ```
 
+### I can't see environment variables in my package scripts
+
+Wrap your package script with the `with:env` script like such:
+
+```
+npm run with:env -- npm run myscript
+```
+
+The same can be done when using `npx` for one of bin scripts:
+
+```
+npm run with:env -- npx myscript
+```
+
+This will load environment variables from your `.env` and `.env.local` files.
+
 ## Repo Activity
 
 ![Repository Activity](https://repobeats.axiom.co/api/embed/622a2e9aa709696f7226304b5b7178a5741b3868.svg)
diff --git a/package.json b/package.json
index 8f1b31211..e32c0322f 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,12 @@
     "commitlint": "commitlint --edit",
     "clean": "turbo run clean && rimraf node_modules",
     "d": "npm run dx && npm run dev",
-    "envprisma": "npm run prisma:migrate-dev -w @documenso/prisma",
-    "dx": "npm i && npm run dx:up && dotenv -e .env npm run envprisma",
+    "dx": "npm i && npm run dx:up && npm run prisma:migrate-dev",
     "dx:up": "docker compose -f docker/compose-services.yml up -d",
-    "dx:down": "docker compose -f docker/compose-services.yml down"
+    "dx:down": "docker compose -f docker/compose-services.yml down",
+    "prisma:migrate-dev": "npm run with:env -- npm run prisma:migrate-dev -w @documenso/prisma",
+    "prisma:migrate-deploy": "npm run with:env -- npm run prisma:migrate-deploy -w @documenso/prisma",
+    "with:env": "dotenv -e .env -e .env.local --"
   },
   "engines": {
     "npm": ">=8.6.0",

From f53cdbace9fa2575d5c779ce557749d9c9307119 Mon Sep 17 00:00:00 2001
From: hallidayo <22655069+Hallidayo@users.noreply.github.com>
Date: Mon, 9 Oct 2023 02:04:01 +0100
Subject: [PATCH 10/13] fix: frequency focus ring (#533)

---
 apps/web/src/app/(dashboard)/documents/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/app/(dashboard)/documents/page.tsx b/apps/web/src/app/(dashboard)/documents/page.tsx
index d200fe262..d8a5a5bd8 100644
--- a/apps/web/src/app/(dashboard)/documents/page.tsx
+++ b/apps/web/src/app/(dashboard)/documents/page.tsx
@@ -66,7 +66,7 @@ export default async function DocumentsPage({ searchParams = {} }: DocumentsPage
       <div className="mt-12 flex flex-wrap items-center justify-between gap-x-4 gap-y-8">
         <h1 className="text-4xl font-semibold">Documents</h1>
 
-        <div className="flex flex-wrap gap-x-4 gap-y-6 overflow-hidden">
+        <div className="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">
           <Tabs defaultValue={status} className="overflow-x-auto">
             <TabsList>
               {[

From f49880125abb81b721ebb249988f07a7e13afcf0 Mon Sep 17 00:00:00 2001
From: Anik Dhabal Babu <adhabal2002@gmail.com>
Date: Mon, 9 Oct 2023 08:41:13 +0000
Subject: [PATCH 11/13] fix: mismatch the version of dotenv-cli

---
 package-lock.json | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 46ff2f745..8fb6594de 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,8 +15,8 @@
       "devDependencies": {
         "@commitlint/cli": "^17.7.1",
         "@commitlint/config-conventional": "^17.7.0",
-        "dotenv": "^16.0.3",
-        "dotenv-cli": "^7.2.1",
+        "dotenv": "^16.3.1",
+        "dotenv-cli": "^7.3.0",
         "eslint": "^8.40.0",
         "eslint-config-custom": "*",
         "husky": "^8.0.0",
@@ -9103,7 +9103,6 @@
       "version": "16.3.1",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
       "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
-      "dev": true,
       "engines": {
         "node": ">=12"
       },
@@ -9112,13 +9111,12 @@
       }
     },
     "node_modules/dotenv-cli": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.2.1.tgz",
-      "integrity": "sha512-ODHbGTskqRtXAzZapDPvgNuDVQApu4oKX8lZW7Y0+9hKA6le1ZJlyRS687oU9FXjOVEDU/VFV6zI125HzhM1UQ==",
-      "dev": true,
+      "version": "7.3.0",
+      "resolved": "https://registry.npmjs.org/dotenv-cli/-/dotenv-cli-7.3.0.tgz",
+      "integrity": "sha512-314CA4TyK34YEJ6ntBf80eUY+t1XaFLyem1k9P0sX1gn30qThZ5qZr/ZwE318gEnzyYP9yj9HJk6SqwE0upkfw==",
       "dependencies": {
         "cross-spawn": "^7.0.3",
-        "dotenv": "^16.0.0",
+        "dotenv": "^16.3.0",
         "dotenv-expand": "^10.0.0",
         "minimist": "^1.2.6"
       },
@@ -9130,7 +9128,6 @@
       "version": "10.0.0",
       "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz",
       "integrity": "sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==",
-      "dev": true,
       "engines": {
         "node": ">=12"
       }
@@ -19889,6 +19886,8 @@
       "license": "MIT",
       "dependencies": {
         "@prisma/client": "5.3.1",
+        "dotenv": "^16.3.1",
+        "dotenv-cli": "^7.3.0",
         "prisma": "5.3.1"
       },
       "devDependencies": {

From a287aab4f49313bab9160a8b37d76de7ddddf3bc Mon Sep 17 00:00:00 2001
From: Mythie <me@lucasjamessmith.me>
Date: Mon, 9 Oct 2023 20:35:19 +1100
Subject: [PATCH 12/13] chore: disable dependabot for now

---
 .github/dependabot.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 74fcb319b..1269fd6c5 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,7 +9,7 @@ updates:
     labels:
       - "ci dependencies"
       - "ci"
-    open-pull-requests-limit: 2
+    open-pull-requests-limit: 0
 
   - package-ecosystem: "npm"
     directory: "/apps/marketing"
@@ -19,7 +19,7 @@ updates:
     labels:
       - "npm dependencies"
       - "frontend"
-    open-pull-requests-limit: 2
+    open-pull-requests-limit: 0
 
   - package-ecosystem: "npm"
     directory: "/apps/web"
@@ -29,4 +29,4 @@ updates:
     labels:
       - "npm dependencies"
       - "frontend"
-    open-pull-requests-limit: 2
+    open-pull-requests-limit: 0

From e0271cace35f719a88d2bc1595b20866c353e161 Mon Sep 17 00:00:00 2001
From: Nafees Nazik <84864519+G3root@users.noreply.github.com>
Date: Tue, 10 Oct 2023 08:25:58 +0530
Subject: [PATCH 13/13] feat: delete draft document (#491)

---
 .../documents/data-table-action-dropdown.tsx  | 17 +++-
 .../delete-draft-document-dialog.tsx          | 89 +++++++++++++++++++
 .../document/delete-draft-document.ts         | 13 +++
 .../trpc/server/document-router/router.ts     | 21 +++++
 .../trpc/server/document-router/schema.ts     |  6 ++
 5 files changed, 145 insertions(+), 1 deletion(-)
 create mode 100644 apps/web/src/app/(dashboard)/documents/delete-draft-document-dialog.tsx
 create mode 100644 packages/lib/server-only/document/delete-draft-document.ts

diff --git a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
index 666930b65..2fb06833b 100644
--- a/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
+++ b/apps/web/src/app/(dashboard)/documents/data-table-action-dropdown.tsx
@@ -1,5 +1,7 @@
 'use client';
 
+import { useState } from 'react';
+
 import Link from 'next/link';
 
 import {
@@ -32,6 +34,8 @@ import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
 
+import { DeleteDraftDocumentDialog } from './delete-draft-document-dialog';
+
 export type DataTableActionDropdownProps = {
   row: Document & {
     User: Pick<User, 'id' | 'name' | 'email'>;
@@ -44,6 +48,8 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
   const { toast } = useToast();
   const [, copyToClipboard] = useCopyToClipboard();
 
+  const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
+
   if (!session) {
     return null;
   }
@@ -59,6 +65,7 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
   // const isPending = row.status === DocumentStatus.PENDING;
   const isComplete = row.status === DocumentStatus.COMPLETED;
   // const isSigned = recipient?.signingStatus === SigningStatus.SIGNED;
+  const isDocumentDeletable = isOwner && row.status === DocumentStatus.DRAFT;
 
   const onShareClick = async () => {
     const { slug } = await createOrGetShareLink({
@@ -147,7 +154,7 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
           Void
         </DropdownMenuItem>
 
-        <DropdownMenuItem disabled>
+        <DropdownMenuItem onClick={() => setDeleteDialogOpen(true)} disabled={!isDocumentDeletable}>
           <Trash2 className="mr-2 h-4 w-4" />
           Delete
         </DropdownMenuItem>
@@ -168,6 +175,14 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
           Share
         </DropdownMenuItem>
       </DropdownMenuContent>
+
+      {isDocumentDeletable && (
+        <DeleteDraftDocumentDialog
+          id={row.id}
+          open={isDeleteDialogOpen}
+          onOpenChange={setDeleteDialogOpen}
+        />
+      )}
     </DropdownMenu>
   );
 };
diff --git a/apps/web/src/app/(dashboard)/documents/delete-draft-document-dialog.tsx b/apps/web/src/app/(dashboard)/documents/delete-draft-document-dialog.tsx
new file mode 100644
index 000000000..1a458a13d
--- /dev/null
+++ b/apps/web/src/app/(dashboard)/documents/delete-draft-document-dialog.tsx
@@ -0,0 +1,89 @@
+import { useRouter } from 'next/navigation';
+
+import { trpc as trpcReact } from '@documenso/trpc/react';
+import { Button } from '@documenso/ui/primitives/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@documenso/ui/primitives/dialog';
+import { useToast } from '@documenso/ui/primitives/use-toast';
+
+type DeleteDraftDocumentDialogProps = {
+  id: number;
+  open: boolean;
+  onOpenChange: (_open: boolean) => void;
+};
+
+export const DeleteDraftDocumentDialog = ({
+  id,
+  open,
+  onOpenChange,
+}: DeleteDraftDocumentDialogProps) => {
+  const router = useRouter();
+
+  const { toast } = useToast();
+
+  const { mutateAsync: deleteDocument, isLoading } =
+    trpcReact.document.deleteDraftDocument.useMutation({
+      onSuccess: () => {
+        router.refresh();
+
+        toast({
+          title: 'Document deleted',
+          description: 'Your document has been successfully deleted.',
+          duration: 5000,
+        });
+
+        onOpenChange(false);
+      },
+    });
+
+  const onDraftDelete = async () => {
+    try {
+      await deleteDocument({ id });
+    } catch {
+      toast({
+        title: 'Something went wrong',
+        description: 'This document could not be deleted at this time. Please try again.',
+        variant: 'destructive',
+        duration: 7500,
+      });
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={(value) => !isLoading && onOpenChange(value)}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Do you want to delete this document?</DialogTitle>
+
+          <DialogDescription>
+            Please note that this action is irreversible. Once confirmed, your document will be
+            permanently deleted.
+          </DialogDescription>
+        </DialogHeader>
+
+        <DialogFooter>
+          <div className="flex w-full flex-1 flex-nowrap gap-4">
+            <Button
+              type="button"
+              variant="secondary"
+              onClick={() => onOpenChange(false)}
+              className="flex-1"
+            >
+              Cancel
+            </Button>
+
+            <Button type="button" loading={isLoading} onClick={onDraftDelete} className="flex-1">
+              Delete
+            </Button>
+          </div>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
diff --git a/packages/lib/server-only/document/delete-draft-document.ts b/packages/lib/server-only/document/delete-draft-document.ts
new file mode 100644
index 000000000..6b0bc3511
--- /dev/null
+++ b/packages/lib/server-only/document/delete-draft-document.ts
@@ -0,0 +1,13 @@
+'use server';
+
+import { prisma } from '@documenso/prisma';
+import { DocumentStatus } from '@documenso/prisma/client';
+
+export type DeleteDraftDocumentOptions = {
+  id: number;
+  userId: number;
+};
+
+export const deleteDraftDocument = async ({ id, userId }: DeleteDraftDocumentOptions) => {
+  return await prisma.document.delete({ where: { id, userId, status: DocumentStatus.DRAFT } });
+};
diff --git a/packages/trpc/server/document-router/router.ts b/packages/trpc/server/document-router/router.ts
index e436bb391..6d19afc0b 100644
--- a/packages/trpc/server/document-router/router.ts
+++ b/packages/trpc/server/document-router/router.ts
@@ -1,6 +1,7 @@
 import { TRPCError } from '@trpc/server';
 
 import { createDocument } from '@documenso/lib/server-only/document/create-document';
+import { deleteDraftDocument } from '@documenso/lib/server-only/document/delete-draft-document';
 import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
 import { getDocumentAndSenderByToken } from '@documenso/lib/server-only/document/get-document-by-token';
 import { sendDocument } from '@documenso/lib/server-only/document/send-document';
@@ -10,6 +11,7 @@ import { setRecipientsForDocument } from '@documenso/lib/server-only/recipient/s
 import { authenticatedProcedure, procedure, router } from '../trpc';
 import {
   ZCreateDocumentMutationSchema,
+  ZDeleteDraftDocumentMutationSchema,
   ZGetDocumentByIdQuerySchema,
   ZGetDocumentByTokenQuerySchema,
   ZSendDocumentMutationSchema,
@@ -76,6 +78,25 @@ export const documentRouter = router({
       }
     }),
 
+  deleteDraftDocument: authenticatedProcedure
+    .input(ZDeleteDraftDocumentMutationSchema)
+    .mutation(async ({ input, ctx }) => {
+      try {
+        const { id } = input;
+
+        const userId = ctx.user.id;
+
+        return await deleteDraftDocument({ id, userId });
+      } catch (err) {
+        console.error(err);
+
+        throw new TRPCError({
+          code: 'BAD_REQUEST',
+          message: 'We were unable to delete this document. Please try again later.',
+        });
+      }
+    }),
+
   setRecipientsForDocument: authenticatedProcedure
     .input(ZSetRecipientsForDocumentMutationSchema)
     .mutation(async ({ input, ctx }) => {
diff --git a/packages/trpc/server/document-router/schema.ts b/packages/trpc/server/document-router/schema.ts
index c95417306..e5b27c0ea 100644
--- a/packages/trpc/server/document-router/schema.ts
+++ b/packages/trpc/server/document-router/schema.ts
@@ -61,3 +61,9 @@ export const ZSendDocumentMutationSchema = z.object({
 });
 
 export type TSendDocumentMutationSchema = z.infer<typeof ZSendDocumentMutationSchema>;
+
+export const ZDeleteDraftDocumentMutationSchema = z.object({
+  id: z.number().min(1),
+});
+
+export type TDeleteDraftDocumentMutationSchema = z.infer<typeof ZDeleteDraftDocumentMutationSchema>;