chore: next 13.5.4

.devcontainer/on-create.sh

@@ -9,5 +9,10 @@ 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 prisma:migrate-dev
+npm run -w @documenso/prisma prisma:migrate-dev

.env.example

@@ -2,11 +2,6 @@
 NEXTAUTH_URL="http://localhost:3000"
 NEXTAUTH_SECRET="secret"
 
-# [[CRYPTO]]
-# Application Key for symmetric encryption and decryption
-# This should be a random string of at least 32 characters
-NEXT_PRIVATE_ENCRYPTION_KEY="CAFEBABE"
-
 # [[AUTH OPTIONAL]]
 NEXT_PRIVATE_GOOGLE_CLIENT_ID=""
 NEXT_PRIVATE_GOOGLE_CLIENT_SECRET=""
@@ -20,11 +15,6 @@ NEXT_PRIVATE_DATABASE_URL="postgres://documenso:password@127.0.0.1:54320/documen
 # Defines the URL to use for the database when running migrations and other commands that won't work with a connection pool.
 NEXT_PRIVATE_DIRECT_DATABASE_URL="postgres://documenso:password@127.0.0.1:54320/documenso"
 
-# [[E2E Tests]]
-E2E_TEST_AUTHENTICATE_USERNAME="Test User"
-E2E_TEST_AUTHENTICATE_USER_EMAIL="testuser@mail.com"
-E2E_TEST_AUTHENTICATE_USER_PASSWORD="test_password"
-
 # [[STORAGE]]
 # OPTIONAL: Defines the storage transport to use. Available options: database (default) | s3
 NEXT_PUBLIC_UPLOAD_TRANSPORT="database"
@@ -60,9 +50,7 @@ NEXT_PRIVATE_SMTP_SECURE=
 NEXT_PRIVATE_SMTP_FROM_NAME="No Reply @ Documenso"
 # REQUIRED: Defines the email address to use as the from address.
 NEXT_PRIVATE_SMTP_FROM_ADDRESS="noreply@documenso.com"
-# OPTIONAL: The API key to use for Resend.com
-NEXT_PRIVATE_RESEND_API_KEY=
-# OPTIONAL: The API key to use for MailChannels.
+# OPTIONAL: The API key to use for the MailChannels proxy endpoint.
 NEXT_PRIVATE_MAILCHANNELS_API_KEY=
 # OPTIONAL: The endpoint to use for the MailChannels API if using a proxy.
 NEXT_PRIVATE_MAILCHANNELS_ENDPOINT=
@@ -78,7 +66,6 @@ NEXT_PRIVATE_STRIPE_API_KEY=
 NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET=
 NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID=
 NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID=
-NEXT_PUBLIC_STRIPE_FREE_PLAN_ID=
 
 # [[FEATURES]]
 # OPTIONAL: Leave blank to disable PostHog and feature flags.

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,48 +0,0 @@
-name: "Bug Report"
-labels: "bug"
-description: Create a bug report to help us improve
-body:
-  - type: markdown
-    attributes:
-      value:
-        Thank you for reporting an issue.
-        Please fill in as much of the form below as you're able to.
-  - type: textarea
-    attributes:
-      label: Issue Description
-      description: Please provide a clear and concise description of the problem.
-  - type: textarea
-    attributes:
-      label: Steps to Reproduce
-      description: Please provide step-by-step instructions to reproduce the issue. Include code snippets, error messages, and any other relevant information.
-  - type: textarea
-    attributes:
-      label: Expected Behavior
-      description: Describe what you expected to happen.
-  - type: textarea
-    attributes:
-      label: Current Behavior
-      description: Describe what is currently happening.
-  - type: textarea
-    attributes:
-      label: Screenshots (optional)
-      description: If applicable, add screenshots to help explain the issue.
-  - type: input
-    attributes:
-      label: Operating System [e.g., Windows 10]
-  - type: input
-    attributes:
-      label: Browser [e.g., Chrome, Firefox]
-  - type: input
-    attributes:
-      label: Version [e.g., 2.0.1]
-  - type: checkboxes
-    attributes:
-      label: Please check the boxes that apply to this issue report.
-      options:
-        - label: I have searched the existing issues to make sure this is not a duplicate.
-        - label: I have provided steps to reproduce the issue.
-        - label: I have included relevant environment information.
-        - label: I have included any relevant screenshots.
-        - label: I understand that this is a voluntary contribution and that there is no guarantee of resolution.
-        - label: I want to work on creating a PR for this issue if approved

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,35 +0,0 @@
-name: "Feature Request"
-description: Suggest a new idea or enhancement for this project
-body:
-  - type: markdown
-    attributes:
-      value: Please provide a clear and concise title for your feature request 
-  - type: textarea
-    attributes:
-      label: Feature Description
-      description: Describe the feature you are requesting in detail. Explain what problem it solves or what value it adds to the project.
-  - type: textarea
-    attributes:
-      label: Use Case
-      description: 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.
-  - type: textarea
-    attributes:
-      label: Proposed Solution
-      description: 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.
-  - type: textarea
-    attributes:
-      label: Alternatives (optional)
-      description: Are there any alternative ways to achieve the same goal? Describe other approaches that could be considered if this feature is not implemented.
-  - type: textarea
-    attributes:
-      label: Additional Context
-      description: Add any additional context or information that might be relevant to the feature request.
-  - type: checkboxes
-    attributes:
-      label: Please check the boxes that apply to this feature request.
-      options:
-        - label: I have searched the existing feature requests to make sure this is not a duplicate.
-        - label: I have provided a detailed description of the requested feature.
-        - label: I have explained the use case or scenario for this feature.
-        - label: I have included any relevant technical details or design suggestions.
-        - label: I understand that this is a suggestion and that there is no guarantee of implementation.

.github/ISSUE_TEMPLATE/improvement.yml

@@ -1,35 +0,0 @@
-name: "General Improvement"
-description: Suggest a minor enhancement or improvement for this project
-body:
-  - type: markdown
-    attributes:
-      value: Please provide a clear and concise title for your improvement suggestion
-  - type: textarea
-    attributes:
-      label: Improvement Description
-      description: Describe the improvement you are suggesting in detail. Explain what specific aspect of the project it addresses or enhances.
-  - type: textarea
-    attributes:
-      label: Rationale
-      description: Explain why this improvement would be beneficial. Share any context, pain points, or reasons for suggesting this change.
-  - type: textarea
-    attributes:
-      label: Proposed Solution
-      description: 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.
-  - type: textarea
-    attributes:
-      label: Alternatives (optional)
-      description: Are there any alternative approaches to achieve the same improvement? Describe other ways to address the issue or enhance the project.
-  - type: textarea
-    attributes:
-      label: Additional Context
-      description: Add any additional context or information that might be relevant to the improvement suggestion.
-  - type: checkboxes
-    attributes:
-      label: Please check the boxes that apply to this improvement suggestion.
-      options:
-        - label: I have searched the existing issues and improvement suggestions to avoid duplication.
-        - label: I have provided a clear description of the improvement being suggested.
-        - label: I have explained the rationale behind this improvement.
-        - label: I have included any relevant technical details or design suggestions.
-        - label: I understand that this is a suggestion and that there is no guarantee of implementation.

.github/PULL_REQUEST_TEMPLATE/generic.md

@@ -1,49 +0,0 @@
----
-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. -->

.github/PULL_REQUEST_TEMPLATE/test-addition.md

@@ -1,40 +0,0 @@
----
-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. -->

.github/dependabot.yml

@@ -9,7 +9,7 @@ updates:
     labels:
       - "ci dependencies"
       - "ci"
-    open-pull-requests-limit: 0
+    open-pull-requests-limit: 2
 
   - package-ecosystem: "npm"
     directory: "/apps/marketing"
@@ -19,7 +19,7 @@ updates:
     labels:
       - "npm dependencies"
       - "frontend"
-    open-pull-requests-limit: 0
+    open-pull-requests-limit: 2
 
   - package-ecosystem: "npm"
     directory: "/apps/web"
@@ -29,4 +29,4 @@ updates:
     labels:
       - "npm dependencies"
       - "frontend"
-    open-pull-requests-limit: 0
+    open-pull-requests-limit: 2

.github/workflows/e2e-tests.yml

@@ -1,51 +0,0 @@
-name: Playwright Tests
-on:
-  push:
-    branches: [feat/refresh]
-  pull_request:
-    branches: [feat/refresh]
-jobs:
-  e2e_tests:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: Install dependencies
-        run: npm ci
-      - name: Copy env
-        run: cp .env.example .env
-      - name: Install Playwright Browsers
-        run: npx playwright install --with-deps
-      - name: Generate Prisma Client
-        run: npm run prisma:generate -w @documenso/prisma
-      - name: Create the database
-        run: npm run prisma:migrate-dev
-      - name: Run Playwright tests
-        run: npm run ci
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 30
-    env:
-      NEXT_PRIVATE_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/documenso
-      NEXT_PRIVATE_DIRECT_DATABASE_URL: postgresql://postgres:postgres@localhost:5432/documenso
-      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
-      TURBO_TEAM: ${{ vars.TURBO_TEAM }}

.gitignore

@@ -31,7 +31,6 @@ yarn-error.log*
 
 # turbo
 .turbo
-.turbo-cookie
 
 # vercel
 .vercel

.gitpod.yml

@@ -1,55 +0,0 @@
-tasks:
-  - init: |
-      npm i &&
-      npm run dx:up &&
-      cp .env.example .env &&
-      set -a; source .env &&
-      export NEXTAUTH_URL="$(gp url 3000)" &&
-      export NEXT_PUBLIC_WEBAPP_URL="$(gp url 3000)" &&
-      export NEXT_PUBLIC_MARKETING_URL="$(gp url 3001)" 
-    command: npm run d
-
-ports:
-  - port: 3000
-    visibility: public
-    onOpen: open-preview
-  - port: 3001
-    visibility: public
-    onOpen: open-preview
-  - port: 9000
-    visibility: public
-    onOpen: ignore
-  - port: 1100
-    visibility: private
-    onOpen: ignore
-  - port: 2500
-    visibility: private
-    onOpen: ignore
-  - port: 54320 
-    visibility: private 
-    onOpen: ignore
-
-
-github:
-  prebuilds:
-    master: true
-    pullRequests: true
-    pullRequestsFromForks: true
-    addCheck: true
-    addComment: true
-    addBadge: true
-
-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

.prettierignore

@@ -1,16 +0,0 @@
-node_modules
-.next
-public
-**/**/node_modules
-**/**/.next
-**/**/public
-
-*.lock
-*.log
-*.test.ts
-
-.gitignore
-.npmignore
-.prettierignore
-.DS_Store
-.eslintignore

CODE_OF_CONDUCT.md

