Merge branch 'feat/refresh' into feat/marketing-share-document

fix: update share link
2026-07-11 13:35:20 +10:00 · 2023-10-12 12:23:14 +11:00 · 2023-10-12 12:22:31 +11:00 · 2023-10-12 12:14:12 +11:00 · 2023-10-12 11:33:01 +11:00 · 2023-10-11 16:56:59 +11:00
12 changed files with 104 additions and 58 deletions
@@ -0,0 +1,55 @@
+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
@@ -4,6 +4,7 @@ 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';

@@ -63,7 +64,9 @@ export default async function RootLayout({ children }: { children: React.ReactNo
      <body>
        <FeatureFlagProvider initialFlags={flags}>
          <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
-            <PlausibleProvider>{children}</PlausibleProvider>
+            <PlausibleProvider>
+              <TrpcProvider>{children}</TrpcProvider>
+            </PlausibleProvider>
          </ThemeProvider>
        </FeatureFlagProvider>

@@ -1,9 +1,8 @@
 '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;
 };
@@ -4,14 +4,13 @@ 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 { 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';
@@ -87,11 +86,11 @@ export const SinglePlayerModeSuccess = ({ className, document }: SinglePlayerMod
      <div className="relative 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">
-            {/* TODO: Hook this up */}
-            <Button variant="outline" className="flex-1 bg-transparent backdrop-blur-sm" disabled>
-              <Share className="mr-2 h-5 w-5" />
-              Share
-            </Button>
+            <DocumentShareButton
+              documentId={document.id}
+              token={document.Recipient.token}
+              className="flex-1 bg-transparent backdrop-blur-sm"
+            />

            <DocumentDownloadButton
              className="flex-1 bg-transparent backdrop-blur-sm"
@@ -103,7 +102,7 @@ export const SinglePlayerModeSuccess = ({ className, document }: SinglePlayerMod
            <Button
              onClick={async () => onShowDocumentClick()}
              loading={isFetchingDocumentFile}
-              className="col-span-2"
+              className="z-10 col-span-2"
            >
              Show document
            </Button>
@@ -0,0 +1,8 @@
+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 }),
+});
@@ -6,13 +6,12 @@ import { Edit, Pencil, Share } from 'lucide-react';
 import { useSession } from 'next-auth/react';
 import { match } from 'ts-pattern';

+import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { Document, DocumentStatus, Recipient, SigningStatus, User } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/react';
 import { Button } from '@documenso/ui/primitives/button';
 import { useToast } from '@documenso/ui/primitives/use-toast';

