The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: update legal links on recipient routes (#3419)
Lucas Smith5311457b4b86
diff --git a/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx b/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsxindex 46ff0d89f..f2339dfd6 100644--- a/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx+++ b/apps/remix/app/components/general/document-signing/document-signing-page-view-v2.tsx@@ -31,6 +31,7 @@ import { SignFieldTextDialog } from '~/components/dialogs/sign-field-text-dialogimport { useEmbedSigningContext } from '~/components/embed/embed-signing-context';import { EnvelopeSignerPageRenderer } from '~/components/general/envelope-signing/envelope-signer-page-renderer';import { EnvelopePdfViewer } from '~/components/general/pdf-viewer/envelope-pdf-viewer';+import { PublicLegalLinks } from '~/components/general/public-legal-links';import { BrandingLogo } from '../branding-logo';import { DocumentSigningAttachmentsPopover } from '../document-signing/document-signing-attachments-popover';@@ -231,6 +232,8 @@ export const DocumentSigningPageViewV2 = () => {</Button></div>)}++ {!isEmbed && <PublicLegalLinks className="mt-4 justify-start px-4 pt-4" />}</div></div></div>diff --git a/apps/remix/app/components/general/envelope-signing/envelope-signer-header.tsx b/apps/remix/app/components/general/envelope-signing/envelope-signer-header.tsxindex 946eb6ae4..d4cddf151 100644--- a/apps/remix/app/components/general/envelope-signing/envelope-signer-header.tsx+++ b/apps/remix/app/components/general/envelope-signing/envelope-signer-header.tsx@@ -17,7 +17,7 @@ import { match } from 'ts-pattern';import { EnvelopeDownloadDialog } from '~/components/dialogs/envelope-download-dialog';import { useEmbedSigningContext } from '~/components/embed/embed-signing-context';import { BrandingLogo } from '~/components/general/branding-logo';-import { PublicLegalLinks } from '~/components/general/public-legal-links';+import { PublicLegalLinksDropdownMenuItems } from '~/components/general/public-legal-links';import { BrandingLogoIcon } from '../branding-logo-icon';import { DocumentSigningRejectDialog } from '../document-signing/document-signing-reject-dialog';@@ -69,10 +69,8 @@ export const EnvelopeSignerHeader = () => {</div>{/* Right side - Desktop content */}- <div className="hidden items-center space-x-4 lg:flex">- <PublicLegalLinks />-- <p className="flex-shrink-0 text-muted-foreground text-sm">+ <div className="hidden items-center space-x-2 lg:flex">+ <p className="mr-2 flex-shrink-0 text-muted-foreground text-sm"><Plural one="1 Field Remaining" other="# Fields Remaining" value={recipientFieldsRemaining.length} /></p>@@ -90,7 +88,10 @@ export const EnvelopeSignerHeader = () => {const MobileDropdownMenu = () => {const { envelope, recipient } = useRequiredEnvelopeSigningContext();- const { allowDocumentRejection } = useEmbedSigningContext() || {};+ const embedSigningContext = useEmbedSigningContext();++ const isEmbedSigning = embedSigningContext !== null;+ const { allowDocumentRejection } = embedSigningContext || {};return (<DropdownMenu>@@ -130,6 +131,8 @@ const MobileDropdownMenu = () => {}/>)}++ {!isEmbedSigning && <PublicLegalLinksDropdownMenuItems />}</DropdownMenuContent></DropdownMenu>);diff --git a/apps/remix/app/components/general/public-legal-links.tsx b/apps/remix/app/components/general/public-legal-links.tsxindex d21c81949..1bdc0e96c 100644--- a/apps/remix/app/components/general/public-legal-links.tsx+++ b/apps/remix/app/components/general/public-legal-links.tsx@@ -4,7 +4,9 @@ import {NEXT_PUBLIC_TERMS_OF_SERVICE_URL,} from '@documenso/lib/constants/app';import { cn } from '@documenso/ui/lib/utils';-import { Trans } from '@lingui/react/macro';+import { DropdownMenuItem, DropdownMenuSeparator } from '@documenso/ui/primitives/dropdown-menu';+import { msg } from '@lingui/core/macro';+import { useLingui } from '@lingui/react';import { Link } from 'react-router';export type PublicLegalLinksProps = {@@ -12,49 +14,70 @@ export type PublicLegalLinksProps = {};export const PublicLegalLinks = ({ className }: PublicLegalLinksProps) => {- const termsUrl = NEXT_PUBLIC_TERMS_OF_SERVICE_URL();- const privacyUrl = NEXT_PUBLIC_PRIVACY_POLICY_URL();- const imprintUrl = NEXT_PUBLIC_IMPRINT_URL();+ const { _ } = useLingui();++ const links = getPublicLegalLinks();++ if (links.length === 0) {+ return null;+ }return (<divclassName={cn(- 'flex flex-wrap items-center justify-center gap-x-4 gap-y-2 text-xs text-muted-foreground',+ 'flex flex-wrap items-center justify-center gap-x-4 gap-y-2 text-muted-foreground text-xs',className,)}>- {termsUrl && (+ {links.map((link) => (<Link- to={termsUrl}+ key={link.href}+ to={link.href}target="_blank"rel="noopener noreferrer"className="duration-200 hover:text-foreground hover:underline">- <Trans>Terms of Service</Trans>+ {_(link.label)}</Link>- )}+ ))}+ </div>+ );+};- {privacyUrl && (- <Link- to={privacyUrl}- target="_blank"- rel="noopener noreferrer"- className="duration-200 hover:text-foreground hover:underline"- >- <Trans>Privacy Policy</Trans>- </Link>- )}+export const PublicLegalLinksDropdownMenuItems = () => {+ const { _ } = useLingui();- {imprintUrl && (- <Link- to={imprintUrl}- target="_blank"- rel="noopener noreferrer"- className="duration-200 hover:text-foreground hover:underline"- >- <Trans>Imprint</Trans>- </Link>- )}- </div>+ const links = getPublicLegalLinks();++ if (links.length === 0) {+ return null;+ }++ return (+ <>+ <DropdownMenuSeparator />++ {links.map((link) => (+ <DropdownMenuItem key={link.href} asChild className="text-muted-foreground text-xs">+ <Link to={link.href} target="_blank" rel="noopener noreferrer">+ {_(link.label)}+ </Link>+ </DropdownMenuItem>+ ))}+ </>);};++const getPublicLegalLinks = () => {+ const termsUrl = NEXT_PUBLIC_TERMS_OF_SERVICE_URL();+ const privacyUrl = NEXT_PUBLIC_PRIVACY_POLICY_URL();+ const imprintUrl = NEXT_PUBLIC_IMPRINT_URL();++ const links = [+ termsUrl ? { label: msg`Terms of Service`, href: termsUrl } : null,+ privacyUrl ? { label: msg`Privacy Policy`, href: privacyUrl } : null,+ imprintUrl ? { label: msg`Imprint`, href: imprintUrl } : null,+ ];++ return links.filter((link) => link !== null);+};diff --git a/apps/remix/app/routes/_recipient+/_layout.tsx b/apps/remix/app/routes/_recipient+/_layout.tsxindex b074e4462..fde4a7998 100644--- a/apps/remix/app/routes/_recipient+/_layout.tsx+++ b/apps/remix/app/routes/_recipient+/_layout.tsx@@ -10,8 +10,6 @@ import { useEffect } from 'react';import { isRouteErrorResponse, Link, Outlet } from 'react-router';import { Header as AuthenticatedHeader } from '~/components/general/app-header';import { GenericErrorLayout } from '~/components/general/generic-error-layout';-import { PublicLegalLinks } from '~/components/general/public-legal-links';-import type { Route } from './+types/_layout';export function meta() {@@ -37,24 +35,16 @@ export default function RecipientLayout({ matches }: Route.ComponentProps) {);return (- <div className="flex min-h-screen flex-col justify-between">- <div>- {!hideHeader && sessionData?.user && <AuthenticatedHeader />}-- <main- className={cn({- 'mt-8 mb-8 px-4 md:mt-12 md:mb-12 md:px-8': !hideHeader,- })}- >- <Outlet />- </main>- </div>+ <div className="min-h-screen">+ {!hideHeader && sessionData?.user && <AuthenticatedHeader />}- {!hideHeader && (- <footer className="py-4">- <PublicLegalLinks />- </footer>- )}+ <main+ className={cn({+ 'mt-8 mb-8 px-4 md:mt-12 md:mb-12 md:px-8': !hideHeader,+ })}+ >+ <Outlet />+ </main></div>);}