@@ -1,126 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, caste, color, religion, or sexual
-identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our
-community include:
-
-- Demonstrating empathy and kindness toward other people
-- Being respectful of differing opinions, viewpoints, and experiences
-- Giving and gracefully accepting constructive feedback
-- Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-- Focusing on what is best not just for us as individuals, but for the overall
-  community
-
-Examples of unacceptable behavior include:
-
-- The use of sexualized language or imagery, and sexual attention or advances of
-  any kind
-- Trolling, insulting or derogatory comments, and personal or political attacks
-- Public or private harassment
-- Publishing others' private information, such as a physical or email address,
-  without their explicit permission
-- Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-support@documenso.com.
-All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of
-actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or permanent
-ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior, harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the
-community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.1, available at
-[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
-
-Community Impact Guidelines were inspired by
-[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
-
-For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
-[https://www.contributor-covenant.org/translations][translations].

CONTRIBUTING.md

@@ -5,36 +5,20 @@ If you plan to contribute to Documenso, please take a moment to feel awesome ✨
 ## Before getting started
 
 - Before jumping into a PR be sure to search [existing PRs](https://github.com/documenso/documenso/pulls) or [issues](https://github.com/documenso/documenso/issues) for an open or closed item that relates to your submission.
-- Select an issue from [here](https://github.com/documenso/documenso/issues) or create a new one
-- Consider the results from the discussion on the issue
+- Select and issue from [here](https://github.com/documenso/documenso/issues) or create a new one
+- Consider the results from the discussion in the issue
 - Accept the [Contributor License Agreement](https://documen.so/cla) to ensure we can accept your contributions.
 
-## Taking issues
-
-Before taking an issue, ensure that:
-
-- The issue has been assigned the public label
-- The issue is clearly defined and understood
-- No one has been assigned to the issue
-- No one has expressed intention to work on it
-
-You can then:
-
-1. Comment on the issue with your intention to work on it
-2. Begin work on the issue
-
-Always feel free to ask questions or seek clarification on the issue.
-
 ## Developing
 
-The development branch is <code>main</code>. All pull requests should be made against this branch. If you need help getting started, [join us on Discord](https://documen.so/discord).
+The development branch is <code>main</code>. All pull request should be made against this branch. If you need help getting started, [join us on Discord](https://documen.so/discord).
 
 1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your
    own GitHub account and then
    [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device.
 2. Create a new branch:
 
-- Create a new branch (include the issue id and something readable):
+- Create a new branch (include the issue id and somthing readable):
 
   ```sh
   git checkout -b doc-999-my-feature-or-fix
@@ -45,7 +29,7 @@ The development branch is <code>main</code>. All pull requests should be made ag
 ## Building
 
 > **Note**
-> Please ensure you can make a full production build before pushing code or creating PRs.
+> Please be sure that you can make a full production build before pushing code or creating PRs.
 
 You can build the project with:
 

README.md

@@ -1,8 +1,8 @@
-🚨 We are live on Product Hunt with Single Player Mode and the new free tier: [https://www.producthunt.com/products/documenso](https://www.producthunt.com/posts/documenso-singleplayer-mode)
+<p align="center" style="margin-top: 120px">
+  <a href="https://github.com/documenso/documenso">
+   <img width="250px" src="https://github.com/documenso/documenso/assets/1309312/cd7823ec-4baa-40b9-be78-4acb3b1c73cb" alt="Documenso Logo">
+  </a>
 
-<img src="https://github.com/documenso/documenso/assets/13398220/a643571f-0239-46a6-a73e-6bef38d1228b" alt="Documenso Logo">
-
-<p align="center" style="margin-top: 20px">
   <p align="center">
   The Open Source DocuSign Alternative.
   <br>
@@ -16,62 +16,63 @@
     <a href="https://github.com/documenso/documenso/issues">Issues</a>
     ·
     <a href="https://github.com/documenso/documenso/milestones">Roadmap</a>
-    ·
-    <a href="https://documen.so/launches">Upcoming Launches</a>
   </p>
 </p>
 
 <p align="center">
-   <a href="https://documen.so/discord"><img src="https://img.shields.io/badge/Discord-documen.so/discord-%235865F2" alt="Join Documenso on Discord"></a>
+   <a href="https://documen.so/discord"><img src="https://img.shields.io/badge/Discord-documen.so/discord-%235865F2" alt="Join Documenso on Discord"></a> 
    <a href="https://github.com/documenso/documenso/stargazers"><img src="https://img.shields.io/github/stars/documenso/documenso" alt="Github Stars"></a>
    <a href="https://github.com/documenso/documenso/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-AGPLv3-purple" alt="License"></a>
    <a href="https://github.com/documenso/documenso/pulse"><img src="https://img.shields.io/github/commit-activity/m/documenso/documenso" alt="Commits-per-month"></a>
-   <a href="https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/documenso/documenso">
-   <img alt="open in devcontainer" src="https://img.shields.io/static/v1?label=Dev%20Containers&message=Enabled&color=blue&logo=visualstudiocode" />
-   </a>
-   <a href="code_of_conduct.md"><img src="https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg" alt="Contributor Covenant"></a>
 </p>
 
+> **🚧 We're currently working on a large scale refactor which can be found on the [feat/refresh](https://github.com/documenso/documenso/tree/feat/refresh) branch.**
+>
+> **[Read more on why 👀](https://documenso.com/blog/why-were-doing-a-rewrite)**
+
+# Documenso 0.9 - Developer Preview
+
 <div>
   <img style="display: block; height: 120px; width: 24%"
-    src="https://github.com/documenso/documenso/assets/1309312/67e08c98-c153-4115-aa2d-77979bb12c94)">
+    src="https://user-images.githubusercontent.com/1309312/224570645-167128ee-3e39-4578-85d2-5394d9a0379c.png">
   <img style="display: block; height: 120px; width: 24%"
-    src="https://github.com/documenso/documenso/assets/1309312/040cfbae-3438-4ca3-87f2-ce52c793dcaf">
+    src="https://user-images.githubusercontent.com/1309312/224570651-0afd12f8-cfe3-49d1-805e-e495af963d91.png">
   <img style="display: block; height: 120px; width: 24%"
-    src="https://github.com/documenso/documenso/assets/1309312/72d445be-41e5-4936-bdba-87ef8e70fa09">
+    src="https://user-images.githubusercontent.com/1309312/224570655-328d2279-058d-4a3e-b5c3-5cbd8a1f4e05.png">
   <img style="display: block; height: 120px; width: 24%"
-    src="https://github.com/documenso/documenso/assets/1309312/d7b86c0f-a755-4476-a022-a608db2c4633">
+    src="https://user-images.githubusercontent.com/1309312/224571617-1f3c2811-c1ac-4d7d-b9b0-4ab183731405.png">
   <img style="display: block; height: 120px; width: 24%"
-    src=https://github.com/documenso/documenso/assets/1309312/c0f55116-ab82-433f-a266-f3fc8571d69f">
+    src="https://user-images.githubusercontent.com/1309312/224570322-b2c76ea8-7482-4043-ad97-f1221220c591.png">
+  <img style="display: block; height: 120px; width: 24%"
+    src="https://user-images.githubusercontent.com/1309312/224570325-a8055f24-9826-4a23-b116-4fbb0577581a.png">
+  <img style="display: block; height: 120px; width: 24%"
+    src="https://user-images.githubusercontent.com/1309312/224570318-f724bbd9-c394-4bdc-bace-2d78af92de44.png">
+      <img style="display: block; height: 120px; width: 24%"
+    src="https://user-images.githubusercontent.com/1309312/224571539-f019b860-f613-4b20-86e8-4437c5784265.png">
 </div>
 
+> **Note**
+> This project is currently under community review and will publish it's first production release soon™.
+
 ## About this project
 
-Signing documents digitally should be fast and easy and should be the best practice for every document signed worldwide.
-
-This is technically quite easy today, but it also introduces a new party to every signature: The signing tool providers. While this is not a problem in itself, it should make us think about how we want these providers of trust to work.
-
-Documenso aims to be the world's most trusted document-signing tool. This trust is built by empowering you to self-host Documenso and review how it works under the hood.
-
-Join us in creating the next generation of open trust infrastructure.
+Signing documents digitally is fast, easy and should be best practice for every document signed worldwide. This is technically quite easy today, but it also introduces a new party to every signature: The signing tool providers. While this is not a problem in itself, it should make us think about how we want these providers of trust to work. Documenso aims to be the world's most trusted document signing tool. This trust is built by empowering you to self-host Documenso and review how it works under the hood. Join us in creating the next generation of open trust infrastructure.
 
 ## Recognition
 
-<p align="center">
-  <a href="https://www.producthunt.com/posts/documenso?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-documenso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=395047&theme=light&period=daily" alt="Documenso - The&#0032;open&#0032;source&#0032;DocuSign&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-  <a href="https://www.producthunt.com/posts/documenso?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-documenso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=395047&theme=light" alt="Documenso - The&#0032;Open&#0032;Source&#0032;DocuSign&#0032;Alternative&#0046; | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
-</p>
+<a href="https://www.producthunt.com/posts/documenso?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-documenso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=395047&theme=light&period=daily" alt="Documenso - The&#0032;open&#0032;source&#0032;DocuSign&#0032;alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
+<a href="https://www.producthunt.com/posts/documenso?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-documenso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=395047&theme=light" alt="Documenso - The&#0032;Open&#0032;Source&#0032;DocuSign&#0032;Alternative&#0046; | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 
 ## Community and Next Steps 🎯
 
-We're currently working on a redesign of the application, including a revamp of the codebase, so Documenso can be more intuitive to use and robust to develop upon.
+We're currently working on a redesign of the application including a revamp of the codebase so Documenso can be more intuitive to use and robust to develop upon.
 
-- Check out the first source code release in this repository and test it.
-- Tell us what you think in the [Discussions](https://github.com/documenso/documenso/discussions).
-- Join the [Discord server](https://documen.so/discord) for any questions and getting to know to other community members.
-- ⭐ the repository to help us raise awareness.
-- Spread the word on Twitter that Documenso is working towards a more open signing tool.
-- Fix or create [issues](https://github.com/documenso/documenso/issues), that are needed for the first production release.
+- Check out the first source code release in this repository and test it
+- Tell us what you think in the current [Discussions](https://github.com/documenso/documenso/discussions)
+- Join the [Discord server](https://documen.so/discord) for any questions and getting to know to other community members
+- ⭐ the repository to help us raise awareness
+- Spread the word on Twitter, that Documenso is working towards a more open signing tool
+- Fix or create [issues](https://github.com/documenso/documenso/issues), that are needed for the first production release
 
 ## Contributing
 
@@ -83,107 +84,96 @@ Contact us if you are interested in our Enterprise plan for large organizations
 
 <a href="https://cal.com/timurercan/enterprise-customers?utm_source=banner&utm_campaign=oss"><img alt="Book us with Cal.com" src="https://cal.com/book-with-cal-dark.svg" /></a>
 
-## Tech Stack
+## Activity
 
-- [Typescript](https://www.typescriptlang.org/) - Language
-- [Next.js](https://nextjs.org/) - Framework
-- [Prisma](https://www.prisma.io/) - ORM
-- [Tailwind](https://tailwindcss.com/) - CSS
-- [shadcn/ui](https://ui.shadcn.com/) - Component Library
-- [NextAuth.js](https://next-auth.js.org/) - Authentication
-- [react-email](https://react.email/) - Email Templates
-- [tRPC](https://trpc.io/) - API
-- [Node SignPDF](https://github.com/vbuch/node-signpdf) - Digital Signature
-- [React-PDF](https://github.com/wojtekmaj/react-pdf) - Viewing PDFs
-- [PDF-Lib](https://github.com/Hopding/pdf-lib) - PDF manipulation
-- [Stripe](https://stripe.com/) - Payments
-- [Vercel](https://vercel.com) - Hosting
+![Repository Activity](https://repobeats.axiom.co/api/embed/622a2e9aa709696f7226304b5b7178a5741b3868.svg)
 
-<!-- - Support for [opensignpdf (requires Java on server)](https://github.com/open-pdf-sign) is currently planned. -->
+# Tech
 
-## Local Development
+Documenso is built using awesome open source tech including:
 
-### Requirements
+- [Typescript](https://www.typescriptlang.org/)
+- [Javascript (when necessary)](https://developer.mozilla.org/en-US/docs/Web/JavaScript)
+- [NextJS (JS Fullstack Framework)](https://nextjs.org/)
+- [Postgres SQL (Database)](https://www.postgresql.org/)
+- [Prisma (ORM - Object-relational mapping)](https://www.prisma.io/)
+- [Tailwind CSS (Styling)](https://tailwindcss.com/)
+- [Node SignPDF (Digital Signature)](https://github.com/vbuch/node-signpdf)
+- [React-PDF for viewing PDFs](https://github.com/wojtekmaj/react-pdf)
+- [PDF-Lib for PDF manipulation](https://github.com/Hopding/pdf-lib)
+- Check out `/package.json` and `/apps/web/package.json` for more
+- Support for [opensignpdf (requires Java on server)](https://github.com/open-pdf-sign) is currently planned.
 
-To run Documenso locally, you will need
+# Getting Started
 
-- Node.js
-- Postgres SQL Database
-- Docker (optional)
+## Requirements
 
-### Developer Quickstart
+To run Documenso locally you need
+
+- [Node.js (Version: >=18.x)](https://nodejs.org/en/download/)
+- Node Package Manager NPM - included in Node.js
+- [PostgreSQL (local or remote)](https://www.postgresql.org/download/)
+
+## Developer Quickstart
 
 > **Note**: This is a quickstart for developers. It assumes that you have both [docker](https://docs.docker.com/get-docker/) and [docker-compose](https://docs.docker.com/compose/) installed on your machine.
 
 Want to get up and running quickly? Follow these steps:
 
-1. [Clone the repository](https://help.github.com/articles/cloning-a-repository/) it to your local device.
+- [Clone the repository](https://help.github.com/articles/cloning-a-repository/) it to your local device.
 
-```sh
-git clone https://github.com/documenso/documenso
-```
+  ```sh
+  git clone https://github.com/documenso/documenso
+  ```
 
-2. Set up your `.env` file using the recommendations in the `.env.example` file. Alternatively, just run `cp .env.example .env` to get started with our handpicked defaults.
+- Set up your `.env` file using the recommendations in the `.env.example` file.
+- Run `npm run dx` in the root directory
+  - This will spin up a postgres database and inbucket mail server in docker containers.
+- Run `npm run dev` in the root directory
+- Want it even faster? Just use
+  ```sh
+  npm run d
+  ```
 
-3. Run `npm run dx` in the root directory
+That's it! You should now be able to access the app at http://localhost:3000
 
-   - This will spin up a postgres database and inbucket mailserver in a docker container.
+Incoming mail will be available at http://localhost:9000
 
-4. Run `npm run dev` in the root directory
-
-5. Want it even faster? Just use
-
-```sh
-npm run d
-```
-
-#### Access Points for Your Application
-
-1. **App** - http://localhost:3000
-2. **Incoming Mail Access** - http://localhost:9000
-
-3. **Database Connection Details**
-   - **Port**: 54320
-   - **Connection**: Use your favorite database client to connect using the provided port.
+Your database will also be available on port `54320`. You can connect to it using your favorite database client.
 
 ## Developer Setup
 
 ### Manual Setup
 
-Follow these steps to setup Documenso on your local machine:
+Follow these steps to setup documenso on you local machine:
 
-1. [Clone the repository](https://help.github.com/articles/cloning-a-repository/) it to your local device.
-
-```sh
-git clone https://github.com/documenso/documenso
-```
-
-2. Run `npm i` in the root directory
-
-3. Create your `.env` from the `.env.example`. You can use `cp .env.example .env` to get started with our handpicked defaults.
-
-4. Set the following environment variables:
-
-   - NEXTAUTH_URL
-   - NEXTAUTH_SECRET
-   - NEXT_PUBLIC_WEBAPP_URL
-   - NEXT_PUBLIC_MARKETING_URL
-   - NEXT_PRIVATE_DATABASE_URL
-   - NEXT_PRIVATE_DIRECT_DATABASE_URL
-   - NEXT_PRIVATE_SMTP_FROM_NAME
-   - NEXT_PRIVATE_SMTP_FROM_ADDRESS
-
-5. Create the database schema by running `npm run prisma:migrate-dev`
-
-6. Run `npm run dev` in the root directory to start
-
-7. Register a new user at http://localhost:3000/signup
+- [Clone the repository](https://help.github.com/articles/cloning-a-repository/) it to your local device.
+  ```sh
+  git clone https://github.com/documenso/documenso
+  ```
+- Run `npm i` in root directory
+- Rename `.env.example` to `.env`
+- Set DATABASE_URL value in .env file
+  - You can use the provided test database url (may be wiped at any point)
+  - Or setup a local postgres sql instance (recommended)
+- Create the database scheme by running `db-migrate:dev`
+- Setup your mail provider
+  - Set `SENDGRID_API_KEY` value in .env file
+  - You need a SendGrid account, which you can create [here](https://signup.sendgrid.com/).
+  - Documenso uses [Nodemailer](https://nodemailer.com/about/) so you can easily use your own SMTP server by setting the `SMTP
+    \_
+  * variables` in your .env
+- Run `npm run dev` root directory to start
+- Register a new user at http://localhost:3000/signup
 
 ---
 
-- Optional: Seed the database using `npm run prisma:seed -w @documenso/prisma` to create a test user and document.
-- Optional: Create your own signing certificate.
-  - To generate your own using these steps and a Linux Terminal or Windows Subsystem for Linux (WSL), see **[Create your own signing certificate](./SIGNING.md)**.
+- Optional: Seed the database using `npm run db-seed` to create a test user and document
+- Optional: Upload and sign `apps/web/resources/example.pdf` manually to test your setup
+
+- Optional: Create your own signing certificate
+  - A demo certificate is provided in `/app/web/resources/certificate.p12`
+  - To generate your own using these steps and a Linux Terminal or Windows Subsystem for Linux (WSL) see **[Create your own signing certificate](#creating-your-own-signing-certificate)**.
 
 ### Run in Gitpod
 
@@ -191,106 +181,81 @@ git clone https://github.com/documenso/documenso
 
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/documenso/documenso)
 
-### Run in DevContainer
+## Updating
 
-We support DevContainers for VSCode. [Click here to get started.](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/documenso/documenso)
+- If you pull the newest version from main, using `git pull`, it may be necessary to regenerate your database client
+- You can do this by running the generate command in `/packages/prisma`:
+  ```sh
+  npx prisma generate
+  ```
+- This is not necessary on first clone.
 
-## Docker
+# Creating your own signing certificate
 
-🚧 Docker containers and images are current in progress. We are actively working on bringing a simple Docker build and publish pipeline for Documenso.
+For the digital signature of your documents you need a signing certificate in .p12 format (public and private key). You can buy one (not recommended for dev) or use the steps to create a self-signed one:
 
-## Self Hosting
+1. Generate a private key using the OpenSSL command. You can run the following command to generate a 2048-bit RSA key:
+
+   `openssl genrsa -out private.key 2048`
+
+2. Generate a self-signed certificate using the private key. You can run the following command to generate a self-signed certificate:
+
+   `openssl req -new -x509 -key private.key -out certificate.crt -days 365`
+
+   This will prompt you to enter some information, such as the Common Name (CN) for the certificate. Make sure you enter the correct information. The -days parameter sets the number of days for which the certificate is valid.
+
+3. Combine the private key and the self-signed certificate to create the p12 certificate. You can run the following command to do this:
+
+   `openssl pkcs12 -export -out certificate.p12 -inkey private.key -in certificate.crt`
+
+4. You will be prompted to enter a password for the p12 file. Choose a strong password and remember it, as you will need it to use the certificate (**can be empty for dev certificates**)
+5. Place the certificate `/apps/web/resources/certificate.p12`
+
+# Docker
+
+> We are still working on the publishing of docker images, in the meantime you can follow the steps below to create a production ready docker image.
+
+Want to create a production ready docker image? Follow these steps:
+
+- cd into `docker` directory
+- Make `build.sh` executable by running `chmod +x build.sh`
+- Run `./build.sh` to start building the docker image.
+- Publish the image to your docker registry of choice (or) If you prefer running the image from local, run the below command
+
+```
+docker run -d --restart=unless-stopped -p 3000:3000 -v documenso:/app/data --name documenso documenso:latest
+```
+
+Command Breakdown:
+- `-d` - Let's you run the container in background
+- `-p` - Passes down which ports to use. First half is the host port, Second half is the app port. You can change the first half anything you want and reverse proxy to that port.
+- `-v` - Volume let's you persist the data
+- `--name` - Name of the container
+- `documenso:latest` -  Image you have built
+
+# Deployment
 
 We support a variety of deployment methods, and are actively working on adding more. Stay tuned for updates!
 
-> Please note that the below deployment methods are for v0.9, we will update these to v1.0 once it has been released.
-
-### Fetch, configure, and build
-
-First, clone the code from Github:
-
-```
-git clone https://github.com/documenso/documenso.git
-```
-
-Then, inside the `documenso` folder, copy the example env file:
-
-```
-cp .env.example .env
-```
-
-The following environment variables must be set:
-
-* `NEXTAUTH_URL`
-* `NEXTAUTH_SECRET`
-* `NEXT_PUBLIC_WEBAPP_URL`
-* `NEXT_PUBLIC_MARKETING_URL`
-* `NEXT_PRIVATE_DATABASE_URL`
-* `NEXT_PRIVATE_DIRECT_DATABASE_URL`
-* `NEXT_PRIVATE_SMTP_FROM_NAME`
-* `NEXT_PRIVATE_SMTP_FROM_ADDRESS`
-
-> If you are using a reverse proxy in front of Documenso, don't forget to provide the public URL for both `NEXTAUTH_URL` and `NEXT_PUBLIC_WEBAPP_URL` variables!
-
-Now you can install the dependencies and build it:
-
-```
-npm i
-npm run:build:web
-npm run prisma:migrate-deploy
-```
-
-Finally, you can start it with:
-
-```
-npm run start
-```
-
-This will start the server on `localhost:3000`. For now, any reverse proxy can then do the frontend and SSL termination.
-
-> If you want to run with another port than 3000, you can start the application with `next -p <ANY PORT>` from the `apps/web` folder.
-
-### Run as a service
-
-You can use a systemd service file to run the app. Here is a simple example of the service running on port 3500 (using 3000 by default):
-
-```bash
-[Unit]
-Description=documenso
-After=network.target
-
-[Service]
-Environment=PATH=/path/to/your/node/binaries
-Type=simple
-User=www-data
-WorkingDirectory=/var/www/documenso/apps/web
-ExecStart=/usr/bin/next start -p 3500
-TimeoutSec=15
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
-```
-
-### Railway
+## Railway
 
 [![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/DjrRRX)
 
-### Render
+## Render
 
 [![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/documenso/documenso)
 
-## Troubleshooting
+# Troubleshooting
 
-### I'm not receiving any emails when using the developer quickstart.
+## I'm not receiving any emails when using the developer quickstart
 
-When using the developer quickstart, an [Inbucket](https://inbucket.org/) server will be spun up in a docker container that will store all outgoing emails locally for you to view.
+When using the developer quickstart an [Inbucket](https://inbucket.org/) server will be spun up in a docker container that will store all outgoing email locally for you to view.
 
-The Web UI can be found at http://localhost:9000, while the SMTP port will be on localhost:2500.
+The Web UI can be found at http://localhost:9000 while the SMTP port will be on localhost:2500.
 
-### Support IPv6
+## Support IPv6
 
-If you are deploying to a cluster that uses only IPv6, You can use a custom command to pass a parameter to the Next.js start command
+In case you are deploying to a cluster that uses only IPv6. You can use a custom command to pass a parameter to the NextJS start command
 
 For local docker run
 
@@ -312,25 +277,5 @@ containers:
       - start
       - --
       - -H
-      - '::'
+      - "::"
 ```
-
-### 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 the 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)

SIGNING.md

@@ -1,55 +0,0 @@
-# Creating your own signing certificate
-
-For the digital signature of your documents you need a signing certificate in .p12 format (public and private key). You can buy one (not recommended for dev) or use the steps to create a self-signed one:
-
-1. Generate a private key using the OpenSSL command. You can run the following command to generate a 2048-bit RSA key:
-
-   `openssl genrsa -out private.key 2048`
-
-2. Generate a self-signed certificate using the private key. You can run the following command to generate a self-signed certificate:
-
-   `openssl req -new -x509 -key private.key -out certificate.crt -days 365`
-
-   This will prompt you to enter some information, such as the Common Name (CN) for the certificate. Make sure you enter the correct information. The -days parameter sets the number of days for which the certificate is valid.
-
-3. Combine the private key and the self-signed certificate to create the p12 certificate. You can run the following command to do this:
-
-   `openssl pkcs12 -export -out certificate.p12 -inkey private.key -in certificate.crt`
-
-4. You will be prompted to enter a password for the p12 file. Choose a strong password and remember it, as you will need it to use the certificate (**can be empty for dev certificates**)
-5. Place the certificate `/apps/web/resources/certificate.p12`
-
-## Docker
-
-> We are still working on the publishing of docker images, in the meantime you can follow the steps below to create a production ready docker image.
-
-Want to create a production ready docker image? Follow these steps:
-
-- cd into `docker` directory
-- Make `build.sh` executable by running `chmod +x build.sh`
-- Run `./build.sh` to start building the docker image.
-- Publish the image to your docker registry of choice (or) If you prefer running the image from local, run the below command
-
-```
-docker run -d --restart=unless-stopped -p 3000:3000 -v documenso:/app/data --name documenso documenso:latest
-```
-
-Command Breakdown:
-
-- `-d` - Let's you run the container in background
-- `-p` - Passes down which ports to use. First half is the host port, Second half is the app port. You can change the first half anything you want and reverse proxy to that port.
-- `-v` - Volume let's you persist the data
-- `--name` - Name of the container
-- `documenso:latest` - Image you have built
-
-## Deployment
-
-We support a variety of deployment methods, and are actively working on adding more. Stay tuned for updates!
-
-## Railway
-
-[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/DjrRRX)
-
-## Render
-
-[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy?repo=https://github.com/documenso/documenso)

apps/marketing/content/blog/building-documenso-pt1.mdx

@@ -1,6 +1,6 @@
 ---
 title: 'Building Documenso — Part 1: Certificates'
-description: In today's fast-paced world, productivity and efficiency are crucial for success, both in personal and professional endeavors. We all strive to make the most of our time and energy to achieve our goals effectively. However, it's not always easy to stay on track and maintain peak performance. In this blog post, we'll explore 10 valuable tips to help you boost productivity and efficiency in your daily life.
+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: 'Timur Ercan'
 authorImage: '/blog/blog-author-timur.jpeg'
 authorRole: 'Co-Founder'

apps/marketing/content/blog/design-system.mdx

@@ -1,49 +0,0 @@
----
-title: Open Sourcing Documenso's Design
-description: It's day 1 of our first launch week. We are kicking it off by open sourcing Documenso's design system! Let's go..
-authorName: 'Timur Ercan'
-authorImage: '/blog/blog-author-timur.jpeg'
-authorRole: 'Co-Founder'
-date: 2023-09-25
-tags:
-  - Design
-  - Open Source
-  - Community
----
-
-<figure>
-  <MdxNextImage
-    src="/blog/designsystem.png"
-    width="1260"
-    height="630"
-    alt="Documenso's Design System"
-  />
-
-  <figcaption className="text-center">
-   Documenso's Design System ✨
-  </figcaption>
-</figure>
-
-> TLDR; Our design system is OSS under MIT at [design.documenso.com](https://design.documenso.com)
-
-Today, we are open sourcing our design system, lovingly crafted by [Thilo](https://twitter.com/thilokonzok). The system is public on Figma and will be available at [design.documenso.com](https://design.documenso.com) from here on out.
-We are publishing it under the MIT License so everyone can share, remix, and use it as it helps them most.
-
-We chose to start our first launch week with a design topic to emphasize the role design will play in Documenso's company and community culture. As it is historically difficult to bring together open-source software with great design, this is our first step towards encouraging a more design-driven COSS (Commercial Open Source) movement.
-
-## Designers Welcome
-
-We added a designer role in our Discord to create a space for designers to explore and discuss design-related topics of Documenso and signing in general. In the future, we want to foster more coding contributions and start a design culture around the product. As it is much more difficult to incorporate design contributions, we have yet to find a clear plan of what that will look like. I would like to see contributions around stuff we are NOT working on. Designs in that area can inspire and start discussions without the complexities of implementing them immediately — a free-thinking space around everything Documenso. Having a free mandate to design without restriction can create many exciting ideas. Some Ideas worth exploring:
-
-## Areas for design contributions
-
-- Explorations of exciting aspects of signing and document handling:
-- What does signing look like when we no longer have skeuomorphic signatures?
-- What is signing if we move beyond paper-inspired documents?
-- What would the government process look like using Documenso?
-- Solutions Concepts for features further down the roadmap, e.g., Widgets in websites
-
-These are fascinating ideas for explorative design. They won't be built 1:1 but shape how we think about signing and where it can go, which is even more critical. If you are interested in product design, you are invited to join our [Discord](https://documen.so/discord) and discuss the future of signing design or the future of Documenso's design system. Also let me know what you think on [X (formerly Twitter)](https://x.com/eltimuro).
-
-Best from Hamburg\
-Timur

apps/marketing/content/blog/early-adopters.mdx

@@ -1,65 +0,0 @@
----
-title: The Early Adopters Plan
-description: Launch Week Day 4 and we are still early! Early enough for you to get a sweet deal for supporting Documenso's Mission. Join the movement and get a shiny early adopter account in the process.
-authorName: 'Timur Ercan'
-authorImage: '/blog/blog-author-timur.jpeg'
-authorRole: 'Co-Founder'
-date: 2023-09-28
-tags:
-  - Paid Plan
-  - Metrics
-  - Open Startup
----
-
-<figure>
-  <MdxNextImage
-    src="/blog/early.png"
-    width="1260"
-    height="630"
-    alt="XKCD: Bug"
-  />
-
-  <figcaption className="text-center">
-    "Being early is, uh, good." -Unknown
-  </figcaption>
-</figure>
-
-## Community-Driven Development
-
-As we ramp up hiring and development speed for Documenso, I want to discuss how we plan to build its core version.
-As we want to be a highly community-driven product, we want to capture the thoughts and ideas of said community in two ways:
-
-1. Everything we plan (i.e. documen.so/roadmap) and build (i.e. documen.so/repo) is public and open to comments and suggestions from everyone by design. We plan to have discussions, streams, and articles showcasing what we're up to, encouraging feedback and iterations on our plans.
-2. We're looking for 100 die-hard early adopters to get more deep hands-on feedback. If you want to be among the first to use and help shape Documenso, we have a special offer for you:
-
-## The Early Adopter Plan
-
-- All first 100 signups are entitled to the early adopter plan.
-- The plan includes everything we build in the next 12 months and unlimited<sup>1</sup> signatures
-- This plan is priced at $30/mo.
-- No matter what we add, the price is guaranteed for life as a thank you for supporting Documenso's mission<sup>2</sup>. And we plan to add a lot.
-- This also includes unlimited users<sup>3</sup> as part of the upcoming support for teams.
-- If you already claimed an early adopter account in the past and canceled, we are happy to reactivate your account with the early adopter pricing. Reach out to support@documenso.com
-
-## Being an Early Adopter
-
-Being eligible for the early adopter plan has no formal requirements like giving feedback or being active in the community. In good faith, we assume you sign the Documenso Supporter Pledge to be part of this. And if you want to use the newest version quietly, that's fine, too. Everything the die-hard community brings up will be carefully considered and prioritized <sup>4</sup>. Also, there will obviously be limited edition merch available for the first 100.
-Documenso currently runs the community reviewed 0.9.1 version. Getting from here to the globally loved and adopted signing tool we all deserve will take a lot of work, and we want you on board to help us create it. Join us in shaping the future of open signing and having fun doing it. [Malfunction Mania](https://documenso.com/blog/malfunction-mania) and releasing 1.0 will go a long way.
-
-## Extending our open metrics
-
-As part of our ongoing effort to be open and transparent in our doing, we are adding "Early Adopters" to our [/open page](https://documenso.com/open) page. After we exceed the early adopter slots, this metric will transition to "Customers". When no more early adopter seats can be claimed, the early adopter plan will transition to a standard paid plan. It will still be priced at $30/mo., but will no longer include upcoming features or unlimited seats.
-
-If you have any questions or comments, please reach out on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord).
-
-Best from Hamburg\
-Timur
-
-\
-[1] Excluding signatures, we have to pay for i.e. third-party QES
-
-[2] The Documenso Manifest
-
-[3] Within reason. If you are unsure what that means, feel free to contact hi@documenso.com. But it should be fine if you don't plan to onboard a huge enterprise.
-
-[4] We won't be able to build everything everyone asks for. But we firmly plan to listen and build in a way everyone's requirements are met as well as possible.

apps/marketing/content/blog/live-roadmap-singleplayer.mdx

@@ -1,75 +0,0 @@
----
-title: The 🔴 LIVE Roadmap
-description: It's the Launch Week Day finale, Day 5! We are going out with a bang and introducing the 🔴 LIVE roadmap, featuring our next Product Hunt Launch - Free Singleplayer Documenso - Sign without creating an account!
-authorName: 'Timur Ercan'
-authorImage: '/blog/blog-author-timur.jpeg'
-authorRole: 'Co-Founder'
-date: 2023-09-29
-tags:
-  - Free Plan
-  - Launch
-  - Roadmap
----
-
-<figure>
-  <MdxNextImage
-    src="/blog/roadmap.png"
-    width="1260"
-    height="630"
-    alt="XKCD: Bug"
-  />
-
-  <figcaption className="text-center">
-    "Being early is, uh, good." -Unknown
-  </figcaption>
-</figure>
-
-> TLDR; We are launching a [🔴 LIVE roadmap](https://documen.so/launches), that gets updated regularly.\
-> First upcoming launch: A free single signer experience.
-
-## The Road Ahead
-
-It's been quite a week, launching our [design system](https://documenso.com/blog/design-system), [kicking of a Malfunction Mania](https://documenso.com/blog/malfunction-mania), a [shiny new contributor perk](https://documenso.com/blog/shop) and our [early adopter deal](https://documenso.com/blog/early-adopters). After discussing Version 1.0 a lot, we want to close the week by looking ahead. As an open company, we want transparency about what we are working on and what to expect next. Especially for our Early Adopters, we want to paint a clear picture of what to expect in the near term.
-
-Communicating software development progress and goals is historically tricky because of it's complex nature. Exact release dates are notoriously unreliable; if they are not, they force a particular style of development, forcing the team to make tradeoffs on scope and quality.
-
-To give an appropriate insight into our work, we are launching our new [🔴 LIVE roadmap](https://documen.so/launches) today:
-
-- A List of quarterly development and feature goals
-- That gets updated regularly (bi-weekly)
-- Has up-to-date insights from the team on where we stand
-
-**While there are some great features planned, one stands out: Single Player Mode!**
-
-## Announcing Documenso Singleplayer Mode
-
-<a href="https://www.producthunt.com/products/documenso" target="_blank">
-<figure>
-  <MdxNextImage
-    src="/blog/sp5.png"
-    width="1260"
-    height="630"
-  />
-
-  <figcaption className="text-center font-bold">
-   🚨 We are going back to Product Hunt! Are you ready, player one?
-  </figcaption>
-</figure>
-</a>
-
-Single Player Mode will be a free, loginless signing experience for single signers. If you hate creating an account to sign a single, once-in-a-while-document yourself as much as we do, we've got you. Our new free tier will accompany Singleplayer. While you don't HAVE to create an account to sign sth. quickly, you can. A free tier Documenso Account will give you the following:
-
-- A place to store all your sent and received Documenso-signed documents
-- Free forever
-- Unlimited recipients
-- 5 free signatures per month (for now, excluding third party types like QES)
-- The use of templates, as soon as we [release](https://documen.so/launches) them
-
-Singleplayer will launch in the first half of October, shortly after the release of 1.0, **[ON PRODUCT HUNT!](https://www.producthunt.com/products/documenso)** That's right, we are going back to Product Hunt to kick of this new phase of Documenso and you are invited to join us once again :)
-
-**[Subscribe on PH](https://www.producthunt.com/products/documenso)** to be notified when we launch.
-
-If you have any questions or comments, please reach out on [Twitter / X](https://twitter.com/eltimuro) (DM open) or [Discord](https://documen.so/discord).
-
-Best from Hamburg\
-Timur

apps/marketing/content/blog/malfunction-mania.mdx

@@ -1,57 +0,0 @@
----
-title: Announcing Malfunction Mania
-description: Launch Week Day 2 Y'all! We're getting ready to release Documenso 1.0! Join in on the fun of making sure the open-source alternative to DocuSign is on point. We're calling a 'MALFUNCTION MANIA.'
-authorName: 'Timur Ercan'
-authorImage: '/blog/blog-author-timur.jpeg'
-authorRole: 'Co-Founder'
-date: 2023-09-26
-tags:
-  - Testing
-  - Rewrite
-  - Bounties
----
-
-<figure>
-  <MdxNextImage
-    src="/blog/mm.png"
-    width="1260"
-    height="630"
-    alt="Malfunctioning Documenso Logo in broken colors"
-  />
-
-  <figcaption className="text-center">
-   We're calling a MALFUNCTION MANIA! 🚨
-  </figcaption>
-</figure>
-
-> TLDR; Documenso 1.0 is in the [staging environment](https://documen.so/staging). Go check it out.
-
-It's been a minute since Lucas proclaimed, ["We're doing a rewrite"](https://documenso.com/blog/why-were-doing-a-rewrite), and many of you have been asking when the new version will be available. I'm happy to say that the wait has come to an end. The work on Documenso 1.0 has reached a level we feel comfortable going into the next phase with. We had a lot of community feedback, contributions, and moral support to get us this far, which is why we're excited to announce the most extensive community project yet:
-
-As Documenso 1.0 just hit the staging environment, we're calling a MALFUNCTION MANIA. An enormous, public testing phase, where we invite everyone to try out the new version, hunt down, report, and fix any malfunctions (aka bugs), and give feedback before release. Malfunction Mania will happen alongside our internal testing, and by combining the two, we want to ensure the best possible release we can have for Version 1.0. We know many of you have been eager to contribute; this is your chance (the first of many to come).
-
-## As part of Malfunction Mania, we're offering special bug bounties
-
-- We award $25 - $100 per report/ issue/ fix, depending on the severity and if the problem is already known
-- Bounties will be awarded for fixing reported or other critical issues via accepted Pull Requests (PR)
-- Just reporting issues in a reproducible way can also be awarded
-- Smaller but notable contributions like minor issues and documentation will be awarded with exclusive merch as we see fit.
-
-## What you can do
-
-- Head over to the [staging environment](https://documen.so/staging), check out the new version and give it a spin;
-- Check out the [source code](https://github.com/documenso/documenso) on GitHub and look it over;
-- Spin up the new version locally and try it out.
-
-## How to get the bounties
-
-- Report bugs by creating an issue here: [documen.so/issues](https://documen.so/issues);
-- Fix bugs by creating a Pull Request (PR);
-- Look over and add missing documentation/ Quickstarts and other useful resources.
-
-Best from Hamburg
-Timur
-
-We don't have a specific end date for Malfunction Mania. We plan to move the staging version into the production environment by the end of the month once we're happy with the results. Bug reports and fixes are, of course, always welcome going forward.
-
-**[Follow Documenso on Twitter / X](https://documen.so/tw) and [join the Discord server](https://documen.so/discord) to get the latest about Malfunction Mania.**

apps/marketing/content/blog/next.mdx

@@ -12,7 +12,7 @@ tags:
 
 Since we launched [Documenso 0.9 on Product Hunt](https://producthunt.com/products/documenso#documenso) last May, the team's been hard at work behind the scenes to ramp up development and design to deliver an excellent next version.
 
-Last week, Lucas shared the reasoning how [why we're doing a rewrite](https://documenso.com/blog/why-were-doing-a-rewrite).
+Last week, Lucas shared the reasoning on [why we're doing a rewrite](https://documenso.com/blog/why-were-doing-a-rewrite).
 
 Today, I'm pleased to share with you a preview of the next Documenso.
 
@@ -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/content/blog/shop.mdx

@@ -1,64 +0,0 @@
----
-title: Merch Mania
-description: Happy Launch Week Day 3. The limited edition "Malfunction Mania" shirt is here. Grab it, while you can.
-authorName: 'Timur Ercan'
-authorImage: '/blog/blog-author-timur.jpeg'
-authorRole: 'Co-Founder'
-date: 2023-09-27
-tags:
-  - Merch
-  - Rewrite
-  - Bounties
----
-
-<figure>
-  <MdxNextImage
-    src="/blog/mania-shirt.png"
-    width="1260"
-    height="630"
-    alt="Malfunctioning Mania Themed Documenso Shirt"
-  />
-
-  <figcaption className="text-center">
-    The Limited Edition "Malfunction Mania" Shirt - Only during Malfunction Mania
-  </figcaption>
-</figure>
-
-> TLDR; We have a fancy limited edition shirt. Contribute to [Malfunction Mania](https://documenso.com/blog/malfunction-mania) to get one.
-
-We kicked off [Malfunction Mania](https://documenso.com/blog/malfunction-mania) yesterday, and the first [issues](https://github.com/documenso/documenso/issues) are coming in. As mentioned, there will be dollar bounties, but we also wanted to celebrate entering the final stage of version 1.0 with something special. This is why we created this limited edition shirt. It will only be available during the runtime of Malfunction Mania. We have yet to set an exact end date, the next event in October, however, is looming, ready to end MM.
-
-## Documenso Merch Shop
-
-The shirt will be available in our [merch shop](https://documen.so/shop) via a unique discount code. While the shirt will be gone after Malfunction Mania, the shop is here to stay and provide a well-deserved reward for great community members and contributors. All items can be earned by contrinuting to Documenso.
-
-<figure>
-  <MdxNextImage
-    src="/blog/shop.png"
-    width="1260"
-    height="630"
-    alt="Malfunctioning Mania Themed Documenso Shirt"
-  />
-
-  <figcaption className="text-center">
-    Merch at Documenso is always given to those who deserve it.
-  </figcaption>
-</figure>
-
-## How earn the shirt
-
-If you have been following us, you know we are not big on formalities but highly value rewarding merit. That being said, any worthwhile contribution has a chance to get one. To inspire, here are a few ideas on how to contribute to securing one:
-
-- Report a bug with detailed reproduction details
-- Fix a bug (you or somebody else reported)
-- Analyze and describe a usability or user experience shortcoming
-- Test the product in a systematic and least somewhat documented way
-- Engage in discussion about the current version and its choices
-- Raise awareness for Malfunction Mania and try out the [version currently in staging](https://documen.so/staging)
-- Review the version with a video, stream, or screenshots and post about it
-- Review existing or create missing documentation
-
-Best from Hamburg
-Timur
-
-**[Follow Documenso on Twitter / X](https://documen.so/tw) and [join the Discord server](https://documen.so/discord) to get the latest updates about Malfunction Mania.**

apps/marketing/content/design-system.mdx

@@ -1,42 +0,0 @@
----
-title: Design System
----
-
-# We're building a beautiful, open-source alternative to DocuSign
-
-> Read more about our design culture here:
->
-> [https://documenso.com/blog/design-system](https://documenso.com/blog/design-system)
-
-At Documenso, we aim to be a design-driven company.
-
-We believe that design isn't just about how things look, but also how they work. We want to make sure that the product is easy to use and intuitive. We also want to ensure that the website, desktop and mobile apps are consistent and look and feel like they belong together.
-
-To achieve this, we've created Documenso's design system containing tokens, primitives, and components, screens, and brand assets.
-
-We're open-sourcing this design system so you can see how we build the product and think about design as a whole.
-
-## Check out the design system
-
-<iframe
-  src="https://documen.so/design-system-embed"
-  className="aspect-square w-full border-none"
-  frameBorder="0"
-/>
-
-## Remix and Share the community version on Figma
-
-<a href="https://documen.so/design" target="_blank">
-<figure>
-  <MdxNextImage
-    src="/blog/designsystem.png"
-    width="1260"
-    height="630"
-    alt="Documenso's Design System"
-  />
-
-  <figcaption className="text-center">
-   Documenso's Design System ✨
-  </figcaption>
-</figure>
-</a>

apps/marketing/next.config.js

@@ -2,17 +2,14 @@
 const path = require('path');
 const { withContentlayer } = require('next-contentlayer');
 
-const ENV_FILES = ['.env', '.env.local', `.env.${process.env.NODE_ENV || 'development'}`];
-
-ENV_FILES.forEach((file) => {
-  require('dotenv').config({
-    path: path.join(__dirname, `../../${file}`),
-  });
+require('dotenv').config({
+  path: path.join(__dirname, '../../.env.local'),
 });
 
 /** @type {import('next').NextConfig} */
 const config = {
   experimental: {
+    serverActions: true,
     serverActionsBodySizeLimit: '10mb',
   },
   reactStrictMode: true,
@@ -25,14 +22,6 @@ const config = {
       transform: 'lucide-react/dist/esm/icons/{{ kebabCase member }}',
     },
   },
-  webpack: (config, { isServer }) => {
-    // fixes: Module not found: Can’t resolve ‘../build/Release/canvas.node’
-    if (isServer) {
-      config.resolve.alias.canvas = false;
-    }
-
-    return config;
-  },
   async headers() {
     return [
       {
@@ -67,14 +56,6 @@ const config = {
       },
     ];
   },
-  async rewrites() {
-    return [
-      {
-        source: '/ingest/:path*',
-        destination: 'https://eu.posthog.com/:path*',
-      },
-    ];
-  },
 };
 
 module.exports = withContentlayer(config);

apps/marketing/package.json

@@ -6,9 +6,8 @@
   "scripts": {
     "dev": "next dev -p 3001",
     "build": "next build",
-    "start": "next start -p 3001",
+    "start": "next start",
     "lint": "next lint",
-    "lint:fix": "next lint --fix",
     "clean": "rimraf .next && rimraf node_modules",
     "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
   },
@@ -21,10 +20,9 @@
     "contentlayer": "^0.3.4",
     "framer-motion": "^10.12.8",
     "lucide-react": "^0.279.0",
-    "luxon": "^3.4.0",
     "micro": "^10.0.1",
-    "next": "14.0.0",
-    "next-auth": "4.24.3",
+    "next": "13.5.4",
+    "next-auth": "4.22.3",
     "next-contentlayer": "^0.3.4",
     "next-plausible": "^3.10.1",
     "perfect-freehand": "^1.2.0",
@@ -33,11 +31,11 @@
     "react-confetti": "^6.1.0",
     "react-dom": "18.2.0",
     "react-hook-form": "^7.43.9",
-    "react-icons": "^4.11.0",
+    "react-icons": "^4.8.0",
     "recharts": "^2.7.2",
     "sharp": "0.32.5",
-    "typescript": "5.2.2",
-    "zod": "^3.22.4"
+    "typescript": "5.1.6",
+    "zod": "^3.21.4"
   },
   "devDependencies": {
     "@types/node": "20.1.0",

apps/marketing/process-env.d.ts

@@ -7,7 +7,6 @@ declare namespace NodeJS {
 
     NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID: string;
     NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID: string;
-    NEXT_PUBLIC_STRIPE_FREE_PLAN_ID?: string;
 
     NEXT_PRIVATE_STRIPE_API_KEY: string;
     NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET: string;

apps/marketing/src/app/(marketing)/blog/[post]/opengraph-image.tsx

@@ -1,4 +1,4 @@
-import { ImageResponse } from 'next/og';
+import { ImageResponse } from 'next/server';
 
 import { allBlogPosts } from 'contentlayer/generated';
 
@@ -41,7 +41,7 @@ export default async function BlogPostOpenGraphImage({ params }: BlogPostOpenGra
 
   return new ImageResponse(
     (
-      <div tw="relative h-full w-full flex flex-col items-center justify-center text-center bg-white">
+      <div tw="relative h-full w-full flex flex-col items-center justify-center text-center">
         {/* @ts-expect-error Lack of typing from ImageResponse */}
         <img src={backgroundImage} alt="og-background" tw="absolute inset-0 w-full h-full" />
 

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

@@ -32,21 +32,10 @@ export default async function ClaimedPlanPage({ searchParams = {} }: ClaimedPlan
   }
 
   const session = await stripe.checkout.sessions.retrieve(sessionId);
-  const customerId = typeof session.customer === 'string' ? session.customer : session.customer?.id;
-
-  if (!customerId) {
-    redirect('/');
-  }
-
-  const customer = await stripe.customers.retrieve(customerId);
-
-  if (!customer || customer.deleted) {
-    redirect('/');
-  }
 
   const user = await prisma.user.findFirst({
     where: {
-      id: Number(customer.metadata.userId),
+      id: Number(session.client_reference_id),
     },
   });
 
@@ -176,7 +165,7 @@ export default async function ClaimedPlanPage({ searchParams = {} }: ClaimedPlan
         </p>
 
         <Link
-          href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signin`}
+          href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`}
           target="_blank"
           className="mt-4 block"
         >

apps/marketing/src/app/(marketing)/layout.tsx

@@ -2,8 +2,6 @@
 
 import React, { useEffect, useState } from 'react';
 
-import { usePathname } from 'next/navigation';
-
 import { cn } from '@documenso/ui/lib/utils';
 
 import { Footer } from '~/components/(marketing)/footer';
@@ -15,7 +13,6 @@ export type MarketingLayoutProps = {
 
 export default function MarketingLayout({ children }: MarketingLayoutProps) {
   const [scrollY, setScrollY] = useState(0);
-  const pathname = usePathname();
 
   useEffect(() => {
     const onScroll = () => {
@@ -28,11 +25,7 @@ export default function MarketingLayout({ children }: MarketingLayoutProps) {
   }, []);
 
   return (
-    <div
-      className={cn('relative max-w-[100vw] pt-20 md:pt-28', {
-        'overflow-y-auto overflow-x-hidden': pathname !== '/singleplayer',
-      })}
-    >
+    <div className="relative max-w-[100vw] overflow-y-auto overflow-x-hidden pt-20 md:pt-28">
       <div
         className={cn('fixed left-0 top-0 z-50 w-full bg-transparent', {
           'bg-background/50 backdrop-blur-md': scrollY > 5,

apps/marketing/src/app/(marketing)/open/cap-table.tsx

@@ -71,7 +71,7 @@ export const CapTable = ({ className, ...props }: CapTableProps) => {
             </Pie>
             <Legend
               formatter={(value) => {
-                return <span className="text-foreground text-sm">{value}</span>;
+                return <span className="text-sm text-black">{value}</span>;
               }}
             />
             <Tooltip

apps/marketing/src/app/(marketing)/open/data.ts

@@ -23,6 +23,22 @@ export const TEAM_MEMBERS = [
     engagement: 'Part-Time',
     joinDate: 'June 6th, 2023',
   },
+  {
+    name: 'Florent Merian',
+    role: 'Marketer - III',
+    salary: 'Project-Based',
+    location: 'France',
+    engagement: 'Full-Time',
+    joinDate: 'July 10th, 2023',
+  },
+  {
+    name: 'Thilo Konzok',
+    role: 'Designer',
+    salary: 'Project-Based',
+    location: 'Germany',
+    engagement: 'Full-Time',
+    joinDate: 'April 26th, 2023',
+  },
   {
     name: 'David Nguyen',
     role: 'Software Engineer - III',
@@ -31,22 +47,6 @@ export const TEAM_MEMBERS = [
     engagement: 'Full-Time',
     joinDate: 'July 26th, 2023',
   },
-  {
-    name: 'Catalin-Marinel Pit',
-    role: 'Software Engineer - II',
-    salary: 80_000,
-    location: 'Romania',
-    engagement: 'Full-Time',
-    joinDate: 'September 4th, 2023',
-  },
-  {
-    name: 'Gowdhama Rajan B',
-    role: 'Designer - III',
-    salary: 100_000,
-    location: 'India',
-    engagement: 'Full-Time',
-    joinDate: 'October 9th, 2023',
-  },
 ];
 
 export const FUNDING_RAISED = [

apps/marketing/src/app/(marketing)/open/funding-raised.tsx

@@ -7,21 +7,21 @@ import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recha
 import { formatMonth } from '@documenso/lib/client-only/format-month';
 import { cn } from '@documenso/ui/lib/utils';
 
-export type FundingRaisedProps = HTMLAttributes<HTMLDivElement> & {
-  data: Record<string, string | number>[];
-};
+import { FUNDING_RAISED } from '~/app/(marketing)/open/data';
 
-export const FundingRaised = ({ className, data, ...props }: FundingRaisedProps) => {
-  const formattedData = data.map((item) => ({
+export type FundingRaisedProps = HTMLAttributes<HTMLDivElement>;
+
+export const FundingRaised = ({ className, ...props }: FundingRaisedProps) => {
+  const formattedData = FUNDING_RAISED.map((item) => ({
     amount: Number(item.amount),
-    date: formatMonth(item.date as string),
+    date: formatMonth(item.date),
   }));
 
   return (
     <div className={cn('flex flex-col', className)} {...props}>
       <h3 className="px-4 text-lg font-semibold">Total Funding Raised</h3>
 
-      <div className="border-border mt-2.5 flex flex-1 flex-col items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
+      <div className="border-border mt-2.5 flex flex-1 flex-col items-center justify-center rounded-2xl border p-4 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={400}>
           <BarChart data={formattedData} margin={{ top: 40, right: 40, bottom: 20, left: 40 }}>
             <XAxis dataKey="date" />
@@ -35,9 +35,6 @@ export const FundingRaised = ({ className, data, ...props }: FundingRaisedProps)
               }
             />
             <Tooltip
-              labelStyle={{
-                color: 'hsl(var(--primary-foreground))',
-              }}
               itemStyle={{
                 color: 'hsl(var(--primary-foreground))',
               }}
@@ -51,13 +48,7 @@ export const FundingRaised = ({ className, data, ...props }: FundingRaisedProps)
               ]}
               cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
             />
-            <Bar
-              dataKey="amount"
-              fill="hsl(var(--primary))"
-              label="Amount Raised"
-              maxBarSize={60}
-              radius={[4, 4, 0, 0]}
-            />
+            <Bar dataKey="amount" fill="hsl(var(--primary))" label="Amount Raised" />
           </BarChart>
         </ResponsiveContainer>
       </div>

apps/marketing/src/app/(marketing)/open/gh-metrics.tsx

@@ -7,25 +7,26 @@ import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recha
 import { formatMonth } from '@documenso/lib/client-only/format-month';
 import { cn } from '@documenso/ui/lib/utils';
 
-export type BarMetricProps<T extends Record<string, unknown>> = HTMLAttributes<HTMLDivElement> & {
-  data: T;
-  metricKey: keyof T[string];
+import { StargazersType } from './page';
+
+export type MetricsDataKey = 'stars' | 'forks' | 'mergedPRs' | 'openIssues';
+export type GithubMetricProps = HTMLAttributes<HTMLDivElement> & {
+  data: StargazersType;
+  metricKey: MetricsDataKey;
   title: string;
   label: string;
   chartHeight?: number;
-  extraInfo?: JSX.Element;
 };
 
-export const BarMetric = <T extends Record<string, Record<keyof T[string], unknown>>>({
+export const GithubMetric = ({
   className,
   data,
   metricKey,
   title,
   label,
   chartHeight = 400,
-  extraInfo,
   ...props
-}: BarMetricProps<T>) => {
+}: GithubMetricProps) => {
   const formattedData = Object.keys(data)
     .map((key) => ({
       month: formatMonth(key),
@@ -35,33 +36,21 @@ export const BarMetric = <T extends Record<string, Record<keyof T[string], unkno
 
   return (
     <div className={cn('flex flex-col', className)} {...props}>
-      <div className="flex items-center px-4">
-        <h3 className="text-lg font-semibold">{title}</h3>
-        <span>{extraInfo}</span>
-      </div>
+      <h3 className="px-4 text-lg font-semibold">{title}</h3>
 
-      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
+      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border pr-2 shadow-sm hover:shadow">
         <ResponsiveContainer width="100%" height={chartHeight}>
-          <BarChart data={formattedData}>
+          <BarChart data={formattedData} margin={{ top: 30, right: 20 }}>
             <XAxis dataKey="month" />
             <YAxis />
             <Tooltip
-              labelStyle={{
-                color: 'hsl(var(--primary-foreground))',
-              }}
               itemStyle={{
                 color: 'hsl(var(--primary-foreground))',
               }}
               formatter={(value) => [Number(value), label]}
               cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
             />
-            <Bar
-              dataKey={metricKey as string}
-              maxBarSize={60}
-              fill="hsl(var(--primary))"
-              label={label}
-              radius={[4, 4, 0, 0]}
-            />
+            <Bar dataKey={metricKey} fill="hsl(var(--primary))" label={label} />
           </BarChart>
         </ResponsiveContainer>
       </div>

apps/marketing/src/app/(marketing)/open/monthly-new-users-chart.tsx

@@ -1,51 +0,0 @@
-'use client';
-
-import { DateTime } from 'luxon';
-import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
-
-import { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
-import { cn } from '@documenso/ui/lib/utils';
-
-export type MonthlyNewUsersChartProps = {
-  className?: string;
-  data: GetUserMonthlyGrowthResult;
-};
-
-export const MonthlyNewUsersChart = ({ className, data }: MonthlyNewUsersChartProps) => {
-  const formattedData = [...data].reverse().map(({ month, count }) => {
-    return {
-      month: DateTime.fromFormat(month, 'yyyy-MM').toFormat('LLL'),
-      count: Number(count),
-    };
-  });
-
-  return (
-    <div className={cn('flex flex-col', className)}>
-      <div className="flex items-center px-4">
-        <h3 className="text-lg font-semibold">Monthly New Users</h3>
-      </div>
-
-      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
-        <ResponsiveContainer width="100%" height={400}>
-          <BarChart data={formattedData}>
-            <XAxis dataKey="month" />
-            <YAxis />
-
-            <Tooltip
-              formatter={(value) => [Number(value).toLocaleString('en-US'), 'New Users']}
-              cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
-            />
-
-            <Bar
-              dataKey="count"
-              fill="hsl(var(--primary))"
-              radius={[4, 4, 0, 0]}
-              maxBarSize={60}
-              label="New Users"
-            />
-          </BarChart>
-        </ResponsiveContainer>
-      </div>
-    </div>
-  );
-};

apps/marketing/src/app/(marketing)/open/monthly-total-users-chart.tsx

@@ -1,51 +0,0 @@
-'use client';
-
-import { DateTime } from 'luxon';
-import { Bar, BarChart, ResponsiveContainer, Tooltip, XAxis, YAxis } from 'recharts';
-
-import { GetUserMonthlyGrowthResult } from '@documenso/lib/server-only/user/get-user-monthly-growth';
-import { cn } from '@documenso/ui/lib/utils';
-
-export type MonthlyTotalUsersChartProps = {
-  className?: string;
-  data: GetUserMonthlyGrowthResult;
-};
-
-export const MonthlyTotalUsersChart = ({ className, data }: MonthlyTotalUsersChartProps) => {
-  const formattedData = [...data].reverse().map(({ month, cume_count: count }) => {
-    return {
-      month: DateTime.fromFormat(month, 'yyyy-MM').toFormat('LLL'),
-      count: Number(count),
-    };
-  });
-
-  return (
-    <div className={cn('flex flex-col', className)}>
-      <div className="flex items-center px-4">
-        <h3 className="text-lg font-semibold">Monthly Total Users</h3>
-      </div>
-
-      <div className="border-border mt-2.5 flex flex-1 items-center justify-center rounded-2xl border p-6 pl-2 pt-12 shadow-sm hover:shadow">
-        <ResponsiveContainer width="100%" height={400}>
-          <BarChart data={formattedData}>
-            <XAxis dataKey="month" />
-            <YAxis />
-
-            <Tooltip
-              formatter={(value) => [Number(value).toLocaleString('en-US'), 'Total Users']}
-              cursor={{ fill: 'hsl(var(--primary) / 10%)' }}
-            />
-
-            <Bar
-              dataKey="count"
-              fill="hsl(var(--primary))"
-              radius={[4, 4, 0, 0]}
-              maxBarSize={60}
-              label="Total Users"
-            />
-          </BarChart>
-        </ResponsiveContainer>
-      </div>
-    </div>
-  );
-};

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

@@ -1,31 +1,15 @@
 import { z } from 'zod';
 
-import { getUserMonthlyGrowth } from '@documenso/lib/server-only/user/get-user-monthly-growth';
-
-import { FUNDING_RAISED } from '~/app/(marketing)/open/data';
 import { MetricCard } from '~/app/(marketing)/open/metric-card';
 import { SalaryBands } from '~/app/(marketing)/open/salary-bands';
 
-import { BarMetric } from './bar-metrics';
 import { CapTable } from './cap-table';
 import { FundingRaised } from './funding-raised';
-import { MonthlyNewUsersChart } from './monthly-new-users-chart';
-import { MonthlyTotalUsersChart } from './monthly-total-users-chart';
+import { GithubMetric } from './gh-metrics';
 import { TeamMembers } from './team-members';
-import { OpenPageTooltip } from './tooltip';
 
 export const revalidate = 3600;
 
-export const dynamic = 'force-dynamic';
-
-const GITHUB_HEADERS: Record<string, string> = {
-  accept: 'application/vnd.github.v3+json',
-};
-
-if (process.env.NEXT_PRIVATE_GITHUB_TOKEN) {
-  GITHUB_HEADERS.authorization = `Bearer ${process.env.NEXT_PRIVATE_GITHUB_TOKEN}`;
-}
-
 const ZGithubStatsResponse = z.object({
   stargazers_count: z.number(),
   forks_count: z.number(),
@@ -36,10 +20,6 @@ const ZMergedPullRequestsResponse = z.object({
   total_count: z.number(),
 });
 
-const ZOpenIssuesResponse = z.object({
-  total_count: z.number(),
-});
-
 const ZStargazersLiveResponse = z.record(
   z.object({
     stars: z.number(),
@@ -49,89 +29,41 @@ const ZStargazersLiveResponse = z.record(
   }),
 );
 
-const ZEarlyAdoptersResponse = z.record(
-  z.object({
-    id: z.number(),
-    time: z.string().datetime(),
-    earlyAdopters: z.number(),
-  }),
-);
-
 export type StargazersType = z.infer<typeof ZStargazersLiveResponse>;
-export type EarlyAdoptersType = z.infer<typeof ZEarlyAdoptersResponse>;
 
-const fetchGithubStats = async () => {
-  return await fetch('https://api.github.com/repos/documenso/documenso', {
+// const ZOpenPullRequestsResponse = ZMergedPullRequestsResponse;
+
+export default async function OpenPage() {
+  const {
+    forks_count: forksCount,
+    open_issues: openIssues,
+    stargazers_count: stargazersCount,
+  } = await fetch('https://api.github.com/repos/documenso/documenso', {
     headers: {
-      ...GITHUB_HEADERS,
+      accept: 'application/vnd.github.v3+json',
     },
   })
     .then(async (res) => res.json())
     .then((res) => ZGithubStatsResponse.parse(res));
-};
 
-const fetchOpenIssues = async () => {
-  return await fetch(
-    'https://api.github.com/search/issues?q=repo:documenso/documenso+type:issue+state:open&page=0&per_page=1',
-    {
-      headers: {
-        ...GITHUB_HEADERS,
-      },
-    },
-  )
-    .then(async (res) => res.json())
-    .then((res) => ZOpenIssuesResponse.parse(res));
-};
-
-const fetchMergedPullRequests = async () => {
-  return await fetch(
+  const { total_count: mergedPullRequests } = await fetch(
     'https://api.github.com/search/issues?q=repo:documenso/documenso/+is:pr+merged:>=2010-01-01&page=0&per_page=1',
     {
       headers: {
-        ...GITHUB_HEADERS,
+        accept: 'application/vnd.github.v3+json',
       },
     },
   )
     .then(async (res) => res.json())
     .then((res) => ZMergedPullRequestsResponse.parse(res));
-};
 
-const fetchStargazers = async () => {
-  return await fetch('https://stargrazer-live.onrender.com/api/stats', {
+  const STARGAZERS_DATA = await fetch('https://stargrazer-live.onrender.com/api/stats', {
     headers: {
       accept: 'application/json',
     },
   })
     .then(async (res) => res.json())
     .then((res) => ZStargazersLiveResponse.parse(res));
-};
-
-const fetchEarlyAdopters = async () => {
-  return await fetch('https://stargrazer-live.onrender.com/api/stats/stripe', {
-    headers: {
-      accept: 'application/json',
-    },
-  })
-    .then(async (res) => res.json())
-    .then((res) => ZEarlyAdoptersResponse.parse(res));
-};
-
-export default async function OpenPage() {
-  const [
-    { forks_count: forksCount, stargazers_count: stargazersCount },
-    { total_count: openIssues },
-    { total_count: mergedPullRequests },
-    STARGAZERS_DATA,
-    EARLY_ADOPTERS_DATA,
-  ] = await Promise.all([
-    fetchGithubStats(),
-    fetchOpenIssues(),
-    fetchMergedPullRequests(),
-    fetchStargazers(),
-    fetchEarlyAdopters(),
-  ]);
-
-  const MONTHLY_USERS = await getUserMonthlyGrowth();
 
   return (
     <div className="mx-auto mt-6 max-w-screen-lg sm:mt-12">
@@ -173,22 +105,12 @@ export default async function OpenPage() {
 
         <TeamMembers className="col-span-12" />
 
-        <SalaryBands className="col-span-12" />
+        <SalaryBands className="col-span-12 lg:col-span-6" />
 
-        <FundingRaised data={FUNDING_RAISED} className="col-span-12 lg:col-span-6" />
+        <FundingRaised className="col-span-12 lg:col-span-6" />
 
         <CapTable className="col-span-12 lg:col-span-6" />
-
-        <BarMetric<EarlyAdoptersType>
-          data={EARLY_ADOPTERS_DATA}
-          metricKey="earlyAdopters"
-          title="Early Adopters"
-          label="Early Adopters"
-          className="col-span-12 lg:col-span-6"
-          extraInfo={<OpenPageTooltip />}
-        />
-
-        <BarMetric<StargazersType>
+        <GithubMetric
           data={STARGAZERS_DATA}
           metricKey="stars"
           title="Github: Total Stars"
@@ -196,36 +118,31 @@ export default async function OpenPage() {
           className="col-span-12 lg:col-span-6"
         />
 
-        <BarMetric<StargazersType>
+        <GithubMetric
           data={STARGAZERS_DATA}
           metricKey="mergedPRs"
           title="Github: Total Merged PRs"
           label="Merged PRs"
           chartHeight={300}
-          className="col-span-12 lg:col-span-6"
+          className="col-span-12 lg:col-span-4"
         />
-
-        <BarMetric<StargazersType>
+        <GithubMetric
           data={STARGAZERS_DATA}
           metricKey="forks"
           title="Github: Total Forks"
           label="Forks"
           chartHeight={300}
-          className="col-span-12 lg:col-span-6"
+          className="col-span-12 lg:col-span-4"
         />
-
-        <BarMetric<StargazersType>
+        <GithubMetric
           data={STARGAZERS_DATA}
           metricKey="openIssues"
           title="Github: Total Open Issues"
           label="Open Issues"
           chartHeight={300}
-          className="col-span-12 lg:col-span-6"
+          className="col-span-12 lg:col-span-4"
         />
 
-        <MonthlyTotalUsersChart data={MONTHLY_USERS} className="col-span-12 lg:col-span-6" />
-        <MonthlyNewUsersChart data={MONTHLY_USERS} className="col-span-12 lg:col-span-6" />
-
         <div className="col-span-12 mt-12 flex flex-col items-center justify-center">
           <h2 className="text-2xl font-bold">Where's the rest?</h2>
 

apps/marketing/src/app/(marketing)/open/tooltip.tsx

@@ -1,40 +0,0 @@
-import React from 'react';
-
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from '@documenso/ui/primitives/tooltip';
-
-export function OpenPageTooltip() {
-  return (
-    <TooltipProvider>
-      <Tooltip>
-        <TooltipTrigger>
-          <svg
-            width="16"
-            height="16"
-            viewBox="0 0 16 16"
-            className="ml-2 mt-2.5"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M7.49991 0.876892C3.84222 0.876892 0.877075 3.84204 0.877075 7.49972C0.877075 11.1574 3.84222 14.1226 7.49991 14.1226C11.1576 14.1226 14.1227 11.1574 14.1227 7.49972C14.1227 3.84204 11.1576 0.876892 7.49991 0.876892ZM1.82707 7.49972C1.82707 4.36671 4.36689 1.82689 7.49991 1.82689C10.6329 1.82689 13.1727 4.36671 13.1727 7.49972C13.1727 10.6327 10.6329 13.1726 7.49991 13.1726C4.36689 13.1726 1.82707 10.6327 1.82707 7.49972ZM8.24992 4.49999C8.24992 4.9142 7.91413 5.24999 7.49992 5.24999C7.08571 5.24999 6.74992 4.9142 6.74992 4.49999C6.74992 4.08577 7.08571 3.74999 7.49992 3.74999C7.91413 3.74999 8.24992 4.08577 8.24992 4.49999ZM6.00003 5.99999H6.50003H7.50003C7.77618 5.99999 8.00003 6.22384 8.00003 6.49999V9.99999H8.50003H9.00003V11H8.50003H7.50003H6.50003H6.00003V9.99999H6.50003H7.00003V6.99999H6.50003H6.00003V5.99999Z"
-              fill="currentColor"
-              fillRule="evenodd"
-              clipRule="evenodd"
-            ></path>
-          </svg>
-        </TooltipTrigger>
-        <TooltipContent>
-          <p>
-            August and earlier: Active subscribers. September and beyond: Numbers of active
-            subscriptions.
-          </p>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
-  );
-}

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

@@ -6,7 +6,6 @@ import {
   AccordionItem,
   AccordionTrigger,
 } from '@documenso/ui/primitives/accordion';
-import { Button } from '@documenso/ui/primitives/button';
 
 import { PricingTable } from '~/components/(marketing)/pricing-table';
 
@@ -35,26 +34,6 @@ export default function PricingPage() {
         <PricingTable />
       </div>
 
-      <div className="mx-auto mt-36 max-w-2xl">
-        <h2 className="text-center text-2xl font-semibold">
-          None of these work for you? Try self-hosting!
-        </h2>
-
-        <p className="text-muted-foreground mt-4 text-center leading-relaxed">
-          Our self-hosted option is great for small teams and individuals who need a simple
-          solution. You can use our docker based setup to get started in minutes. Take control with
-          full customizability and data ownership.
-        </p>
-
-        <div className="mt-4 flex justify-center">
-          <Button variant="outline" size="lg" className="rounded-full hover:cursor-pointer" asChild>
-            <Link href="https://github.com/documenso/documenso" target="_blank">
-              Get Started
-            </Link>
-          </Button>
-        </div>
-      </div>
-
       <div className="mx-auto mt-36 max-w-2xl">
         {/* FAQ Section */}
 
@@ -69,9 +48,9 @@ export default function PricingPage() {
             <AccordionContent className="text-muted-foreground max-w-prose text-sm leading-relaxed">
               You can self-host Documenso for free or use our ready-to-use hosted version. The
               hosted version comes with additional support, painless scalability and more. Early
-              adopters will get access to all features we build this year, for no additional cost!
-              Forever! Yes, that includes multiple users per account later. If you want Documenso
-              for your enterprise, we are happy to talk about your needs.
+              adopters of the community plan will get access to all features we build this year, for
+              no additional cost! Forever! Yes, that includes multiple users per account later. If
+              you want Documenso for your enterprise, we are happy to talk about your needs.
             </AccordionContent>
           </AccordionItem>
 
@@ -117,10 +96,10 @@ export default function PricingPage() {
               and join our{' '}
               <Link
                 className="text-documenso-700 font-bold"
-                href="https://documen.so/discord"
+                href="https://join.slack.com/t/documenso/shared_invite/zt-1vibm8txi-DqsDFtdp44Hn2H5lc~RpPQ"
                 target="_blank"
               >
-                Discord Community
+                Slack Community
               </Link>{' '}
               to keep up to date, on what the current priorities are. In any case, we are an open
               community and welcome all input, technical and non-technical ❤️
@@ -168,10 +147,10 @@ export default function PricingPage() {
               or{' '}
               <a
                 className="text-documenso-700 font-bold"
-                href="https://documen.so/discord"
+                href="https://join.slack.com/t/documenso/shared_invite/zt-1vibm8txi-DqsDFtdp44Hn2H5lc~RpPQ"
                 target="_blank"
               >
-                in our Discord-Support-Channel
+                in our Slack-Support-Channel
               </a>{' '}
               please message either Lucas or Timur to get added to the channel if you are not
               already a member.

apps/marketing/src/app/(marketing)/single-player-mode/[token]/success/page.tsx

@@ -1,7 +1,6 @@
 import { notFound } from 'next/navigation';
 
 import { getDocumentAndRecipientByToken } from '@documenso/lib/server-only/document/get-document-by-token';
-import { getRecipientSignatures } from '@documenso/lib/server-only/recipient/get-recipient-signatures';
 import { DocumentStatus } from '@documenso/prisma/client';
 
 import { SinglePlayerModeSuccess } from '~/components/(marketing)/single-player-mode/single-player-mode-success';
@@ -27,7 +26,5 @@ export default async function SinglePlayerModeSuccessPage({
     return notFound();
   }
 
-  const signatures = await getRecipientSignatures({ recipientId: document.Recipient.id });
-
-  return <SinglePlayerModeSuccess document={document} signatures={signatures} />;
+  return <SinglePlayerModeSuccess document={document} />;
 }

apps/marketing/src/app/(marketing)/single-player-mode/page.tsx

@@ -8,7 +8,7 @@ import { useRouter } from 'next/navigation';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { base64 } from '@documenso/lib/universal/base64';
 import { putFile } from '@documenso/lib/universal/upload/put-file';
-import { DocumentDataType, Field, Prisma, Recipient } from '@documenso/prisma/client';
+import { Field, Prisma, Recipient } from '@documenso/prisma/client';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { DocumentDropzone } from '@documenso/ui/primitives/document-dropzone';
 import { AddFieldsFormPartial } from '@documenso/ui/primitives/document-flow/add-fields';
@@ -27,10 +27,7 @@ import { createSinglePlayerDocument } from '~/components/(marketing)/single-play
 
 type SinglePlayerModeStep = 'fields' | 'sign';
 
-// !: This entire file is a hack to get around failed prerendering of
-// !: the Single Player Mode page. This regression was introduced during
-// !: the upgrade of Next.js to v13.5.x.
-export const SinglePlayerClient = () => {
+export default function SinglePlayerModePage() {
   const analytics = useAnalytics();
   const router = useRouter();
 
@@ -133,7 +130,7 @@ export const SinglePlayerClient = () => {
         signer: data.email,
       });
 
-      router.push(`/singleplayer/${documentToken}/success`);
+      router.push(`/single-player-mode/${documentToken}/success`);
     } catch {
       toast({
         title: 'Something went wrong',
@@ -159,11 +156,11 @@ export const SinglePlayerClient = () => {
   const onFileDrop = async (file: File) => {
     try {
       const arrayBuffer = await file.arrayBuffer();
-      const fileBase64 = base64.encode(new Uint8Array(arrayBuffer));
+      const base64String = base64.encode(new Uint8Array(arrayBuffer));
 
       setUploadedFile({
         file,
-        fileBase64,
+        fileBase64: `data:application/pdf;base64,${base64String}`,
       });
 
       analytics.capture('Marketing: SPM - Document uploaded');
@@ -182,15 +179,7 @@ export const SinglePlayerClient = () => {
         <h1 className="text-3xl font-bold lg:text-5xl">Single Player Mode</h1>
 
         <p className="text-foreground mx-auto mt-4 max-w-[50ch] text-lg leading-normal">
-          Create a{' '}
-          <Link
-            href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signup`}
-            target="_blank"
-            className="hover:text-foreground/80 font-semibold transition-colors"
-          >
-            free account
-          </Link>{' '}
-          or view our{' '}
+          View our{' '}
           <Link
             href={'/pricing'}
             target="_blank"
@@ -207,14 +196,7 @@ export const SinglePlayerClient = () => {
           {uploadedFile ? (
             <Card gradient>
               <CardContent className="p-2">
-                <LazyPDFViewer
-                  documentData={{
-                    id: '',
-                    data: uploadedFile.fileBase64,
-                    initialData: uploadedFile.fileBase64,
-                    type: DocumentDataType.BYTES_64,
-                  }}
-                />
+                <LazyPDFViewer document={uploadedFile.fileBase64} />
               </CardContent>
             </Card>
           ) : (
@@ -259,4 +241,4 @@ export const SinglePlayerClient = () => {
       </div>
     </div>
   );
-};
+}

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

@@ -1,10 +0,0 @@
-import { SinglePlayerClient } from './client';
-
-export const revalidate = 0;
-
-// !: This entire file is a hack to get around failed prerendering of
-// !: the Single Player Mode page. This regression was introduced during
-// !: the upgrade of Next.js to v13.5.x.
-export default function SingleplayerPage() {
-  return <SinglePlayerClient />;
-}

apps/marketing/src/app/layout.tsx

@@ -4,7 +4,6 @@ import { Caveat, Inter } from 'next/font/google';
 
 import { FeatureFlagProvider } from '@documenso/lib/client-only/providers/feature-flag';
 import { getAllAnonymousFlags } from '@documenso/lib/universal/get-feature-flag';
-import { TrpcProvider } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { Toaster } from '@documenso/ui/primitives/toaster';
 
@@ -64,9 +63,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
       <body>
         <FeatureFlagProvider initialFlags={flags}>
           <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-            <PlausibleProvider>
-              <TrpcProvider>{children}</TrpcProvider>
-            </PlausibleProvider>
+            <PlausibleProvider>{children}</PlausibleProvider>
           </ThemeProvider>
         </FeatureFlagProvider>
 

apps/marketing/src/components/(marketing)/callout.tsx

@@ -2,8 +2,8 @@
 
 import Link from 'next/link';
 
+import { Github } from 'lucide-react';
 import { usePlausible } from 'next-plausible';
-import { LuGithub } from 'react-icons/lu';
 
 import { Button } from '@documenso/ui/primitives/button';
 
@@ -40,7 +40,7 @@ export const Callout = ({ starCount }: CalloutProps) => {
         className="rounded-full bg-transparent backdrop-blur-sm"
         onClick={onSignUpClick}
       >
-        Get the Early Adopters Plan
+        Get the Community Plan
         <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs">
           $30/mo. forever!
         </span>
@@ -52,7 +52,7 @@ export const Callout = ({ starCount }: CalloutProps) => {
         onClick={() => event('view-github')}
       >
         <Button variant="outline" className="rounded-full bg-transparent backdrop-blur-sm">
-          <LuGithub className="mr-2 h-5 w-5" />
+          <Github className="mr-2 h-5 w-5" />
           Star on Github
           {starCount && starCount > 0 && (
             <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs">

apps/marketing/src/components/(marketing)/claim-plan-dialog.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 
 import { useSearchParams } from 'next/navigation';
 
@@ -30,7 +30,7 @@ import { claimPlan } from '~/api/claim-plan/fetcher';
 import { FormErrorMessage } from '../form/form-error-message';
 
 export const ZClaimPlanDialogFormSchema = z.object({
-  name: z.string().trim().min(3, { message: 'Please enter a valid name.' }),
+  name: z.string().min(3),
   email: z.string().email(),
 });
 
@@ -55,8 +55,8 @@ export const ClaimPlanDialog = ({ className, planId, children }: ClaimPlanDialog
     register,
     handleSubmit,
     formState: { errors, isSubmitting },
-    reset,
   } = useForm<TClaimPlanDialogFormSchema>({
+    mode: 'onBlur',
     defaultValues: {
       name: params?.get('name') ?? '',
       email: params?.get('email') ?? '',
@@ -91,12 +91,6 @@ export const ClaimPlanDialog = ({ className, planId, children }: ClaimPlanDialog
     }
   };
 
-  useEffect(() => {
-    if (!isSubmitting && !open) {
-      reset();
-    }
-  }, [open]);
-
   return (
     <Dialog open={open} onOpenChange={(value) => !isSubmitting && setOpen(value)}>
       <DialogTrigger asChild>{children}</DialogTrigger>
@@ -145,7 +139,7 @@ export const ClaimPlanDialog = ({ className, planId, children }: ClaimPlanDialog
             </div>
 
             <Button type="submit" size="lg" loading={isSubmitting}>
-              Claim the early adopters Plan (
+              Claim the Community Plan (
               {/* eslint-disable-next-line turbo/no-undeclared-env-vars */}
               {planId === process.env.NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID
                 ? 'Monthly'

apps/marketing/src/components/(marketing)/confetti-screen.tsx

@@ -8,10 +8,10 @@ import { createPortal } from 'react-dom';
 import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted';
 import { useWindowSize } from '@documenso/lib/client-only/hooks/use-window-size';
 
-export const ConfettiScreen = ({
+export default function ConfettiScreen({
   numberOfPieces: numberOfPiecesProp = 200,
   ...props
-}: React.ComponentPropsWithoutRef<typeof Confetti> & { duration?: number }) => {
+}: React.ComponentPropsWithoutRef<typeof Confetti> & { duration?: number }) {
   const isMounted = useIsMounted();
   const { width, height } = useWindowSize();
 
@@ -43,4 +43,4 @@ export const ConfettiScreen = ({
     />,
     document.body,
   );
-};
+}

apps/marketing/src/components/(marketing)/footer.tsx

@@ -5,34 +5,33 @@ import { HTMLAttributes } from 'react';
 import Image from 'next/image';
 import Link from 'next/link';
 
-import { FaXTwitter } from 'react-icons/fa6';
-import { LiaDiscord } from 'react-icons/lia';
-import { LuGithub } from 'react-icons/lu';
+import { Github, MessagesSquare, Moon, Sun, Twitter } from 'lucide-react';
+import { useTheme } from 'next-themes';
 
 import { cn } from '@documenso/ui/lib/utils';
-import { ThemeSwitcher } from '@documenso/ui/primitives/theme-switcher';
 
 export type FooterProps = HTMLAttributes<HTMLDivElement>;
 
 const SOCIAL_LINKS = [
-  { href: 'https://twitter.com/documenso', icon: <FaXTwitter className="h-6 w-6" /> },
-  { href: 'https://github.com/documenso/documenso', icon: <LuGithub className="h-6 w-6" /> },
-  { href: 'https://documen.so/discord', icon: <LiaDiscord className="h-7 w-7" /> },
+  { href: 'https://twitter.com/documenso', icon: <Twitter className="h-6 w-6" /> },
+  { href: 'https://github.com/documenso/documenso', icon: <Github className="h-6 w-6" /> },
+  { href: 'https://documen.so/discord', icon: <MessagesSquare className="h-6 w-6" /> },
 ];
 
 const FOOTER_LINKS = [
   { href: '/pricing', text: 'Pricing' },
-  { href: '/singleplayer', text: 'Singleplayer' },
+  { href: '/single-player-mode', text: 'Single Player Mode' },
   { href: '/blog', text: 'Blog' },
-  { href: '/design-system', text: 'Design' },
   { href: '/open', text: 'Open' },
   { href: 'https://shop.documenso.com', text: 'Shop', target: '_blank' },
   { href: 'https://status.documenso.com', text: 'Status', target: '_blank' },
-  { href: 'mailto:support@documenso.com', text: 'Support', target: '_blank' },
+  { href: 'mailto:support@documenso.com', text: 'Support' },
   { href: '/privacy', text: 'Privacy' },
 ];
 
 export const Footer = ({ className, ...props }: FooterProps) => {
+  const { setTheme } = useTheme();
+
   return (
     <div className={cn('border-t py-12', className)} {...props}>
       <div className="mx-auto flex w-full max-w-screen-xl flex-wrap items-start justify-between gap-8 px-8">
@@ -61,7 +60,7 @@ export const Footer = ({ className, ...props }: FooterProps) => {
           </div>
         </div>
 
-        <div className="grid max-w-xs flex-1 grid-cols-2 gap-x-4 gap-y-2">
+        <div className="flex flex-wrap items-center gap-x-4 gap-y-2.5">
           {FOOTER_LINKS.map((link, index) => (
             <Link
               key={index}
@@ -74,13 +73,21 @@ export const Footer = ({ className, ...props }: FooterProps) => {
           ))}
         </div>
       </div>
-      <div className="mx-auto mt-4 flex w-full max-w-screen-xl flex-wrap items-center justify-between gap-4 px-8 md:mt-12 lg:mt-24">
+      <div className="mx-auto mt-4 flex w-full max-w-screen-xl flex-wrap justify-between gap-4 px-8 md:mt-12 lg:mt-24">
         <p className="text-muted-foreground text-sm">
           © {new Date().getFullYear()} Documenso, Inc. All rights reserved.
         </p>
 
-        <div className="flex flex-wrap">
-          <ThemeSwitcher />
+        <div className="flex flex-wrap items-center gap-x-4 gap-y-2.5">
+          <button type="button" className="text-muted-foreground" onClick={() => setTheme('light')}>
+            <Sun className="h-5 w-5" />
+            <span className="sr-only">Light</span>
+          </button>
+
+          <button type="button" className="text-muted-foreground" onClick={() => setTheme('dark')}>
+            <Moon className="h-5 w-5" />
+            <span className="sr-only">Dark</span>
+          </button>
         </div>
       </div>
     </div>

apps/marketing/src/components/(marketing)/header.tsx

@@ -35,7 +35,7 @@ export const Header = ({ className, ...props }: HeaderProps) => {
 
         {isSinglePlayerModeMarketingEnabled && (
           <Link
-            href="/singleplayer"
+            href="/single-player-mode"
             className="bg-primary dark:text-background rounded-full px-2 py-1 text-xs font-semibold sm:px-3"
           >
             Try now!
@@ -66,7 +66,7 @@ export const Header = ({ className, ...props }: HeaderProps) => {
         </Link>
 
         <Link
-          href="https://app.documenso.com/signin"
+          href="https://app.documenso.com/login"
           target="_blank"
           className="text-muted-foreground hover:text-muted-foreground/80 text-sm font-semibold"
         >

apps/marketing/src/components/(marketing)/hero.tsx

@@ -4,8 +4,8 @@ import Image from 'next/image';
 import Link from 'next/link';
 
 import { Variants, motion } from 'framer-motion';
+import { Github } from 'lucide-react';
 import { usePlausible } from 'next-plausible';
-import { LuGithub } from 'react-icons/lu';
 import { match } from 'ts-pattern';
 
 import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';
@@ -114,7 +114,7 @@ export const Hero = ({ className, ...props }: HeroProps) => {
             className="rounded-full bg-transparent backdrop-blur-sm"
             onClick={onSignUpClick}
           >
-            Get the Early Adopters Plan
+            Get the Community Plan
             <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs">
               $30/mo. forever!
             </span>
@@ -122,7 +122,7 @@ export const Hero = ({ className, ...props }: HeroProps) => {
 
           <Link href="https://github.com/documenso/documenso" onClick={() => event('view-github')}>
             <Button variant="outline" className="rounded-full bg-transparent backdrop-blur-sm">
-              <LuGithub className="mr-2 h-5 w-5" />
+              <Github className="mr-2 h-5 w-5" />
               Star on Github
             </Button>
           </Link>
@@ -134,9 +134,9 @@ export const Hero = ({ className, ...props }: HeroProps) => {
               variants={HeroTitleVariants}
               initial="initial"
               animate="animate"
-              className="border-primary bg-background hover:bg-muted mx-auto mt-8 w-60 rounded-xl border transition-colors duration-300"
+              className="border-primary bg-background hover:bg-muted mx-auto mt-8 w-60 rounded-xl border transition duration-300"
             >
-              <Link href="/singleplayer" className="block px-4 py-2 text-center">
+              <Link href="/single-player-mode" className="block px-4 py-2 text-center">
                 <h2 className="text-muted-foreground text-xs font-semibold">
                   Introducing Single Player Mode
                 </h2>

apps/marketing/src/components/(marketing)/mobile-navigation.tsx

@@ -4,9 +4,7 @@ import Image from 'next/image';
 import Link from 'next/link';
 
 import { motion, useReducedMotion } from 'framer-motion';
-import { FaXTwitter } from 'react-icons/fa6';
-import { LiaDiscord } from 'react-icons/lia';
-import { LuGithub } from 'react-icons/lu';
+import { Github, MessagesSquare, Twitter } from 'lucide-react';
 
 import { Sheet, SheetContent } from '@documenso/ui/primitives/sheet';
 
@@ -17,8 +15,8 @@ export type MobileNavigationProps = {
 
 export const MENU_NAVIGATION_LINKS = [
   {
-    href: '/singleplayer',
-    text: 'Singleplayer',
+    href: '/single-player-mode',
+    text: 'Single Player Mode',
   },
   {
     href: '/blog',
@@ -39,14 +37,13 @@ export const MENU_NAVIGATION_LINKS = [
   {
     href: 'mailto:support@documenso.com',
     text: 'Support',
-    target: '_blank',
   },
   {
     href: '/privacy',
     text: 'Privacy',
   },
   {
-    href: 'https://app.documenso.com/signin',
+    href: 'https://app.documenso.com/login',
     text: 'Sign in',
   },
 ];
@@ -79,7 +76,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
             staggerChildren: 0.03,
           }}
         >
-          {MENU_NAVIGATION_LINKS.map(({ href, text, target }) => (
+          {MENU_NAVIGATION_LINKS.map(({ href, text }) => (
             <motion.div
               key={href}
               variants={{
@@ -101,7 +98,6 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
                 className="text-foreground hover:text-foreground/80 text-2xl font-semibold"
                 href={href}
                 onClick={() => handleMenuItemClick()}
-                target={target}
               >
                 {text}
               </Link>
@@ -115,7 +111,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
             target="_blank"
             className="text-foreground hover:text-foreground/80"
           >
-            <FaXTwitter className="h-6 w-6" />
+            <Twitter className="h-6 w-6" />
           </Link>
 
           <Link
@@ -123,7 +119,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
             target="_blank"
             className="text-foreground hover:text-foreground/80"
           >
-            <LuGithub className="h-6 w-6" />
+            <Github className="h-6 w-6" />
           </Link>
 
           <Link
@@ -131,7 +127,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
             target="_blank"
             className="text-foreground hover:text-foreground/80"
           >
-            <LiaDiscord className="h-7 w-7" />
+            <MessagesSquare className="h-6 w-6" />
           </Link>
         </div>
       </SheetContent>

apps/marketing/src/components/(marketing)/password-reveal.tsx

@@ -1,8 +1,9 @@
 'use client';
 
-import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { useToast } from '@documenso/ui/primitives/use-toast';
 
+import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
+
 export type PasswordRevealProps = {
   password: string;
 };

apps/marketing/src/components/(marketing)/pricing-table.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { HTMLAttributes, useState } from 'react';
+import { HTMLAttributes, useMemo, useState } from 'react';
 
 import Link from 'next/link';
 import { useSearchParams } from 'next/navigation';
@@ -11,6 +11,8 @@ import { usePlausible } from 'next-plausible';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 
+import { ClaimPlanDialog } from './claim-plan-dialog';
+
 export type PricingTableProps = HTMLAttributes<HTMLDivElement>;
 
 const SELECTED_PLAN_BAR_LAYOUT_ID = 'selected-plan-bar';
@@ -25,6 +27,14 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
       : 'MONTHLY',
   );
 
+  const planId = useMemo(() => {
+    if (period === 'MONTHLY') {
+      return process.env.NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID;
+    }
+
+    return process.env.NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID;
+  }, [period]);
+
   return (
     <div className={cn('', className)} {...props}>
       <div className="flex items-center justify-center gap-x-6">
@@ -76,40 +86,40 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
 
       <div className="mt-12 grid grid-cols-1 gap-x-6 gap-y-12 md:grid-cols-2 lg:grid-cols-3">
         <div
-          data-plan="free"
+          data-plan="self-hosted"
           className="bg-background shadow-foreground/5 flex flex-col items-center justify-center rounded-lg border px-8 py-12 shadow-lg"
         >
-          <p className="text-foreground text-4xl font-medium">Free Plan</p>
-          <p className="text-primary mt-2.5 text-xl font-medium">$0</p>
+          <p className="text-foreground text-4xl font-medium">Self Hosted</p>
+          <p className="text-primary mt-2.5 text-xl font-medium">Free</p>
 
           <p className="text-foreground mt-4 max-w-[30ch] text-center">
-            For small teams and individuals with basic needs.
+            For small teams and individuals who need a simple solution
           </p>
 
-          <Button className="rounded-full text-base" asChild>
-            <Link
-              href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signup`}
-              target="_blank"
-              className="mt-6"
-            >
-              Signup Now
-            </Link>
-          </Button>
+          <Link
+            href="https://github.com/documenso/documenso"
+            target="_blank"
+            className="mt-6"
+            onClick={() => event('view-github')}
+          >
+            <Button className="rounded-full text-base">View on Github</Button>
+          </Link>
 
           <div className="mt-8 flex w-full flex-col divide-y">
-            <p className="text-foreground py-4">5 standard documents per month</p>
-            <p className="text-foreground py-4">Up to 10 recipients per document</p>
-            <p className="text-foreground py-4">No credit card required</p>
+            <p className="text-foreground py-4 font-medium">Host your own instance</p>
+            <p className="text-foreground py-4">Full Control</p>
+            <p className="text-foreground py-4">Customizability</p>
+            <p className="text-foreground py-4">Docker Ready</p>
+            <p className="text-foreground py-4">Community Support</p>
+            <p className="text-foreground py-4">Free, Forever</p>
           </div>
-
-          <div className="flex-1" />
         </div>
 
         <div
           data-plan="community"
           className="border-primary bg-background shadow-foreground/5 flex flex-col items-center justify-center rounded-lg border-2 px-8 py-12 shadow-[0px_0px_0px_4px_#E3E3E380]"
         >
-          <p className="text-foreground text-4xl font-medium">Early Adopters</p>
+          <p className="text-foreground text-4xl font-medium">Community</p>
           <div className="text-primary mt-2.5 text-xl font-medium">
             <AnimatePresence mode="wait">
               {period === 'MONTHLY' && <motion.div layoutId="pricing">$30</motion.div>}
@@ -121,27 +131,17 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
             For fast-growing companies that aim to scale across multiple teams.
           </p>
 
-          <Button className="mt-6 rounded-full text-base" asChild>
-            <Link href={`${process.env.NEXT_PUBLIC_WEBAPP_URL}/signup`}>Signup Now</Link>
-          </Button>
+          <ClaimPlanDialog planId={planId}>
+            <Button className="mt-6 rounded-full text-base">Signup Now</Button>
+          </ClaimPlanDialog>
 
           <div className="mt-8 flex w-full flex-col divide-y">
-            <p className="text-foreground py-4 font-medium">
-              {' '}
-              <a href="https://documenso.com/blog/early-adopters" target="_blank">
-                The Early Adopter Deal:
-              </a>
-            </p>
+            <p className="text-foreground py-4 font-medium">Documenso Early Adopter Deal:</p>
             <p className="text-foreground py-4">Join the movement</p>
             <p className="text-foreground py-4">Simple signing solution</p>
-            <p className="text-foreground py-4">Email, Discord and Slack assistance</p>
+            <p className="text-foreground py-4">Email and Slack assistance</p>
             <p className="text-foreground py-4">
-              <strong>
-                {' '}
-                <a href="https://documenso.com/blog/early-adopters" target="_blank">
-                  Includes all upcoming features
-                </a>
-              </strong>
+              <strong>Includes all upcoming features</strong>
             </p>
             <p className="text-foreground py-4">Fixed, straightforward pricing</p>
           </div>
@@ -168,7 +168,7 @@ export const PricingTable = ({ className, ...props }: PricingTableProps) => {
           </Link>
 
           <div className="mt-8 flex w-full flex-col divide-y">
-            <p className="text-foreground py-4 font-medium">Everything in Early Adopters, plus:</p>
+            <p className="text-foreground py-4 font-medium">Everything in Community, plus:</p>
             <p className="text-foreground py-4">Custom Subdomain</p>
             <p className="text-foreground py-4">Compliance Check</p>
             <p className="text-foreground py-4">Guaranteed Uptime</p>

apps/marketing/src/components/(marketing)/single-player-mode/create-single-player-document.action.ts

@@ -14,7 +14,6 @@ import { FROM_ADDRESS, FROM_NAME, SERVICE_USER_EMAIL } from '@documenso/lib/cons
 import { insertFieldInPDF } from '@documenso/lib/server-only/pdf/insert-field-in-pdf';
 import { alphaid } from '@documenso/lib/universal/id';
 import { getFile } from '@documenso/lib/universal/upload/get-file';
-import { putFile } from '@documenso/lib/universal/upload/put-file';
 import { prisma } from '@documenso/prisma';
 import {
   DocumentDataType,
@@ -25,7 +24,6 @@ import {
   SendStatus,
   SigningStatus,
 } from '@documenso/prisma/client';
-import { signPdf } from '@documenso/signing';
 
 const ZCreateSinglePlayerDocumentSchema = z.object({
   documentData: z.object({
@@ -99,13 +97,11 @@ export const createSinglePlayerDocument = async (
     });
   }
 
-  const unsignedPdfBytes = await doc.save();
+  const pdfBytes = await doc.save();
 
-  const signedPdfBuffer = await signPdf({ pdf: Buffer.from(unsignedPdfBytes) });
-
-  const { token } = await prisma.$transaction(
+  const documentToken = await prisma.$transaction(
     async (tx) => {
-      const token = alphaid();
+      const documentToken = alphaid();
 
       // Fetch service user who will be the owner of the document.
       const serviceUser = await tx.user.findFirstOrThrow({
@@ -114,10 +110,14 @@ export const createSinglePlayerDocument = async (
         },
       });
 
-      const { id: documentDataId } = await putFile({
-        name: `${documentName}.pdf`,
-        type: 'application/pdf',
-        arrayBuffer: async () => Promise.resolve(signedPdfBuffer),
+      const documentDataBytes = Buffer.from(pdfBytes).toString('base64');
+
+      const { id: documentDataId } = await tx.documentData.create({
+        data: {
+          type: DocumentDataType.BYTES_64,
+          data: documentDataBytes,
+          initialData: documentDataBytes,
+        },
       });
 
       // Create document.
@@ -137,7 +137,7 @@ export const createSinglePlayerDocument = async (
           documentId: document.id,
           name: signer.name,
           email: signer.email,
-          token,
+          token: documentToken,
           signedAt: createdAt,
           readStatus: ReadStatus.OPENED,
           signingStatus: SigningStatus.SIGNED,
@@ -169,7 +169,7 @@ export const createSinglePlayerDocument = async (
         }),
       );
 
-      return { document, token };
+      return documentToken;
     },
     {
       maxWait: 5000,
@@ -177,7 +177,9 @@ export const createSinglePlayerDocument = async (
     },
   );
 
+  // Todo: Handle `downloadLink`
   const template = createElement(DocumentSelfSignedEmailTemplate, {
+    downloadLink: `${process.env.NEXT_PUBLIC_MARKETING_URL}/single-player-mode/${documentToken}`,
     documentName: documentName,
     assetBaseUrl: process.env.NEXT_PUBLIC_WEBAPP_URL || 'http://localhost:3000',
   });
@@ -195,10 +197,9 @@ export const createSinglePlayerDocument = async (
     subject: 'Document signed',
     html: render(template),
     text: render(template, { plainText: true }),
-    attachments: [{ content: signedPdfBuffer, filename: documentName }],
   });
 
-  return token;
+  return documentToken;
 };
 
 /**

apps/marketing/src/components/(marketing)/single-player-mode/single-player-mode-success.tsx

@@ -4,37 +4,64 @@ import { useEffect, useState } from 'react';
 
 import Link from 'next/link';
 
+import { Share } from 'lucide-react';
+
 import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';
-import { DocumentStatus, Signature } from '@documenso/prisma/client';
+import { base64 } from '@documenso/lib/universal/base64';
+import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { DocumentWithRecipient } from '@documenso/prisma/types/document-with-recipient';
 import DocumentDialog from '@documenso/ui/components/document/document-dialog';
 import { DocumentDownloadButton } from '@documenso/ui/components/document/document-download-button';
-import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
 import { SigningCard3D } from '@documenso/ui/components/signing-card';
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
+import { useToast } from '@documenso/ui/primitives/use-toast';
 
 import signingCelebration from '~/assets/signing-celebration.png';
-import { ConfettiScreen } from '~/components/(marketing)/confetti-screen';
+import ConfettiScreen from '~/components/(marketing)/confetti-screen';
+
+import { DocumentStatus } from '.prisma/client';
 
 interface SinglePlayerModeSuccessProps {
   className?: string;
   document: DocumentWithRecipient;
-  signatures: Signature[];
 }
 
-export const SinglePlayerModeSuccess = ({
-  className,
-  document,
-  signatures,
-}: SinglePlayerModeSuccessProps) => {
+export const SinglePlayerModeSuccess = ({ className, document }: SinglePlayerModeSuccessProps) => {
   const { getFlag } = useFeatureFlags();
 
   const isConfettiEnabled = getFlag('marketing_spm_confetti');
 
   const [showDocumentDialog, setShowDocumentDialog] = useState(false);
+  const [isFetchingDocumentFile, setIsFetchingDocumentFile] = useState(false);
+  const [documentFile, setDocumentFile] = useState<string | null>(null);
 
-  const { documentData } = document;
+  const { toast } = useToast();
+
+  const onShowDocumentClick = async () => {
+    if (isFetchingDocumentFile) {
+      return;
+    }
+
+    setIsFetchingDocumentFile(true);
+
+    try {
+      const data = await getFile(document.documentData);
+
+      setDocumentFile(base64.encode(data));
+
+      setShowDocumentDialog(true);
+    } catch {
+      toast({
+        title: 'Something went wrong.',
+        description: 'We were unable to retrieve the document at this time. Please try again.',
+        variant: 'destructive',
+        duration: 7500,
+      });
+    }
+
+    setIsFetchingDocumentFile(false);
+  };
 
   useEffect(() => {
     window.scrollTo({ top: 0 });
@@ -46,7 +73,7 @@ export const SinglePlayerModeSuccess = ({
         <ConfettiScreen duration={3000} gravity={0.075} initialVelocityY={50} wind={0.005} />
       )}
 
-      <h2 className="relative z-10 text-center text-2xl font-semibold leading-normal md:text-3xl lg:mb-2 lg:text-4xl">
+      <h2 className="text-center text-2xl font-semibold leading-normal md:text-3xl lg:mb-2 lg:text-4xl">
         You have signed
         <span className="mt-2 block">{document.title}</span>
       </h2>
@@ -54,27 +81,30 @@ export const SinglePlayerModeSuccess = ({
       <SigningCard3D
         className="mt-8"
         name={document.Recipient.name || document.Recipient.email}
-        signature={signatures.at(0)}
         signingCelebrationImage={signingCelebration}
       />
 
-      <div className="relative mt-8 w-full">
+      <div className="mt-8 w-full">
         <div className={cn('flex flex-col items-center', className)}>
           <div className="grid w-full max-w-sm grid-cols-2 gap-4">
-            <DocumentShareButton
-              documentId={document.id}
-              token={document.Recipient.token}
-              className="flex-1 bg-transparent backdrop-blur-sm"
-            />
+            {/* TODO: Hook this up */}
+            <Button variant="outline" className="flex-1" disabled>
+              <Share className="mr-2 h-5 w-5" />
+              Share
+            </Button>
 
             <DocumentDownloadButton
-              className="flex-1 bg-transparent backdrop-blur-sm"
+              className="flex-1"
               fileName={document.title}
               documentData={document.documentData}
               disabled={document.status !== DocumentStatus.COMPLETED}
             />
 
-            <Button onClick={() => setShowDocumentDialog(true)} className="z-10 col-span-2">
+            <Button
+              onClick={async () => onShowDocumentClick()}
+              loading={isFetchingDocumentFile}
+              className="col-span-2"
+            >
               Show document
             </Button>
           </div>
@@ -94,7 +124,7 @@ export const SinglePlayerModeSuccess = ({
       </p>
 
       <DocumentDialog
-        documentData={documentData}
+        document={documentFile ?? ''}
         open={showDocumentDialog}
         onOpenChange={setShowDocumentDialog}
       />

apps/marketing/src/components/(marketing)/widget.tsx

@@ -31,7 +31,7 @@ import { FormErrorMessage } from '../form/form-error-message';
 const ZWidgetFormSchema = z
   .object({
     email: z.string().email({ message: 'Please enter a valid email address.' }),
-    name: z.string().trim().min(3, { message: 'Please enter a valid name.' }),
+    name: z.string().min(3, { message: 'Please enter a valid name.' }),
   })
   .and(
     z.union([
@@ -41,7 +41,7 @@ const ZWidgetFormSchema = z
       }),
       z.object({
         signatureDataUrl: z.null().or(z.string().max(0)),
-        signatureText: z.string().trim().min(1),
+        signatureText: z.string().min(1),
       }),
     ]),
   );
@@ -189,7 +189,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
             className="bg-foreground/5 col-span-12 flex flex-col rounded-2xl p-6 lg:col-span-5"
             onSubmit={handleSubmit(onFormSubmit)}
           >
-            <h3 className="text-2xl font-semibold">Sign up for the early adopters plan</h3>
+            <h3 className="text-2xl font-semibold">Sign up for the community plan</h3>
             <p className="text-muted-foreground mt-2 text-xs">
               with Timur Ercan & Lucas Smith from Documenso
             </p>
@@ -226,7 +226,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
                           type="button"
                           className="bg-primary h-full w-14 rounded"
                           disabled={!field.value || !!errors.email?.message}
-                          onClick={() => step === 'EMAIL' && onNextStepClick()}
+                          onClick={() => onNextStepClick()}
                         >
                           Next
                         </Button>
@@ -303,10 +303,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
             <div className="mt-12 flex-1" />
 
             <div className="flex items-center justify-between">
-              <p className="text-muted-foreground text-xs">
-                {isValid ? 'Ready for Signing' : `${stepsRemaining} step(s) until signed`}
-              </p>
-
+              <p className="text-muted-foreground text-xs">{stepsRemaining} step(s) until signed</p>
               <p className="text-muted-foreground block text-xs md:hidden">Minimise contract</p>
             </div>
 
@@ -316,7 +313,6 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
                   'w-1/3': stepsRemaining === 3,
                   'w-2/3': stepsRemaining === 2,
                   'w-11/12': stepsRemaining === 1,
-                  'w-full': isValid,
                 })}
               />
             </div>
@@ -381,7 +377,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
       </Card>
 
       <Dialog open={showSigningDialog} onOpenChange={setShowSigningDialog}>
-        <DialogContent position="center">
+        <DialogContent>
           <DialogHeader>
             <DialogTitle>Add your signature</DialogTitle>
           </DialogHeader>
@@ -395,7 +391,6 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {
 
           <SignaturePad
             className="aspect-video w-full rounded-md border"
-            defaultValue={signatureDataUrl || ''}
             onChange={setDraftSignatureDataUrl}
           />
 

apps/marketing/src/hooks/use-copy-to-clipboard.ts

@@ -0,0 +1,28 @@
+import { useState } from 'react';
+
+export type CopiedValue = string | null;
+export type CopyFn = (_text: string) => Promise<boolean>;
+
+export function useCopyToClipboard(): [CopiedValue, CopyFn] {
+  const [copiedText, setCopiedText] = useState<CopiedValue>(null);
+
+  const copy: CopyFn = async (text) => {
+    if (!navigator?.clipboard) {
+      console.warn('Clipboard not supported');
+      return false;
+    }
+
+    // Try to save to clipboard then save it in the state if worked
+    try {
+      await navigator.clipboard.writeText(text);
+      setCopiedText(text);
+      return true;
+    } catch (error) {
+      console.warn('Copy failed', error);
+      setCopiedText(null);
+      return false;
+    }
+  };
+
+  return [copiedText, copy];
+}

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

@@ -2,7 +2,7 @@ import { NextApiRequest, NextApiResponse } from 'next';
 
 import { randomUUID } from 'crypto';
 
-import { TEarlyAdopterCheckoutMetadataSchema } from '@documenso/ee/server-only/stripe/webhook/early-adopter-checkout-metadata';
+import { hashSync } from '@documenso/lib/server-only/auth/hash';
 import { redis } from '@documenso/lib/server-only/redis';
 import { stripe } from '@documenso/lib/server-only/stripe';
 import { prisma } from '@documenso/prisma';
@@ -36,38 +36,64 @@ export default async function handler(
       where: {
         email: email.toLowerCase(),
       },
+      include: {
+        Subscription: true,
+      },
     });
 
-    if (user) {
+    if (user && user.Subscription.length > 0) {
       return res.status(200).json({
-        redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/signin`,
+        redirectUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/login`,
       });
     }
 
-    const clientReferenceId = randomUUID();
+    const password = Math.random().toString(36).slice(2, 9);
+    const passwordHash = hashSync(password);
+
+    const { id: userId } = await prisma.user.upsert({
+      where: {
+        email: email.toLowerCase(),
+      },
+      create: {
+        email: email.toLowerCase(),
+        name,
+        password: passwordHash,
+      },
+      update: {
+        name,
+        password: passwordHash,
+      },
+    });
+
+    await redis.set(`user:${userId}:temp-password`, password, {
+      // expire in 24 hours
+      ex: 60 * 60 * 24,
+    });
+
+    const signatureDataUrlKey = randomUUID();
 
     if (signatureDataUrl) {
-      await redis.set(`signature:${clientReferenceId}`, signatureDataUrl, {
+      await redis.set(`signature:${signatureDataUrlKey}`, signatureDataUrl, {
         // expire in 7 days
         ex: 60 * 60 * 24 * 7,
       });
     }
 
-    const metadata: TEarlyAdopterCheckoutMetadataSchema = {
+    const metadata: Record<string, string> = {
       name,
       email,
       signatureText: signatureText || name,
-      source: 'marketing',
+      source: 'landing',
     };
 
     if (signatureDataUrl) {
-      metadata.signatureDataUrl = clientReferenceId;
+      metadata.signatureDataUrl = signatureDataUrlKey;
     }
 
     const checkout = await stripe.checkout.sessions.create({
       customer_email: email,
-      // Using the UUID here means our webhook will not try to use it as a user ID.
-      client_reference_id: clientReferenceId,
+      client_reference_id: userId.toString(),
+      payment_method_types: ['card'],
       line_items: [
         {
           price: planId,
@@ -78,7 +104,9 @@ export default async function handler(
       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}`,
+      cancel_url: `${process.env.NEXT_PUBLIC_MARKETING_URL}/pricing?email=${encodeURIComponent(
+        email,
+      )}&name=${encodeURIComponent(name)}&planId=${planId}&cancelled=true`,
     });
 
     if (!checkout.url) {

apps/marketing/src/pages/api/trpc/[trpc].ts

@@ -1,8 +0,0 @@
-import * as trpcNext from '@documenso/trpc/server/adapters/next';
-import { createTrpcContext } from '@documenso/trpc/server/context';
-import { appRouter } from '@documenso/trpc/server/router';
-
-export default trpcNext.createNextApiHandler({
-  router: appRouter,
-  createContext: async ({ req, res }) => createTrpcContext({ req, res }),
-});

apps/web/next.config.js

@@ -2,18 +2,14 @@
 const path = require('path');
 const { version } = require('./package.json');
 
-const ENV_FILES = ['.env', '.env.local', `.env.${process.env.NODE_ENV || 'development'}`];
-
-ENV_FILES.forEach((file) => {
-  require('dotenv').config({
-    path: path.join(__dirname, `../../${file}`),
-  });
+require('dotenv').config({
+  path: path.join(__dirname, '../../.env.local'),
 });
 
 /** @type {import('next').NextConfig} */
 const config = {
-  output: process.env.DOCKER_OUTPUT ? 'standalone' : undefined,
   experimental: {
+    serverActions: true,
     serverActionsBodySizeLimit: '50mb',
   },
   reactStrictMode: true,
@@ -33,48 +29,6 @@ const config = {
       transform: 'lucide-react/dist/esm/icons/{{ kebabCase member }}',
     },
   },
-  webpack: (config, { isServer }) => {
-    // fixes: Module not found: Can’t resolve ‘../build/Release/canvas.node’
-    if (isServer) {
-      config.resolve.alias.canvas = false;
-    }
-
-    return config;
-  },
-  async rewrites() {
-    return [
-      {
-        source: '/ingest/:path*',
-        destination: 'https://eu.posthog.com/:path*',
-      },
-    ];
-  },
-  async redirects() {
-    return [
-      {
-        permanent: true,
-        source: '/documents/:id/sign',
-        destination: '/sign/:token',
-        has: [
-          {
-            type: 'query',
-            key: 'token',
-          },
-        ],
-      },
-      {
-        permanent: true,
-        source: '/documents/:id/signed',
-        destination: '/sign/:token',
-        has: [
-          {
-            type: 'query',
-            key: 'token',
-          },
-        ],
-      },
-    ];
-  },
 };
 
 module.exports = config;

apps/web/package.json

@@ -8,7 +8,6 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "lint:fix": "next lint --fix",
     "clean": "rimraf .next && rimraf node_modules",
     "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
   },
@@ -26,8 +25,8 @@
     "lucide-react": "^0.279.0",
     "luxon": "^3.4.0",
     "micro": "^10.0.1",
-    "next": "14.0.0",
-    "next-auth": "4.24.3",
+    "next": "13.5.4",
+    "next-auth": "4.22.3",
     "next-plausible": "^3.10.1",
     "next-themes": "^0.2.1",
     "perfect-freehand": "^1.2.0",
@@ -37,14 +36,12 @@
     "react-dom": "18.2.0",
     "react-dropzone": "^14.2.3",
     "react-hook-form": "^7.43.9",
-    "react-hotkeys-hook": "^4.4.1",
-    "react-icons": "^4.11.0",
+    "react-icons": "^4.8.0",
     "react-rnd": "^10.4.1",
     "sharp": "0.32.5",
     "ts-pattern": "^5.0.5",
-    "typescript": "5.2.2",
-    "uqr": "^0.1.2",
-    "zod": "^3.22.4"
+    "typescript": "5.1.6",
+    "zod": "^3.21.4"
   },
   "devDependencies": {
     "@types/formidable": "^2.0.6",

apps/web/process-env.d.ts

@@ -7,7 +7,6 @@ declare namespace NodeJS {
 
     NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID: string;
     NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID: string;
-    NEXT_PUBLIC_STRIPE_FREE_PLAN_ID?: string;
 
     NEXT_PRIVATE_STRIPE_API_KEY: string;
     NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET: string;

apps/web/src/api/claim-plan/fetcher.ts

@@ -0,0 +1,41 @@
+import { TClaimPlanRequestSchema, ZClaimPlanResponseSchema } from './types';
+
+export const claimPlan = async ({
+  name,
+  email,
+  planId,
+  signatureDataUrl,
+  signatureText,
+}: TClaimPlanRequestSchema) => {
+  const response = await fetch('/api/claim-plan', {
+    method: 'POST',
+    body: JSON.stringify({
+      name,
+      email,
+      planId,
+      signatureDataUrl,
+      signatureText,
+    }),
+    headers: {
+      'Content-Type': 'application/json',
+    },
+  });
+
+  const body = await response.json();
+
+  if (response.status !== 200) {
+    throw new Error('Failed to claim plan');
+  }
+
+  const safeBody = ZClaimPlanResponseSchema.safeParse(body);
+
+  if (!safeBody.success) {
+    throw new Error('Failed to claim plan');
+  }
+
+  if ('error' in safeBody.data) {
+    throw new Error(safeBody.data.error);
+  }
+
+  return safeBody.data.redirectUrl;
+};

apps/web/src/api/claim-plan/types.ts

@@ -0,0 +1,37 @@
+import { z } from 'zod';
+
+export const ZClaimPlanRequestSchema = z
+  .object({
+    email: z
+      .string()
+      .email()
+      .transform((value) => value.toLowerCase()),
+    name: z.string(),
+    planId: z.string(),
+  })
+  .and(
+    z.union([
+      z.object({
+        signatureDataUrl: z.string().min(1),
+        signatureText: z.null(),
+      }),
+      z.object({
+        signatureDataUrl: z.null(),
+        signatureText: z.string().min(1),
+      }),
+    ]),
+  );
+
+export type TClaimPlanRequestSchema = z.infer<typeof ZClaimPlanRequestSchema>;
+
+export const ZClaimPlanResponseSchema = z
+  .object({
+    redirectUrl: z.string(),
+  })
+  .or(
+    z.object({
+      error: z.string(),
+    }),
+  );
+
+export type TClaimPlanResponseSchema = z.infer<typeof ZClaimPlanResponseSchema>;

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

@@ -1,125 +0,0 @@
-'use client';
-
-import { useTransition } from 'react';
-
-import Link from 'next/link';
-
-import { Loader } from 'lucide-react';
-
-import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { FindResultSet } from '@documenso/lib/types/find-result-set';
-import { recipientInitials } from '@documenso/lib/utils/recipient-formatter';
-import { Document, User } from '@documenso/prisma/client';
-import { Avatar, AvatarFallback } from '@documenso/ui/primitives/avatar';
-import { DataTable } from '@documenso/ui/primitives/data-table';
-import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { Tooltip, TooltipContent, TooltipTrigger } from '@documenso/ui/primitives/tooltip';
-
-import { DocumentStatus } from '~/components/formatter/document-status';
-import { LocaleDate } from '~/components/formatter/locale-date';
-
-export type DocumentsDataTableProps = {
-  results: FindResultSet<
-    Document & {
-      User: Pick<User, 'id' | 'name' | 'email'>;
-    }
-  >;
-};
-
-export const DocumentsDataTable = ({ results }: DocumentsDataTableProps) => {
-  const [isPending, startTransition] = useTransition();
-
-  const updateSearchParams = useUpdateSearchParams();
-
-  const onPaginationChange = (page: number, perPage: number) => {
-    startTransition(() => {
-      updateSearchParams({
-        page,
-        perPage,
-      });
-    });
-  };
-
-  return (
-    <div className="relative">
-      <DataTable
-        columns={[
-          {
-            header: 'Created',
-            accessorKey: 'createdAt',
-            cell: ({ row }) => <LocaleDate date={row.original.createdAt} />,
-          },
-          {
-            header: 'Title',
-            accessorKey: 'title',
-            cell: ({ row }) => {
-              return (
-                <div className="block max-w-[5rem] truncate font-medium md:max-w-[10rem]">
-                  {row.original.title}
-                </div>
-              );
-            },
-          },
-          {
-            header: 'Owner',
-            accessorKey: 'owner',
-            cell: ({ row }) => {
-              const avatarFallbackText = row.original.User.name
-                ? recipientInitials(row.original.User.name)
-                : row.original.User.email.slice(0, 1).toUpperCase();
-
-              return (
-                <Tooltip delayDuration={200}>
-                  <TooltipTrigger>
-                    <Link href={`/admin/users/${row.original.User.id}`}>
-                      <Avatar className="dark:border-border h-12 w-12 border-2 border-solid border-white">
-                        <AvatarFallback className="text-xs text-gray-400">
-                          {avatarFallbackText}
-                        </AvatarFallback>
-                      </Avatar>
-                    </Link>
-                  </TooltipTrigger>
-                  <TooltipContent className="flex max-w-xs items-center gap-2">
-                    <Avatar className="dark:border-border h-12 w-12 border-2 border-solid border-white">
-                      <AvatarFallback className="text-xs text-gray-400">
-                        {avatarFallbackText}
-                      </AvatarFallback>
-                    </Avatar>
-
-                    <div className="text-muted-foreground flex flex-col text-sm">
-                      <span>{row.original.User.name}</span>
-                      <span>{row.original.User.email}</span>
-                    </div>
-                  </TooltipContent>
-                </Tooltip>
-              );
-            },
-          },
-          {
-            header: 'Last updated',
-            accessorKey: 'updatedAt',
-            cell: ({ row }) => <LocaleDate date={row.original.updatedAt} />,
-          },
-          {
-            header: 'Status',
-            accessorKey: 'status',
-            cell: ({ row }) => <DocumentStatus status={row.original.status} />,
-          },
-        ]}
-        data={results.data}
-        perPage={results.perPage}
-        currentPage={results.currentPage}
-        totalPages={results.totalPages}
-        onPaginationChange={onPaginationChange}
-      >
-        {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
-      </DataTable>
-
-      {isPending && (
-        <div className="absolute inset-0 flex items-center justify-center bg-white/50">
-          <Loader className="h-8 w-8 animate-spin text-gray-500" />
-        </div>
-      )}
-    </div>
-  );
-};

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

@@ -1,29 +0,0 @@
-import { findDocuments } from '@documenso/lib/server-only/admin/get-all-documents';
-
-import { DocumentsDataTable } from './data-table';
-
-export type DocumentsPageProps = {
-  searchParams?: {
-    page?: string;
-    perPage?: string;
-  };
-};
-
-export default async function Documents({ searchParams = {} }: DocumentsPageProps) {
-  const page = Number(searchParams.page) || 1;
-  const perPage = Number(searchParams.perPage) || 20;
-
-  const results = await findDocuments({
-    page,
-    perPage,
-  });
-
-  return (
-    <div>
-      <h2 className="text-4xl font-semibold">Manage documents</h2>
-      <div className="mt-8">
-        <DocumentsDataTable results={results} />
-      </div>
-    </div>
-  );
-}

apps/web/src/app/(dashboard)/admin/layout.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { redirect } from 'next/navigation';
 
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
 import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
 
 import { AdminNav } from './nav';
@@ -12,7 +12,7 @@ export type AdminSectionLayoutProps = {
 };
 
 export default async function AdminSectionLayout({ children }: AdminSectionLayoutProps) {
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   if (!isAdmin(user)) {
     redirect('/documents');
@@ -20,7 +20,7 @@ export default async function AdminSectionLayout({ children }: AdminSectionLayou
 
   return (
     <div className="mx-auto mt-16 w-full max-w-screen-xl px-4 md:px-8">
-      <div className="grid grid-cols-12 md:mt-8 md:gap-8">
+      <div className="grid grid-cols-12 gap-x-8 md:mt-8">
         <AdminNav className="col-span-12 md:col-span-3 md:flex" />
 
         <div className="col-span-12 mt-12 md:col-span-9 md:mt-0">{children}</div>

apps/web/src/app/(dashboard)/admin/nav.tsx

@@ -5,7 +5,7 @@ import { HTMLAttributes } from 'react';
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 
-import { BarChart3, FileStack, User2, Wallet2 } from 'lucide-react';
+import { BarChart3, User2 } from 'lucide-react';
 
 import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
@@ -16,13 +16,7 @@ export const AdminNav = ({ className, ...props }: AdminNavProps) => {
   const pathname = usePathname();
 
   return (
-    <div
-      className={cn(
-        'flex gap-x-2.5 gap-y-2 overflow-hidden overflow-x-auto md:flex-col',
-        className,
-      )}
-      {...props}
-    >
+    <div className={cn('flex gap-x-2.5 gap-y-2 md:flex-col', className)} {...props}>
       <Button
         variant="ghost"
         className={cn(
@@ -43,40 +37,10 @@ export const AdminNav = ({ className, ...props }: AdminNavProps) => {
           'justify-start md:w-full',
           pathname?.startsWith('/admin/users') && 'bg-secondary',
         )}
-        asChild
+        disabled
       >
-        <Link href="/admin/users">
-          <User2 className="mr-2 h-5 w-5" />
-          Users
-        </Link>
-      </Button>
-
-      <Button
-        variant="ghost"
-        className={cn(
-          'justify-start md:w-full',
-          pathname?.startsWith('/admin/documents') && 'bg-secondary',
-        )}
-        asChild
-      >
-        <Link href="/admin/documents">
-          <FileStack className="mr-2 h-5 w-5" />
-          Documents
-        </Link>
-      </Button>
-
-      <Button
-        variant="ghost"
-        className={cn(
-          'justify-start md:w-full',
-          pathname?.startsWith('/admin/subscriptions') && 'bg-secondary',
-        )}
-        asChild
-      >
-        <Link href="/admin/subscriptions">
-          <Wallet2 className="mr-2 h-5 w-5" />
-          Subscriptions
-        </Link>
+        <User2 className="mr-2 h-5 w-5" />
+        Users (Coming Soon)
       </Button>
     </div>
   );

apps/web/src/app/(dashboard)/admin/stats/page.tsx

@@ -32,7 +32,7 @@ export default async function AdminStatsPage() {
     <div>
       <h2 className="text-4xl font-semibold">Instance Stats</h2>
 
-      <div className="mt-8 grid flex-1 grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-4">
+      <div className="mt-8 grid flex-1 grid-cols-1 gap-4 md:grid-cols-4">
         <CardMetric icon={UserIcon} title="Total Users" value={usersCount} />
         <CardMetric icon={File} title="Total Documents" value={docStats.ALL} />
         <CardMetric
@@ -43,7 +43,7 @@ export default async function AdminStatsPage() {
         <CardMetric icon={UserPlus2} title="App Version" value={`v${process.env.APP_VERSION}`} />
       </div>
 
-      <div className="mt-16 grid grid-cols-1 gap-8 md:grid-cols-1 lg:grid-cols-2">
+      <div className="mt-16 grid grid-cols-1 gap-8 md:grid-cols-2">
         <div>
           <h3 className="text-3xl font-semibold">Document metrics</h3>
 

apps/web/src/app/(dashboard)/admin/subscriptions/page.tsx

@@ -1,65 +0,0 @@
-import Link from 'next/link';
-
-import { findSubscriptions } from '@documenso/lib/server-only/admin/get-all-subscriptions';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@documenso/ui/primitives/table';
-
-export default async function Subscriptions() {
-  const subscriptions = await findSubscriptions();
-
-  return (
-    <div>
-      <h2 className="text-4xl font-semibold">Manage subscriptions</h2>
-      <div className="mt-8">
-        <Table>
-          <TableHeader>
-            <TableRow>
-              <TableHead>ID</TableHead>
-              <TableHead>Status</TableHead>
-              <TableHead>Created At</TableHead>
-              <TableHead>Ends On</TableHead>
-              <TableHead>User ID</TableHead>
-            </TableRow>
-          </TableHeader>
-          <TableBody>
-            {subscriptions.map((subscription, index) => (
-              <TableRow key={index}>
-                <TableCell>{subscription.id}</TableCell>
-                <TableCell>{subscription.status}</TableCell>
-                <TableCell>
-                  {subscription.createdAt
-                    ? new Date(subscription.createdAt).toLocaleDateString(undefined, {
-                        weekday: 'long',
-                        year: 'numeric',
-                        month: 'long',
-                        day: 'numeric',
-                      })
-                    : 'N/A'}
-                </TableCell>
-                <TableCell>
-                  {subscription.periodEnd
-                    ? new Date(subscription.periodEnd).toLocaleDateString(undefined, {
-                        weekday: 'long',
-                        year: 'numeric',
-                        month: 'long',
-                        day: 'numeric',
-                      })
-                    : 'N/A'}
-                </TableCell>
-                <TableCell>
-                  <Link href={`/admin/users/${subscription.userId}`}>{subscription.userId}</Link>
-                </TableCell>
-              </TableRow>
-            ))}
-          </TableBody>
-        </Table>
-      </div>
-    </div>
-  );
-}

apps/web/src/app/(dashboard)/admin/users/[id]/page.tsx

@@ -1,141 +0,0 @@
-'use client';
-
-import { useRouter } from 'next/navigation';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { useForm } from 'react-hook-form';
-import type { z } from 'zod';
-
-import { trpc } from '@documenso/trpc/react';
-import { ZUpdateProfileMutationByAdminSchema } from '@documenso/trpc/server/admin-router/schema';
-import { Button } from '@documenso/ui/primitives/button';
-import { Combobox } from '@documenso/ui/primitives/combobox';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@documenso/ui/primitives/form/form';
-import { Input } from '@documenso/ui/primitives/input';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-const ZUserFormSchema = ZUpdateProfileMutationByAdminSchema.omit({ id: true });
-
-type TUserFormSchema = z.infer<typeof ZUserFormSchema>;
-
-export default function UserPage({ params }: { params: { id: number } }) {
-  const { toast } = useToast();
-  const router = useRouter();
-
-  const { data: user } = trpc.profile.getUser.useQuery(
-    {
-      id: Number(params.id),
-    },
-    {
-      enabled: !!params.id,
-    },
-  );
-
-  const roles = user?.roles ?? [];
-
-  const { mutateAsync: updateUserMutation } = trpc.admin.updateUser.useMutation();
-
-  const form = useForm<TUserFormSchema>({
-    resolver: zodResolver(ZUserFormSchema),
-    values: {
-      name: user?.name ?? '',
-      email: user?.email ?? '',
-      roles: user?.roles ?? [],
-    },
-  });
-
-  const onSubmit = async ({ name, email, roles }: TUserFormSchema) => {
-    try {
-      await updateUserMutation({
-        id: Number(user?.id),
-        name,
-        email,
-        roles,
-      });
-
-      router.refresh();
-
-      toast({
-        title: 'Profile updated',
-        description: 'Your profile has been updated.',
-        duration: 5000,
-      });
-    } catch (e) {
-      toast({
-        title: 'Error',
-        description: 'An error occurred while updating your profile.',
-        variant: 'destructive',
-      });
-    }
-  };
-
-  return (
-    <div>
-      <h2 className="text-4xl font-semibold">Manage {user?.name}'s profile</h2>
-      <Form {...form}>
-        <form onSubmit={form.handleSubmit(onSubmit)}>
-          <fieldset className="mt-6 flex w-full flex-col gap-y-4">
-            <FormField
-              control={form.control}
-              name="name"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel className="text-muted-foreground">Name</FormLabel>
-                  <FormControl>
-                    <Input type="text" {...field} value={field.value ?? ''} />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-            <FormField
-              control={form.control}
-              name="email"
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel className="text-muted-foreground">Email</FormLabel>
-                  <FormControl>
-                    <Input type="text" {...field} />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <FormField
-              control={form.control}
-              name="roles"
-              render={({ field: { onChange } }) => (
-                <FormItem>
-                  <fieldset className="flex flex-col gap-2">
-                    <FormLabel className="text-muted-foreground">Roles</FormLabel>
-                    <FormControl>
-                      <Combobox
-                        listValues={roles}
-                        onChange={(values: string[]) => onChange(values)}
-                      />
-                    </FormControl>
-                    <FormMessage />
-                  </fieldset>
-                </FormItem>
-              )}
-            />
-
-            <div className="mt-4">
-              <Button type="submit" loading={form.formState.isSubmitting}>
-                Update user
-              </Button>
-            </div>
-          </fieldset>
-        </form>
-      </Form>
-    </div>
-  );
-}

apps/web/src/app/(dashboard)/admin/users/data-table-users.tsx

@@ -1,143 +0,0 @@
-'use client';
-
-import { useEffect, useState, useTransition } from 'react';
-
-import Link from 'next/link';
-
-import { Edit, Loader } from 'lucide-react';
-
-import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
-import { useUpdateSearchParams } from '@documenso/lib/client-only/hooks/use-update-search-params';
-import { Document, Role, Subscription } from '@documenso/prisma/client';
-import { Button } from '@documenso/ui/primitives/button';
-import { DataTable } from '@documenso/ui/primitives/data-table';
-import { DataTablePagination } from '@documenso/ui/primitives/data-table-pagination';
-import { Input } from '@documenso/ui/primitives/input';
-
-type UserData = {
-  id: number;
-  name: string | null;
-  email: string;
-  roles: Role[];
-  Subscription?: SubscriptionLite | null;
-  Document: DocumentLite[];
-};
-
-type SubscriptionLite = Pick<
-  Subscription,
-  'id' | 'status' | 'planId' | 'priceId' | 'createdAt' | 'periodEnd'
->;
-
-type DocumentLite = Pick<Document, 'id'>;
-
-type UsersDataTableProps = {
-  users: UserData[];
-  totalPages: number;
-  perPage: number;
-  page: number;
-};
-
-export const UsersDataTable = ({ users, totalPages, perPage, page }: UsersDataTableProps) => {
-  const [isPending, startTransition] = useTransition();
-  const updateSearchParams = useUpdateSearchParams();
-  const [searchString, setSearchString] = useState('');
-  const debouncedSearchString = useDebouncedValue(searchString, 1000);
-
-  useEffect(() => {
-    startTransition(() => {
-      updateSearchParams({
-        search: debouncedSearchString,
-        page: 1,
-        perPage,
-      });
-    });
-  }, [debouncedSearchString]);
-
-  const onPaginationChange = (page: number, perPage: number) => {
-    startTransition(() => {
-      updateSearchParams({
-        page,
-        perPage,
-      });
-    });
-  };
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setSearchString(e.target.value);
-  };
-
-  return (
-    <div className="relative">
-      <Input
-        className="my-6 flex flex-row gap-4"
-        type="text"
-        placeholder="Search by name or email"
-        value={searchString}
-        onChange={handleChange}
-      />
-      <DataTable
-        columns={[
-          {
-            header: 'ID',
-            accessorKey: 'id',
-            cell: ({ row }) => <div>{row.original.id}</div>,
-          },
-          {
-            header: 'Name',
-            accessorKey: 'name',
-            cell: ({ row }) => <div>{row.original.name}</div>,
-          },
-          {
-            header: 'Email',
-            accessorKey: 'email',
-            cell: ({ row }) => <div>{row.original.email}</div>,
-          },
-          {
-            header: 'Roles',
-            accessorKey: 'roles',
-            cell: ({ row }) => row.original.roles.join(', '),
-          },
-          {
-            header: 'Subscription',
-            accessorKey: 'subscription',
-            cell: ({ row }) => row.original.Subscription?.status ?? 'NONE',
-          },
-          {
-            header: 'Documents',
-            accessorKey: 'documents',
-            cell: ({ row }) => {
-              return <div>{row.original.Document.length}</div>;
-            },
-          },
-          {
-            header: '',
-            accessorKey: 'edit',
-            cell: ({ row }) => {
-              return (
-                <Button className="w-24" asChild>
-                  <Link href={`/admin/users/${row.original.id}`}>
-                    <Edit className="-ml-1 mr-2 h-4 w-4" />
-                    Edit
-                  </Link>
-                </Button>
-              );
-            },
-          },
-        ]}
-        data={users}
-        perPage={perPage}
-        currentPage={page}
-        totalPages={totalPages}
-        onPaginationChange={onPaginationChange}
-      >
-        {(table) => <DataTablePagination additionalInformation="VisibleCount" table={table} />}
-      </DataTable>
-
-      {isPending && (
-        <div className="absolute inset-0 flex items-center justify-center bg-white/50">
-          <Loader className="h-8 w-8 animate-spin text-gray-500" />
-        </div>
-      )}
-    </div>
-  );
-};

apps/web/src/app/(dashboard)/admin/users/fetch-users.actions.ts

@@ -1,9 +0,0 @@
-'use server';
-
-import { findUsers } from '@documenso/lib/server-only/user/get-all-users';
-
-export async function search(search: string, page: number, perPage: number) {
-  const results = await findUsers({ username: search, email: search, page, perPage });
-
-  return results;
-}

apps/web/src/app/(dashboard)/admin/users/page.tsx

@@ -1,25 +0,0 @@
-import { UsersDataTable } from './data-table-users';
-import { search } from './fetch-users.actions';
-
-type AdminManageUsersProps = {
-  searchParams?: {
-    search?: string;
-    page?: number;
-    perPage?: number;
-  };
-};
-
-export default async function AdminManageUsers({ searchParams = {} }: AdminManageUsersProps) {
-  const page = Number(searchParams.page) || 1;
-  const perPage = Number(searchParams.perPage) || 10;
-  const searchString = searchParams.search || '';
-
-  const { users, totalPages } = await search(searchString, page, perPage);
-
-  return (
-    <div>
-      <h2 className="text-4xl font-semibold">Manage users</h2>
-      <UsersDataTable users={users} totalPages={totalPages} page={page} perPage={perPage} />
-    </div>
-  );
-}

apps/web/src/app/(dashboard)/documents/[id]/edit-document.tsx

@@ -4,7 +4,7 @@ import { useState } from 'react';
 
 import { useRouter } from 'next/navigation';
 
-import { DocumentData, Field, Recipient, User } from '@documenso/prisma/client';
+import { Field, Recipient, User } from '@documenso/prisma/client';
 import { DocumentWithData } from '@documenso/prisma/types/document-with-data';
 import { cn } from '@documenso/ui/lib/utils';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
@@ -32,7 +32,7 @@ export type EditDocumentFormProps = {
   document: DocumentWithData;
   recipients: Recipient[];
   fields: Field[];
-  documentData: DocumentData;
+  dataUrl: string;
 };
 
 type EditDocumentStep = 'signers' | 'fields' | 'subject';
@@ -43,7 +43,7 @@ export const EditDocumentForm = ({
   recipients,
   fields,
   user: _user,
-  documentData,
+  dataUrl,
 }: EditDocumentFormProps) => {
   const { toast } = useToast();
   const router = useRouter();
@@ -153,7 +153,7 @@ export const EditDocumentForm = ({
         gradient
       >
         <CardContent className="p-2">
-          <LazyPDFViewer key={documentData.id} documentData={documentData} />
+          <LazyPDFViewer document={dataUrl} />
         </CardContent>
       </Card>
 

apps/web/src/app/(dashboard)/documents/[id]/loading.tsx

@@ -10,7 +10,7 @@ export default function Loading() {
         Documents
       </Link>
 
-      <h1 className="mt-4 grow-0 truncate text-2xl font-semibold md:text-3xl">
+      <h1 className="mt-4 max-w-xs grow-0 truncate text-2xl font-semibold md:text-3xl">
         Loading Document...
       </h1>
       <div className="mt-8 grid h-[80vh] max-h-[60rem] w-full grid-cols-12 gap-x-8">

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

@@ -3,10 +3,11 @@ import { redirect } from 'next/navigation';
 
 import { ChevronLeft, Users2 } from 'lucide-react';
 
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
 import { getDocumentById } from '@documenso/lib/server-only/document/get-document-by-id';
 import { getFieldsForDocument } from '@documenso/lib/server-only/field/get-fields-for-document';
 import { getRecipientsForDocument } from '@documenso/lib/server-only/recipient/get-recipients-for-document';
+import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { DocumentStatus as InternalDocumentStatus } from '@documenso/prisma/client';
 import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
 
@@ -29,11 +30,11 @@ export default async function DocumentPage({ params }: DocumentPageProps) {
     redirect('/documents');
   }
 
-  const { user } = await getRequiredServerComponentSession();
+  const session = await getRequiredServerComponentSession();
 
   const document = await getDocumentById({
     id: documentId,
-    userId: user.id,
+    userId: session.id,
   }).catch(() => null);
 
   if (!document || !document.documentData) {
@@ -42,14 +43,18 @@ export default async function DocumentPage({ params }: DocumentPageProps) {
 
   const { documentData } = document;
 
+  const documentDataUrl = await getFile(documentData)
+    .then((buffer) => Buffer.from(buffer).toString('base64'))
+    .then((data) => `data:application/pdf;base64,${data}`);
+
   const [recipients, fields] = await Promise.all([
     await getRecipientsForDocument({
       documentId,
-      userId: user.id,
+      userId: session.id,
     }),
     await getFieldsForDocument({
       documentId,
-      userId: user.id,
+      userId: session.id,
     }),
   ]);
 
@@ -60,7 +65,10 @@ export default async function DocumentPage({ params }: DocumentPageProps) {
         Documents
       </Link>
 
-      <h1 className="mt-4 truncate text-2xl font-semibold md:text-3xl" title={document.title}>
+      <h1
+        className="mt-4 max-w-xs truncate text-2xl font-semibold md:text-3xl"
+        title={document.title}
+      >
         {document.title}
       </h1>
 
@@ -82,16 +90,16 @@ export default async function DocumentPage({ params }: DocumentPageProps) {
         <EditDocumentForm
           className="mt-8"
           document={document}
-          user={user}
+          user={session}
           recipients={recipients}
           fields={fields}
-          documentData={documentData}
+          dataUrl={documentDataUrl}
         />
       )}
 
       {document.status === InternalDocumentStatus.COMPLETED && (
         <div className="mx-auto mt-12 max-w-2xl">
-          <LazyPDFViewer key={documentData.id} documentData={documentData} />
+          <LazyPDFViewer document={documentDataUrl} />
         </div>
       )}
     </div>

apps/web/src/app/(dashboard)/documents/[id]/sent/page.tsx

@@ -10,7 +10,7 @@ export default function DocumentSentPage() {
         Documents
       </Link>
 
-      <h1 className="mt-4 grow-0 truncate text-2xl font-semibold md:text-3xl">
+      <h1 className="mt-4 max-w-xs grow-0 truncate text-2xl font-semibold md:text-3xl">
         Loading Document...
       </h1>
     </div>

apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx

@@ -1,185 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { History } from 'lucide-react';
-import { useForm } from 'react-hook-form';
-import * as z from 'zod';
-
-import { getRecipientType } from '@documenso/lib/client-only/recipient-type';
-import { recipientAbbreviation } from '@documenso/lib/utils/recipient-formatter';
-import { type Document, type Recipient, SigningStatus } from '@documenso/prisma/client';
-import { trpc as trpcReact } from '@documenso/trpc/react';
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-import { Checkbox } from '@documenso/ui/primitives/checkbox';
-import {
-  Dialog,
-  DialogClose,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@documenso/ui/primitives/dialog';
-import { DropdownMenuItem } from '@documenso/ui/primitives/dropdown-menu';
-import {
-  Form,
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-} from '@documenso/ui/primitives/form/form';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { StackAvatar } from '~/components/(dashboard)/avatar/stack-avatar';
-
-const FORM_ID = 'resend-email';
-
-export type ResendDocumentActionItemProps = {
-  document: Document;
-  recipients: Recipient[];
-};
-
-export const ZResendDocumentFormSchema = z.object({
-  recipients: z.array(z.number()).min(1, {
-    message: 'You must select at least one item.',
-  }),
-});
-
-export type TResendDocumentFormSchema = z.infer<typeof ZResendDocumentFormSchema>;
-
-export const ResendDocumentActionItem = ({
-  document,
-  recipients,
-}: ResendDocumentActionItemProps) => {
-  const { toast } = useToast();
-
-  const [isOpen, setIsOpen] = useState(false);
-
-  const isDisabled =
-    document.status !== 'PENDING' ||
-    !recipients.some((r) => r.signingStatus === SigningStatus.NOT_SIGNED);
-
-  const { mutateAsync: resendDocument } = trpcReact.document.resendDocument.useMutation();
-
-  const form = useForm<TResendDocumentFormSchema>({
-    resolver: zodResolver(ZResendDocumentFormSchema),
-    defaultValues: {
-      recipients: [],
-    },
-  });
-
-  const {
-    handleSubmit,
-    formState: { isSubmitting },
-  } = form;
-
-  const onFormSubmit = async ({ recipients }: TResendDocumentFormSchema) => {
-    try {
-      await resendDocument({ documentId: document.id, recipients });
-
-      toast({
-        title: 'Document re-sent',
-        description: 'Your document has been re-sent successfully.',
-        duration: 5000,
-      });
-
-      setIsOpen(false);
-    } catch (err) {
-      toast({
-        title: 'Something went wrong',
-        description: 'This document could not be re-sent at this time. Please try again.',
-        variant: 'destructive',
-        duration: 7500,
-      });
-    }
-  };
-
-  return (
-    <>
-      <Dialog open={isOpen} onOpenChange={setIsOpen}>
-        <DialogTrigger asChild>
-          <DropdownMenuItem disabled={isDisabled} onSelect={(e) => e.preventDefault()}>
-            <History className="mr-2 h-4 w-4" />
-            Resend
-          </DropdownMenuItem>
-        </DialogTrigger>
-
-        <DialogContent className="sm:max-w-sm" hideClose>
-          <DialogHeader>
-            <DialogTitle>
-              <h1 className="text-center text-xl">Who do you want to remind?</h1>
-            </DialogTitle>
-          </DialogHeader>
-
-          <Form {...form}>
-            <form id={FORM_ID} onSubmit={handleSubmit(onFormSubmit)} className="px-3">
-              <FormField
-                control={form.control}
-                name="recipients"
-                render={({ field: { value, onChange } }) => (
-                  <>
-                    {recipients.map((recipient) => (
-                      <FormItem
-                        key={recipient.id}
-                        className="flex flex-row items-center justify-between gap-x-3"
-                      >
-                        <FormLabel
-                          className={cn('my-2 flex items-center gap-2 font-normal', {
-                            'opacity-50': !value.includes(recipient.id),
-                          })}
-                        >
-                          <StackAvatar
-                            key={recipient.id}
-                            type={getRecipientType(recipient)}
-                            fallbackText={recipientAbbreviation(recipient)}
-                          />
-                          {recipient.email}
-                        </FormLabel>
-
-                        <FormControl>
-                          <Checkbox
-                            className="h-5 w-5 rounded-full data-[state=checked]:border-black data-[state=checked]:bg-black "
-                            checkClassName="text-white"
-                            value={recipient.id}
-                            checked={value.includes(recipient.id)}
-                            onCheckedChange={(checked: boolean) =>
-                              checked
-                                ? onChange([...value, recipient.id])
-                                : onChange(value.filter((v) => v !== recipient.id))
-                            }
-                          />
-                        </FormControl>
-                      </FormItem>
-                    ))}
-                  </>
-                )}
-              />
-            </form>
-          </Form>
-
-          <DialogFooter>
-            <div className="flex w-full flex-1 flex-nowrap gap-4">
-              <DialogClose asChild>
-                <Button
-                  type="button"
-                  className="dark:bg-muted dark:hover:bg-muted/80 flex-1  bg-black/5 hover:bg-black/10"
-                  variant="secondary"
-                  disabled={isSubmitting}
-                >
-                  Cancel
-                </Button>
-              </DialogClose>
-
-              <Button className="flex-1" loading={isSubmitting} type="submit" form={FORM_ID}>
-                Send reminder
-              </Button>
-            </div>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </>
-  );
-};

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

@@ -7,8 +7,11 @@ import { useSession } from 'next-auth/react';
 import { match } from 'ts-pattern';
 
 import { Document, DocumentStatus, Recipient, SigningStatus, User } from '@documenso/prisma/client';
-import { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
+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 & {
@@ -19,11 +22,16 @@ 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;
@@ -33,6 +41,20 @@ 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,
@@ -58,15 +80,9 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => {
       </Button>
     ))
     .otherwise(() => (
-      <DocumentShareButton
-        documentId={row.id}
-        token={recipient?.token}
-        trigger={({ loading }) => (
-          <Button className="w-24" loading={loading}>
-            {!loading && <Share className="-ml-1 mr-2 h-4 w-4" />}
-            Share
-          </Button>
-        )}
-      />
+      <Button className="w-24" loading={isCreatingShareLink} onClick={onShareClick}>
+        {!isCreatingShareLink && <Share className="-ml-1 mr-2 h-4 w-4" />}
+        Share
+      </Button>
     ));
 };

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

@@ -1,13 +1,12 @@
 'use client';
 
-import { useState } from 'react';
-
 import Link from 'next/link';
 
 import {
   Copy,
   Download,
   Edit,
+  History,
   Loader,
   MoreHorizontal,
   Pencil,
@@ -18,11 +17,10 @@ import {
 import { useSession } from 'next-auth/react';
 
 import { getFile } from '@documenso/lib/universal/upload/get-file';
-import type { Document, Recipient, User } from '@documenso/prisma/client';
-import { DocumentStatus } from '@documenso/prisma/client';
-import type { DocumentWithData } from '@documenso/prisma/types/document-with-data';
+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 { DocumentShareButton } from '@documenso/ui/components/document/document-share-button';
+import { trpc as trpcReact } from '@documenso/trpc/react';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -30,10 +28,9 @@ import {
   DropdownMenuLabel,
   DropdownMenuTrigger,
 } from '@documenso/ui/primitives/dropdown-menu';
+import { useToast } from '@documenso/ui/primitives/use-toast';
 
-import { ResendDocumentActionItem } from './_action-items/resend-document';
-import { DeleteDraftDocumentDialog } from './delete-draft-document-dialog';
-import { DuplicateDocumentDialog } from './duplicate-document-dialog';
+import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
 
 export type DataTableActionDropdownProps = {
   row: Document & {
@@ -44,23 +41,38 @@ export type DataTableActionDropdownProps = {
 
 export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) => {
   const { data: session } = useSession();
-
-  const [isDeleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [isDuplicateDialogOpen, setDuplicateDialogOpen] = useState(false);
+  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;
   // const isRecipient = !!recipient;
-  const isDraft = row.status === DocumentStatus.DRAFT;
+  // const isDraft = row.status === DocumentStatus.DRAFT;
   // 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({
+      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;
@@ -97,7 +109,6 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
     window.URL.revokeObjectURL(link.href);
   };
 
-  const nonSignedRecipients = row.Recipient.filter((item) => item.signingStatus !== 'SIGNED');
   return (
     <DropdownMenu>
       <DropdownMenuTrigger>
@@ -126,7 +137,7 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
           Download
         </DropdownMenuItem>
 
-        <DropdownMenuItem onClick={() => setDuplicateDialogOpen(true)}>
+        <DropdownMenuItem disabled>
           <Copy className="mr-2 h-4 w-4" />
           Duplicate
         </DropdownMenuItem>
@@ -136,43 +147,27 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
           Void
         </DropdownMenuItem>
 
-        <DropdownMenuItem onClick={() => setDeleteDialogOpen(true)} disabled={!isDocumentDeletable}>
+        <DropdownMenuItem disabled>
           <Trash2 className="mr-2 h-4 w-4" />
           Delete
         </DropdownMenuItem>
 
         <DropdownMenuLabel>Share</DropdownMenuLabel>
 
-        <ResendDocumentActionItem document={row} recipients={nonSignedRecipients} />
+        <DropdownMenuItem disabled>
+          <History className="mr-2 h-4 w-4" />
+          Resend
+        </DropdownMenuItem>
 
-        <DocumentShareButton
-          documentId={row.id}
-          token={recipient?.token}
-          trigger={({ loading, disabled }) => (
-            <DropdownMenuItem disabled={disabled || isDraft} onSelect={(e) => e.preventDefault()}>
-              <div className="flex items-center">
-                {loading ? <Loader className="mr-2 h-4 w-4" /> : <Share className="mr-2 h-4 w-4" />}
-                Share
-              </div>
-            </DropdownMenuItem>
+        <DropdownMenuItem onClick={onShareClick}>
+          {isCreatingShareLink ? (
+            <Loader className="mr-2 h-4 w-4" />
+          ) : (
+            <Share className="mr-2 h-4 w-4" />
           )}
-        />
+          Share
+        </DropdownMenuItem>
       </DropdownMenuContent>
-
-      {isDocumentDeletable && (
-        <DeleteDraftDocumentDialog
-          id={row.id}
-          open={isDeleteDialogOpen}
-          onOpenChange={setDeleteDialogOpen}
-        />
-      )}
-      {isDuplicateDialogOpen && (
-        <DuplicateDocumentDialog
-          id={row.id}
-          open={isDuplicateDialogOpen}
-          onOpenChange={setDuplicateDialogOpen}
-        />
-      )}
     </DropdownMenu>
   );
 };

apps/web/src/app/(dashboard)/documents/delete-draft-document-dialog.tsx

@@ -1,89 +0,0 @@
-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>
-  );
-};

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

@@ -1,105 +0,0 @@
-import { useRouter } from 'next/navigation';
-
-import { trpc as trpcReact } from '@documenso/trpc/react';
-import { Button } from '@documenso/ui/primitives/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-} from '@documenso/ui/primitives/dialog';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-type DuplicateDocumentDialogProps = {
-  id: number;
-  open: boolean;
-  onOpenChange: (_open: boolean) => void;
-};
-
-export const DuplicateDocumentDialog = ({
-  id,
-  open,
-  onOpenChange,
-}: DuplicateDocumentDialogProps) => {
-  const router = useRouter();
-  const { toast } = useToast();
-
-  const { data: document, isLoading } = trpcReact.document.getDocumentById.useQuery({
-    id,
-  });
-
-  const documentData = document?.documentData;
-
-  const { mutateAsync: duplicateDocument, isLoading: isDuplicateLoading } =
-    trpcReact.document.duplicateDocument.useMutation({
-      onSuccess: (newId) => {
-        router.push(`/documents/${newId}`);
-        toast({
-          title: 'Document Duplicated',
-          description: 'Your document has been successfully duplicated.',
-          duration: 5000,
-        });
-
-        onOpenChange(false);
-      },
-    });
-
-  const onDuplicate = async () => {
-    try {
-      await duplicateDocument({ id });
-    } catch {
-      toast({
-        title: 'Something went wrong',
-        description: 'This document could not be duplicated at this time. Please try again.',
-        variant: 'destructive',
-        duration: 7500,
-      });
-    }
-  };
-
-  return (
-    <Dialog open={open} onOpenChange={(value) => !isLoading && onOpenChange(value)}>
-      <DialogContent>
-        <DialogHeader>
-          <DialogTitle>Duplicate</DialogTitle>
-        </DialogHeader>
-        {!documentData || isLoading ? (
-          <div className="mx-auto -mt-4 flex w-full max-w-screen-xl flex-col px-4 md:px-8">
-            <h1 className="mt-4 grow-0 truncate text-2xl font-semibold md:text-3xl">
-              Loading Document...
-            </h1>
-          </div>
-        ) : (
-          <div className="p-2 [&>div]:h-[50vh] [&>div]:overflow-y-scroll  ">
-            <LazyPDFViewer key={document?.id} documentData={documentData} />
-          </div>
-        )}
-
-        <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"
-              disabled={isDuplicateLoading || isLoading}
-              loading={isDuplicateLoading}
-              onClick={onDuplicate}
-              className="flex-1"
-            >
-              Duplicate
-            </Button>
-          </div>
-        </DialogFooter>
-      </DialogContent>
-    </Dialog>
-  );
-};

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

@@ -14,13 +14,13 @@ export const EmptyDocumentState = ({ status }: EmptyDocumentProps) => {
     .with(ExtendedDocumentStatus.COMPLETED, () => ({
       title: 'Nothing to do',
       message:
-        'There are no completed documents yet. Documents that you have created or received will appear here once completed.',
+        '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 the current moment. You can upload a document to start drafting.',
+        'There are no active drafts at then current moment. You can upload a document to start drafting.',
       icon: CheckCircle2,
     }))
     .with(ExtendedDocumentStatus.ALL, () => ({
@@ -32,7 +32,7 @@ export const EmptyDocumentState = ({ status }: EmptyDocumentProps) => {
     .otherwise(() => ({
       title: 'Nothing to do',
       message:
-        'All documents have been processed. Any new documents that are sent or received will show here.',
+        'All documents are currently actioned. Any new documents are sent or recieved they will start to appear here.',
       icon: CheckCircle2,
     }));
 

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

@@ -1,6 +1,6 @@
 import Link from 'next/link';
 
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
 import { findDocuments } from '@documenso/lib/server-only/document/find-documents';
 import { getStats } from '@documenso/lib/server-only/document/get-stats';
 import { isExtendedDocumentStatus } from '@documenso/prisma/guards/is-extended-document-status';
@@ -8,8 +8,7 @@ import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-documen
 import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
 
 import { PeriodSelector } from '~/components/(dashboard)/period-selector/period-selector';
-import type { PeriodSelectorValue } from '~/components/(dashboard)/period-selector/types';
-import { isPeriodSelectorValue } from '~/components/(dashboard)/period-selector/types';
+import { PeriodSelectorValue } from '~/components/(dashboard)/period-selector/types';
 import { DocumentStatus } from '~/components/formatter/document-status';
 
 import { DocumentsDataTable } from './data-table';
@@ -26,14 +25,14 @@ export type DocumentsPageProps = {
 };
 
 export default async function DocumentsPage({ searchParams = {} }: DocumentsPageProps) {
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   const stats = await getStats({
     user,
   });
 
   const status = isExtendedDocumentStatus(searchParams.status) ? searchParams.status : 'ALL';
-  const period = isPeriodSelectorValue(searchParams.period) ? searchParams.period : '';
+  // const period = isPeriodSelectorValue(searchParams.period) ? searchParams.period : '';
   const page = Number(searchParams.page) || 1;
   const perPage = Number(searchParams.perPage) || 20;
 
@@ -46,7 +45,6 @@ export default async function DocumentsPage({ searchParams = {} }: DocumentsPage
     },
     page,
     perPage,
-    period,
   });
 
   const getTabHref = (value: typeof status) => {
@@ -68,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="-m-1 flex flex-wrap gap-x-4 gap-y-6 overflow-hidden p-1">
+        <div className="flex flex-wrap gap-x-4 gap-y-6 overflow-hidden">
           <Tabs defaultValue={status} className="overflow-x-auto">
             <TabsList>
               {[

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

@@ -2,16 +2,12 @@
 
 import { useState } from 'react';
 
-import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 
 import { Loader } from 'lucide-react';
-import { useSession } from 'next-auth/react';
 
-import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
 import { putFile } from '@documenso/lib/universal/upload/put-file';
-import { TRPCClientError } from '@documenso/trpc/client';
 import { trpc } from '@documenso/trpc/react';
 import { cn } from '@documenso/ui/lib/utils';
 import { DocumentDropzone } from '@documenso/ui/primitives/document-dropzone';
@@ -23,12 +19,9 @@ export type UploadDocumentProps = {
 
 export const UploadDocument = ({ className }: UploadDocumentProps) => {
   const router = useRouter();
-  const { data: session } = useSession();
 
   const { toast } = useToast();
 
-  const { quota, remaining } = useLimits();
-
   const [isLoading, setIsLoading] = useState(false);
 
   const { mutateAsync: createDocument } = trpc.document.createDocument.useMutation();
@@ -59,19 +52,11 @@ export const UploadDocument = ({ className }: UploadDocumentProps) => {
     } catch (error) {
       console.error(error);
 
-      if (error instanceof TRPCClientError) {
-        toast({
-          title: 'Error',
-          description: error.message,
-          variant: 'destructive',
-        });
-      } else {
-        toast({
-          title: 'Error',
-          description: 'An error occurred while uploading your document.',
-          variant: 'destructive',
-        });
-      }
+      toast({
+        title: 'Error',
+        description: 'An error occurred while uploading your document.',
+        variant: 'destructive',
+      });
     } finally {
       setIsLoading(false);
     }
@@ -79,46 +64,13 @@ export const UploadDocument = ({ className }: UploadDocumentProps) => {
 
   return (
     <div className={cn('relative', className)}>
-      <DocumentDropzone
-        className="min-h-[40vh]"
-        disabled={remaining.documents === 0 || !session?.user.emailVerified}
-        onDrop={onFileDrop}
-      />
-
-      <div className="absolute -bottom-6 right-0">
-        {remaining.documents > 0 && Number.isFinite(remaining.documents) && (
-          <p className="text-muted-foreground/60 text-xs">
-            {remaining.documents} of {quota.documents} documents remaining this month.
-          </p>
-        )}
-      </div>
+      <DocumentDropzone className="min-h-[40vh]" onDrop={onFileDrop} />
 
       {isLoading && (
-        <div className="bg-background/50 absolute inset-0 flex items-center justify-center rounded-lg">
+        <div className="bg-background/50 absolute inset-0 flex items-center justify-center">
           <Loader className="text-muted-foreground h-12 w-12 animate-spin" />
         </div>
       )}
-
-      {remaining.documents === 0 && (
-        <div className="bg-background/60 absolute inset-0 flex items-center justify-center rounded-lg backdrop-blur-sm">
-          <div className="text-center">
-            <h2 className="text-muted-foreground/80 text-xl font-semibold">
-              You have reached your document limit.
-            </h2>
-
-            <p className="text-muted-foreground/60 mt-2 text-sm">
-              You can upload up to {quota.documents} documents per month on your current plan.
-            </p>
-
-            <Link
-              className="text-primary hover:text-primary/80 mt-6 block font-medium"
-              href="/settings/billing"
-            >
-              Upgrade your account to upload more documents.
-            </Link>
-          </div>
-        </div>
-      )}
     </div>
   );
 };

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

@@ -4,13 +4,10 @@ import { redirect } from 'next/navigation';
 
 import { getServerSession } from 'next-auth';
 
-import { LimitsProvider } from '@documenso/ee/server-only/limits/provider/server';
 import { NEXT_AUTH_OPTIONS } from '@documenso/lib/next-auth/auth-options';
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
 
-import { CommandMenu } from '~/components/(dashboard)/common/command-menu';
 import { Header } from '~/components/(dashboard)/layout/header';
-import { VerifyEmailBanner } from '~/components/(dashboard)/layout/verify-email-banner';
 import { RefreshOnFocus } from '~/components/(dashboard)/refresh-on-focus/refresh-on-focus';
 import { NextAuthProvider } from '~/providers/next-auth';
 
@@ -27,19 +24,15 @@ export default async function AuthenticatedDashboardLayout({
     redirect('/signin');
   }
 
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   return (
     <NextAuthProvider session={session}>
-      <LimitsProvider>
-        {!user.emailVerified && <VerifyEmailBanner email={user.email} />}
-        <CommandMenu />
-        <Header user={user} />
+      <Header user={user} />
 
-        <main className="mt-8 pb-8 md:mt-12 md:pb-12">{children}</main>
+      <main className="mt-8 pb-8 md:mt-12 md:pb-12">{children}</main>
 
-        <RefreshOnFocus />
-      </LimitsProvider>
+      <RefreshOnFocus />
     </NextAuthProvider>
   );
 }

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

@@ -1,133 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { AnimatePresence, motion } from 'framer-motion';
-
-import { PriceIntervals } from '@documenso/ee/server-only/stripe/get-prices-by-interval';
-import { useIsMounted } from '@documenso/lib/client-only/hooks/use-is-mounted';
-import { toHumanPrice } from '@documenso/lib/universal/stripe/to-human-price';
-import { Button } from '@documenso/ui/primitives/button';
-import { Card, CardContent, CardTitle } from '@documenso/ui/primitives/card';
-import { Tabs, TabsList, TabsTrigger } from '@documenso/ui/primitives/tabs';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { createCheckout } from './create-checkout.action';
-
-type Interval = keyof PriceIntervals;
-
-const INTERVALS: Interval[] = ['day', 'week', 'month', 'year'];
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-const isInterval = (value: unknown): value is Interval => INTERVALS.includes(value as Interval);
-
-const FRIENDLY_INTERVALS: Record<Interval, string> = {
-  day: 'Daily',
-  week: 'Weekly',
-  month: 'Monthly',
-  year: 'Yearly',
-};
-
-const MotionCard = motion(Card);
-
-export type BillingPlansProps = {
-  prices: PriceIntervals;
-};
-
-export const BillingPlans = ({ prices }: BillingPlansProps) => {
-  const { toast } = useToast();
-
-  const isMounted = useIsMounted();
-
-  const [interval, setInterval] = useState<Interval>('month');
-  const [isFetchingCheckoutSession, setIsFetchingCheckoutSession] = useState(false);
-
-  const onSubscribeClick = async (priceId: string) => {
-    try {
-      setIsFetchingCheckoutSession(true);
-
-      const url = await createCheckout({ priceId });
-
-      if (!url) {
-        throw new Error('Unable to create session');
-      }
-
-      window.open(url);
-    } catch (_err) {
-      toast({
-        title: 'Something went wrong',
-        description: 'An error occurred while trying to create a checkout session.',
-        variant: 'destructive',
-      });
-    } finally {
-      setIsFetchingCheckoutSession(false);
-    }
-  };
-
-  return (
-    <div>
-      <Tabs value={interval} onValueChange={(value) => isInterval(value) && setInterval(value)}>
-        <TabsList>
-          {INTERVALS.map(
-            (interval) =>
-              prices[interval].length > 0 && (
-                <TabsTrigger key={interval} className="min-w-[150px]" value={interval}>
-                  {FRIENDLY_INTERVALS[interval]}
-                </TabsTrigger>
-              ),
-          )}
-        </TabsList>
-      </Tabs>
-
-      <div className="mt-8 grid gap-8 lg:grid-cols-2 2xl:grid-cols-3">
-        <AnimatePresence mode="wait">
-          {prices[interval].map((price) => (
-            <MotionCard
-              key={price.id}
-              initial={{ opacity: isMounted ? 0 : 1, y: isMounted ? 20 : 0 }}
-              animate={{ opacity: 1, y: 0, transition: { duration: 0.3 } }}
-              exit={{ opacity: 0, transition: { duration: 0.3 } }}
-            >
-              <CardContent className="flex h-full flex-col p-6">
-                <CardTitle>{price.product.name}</CardTitle>
-
-                <div className="text-muted-foreground mt-2 text-lg font-medium">
-                  ${toHumanPrice(price.unit_amount ?? 0)} {price.currency.toUpperCase()}{' '}
-                  <span className="text-xs">per {interval}</span>
-                </div>
-
-                <div className="text-muted-foreground mt-1.5 text-sm">
-                  {price.product.description}
-                </div>
-
-                {price.product.features && price.product.features.length > 0 && (
-                  <div className="text-muted-foreground mt-4">
-                    <div className="text-sm font-medium">Includes:</div>
-
-                    <ul className="mt-1 divide-y text-sm">
-                      {price.product.features.map((feature, index) => (
-                        <li key={index} className="py-2">
-                          {feature.name}
-                        </li>
-                      ))}
-                    </ul>
-                  </div>
-                )}
-
-                <div className="flex-1" />
-
-                <Button
-                  className="mt-4"
-                  loading={isFetchingCheckoutSession}
-                  onClick={() => void onSubscribeClick(price.id)}
-                >
-                  Subscribe
-                </Button>
-              </CardContent>
-            </MotionCard>
-          ))}
-        </AnimatePresence>
-      </div>
-    </div>
-  );
-};

apps/web/src/app/(dashboard)/settings/billing/billing-portal-button.tsx

@@ -1,55 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-
-import { Button } from '@documenso/ui/primitives/button';
-import { useToast } from '@documenso/ui/primitives/use-toast';
-
-import { createBillingPortal } from './create-billing-portal.action';
-
-export const BillingPortalButton = () => {
-  const { toast } = useToast();
-
-  const [isFetchingPortalUrl, setIsFetchingPortalUrl] = useState(false);
-
-  const handleFetchPortalUrl = async () => {
-    if (isFetchingPortalUrl) {
-      return;
-    }
-
-    setIsFetchingPortalUrl(true);
-
-    try {
-      const sessionUrl = await createBillingPortal();
-
-      if (!sessionUrl) {
-        throw new Error('NO_SESSION');
-      }
-
-      window.open(sessionUrl, '_blank');
-    } catch (e) {
-      let description =
-        'We are unable to proceed to the billing portal at this time. Please try again, or contact support.';
-
-      if (e.message === 'CUSTOMER_NOT_FOUND') {
-        description =
-          'You do not currently have a customer record, this should not happen. Please contact support for assistance.';
-      }
-
-      toast({
-        title: 'Something went wrong',
-        description,
-        variant: 'destructive',
-        duration: 10000,
-      });
-    }
-
-    setIsFetchingPortalUrl(false);
-  };
-
-  return (
-    <Button onClick={async () => handleFetchPortalUrl()} loading={isFetchingPortalUrl}>
-      Manage Subscription
-    </Button>
-  );
-};

apps/web/src/app/(dashboard)/settings/billing/create-billing-portal.action.ts

@@ -1,49 +0,0 @@
-'use server';
-
-import {
-  getStripeCustomerByEmail,
-  getStripeCustomerById,
-} from '@documenso/ee/server-only/stripe/get-customer';
-import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { Stripe } from '@documenso/lib/server-only/stripe';
-import { stripe } from '@documenso/lib/server-only/stripe';
-import { getSubscriptionByUserId } from '@documenso/lib/server-only/subscription/get-subscription-by-user-id';
-
-export const createBillingPortal = async () => {
-  const { user } = await getRequiredServerComponentSession();
-
-  const existingSubscription = await getSubscriptionByUserId({ userId: user.id });
-
-  let stripeCustomer: Stripe.Customer | null = null;
-
-  // Find the Stripe customer for the current user subscription.
-  if (existingSubscription) {
-    stripeCustomer = await getStripeCustomerById(existingSubscription.customerId);
-
-    if (!stripeCustomer) {
-      throw new Error('Missing Stripe customer for subscription');
-    }
-  }
-
-  // Fallback to check if a Stripe customer already exists for the current user email.
-  if (!stripeCustomer) {
-    stripeCustomer = await getStripeCustomerByEmail(user.email);
-  }
-
-  // Create a Stripe customer if it does not exist for the current user.
-  if (!stripeCustomer) {
-    stripeCustomer = await stripe.customers.create({
-      name: user.name ?? undefined,
-      email: user.email,
-      metadata: {
-        userId: user.id,
-      },
-    });
-  }
-
-  return getPortalSession({
-    customerId: stripeCustomer.id,
-    returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,
-  });
-};

apps/web/src/app/(dashboard)/settings/billing/create-checkout.action.ts

@@ -1,58 +0,0 @@
-'use server';
-
-import { createCustomer } from '@documenso/ee/server-only/stripe/create-customer';
-import { getCheckoutSession } from '@documenso/ee/server-only/stripe/get-checkout-session';
-import {
-  getStripeCustomerByEmail,
-  getStripeCustomerById,
-} from '@documenso/ee/server-only/stripe/get-customer';
-import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
-import type { Stripe } from '@documenso/lib/server-only/stripe';
-import { getSubscriptionByUserId } from '@documenso/lib/server-only/subscription/get-subscription-by-user-id';
-
-export type CreateCheckoutOptions = {
-  priceId: string;
-};
-
-export const createCheckout = async ({ priceId }: CreateCheckoutOptions) => {
-  const { user } = await getRequiredServerComponentSession();
-
-  const existingSubscription = await getSubscriptionByUserId({ userId: user.id });
-
-  let stripeCustomer: Stripe.Customer | null = null;
-
-  // Find the Stripe customer for the current user subscription.
-  if (existingSubscription) {
-    stripeCustomer = await getStripeCustomerById(existingSubscription.customerId);
-
-    if (!stripeCustomer) {
-      throw new Error('Missing Stripe customer for subscription');
-    }
-
-    return getPortalSession({
-      customerId: stripeCustomer.id,
-      returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,
-    });
-  }
-
-  // Fallback to check if a Stripe customer already exists for the current user email.
-  if (!stripeCustomer) {
-    stripeCustomer = await getStripeCustomerByEmail(user.email);
-  }
-
-  // Create a Stripe customer if it does not exist for the current user.
-  if (!stripeCustomer) {
-    await createCustomer({
-      user,
-    });
-
-    stripeCustomer = await getStripeCustomerByEmail(user.email);
-  }
-
-  return getCheckoutSession({
-    customerId: stripeCustomer.id,
-    priceId,
-    returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,
-  });
-};

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

@@ -1,21 +1,18 @@
+import Link from 'next/link';
 import { redirect } from 'next/navigation';
 
-import { match } from 'ts-pattern';
-
-import { getPricesByInterval } from '@documenso/ee/server-only/stripe/get-prices-by-interval';
-import { getProductByPriceId } from '@documenso/ee/server-only/stripe/get-product-by-price-id';
-import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-component-session';
+import { createCustomer } from '@documenso/ee/server-only/stripe/create-customer';
+import { getPortalSession } from '@documenso/ee/server-only/stripe/get-portal-session';
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
 import { getServerComponentFlag } from '@documenso/lib/server-only/feature-flags/get-server-component-feature-flag';
-import type { Stripe } from '@documenso/lib/server-only/stripe';
 import { getSubscriptionByUserId } from '@documenso/lib/server-only/subscription/get-subscription-by-user-id';
+import { SubscriptionStatus } from '@documenso/prisma/client';
+import { Button } from '@documenso/ui/primitives/button';
 
 import { LocaleDate } from '~/components/formatter/locale-date';
 
-import { BillingPlans } from './billing-plans';
-import { BillingPortalButton } from './billing-portal-button';
-
 export default async function BillingSettingsPage() {
-  const { user } = await getRequiredServerComponentSession();
+  const user = await getRequiredServerComponentSession();
 
   const isBillingEnabled = await getServerComponentFlag('app_billing');
 
@@ -24,73 +21,57 @@ export default async function BillingSettingsPage() {
     redirect('/settings/profile');
   }
 
-  const [subscription, prices] = await Promise.all([
-    getSubscriptionByUserId({ userId: user.id }),
-    getPricesByInterval(),
-  ]);
+  const subscription = await getSubscriptionByUserId({ userId: user.id }).then(async (sub) => {
+    if (sub) {
+      return sub;
+    }
 
-  let subscriptionProduct: Stripe.Product | null = null;
+    // If we don't have a customer record, create one as well as an empty subscription.
+    return createCustomer({ user });
+  });
 
-  if (subscription?.priceId) {
-    subscriptionProduct = await getProductByPriceId({ priceId: subscription.priceId }).catch(
-      () => null,
-    );
+  let billingPortalUrl = '';
+
+  if (subscription.customerId) {
+    billingPortalUrl = await getPortalSession({
+      customerId: subscription.customerId,
+      returnUrl: `${process.env.NEXT_PUBLIC_WEBAPP_URL}/settings/billing`,
+    });
   }
 
-  const isMissingOrInactiveOrFreePlan = !subscription || subscription.status === 'INACTIVE';
-
   return (
     <div>
-      <h3 className="text-2xl font-semibold">Billing</h3>
+      <h3 className="text-lg font-medium">Billing</h3>
 
-      <div className="text-muted-foreground mt-2 text-sm">
-        {isMissingOrInactiveOrFreePlan && (
-          <p>
-            You are currently on the <span className="font-semibold">Free Plan</span>.
-          </p>
+      <p className="text-muted-foreground mt-2 text-sm">
+        Your subscription is{' '}
+        {subscription.status !== SubscriptionStatus.INACTIVE ? 'active' : 'inactive'}.
+        {subscription?.periodEnd && (
+          <>
+            {' '}
+            Your next payment is due on{' '}
+            <span className="font-semibold">
+              <LocaleDate date={subscription.periodEnd} />
+            </span>
+            .
+          </>
         )}
-
-        {!isMissingOrInactiveOrFreePlan &&
-          match(subscription.status)
-            .with('ACTIVE', () => (
-              <p>
-                {subscriptionProduct ? (
-                  <span>
-                    You are currently subscribed to{' '}
-                    <span className="font-semibold">{subscriptionProduct.name}</span>
-                  </span>
-                ) : (
-                  <span>You currently have an active plan</span>
-                )}
-
-                {subscription.periodEnd && (
-                  <span>
-                    {' '}
-                    which is set to{' '}
-                    {subscription.cancelAtPeriodEnd ? (
-                      <span>
-                        end on{' '}
-                        <LocaleDate className="font-semibold" date={subscription.periodEnd} />.
-                      </span>
-                    ) : (
-                      <span>
-                        automatically renew on{' '}
-                        <LocaleDate className="font-semibold" date={subscription.periodEnd} />.
-                      </span>
-                    )}
-                  </span>
-                )}
-              </p>
-            ))
-            .with('PAST_DUE', () => (
-              <p>Your current plan is past due. Please update your payment information.</p>
-            ))
-            .otherwise(() => null)}
-      </div>
+      </p>
 
       <hr className="my-4" />
 
-      {isMissingOrInactiveOrFreePlan ? <BillingPlans prices={prices} /> : <BillingPortalButton />}
+      {billingPortalUrl && (
+        <Button asChild>
+          <Link href={billingPortalUrl}>Manage Subscription</Link>
+        </Button>
+      )}
+
+      {!billingPortalUrl && (
+        <p className="text-muted-foreground max-w-[60ch] text-base">
+          You do not currently have a customer record, this should not happen. Please contact
+          support for assistance.
+        </p>
+      )}
     </div>
   );
 }

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

@@ -1,5 +1,19 @@
-import { redirect } from 'next/navigation';
+import { getRequiredServerComponentSession } from '@documenso/lib/next-auth/get-server-session';
 
-export default function PasswordSettingsPage() {
-  redirect('/settings/security');
+import { PasswordForm } from '~/components/forms/password';
+
+export default async function PasswordSettingsPage() {
+  const user = await getRequiredServerComponentSession();
+
+  return (
+    <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>
+
+      <hr className="my-4" />
+
+      <PasswordForm user={user} className="max-w-xl" />
+    </div>
+  );
 }