-import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
-
 export type DataTableActionButtonProps = {
  row: Document & {
    User: Pick<User, 'id' | 'name' | 'email'>;
@@ -47,7 +46,7 @@ export const DataTableActionButton = ({ row }: DataTableActionButtonProps) => {
      documentId: row.id,
    });

-    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
+    await copyToClipboard(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`).catch(() => null);

    toast({
      title: 'Copied to clipboard',
@@ -18,6 +18,7 @@ import {
 } from 'lucide-react';
 import { useSession } from 'next-auth/react';

+import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { Document, DocumentStatus, Recipient, User } from '@documenso/prisma/client';
 import { DocumentWithData } from '@documenso/prisma/types/document-with-data';
@@ -32,8 +33,6 @@ import {
 } from '@documenso/ui/primitives/dropdown-menu';
 import { useToast } from '@documenso/ui/primitives/use-toast';

-import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
-
 import { DeleteDraftDocumentDialog } from './delete-draft-document-dialog';

 export type DataTableActionDropdownProps = {
@@ -73,7 +72,7 @@ export const DataTableActionDropdown = ({ row }: DataTableActionDropdownProps) =
      documentId: row.id,
    });

-    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
+    await copyToClipboard(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`).catch(() => null);

    toast({
      title: 'Copied to clipboard',
@@ -9,12 +9,11 @@ import { getFieldsForToken } from '@documenso/lib/server-only/field/get-fields-f
 import { getRecipientByToken } from '@documenso/lib/server-only/recipient/get-recipient-by-token';
 import { DocumentStatus, FieldType } from '@documenso/prisma/client';
 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 signingCelebration from '~/assets/signing-celebration.png';

-import { ShareButton } from './share-button';
-
 export type CompletedSigningPageProps = {
  params: {
    token?: string;
@@ -89,7 +88,7 @@ export default async function CompletedSigningPage({
          ))}

        <div className="mt-8 flex w-full max-w-sm items-center justify-center gap-4">
-          <ShareButton documentId={document.id} token={recipient.token} />
+          <DocumentShareButton documentId={document.id} token={recipient.token} />

          <DocumentDownloadButton
            className="flex-1"
@@ -1,6 +1,6 @@
 'use client';

-import { useMemo, useState, useTransition } from 'react';
+import { useEffect, useMemo, useState, useTransition } from 'react';

 import { useRouter } from 'next/navigation';

@@ -48,6 +48,7 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {

  const [showSignatureModal, setShowSignatureModal] = useState(false);
  const [localSignature, setLocalSignature] = useState<string | null>(null);
+  const [isLocalSignatureSet, setIsLocalSignatureSet] = useState(false);

  const state = useMemo<SignatureFieldState>(() => {
    if (!field.inserted) {
@@ -61,9 +62,16 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {
    return 'signed-text';
  }, [field.inserted, signature?.signatureImageAsBase64]);

+  useEffect(() => {
+    if (!showSignatureModal && !isLocalSignatureSet) {
+      setLocalSignature(null);
+    }
+  }, [showSignatureModal, isLocalSignatureSet]);
+
  const onSign = async (source: 'local' | 'provider' = 'provider') => {
    try {
      if (!providedSignature && !localSignature) {
+        setIsLocalSignatureSet(false);
        setShowSignatureModal(true);
        return;
      }
@@ -178,6 +186,7 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => {
                disabled={!localSignature}
                onClick={() => {
                  setShowSignatureModal(false);
+                  setIsLocalSignatureSet(true);
                  void onSign('local');
                }}
              >
@@ -1,28 +0,0 @@
-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];
-}
@@ -5,8 +5,10 @@ import { HTMLAttributes, useState } from 'react';
 import { Copy, Share } from 'lucide-react';
 import { FaXTwitter } from 'react-icons/fa6';

+import { useCopyToClipboard } from '@documenso/lib/client-only/hooks/use-copy-to-clipboard';
 import { generateTwitterIntent } from '@documenso/lib/universal/generate-twitter-intent';
 import { trpc } from '@documenso/trpc/react';
+import { cn } from '@documenso/ui/lib/utils';
 import { Button } from '@documenso/ui/primitives/button';
 import {
  Dialog,
@@ -18,14 +20,12 @@ import {
 } from '@documenso/ui/primitives/dialog';
 import { useToast } from '@documenso/ui/primitives/use-toast';

-import { useCopyToClipboard } from '~/hooks/use-copy-to-clipboard';
-
-export type ShareButtonProps = HTMLAttributes<HTMLButtonElement> & {
+export type DocumentShareButtonProps = HTMLAttributes<HTMLButtonElement> & {
  token: string;
  documentId: number;
 };

-export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
+export const DocumentShareButton = ({ token, documentId, className }: DocumentShareButtonProps) => {
  const { toast } = useToast();
  const [, copyToClipboard] = useCopyToClipboard();

@@ -60,7 +60,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
      slug = result.slug;
    }

-    await copyToClipboard(`${window.location.origin}/share/${slug}`).catch(() => null);
+    await copyToClipboard(`${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`).catch(() => null);

    toast({
      title: 'Copied to clipboard',
@@ -85,7 +85,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
    window.open(
      generateTwitterIntent(
        `I just ${token ? 'signed' : 'sent'} a document with @documenso. Check it out!`,
-        `${window.location.origin}/share/${slug}`,
+        `${process.env.NEXT_PUBLIC_WEBAPP_URL}/share/${slug}`,
      ),
      '_blank',
    );
@@ -99,7 +99,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
        <Button
          variant="outline"
          disabled={!token || !documentId}
-          className="flex-1"
+          className={cn('flex-1', className)}
          loading={isLoading}
        >
          {!isLoading && <Share className="mr-2 h-5 w-5" />}
@@ -120,8 +120,12 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
            <span className="font-medium text-blue-400">@documenso</span>
            . Check it out!
            <span className="mt-2 block" />
-            <span className="break-all font-medium text-blue-400">
-              {window.location.origin}/share/{shareLink?.slug || '...'}
+            <span
+              className={cn('break-all font-medium text-blue-400', {
+                'animate-pulse': !shareLink?.slug,
+              })}
+            >
+              {process.env.NEXT_PUBLIC_WEBAPP_URL}/share/{shareLink?.slug || '...'}
            </span>
          </div>
Author	SHA1	Message	Date
David Nguyen	cf84844d9b	Merge branch 'feat/refresh' into feat/marketing-share-document	2023-10-12 12:23:14 +11:00
David Nguyen	37a2ae87a6	fix: update share link	2023-10-12 12:22:31 +11:00
David Nguyen	f964cda8ec	fix: update share link	2023-10-12 12:14:12 +11:00
Abhinav-Developer-23	2ea5ff2c94	fix: bypass signature fix (#536 ) (#547 )	2023-10-12 11:33:01 +11:00
Lucas Smith	565602f8e1	Merge pull request #530 from anikdhabal/issue#518 fix: Add gitpod configuration	2023-10-11 16:56:59 +11:00
David Nguyen	73a445035c	feat: add marketing document share button	2023-10-11 12:02:37 +11:00
Anik Dhabal Babu	cc8c4b8297	Merge branch 'feat/refresh' into issue#518	2023-10-09 15:21:33 +05:30
Anik Dhabal Babu	8380c357d9	Merge branch 'feat/refresh' into issue#518	2023-10-09 10:03:58 +05:30
Anik Dhabal Babu	4e010c5624	fix : add gittpod configuration	2023-10-09 09:58:12 +05:30
Anik Dhabal Babu	cc65537ea3	fix: Add gitpod configuration	2023-10-06 23:03:13 +05:30
Anik Dhabal Babu	04a80b7c03	fix: add gitpod configuration	2023-10-06 11:06:34 +05:30
Anik Dhabal Babu	c71a89d1b7	fix: Add gitpod configuration	2023-10-05 12:21:34 +00:00