fix: completed count incorrect

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

@@ -51,4 +51,7 @@ As Documenso 1.0 just hit the staging environment, we're calling a MALFUNCTION M
 
 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.
 
+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 about Malfunction Mania.**

apps/marketing/content/blog/shop.mdx

@@ -1,12 +1,12 @@
 ---
-title: Shop and Limited Edition "Mania" Shirt
+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:
-  - Testing
+  - Merch
   - Rewrite
   - Bounties
 ---
@@ -24,13 +24,13 @@ tags:
   </figcaption>
 </figure>
 
-> TLDR; We have a fancy limited edition shirt. Contribute to Malfunction Mania to get one.
+> 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 the limited edition shirt for Malfunction Mania. 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.
+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.
+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
@@ -45,7 +45,7 @@ The shirt will be available in our [merch shop](https://documen.so/shop) via a u
   </figcaption>
 </figure>
 
-## How to get the shirt
+## 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:
 
@@ -56,7 +56,9 @@ If you have been following us, you know we are not big on formalities but highly
 - 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 documenso
-- ...
+- Review existing or create missing documentation
 
-**[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.**
+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/src/components/(marketing)/single-player-mode/create-single-player-document.action.ts

@@ -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,7 +197,6 @@ export const createSinglePlayerDocument = async (
     subject: 'Document signed',
     html: render(template),
     text: render(template, { plainText: true }),
-    attachments: [{ content: Buffer.from(pdfBytes), filename: documentName }],
   });
 
   return documentToken;

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

@@ -1,9 +1,7 @@
-import { Button, Column, Img, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Column, Img, Row, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateDocumentCompletedProps {
   downloadLink: string;
   documentName: string;
@@ -29,20 +27,27 @@ export const TemplateDocumentCompleted = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section>
+        <Row className="table-fixed">
+          <Column />
+
+          <Column>
+            <Img
+              className="h-42 mx-auto"
+              src={getAssetUrl('/static/document.png')}
+              alt="Documenso"
+            />
+          </Column>
+
+          <Column />
+        </Row>
+      </Section>
 
       <Section>
-        <Section className="mb-4">
-          <Column align="center">
-            <Text className="text-base font-semibold text-[#7AC455]">
-              <Img
-                src={getAssetUrl('/static/completed.png')}
-                className="-mt-0.5 mr-2 inline h-7 w-7 align-middle"
-              />
-              Completed
-            </Text>
-          </Column>
-        </Section>
+        <Text className="mb-4 flex items-center justify-center text-center text-base font-semibold text-[#7AC455]">
+          <Img src={getAssetUrl('/static/completed.png')} className="-mb-0.5 mr-2 inline h-7 w-7" />
+          Completed
+        </Text>
 
         <Text className="text-primary mb-0 text-center text-lg font-semibold">
           “{documentName}” was signed by all signers
@@ -61,13 +66,10 @@ export const TemplateDocumentCompleted = ({
             Review
           </Button> */}
           <Button
-            className="rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
+            className="inline-flex items-center justify-center rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
             href={downloadLink}
           >
-            <Img
-              src={getAssetUrl('/static/download.png')}
-              className="mb-0.5 mr-2 inline h-5 w-5 align-middle"
-            />
+            <Img src={getAssetUrl('/static/download.png')} className="-mb-1 mr-2 inline h-5 w-5" />
             Download
           </Button>
         </Section>

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

@@ -1,28 +0,0 @@
-import { Column, Img, Row, Section } from '@react-email/components';
-
-export interface TemplateDocumentImageProps {
-  assetBaseUrl: string;
-  className?: string;
-}
-
-export const TemplateDocumentImage = ({ assetBaseUrl, className }: TemplateDocumentImageProps) => {
-  const getAssetUrl = (path: string) => {
-    return new URL(path, assetBaseUrl).toString();
-  };
-
-  return (
-    <Section className={className}>
-      <Row className="table-fixed">
-        <Column />
-
-        <Column>
-          <Img className="h-42 mx-auto" src={getAssetUrl('/static/document.png')} alt="Documenso" />
-        </Column>
-
-        <Column />
-      </Row>
-    </Section>
-  );
-};
-
-export default TemplateDocumentImage;

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

@@ -1,9 +1,7 @@
-import { Button, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Column, Img, Row, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateDocumentInviteProps {
   inviterName: string;
   inviterEmail: string;
@@ -18,6 +16,10 @@ export const TemplateDocumentInvite = ({
   signDocumentLink,
   assetBaseUrl,
 }: TemplateDocumentInviteProps) => {
+  const getAssetUrl = (path: string) => {
+    return new URL(path, assetBaseUrl).toString();
+  };
+
   return (
     <Tailwind
       config={{
@@ -28,7 +30,21 @@ export const TemplateDocumentInvite = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section className="mt-4">
+        <Row className="table-fixed">
+          <Column />
+
+          <Column>
+            <Img
+              className="h-42 mx-auto"
+              src={getAssetUrl('/static/document.png')}
+              alt="Documenso"
+            />
+          </Column>
+
+          <Column />
+        </Row>
+      </Section>
 
       <Section>
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">

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

@@ -1,9 +1,7 @@
-import { Column, Img, Section, Tailwind, Text } from '@react-email/components';
+import { Column, Img, Row, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateDocumentPendingProps {
   documentName: string;
   assetBaseUrl: string;
@@ -27,20 +25,27 @@ export const TemplateDocumentPending = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section>
+        <Row className="table-fixed">
+          <Column />
+
+          <Column>
+            <Img
+              className="h-42 mx-auto"
+              src={getAssetUrl('/static/document.png')}
+              alt="Documenso"
+            />
+          </Column>
+
+          <Column />
+        </Row>
+      </Section>
 
       <Section>
-        <Section className="mb-4">
-          <Column align="center">
-            <Text className="text-base font-semibold text-blue-500">
-              <Img
-                src={getAssetUrl('/static/clock.png')}
-                className="-mt-0.5 mr-2 inline h-7 w-7 align-middle"
-              />
-              Waiting for others
-            </Text>
-          </Column>
-        </Section>
+        <Text className="mb-4 flex items-center justify-center text-center text-base font-semibold text-blue-500">
+          <Img src={getAssetUrl('/static/clock.png')} className="-mb-0.5 mr-2 inline h-7 w-7" />
+          Waiting for others
+        </Text>
 
         <Text className="text-primary mb-0 text-center text-lg font-semibold">
           “{documentName}” has been signed

packages/email/template-components/template-document-self-signed.tsx

@@ -1,20 +1,18 @@
-import { Button, Column, Img, Link, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateDocumentSelfSignedProps {
+  downloadLink: string;
   documentName: string;
   assetBaseUrl: string;
 }
 
 export const TemplateDocumentSelfSigned = ({
+  downloadLink,
   documentName,
   assetBaseUrl,
 }: TemplateDocumentSelfSignedProps) => {
-  const signUpUrl = `${process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'}/signup`;
-
   const getAssetUrl = (path: string) => {
     return new URL(path, assetBaseUrl).toString();
   };
@@ -29,59 +27,39 @@ export const TemplateDocumentSelfSigned = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
-
       <Section className="flex-row items-center justify-center">
-        <Section>
-          <Column align="center">
-            <Text className="text-base font-semibold text-[#7AC455]">
-              <Img
-                src={getAssetUrl('/static/completed.png')}
-                className="-mt-0.5 mr-2 inline h-7 w-7 align-middle"
-              />
-              Completed
-            </Text>
-          </Column>
-        </Section>
+        <div className="flex items-center justify-center p-4">
+          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
+        </div>
 
-        <Text className="text-primary mb-0 mt-6 text-center text-lg font-semibold">
+        <Text className="mb-4 flex items-center justify-center text-center text-base font-semibold text-[#7AC455]">
+          <Img src={getAssetUrl('/static/completed.png')} className="-mb-0.5 mr-2 inline h-7 w-7" />
+          Completed
+        </Text>
+
+        <Text className="text-primary mb-0 text-center text-lg font-semibold">
           You have signed “{documentName}”
         </Text>
 
-        <Text className="mx-auto mb-6 mt-1 max-w-[80%] text-center text-base text-slate-400">
-          Create a{' '}
-          <Link
-            href={signUpUrl}
-            target="_blank"
-            className="text-documenso-700 hover:text-documenso-600 whitespace-nowrap"
-          >
-            free account
-          </Link>{' '}
-          to access your signed documents at any time.
+        <Text className="my-1 text-center text-base text-slate-400">
+          Check out our plans to access the full suite of features.
         </Text>
 
         <Section className="mb-6 mt-8 text-center">
           <Button
-            href={signUpUrl}
-            className="mr-4 rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
-          >
-            <Img
-              src={getAssetUrl('/static/user-plus.png')}
-              className="mb-0.5 mr-2 inline h-5 w-5 align-middle"
-            />
-            Create account
-          </Button>
-
-          <Button
-            className="rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
+            className="mr-4 inline-flex items-center justify-center rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
             href="https://documenso.com/pricing"
           >
-            <Img
-              src={getAssetUrl('/static/review.png')}
-              className="mb-0.5 mr-2 inline h-5 w-5 align-middle"
-            />
+            <Img src={getAssetUrl('/static/review.png')} className="-mb-1 mr-2 inline h-5 w-5" />
             View plans
           </Button>
+          <Button
+            className="inline-flex items-center justify-center rounded-lg border border-solid border-slate-200 px-4 py-2 text-center text-sm font-medium text-black no-underline"
+            href={downloadLink}
+          >
+            <Img src={getAssetUrl('/static/download.png')} className="-mb-1 mr-2 inline h-5 w-5" />
+            Download
+          </Button>
         </Section>
       </Section>
     </Tailwind>

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

@@ -1,9 +1,7 @@
-import { Button, Section, Tailwind, Text } from '@react-email/components';
+import { Button, Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export type TemplateForgotPasswordProps = {
   resetPasswordLink: string;
   assetBaseUrl: string;
@@ -13,6 +11,10 @@ export const TemplateForgotPassword = ({
   resetPasswordLink,
   assetBaseUrl,
 }: TemplateForgotPasswordProps) => {
+  const getAssetUrl = (path: string) => {
+    return new URL(path, assetBaseUrl).toString();
+  };
+
   return (
     <Tailwind
       config={{
@@ -23,9 +25,11 @@ export const TemplateForgotPassword = ({
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section className="mt-4 flex-row items-center justify-center">
+        <div className="flex items-center justify-center p-4">
+          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
+        </div>
 
-      <Section className="flex-row items-center justify-center">
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
           Forgot your password?
         </Text>

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

@@ -1,9 +1,7 @@
-import { Button, Section, Tailwind, Text } from '@react-email/components';
+import { Img, Section, Tailwind, Text } from '@react-email/components';
 
 import * as config from '@documenso/tailwind-config';
 
-import { TemplateDocumentImage } from './template-document-image';
-
 export interface TemplateResetPasswordProps {
   userName: string;
   userEmail: string;
@@ -11,6 +9,10 @@ export interface TemplateResetPasswordProps {
 }
 
 export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordProps) => {
+  const getAssetUrl = (path: string) => {
+    return new URL(path, assetBaseUrl).toString();
+  };
+
   return (
     <Tailwind
       config={{
@@ -21,9 +23,11 @@ export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordPro
         },
       }}
     >
-      <TemplateDocumentImage className="mt-6" assetBaseUrl={assetBaseUrl} />
+      <Section className="mt-4 flex-row items-center justify-center">
+        <div className="flex items-center justify-center p-4">
+          <Img className="h-42" src={getAssetUrl('/static/document.png')} alt="Documenso" />
+        </div>
 
-      <Section className="flex-row items-center justify-center">
         <Text className="text-primary mx-auto mb-0 max-w-[80%] text-center text-lg font-semibold">
           Password updated!
         </Text>
@@ -31,15 +35,6 @@ export const TemplateResetPassword = ({ assetBaseUrl }: TemplateResetPasswordPro
         <Text className="my-1 text-center text-base text-slate-400">
           Your password has been updated.
         </Text>
-
-        <Section className="mb-6 mt-8 text-center">
-          <Button
-            className="bg-documenso-500 inline-flex items-center justify-center rounded-lg px-6 py-3 text-center text-sm font-medium text-black no-underline"
-            href={`${process.env.NEXT_PUBLIC_WEBAPP_URL ?? 'http://localhost:3000'}/signin`}
-          >
-            Sign In
-          </Button>
-        </Section>
       </Section>
     </Tailwind>
   );

packages/email/templates/document-completed.tsx

@@ -15,7 +15,7 @@ import {
   TemplateDocumentCompleted,
   TemplateDocumentCompletedProps,
 } from '../template-components/template-document-completed';
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 
 export type DocumentCompletedEmailTemplateProps = Partial<TemplateDocumentCompletedProps>;
 

packages/email/templates/document-invite.tsx

@@ -18,7 +18,7 @@ import {
   TemplateDocumentInvite,
   TemplateDocumentInviteProps,
 } from '../template-components/template-document-invite';
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 
 export type DocumentInviteEmailTemplateProps = Partial<TemplateDocumentInviteProps> & {
   customBody?: string;

packages/email/templates/document-self-signed.tsx

@@ -15,11 +15,12 @@ import {
   TemplateDocumentSelfSigned,
   TemplateDocumentSelfSignedProps,
 } from '../template-components/template-document-self-signed';
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 
 export type DocumentSelfSignedTemplateProps = TemplateDocumentSelfSignedProps;
 
 export const DocumentSelfSignedEmailTemplate = ({
+  downloadLink = 'https://documenso.com',
   documentName = 'Open Source Pledge.pdf',
   assetBaseUrl = 'http://localhost:3002',
 }: DocumentSelfSignedTemplateProps) => {
@@ -53,6 +54,7 @@ export const DocumentSelfSignedEmailTemplate = ({
                 />
 
                 <TemplateDocumentSelfSigned
+                  downloadLink={downloadLink}
                   documentName={documentName}
                   assetBaseUrl={assetBaseUrl}
                 />

packages/email/templates/forgot-password.tsx

@@ -11,7 +11,7 @@ import {
 
 import config from '@documenso/tailwind-config';
 
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 import {
   TemplateForgotPassword,
   TemplateForgotPasswordProps,

packages/email/templates/reset-password.tsx

@@ -14,7 +14,7 @@ import {
 
 import config from '@documenso/tailwind-config';
 
-import { TemplateFooter } from '../template-components/template-footer';
+import TemplateFooter from '../template-components/template-footer';
 import {
   TemplateResetPassword,
   TemplateResetPasswordProps,

packages/lib/server-only/document/get-stats.ts

@@ -40,7 +40,7 @@ export const getStats = async ({ user }: GetStatsInput) => {
       },
       where: {
         status: {
-          not: ExtendedDocumentStatus.DRAFT,
+          in: [ExtendedDocumentStatus.DRAFT, ExtendedDocumentStatus.PENDING],
         },
         Recipient: {
           some: {

packages/prisma/migrations/20230605122017_password_reset/migration.sql

@@ -0,0 +1,15 @@
+-- CreateTable
+CREATE TABLE "PasswordResetToken" (
+    "id" SERIAL NOT NULL,
+    "token" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "userId" INTEGER NOT NULL,
+
+    CONSTRAINT "PasswordResetToken_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PasswordResetToken_token_key" ON "PasswordResetToken"("token");
+
+-- AddForeignKey
+ALTER TABLE "PasswordResetToken" ADD CONSTRAINT "PasswordResetToken_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

packages/prisma/migrations/20230605164015_expire_password_reset_token/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `expiry` to the `PasswordResetToken` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "PasswordResetToken" ADD COLUMN     "expiry" TIMESTAMP(3) NOT NULL;

packages/prisma/migrations/20230917190854_password_reset_token/migration.sql

@@ -1,3 +1,5 @@
+DROP TABLE IF EXISTS "PasswordResetToken" CASCADE;
+
 -- CreateTable
 CREATE TABLE "PasswordResetToken" (
     "id" SERIAL NOT NULL,