Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add logo on access form
Marc Seitz716db82091df
diff --git a/components/view/access-form/index.tsx b/components/view/access-form/index.tsxindex dc514808..06b5eefb 100644--- a/components/view/access-form/index.tsx+++ b/components/view/access-form/index.tsx@@ -2,10 +2,10 @@ import { useEffect, useState } from "react";import { Brand, CustomField, DataroomBrand } from "@prisma/client";-import { Button } from "@/components/ui/button";-import { determineTextColor } from "@/lib/utils/determine-text-color";+import { Button } from "@/components/ui/button";+import AgreementSection from "./agreement-section";import CustomFieldsSection from "./custom-fields-section";import EmailSection from "./email-section";@@ -42,6 +42,7 @@ export default function AccessForm({disableEditEmail,useCustomAccessForm,customFields,+ logoOnAccessForm,}: {data: DEFAULT_ACCESS_FORM_TYPE;email: string | null | undefined;@@ -59,6 +60,7 @@ export default function AccessForm({disableEditEmail?: boolean;useCustomAccessForm?: boolean;customFields?: Partial<CustomField>[];+ logoOnAccessForm?: boolean;}) {const [isEmailValid, setIsEmailValid] = useState(true);@@ -98,13 +100,31 @@ export default function AccessForm({return (<div- className="flex h-full min-h-dvh flex-col justify-between pb-4 pt-12"+ className="flex h-full min-h-dvh flex-col justify-between pb-4"style={{backgroundColor:brand && brand.accentColor ? brand.accentColor : "black",}}>- <div className="flex flex-1 flex-col px-6 pb-12 lg:px-8">+ {/* Light Navbar */}+ {logoOnAccessForm && brand && brand.logo && (+ <nav+ className="w-full"+ style={{+ backgroundColor: brand.brandColor ? brand.brandColor : "black",+ }}+ >+ <div className="flex h-16 items-center justify-start px-2 sm:px-6 lg:px-8">+ <img+ src={brand.logo as string}+ alt="Brand Logo"+ className="h-16 w-auto object-contain"+ />+ </div>+ </nav>+ )}++ <div className="flex flex-1 flex-col px-6 pb-12 pt-8 lg:px-8"><div className="sm:mx-auto sm:w-full sm:max-w-md"><h1className="mt-10 text-2xl font-bold leading-9 tracking-tight text-white"diff --git a/components/view/dataroom/dataroom-document-view.tsx b/components/view/dataroom/dataroom-document-view.tsxindex c7974e3d..cfd3ebb2 100644--- a/components/view/dataroom/dataroom-document-view.tsx+++ b/components/view/dataroom/dataroom-document-view.tsx@@ -75,6 +75,7 @@ export default function DataroomDocumentView({useCustomAccessForm,isEmbedded,preview,+ logoOnAccessForm,}: {link: LinkWithDataroomDocument;userEmail: string | null | undefined;@@ -94,6 +95,7 @@ export default function DataroomDocumentView({useCustomAccessForm?: boolean;isEmbedded?: boolean;preview?: boolean;+ logoOnAccessForm?: boolean;}) {const {linkType,@@ -306,6 +308,7 @@ export default function DataroomDocumentView({useCustomAccessForm={useCustomAccessForm}brand={brand}customFields={link.customFields}+ logoOnAccessForm={logoOnAccessForm}/>);}diff --git a/components/view/dataroom/dataroom-view.tsx b/components/view/dataroom/dataroom-view.tsxindex 7fc8f905..def19965 100644--- a/components/view/dataroom/dataroom-view.tsx+++ b/components/view/dataroom/dataroom-view.tsx@@ -55,6 +55,7 @@ export default function DataroomView({previewToken,disableEditEmail,useCustomAccessForm,+ logoOnAccessForm,isEmbedded,preview,}: {@@ -70,6 +71,7 @@ export default function DataroomView({useCustomAccessForm?: boolean;isEmbedded?: boolean;preview?: boolean;+ logoOnAccessForm?: boolean;}) {const {linkType,@@ -247,6 +249,7 @@ export default function DataroomView({useCustomAccessForm={useCustomAccessForm}brand={brand}customFields={link.customFields}+ logoOnAccessForm={logoOnAccessForm}/>);}@@ -276,7 +279,13 @@ export default function DataroomView({viewerId={viewData.viewerId}viewData={viewData}isEmbedded={isEmbedded}- viewerEmail={viewData.viewerEmail ?? data.email ?? verifiedEmail ?? userEmail ?? undefined}+ viewerEmail={+ viewData.viewerEmail ??+ data.email ??+ verifiedEmail ??+ userEmail ??+ undefined+ }/></div>);diff --git a/components/view/document-view.tsx b/components/view/document-view.tsxindex fba67beb..626e4c5e 100644--- a/components/view/document-view.tsx+++ b/components/view/document-view.tsx@@ -62,6 +62,7 @@ export default function DocumentView({previewToken,disableEditEmail,useCustomAccessForm,+ logoOnAccessForm,isEmbedded,}: {link: LinkWithDocument;@@ -83,6 +84,7 @@ export default function DocumentView({disableEditEmail?: boolean;useCustomAccessForm?: boolean;isEmbedded?: boolean;+ logoOnAccessForm?: boolean;}) {const {document,@@ -262,6 +264,7 @@ export default function DocumentView({disableEditEmail={disableEditEmail}useCustomAccessForm={useCustomAccessForm}customFields={link.customFields}+ logoOnAccessForm={logoOnAccessForm}/>);}diff --git a/pages/view/[linkId]/d/[documentId].tsx b/pages/view/[linkId]/d/[documentId].tsxindex e1b90259..827176d6 100644--- a/pages/view/[linkId]/d/[documentId].tsx+++ b/pages/view/[linkId]/d/[documentId].tsx@@ -10,14 +10,14 @@ import { useSession } from "next-auth/react";import { ExtendedRecordMap } from "notion-types";import { parsePageId } from "notion-utils";-import LoadingSpinner from "@/components/ui/loading-spinner";-import CustomMetaTag from "@/components/view/custom-metatag";-import DataroomDocumentView from "@/components/view/dataroom/dataroom-document-view";-import notion from "@/lib/notion";import { addSignedUrls } from "@/lib/notion/utils";import { CustomUser, LinkWithDataroomDocument, NotionTheme } from "@/lib/types";+import LoadingSpinner from "@/components/ui/loading-spinner";+import CustomMetaTag from "@/components/view/custom-metatag";+import DataroomDocumentView from "@/components/view/dataroom/dataroom-document-view";+type DataroomDocumentLinkData = {linkType: "DATAROOM_LINK";link: LinkWithDataroomDocument;@@ -43,6 +43,7 @@ type DataroomDocumentProps = {showAccountCreationSlide: boolean;useAdvancedExcelViewer: boolean;useCustomAccessForm: boolean;+ logoOnAccessForm: boolean;};export default function DataroomDocumentViewPage({@@ -53,6 +54,7 @@ export default function DataroomDocumentViewPage({showAccountCreationSlide,useAdvancedExcelViewer,useCustomAccessForm,+ logoOnAccessForm,}: DataroomDocumentProps) {const router = useRouter();const { data: session, status } = useSession();@@ -165,6 +167,7 @@ export default function DataroomDocumentViewPage({previewToken={previewToken}disableEditEmail={!!disableEditEmail}useCustomAccessForm={useCustomAccessForm}+ logoOnAccessForm={logoOnAccessForm}token={storedToken}verifiedEmail={verifiedEmail}preview={!!preview}@@ -257,6 +260,7 @@ export async function getStaticProps(context: GetStaticPropsContext) {teamId === "cm0154tiv0000lr2t6nr5c6kp" ||teamId === "clup33by90000oewh4rfvp2eg" ||teamId === "cm76hfyvy0002q623hmen99pf",+ logoOnAccessForm: teamId === "cm7nlkrhm0000qgh0nvyrrywr",},revalidate: brand || recordMap ? 10 : false,};diff --git a/pages/view/[linkId]/index.tsx b/pages/view/[linkId]/index.tsxindex 1b71f41d..f4b807c1 100644--- a/pages/view/[linkId]/index.tsx+++ b/pages/view/[linkId]/index.tsx@@ -55,6 +55,7 @@ export interface ViewPageProps {showAccountCreationSlide: boolean;useAdvancedExcelViewer: boolean;useCustomAccessForm: boolean;+ logoOnAccessForm: boolean;}export const getStaticProps = async (context: GetStaticPropsContext) => {@@ -146,6 +147,9 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {teamId === "clup33by90000oewh4rfvp2eg" ||teamId === "cm76hfyvy0002q623hmen99pf" ||teamId === "cm9ztf0s70005js04i689gefn",+ logoOnAccessForm:+ teamId === "cm7nlkrhm0000qgh0nvyrrywr" ||+ teamId === "clup33by90000oewh4rfvp2eg",},revalidate: brand || recordMap ? 10 : false,};@@ -215,6 +219,9 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {teamId === "clup33by90000oewh4rfvp2eg" ||teamId === "cm76hfyvy0002q623hmen99pf" ||teamId === "cm9ztf0s70005js04i689gefn",+ logoOnAccessForm:+ teamId === "cm7nlkrhm0000qgh0nvyrrywr" ||+ teamId === "clup33by90000oewh4rfvp2eg",},revalidate: 10,};@@ -240,6 +247,7 @@ export default function ViewPage({showAccountCreationSlide,useAdvancedExcelViewer,useCustomAccessForm,+ logoOnAccessForm,error,notionError,}: ViewPageProps & { error?: boolean; notionError?: boolean }) {@@ -371,6 +379,7 @@ export default function ViewPage({previewToken={previewToken}disableEditEmail={!!disableEditEmail}useCustomAccessForm={useCustomAccessForm}+ logoOnAccessForm={logoOnAccessForm}token={storedToken}verifiedEmail={verifiedEmail}/>@@ -450,6 +459,7 @@ export default function ViewPage({brand={brand}disableEditEmail={!!disableEditEmail}useCustomAccessForm={useCustomAccessForm}+ logoOnAccessForm={logoOnAccessForm}token={storedToken}previewToken={previewToken}preview={!!preview}diff --git a/pages/view/domains/[domain]/[slug]/d/[documentId].tsx b/pages/view/domains/[domain]/[slug]/d/[documentId].tsxindex 3bdd5c22..fdde0f24 100644--- a/pages/view/domains/[domain]/[slug]/d/[documentId].tsx+++ b/pages/view/domains/[domain]/[slug]/d/[documentId].tsx@@ -10,14 +10,14 @@ import { useSession } from "next-auth/react";import { ExtendedRecordMap } from "notion-types";import { parsePageId } from "notion-utils";-import LoadingSpinner from "@/components/ui/loading-spinner";-import CustomMetaTag from "@/components/view/custom-metatag";-import DataroomDocumentView from "@/components/view/dataroom/dataroom-document-view";-import notion from "@/lib/notion";import { addSignedUrls } from "@/lib/notion/utils";import { CustomUser, LinkWithDataroomDocument, NotionTheme } from "@/lib/types";+import LoadingSpinner from "@/components/ui/loading-spinner";+import CustomMetaTag from "@/components/view/custom-metatag";+import DataroomDocumentView from "@/components/view/dataroom/dataroom-document-view";+type DataroomDocumentLinkData = {linkType: "DATAROOM_LINK";link: LinkWithDataroomDocument;@@ -43,6 +43,7 @@ type DataroomDocumentProps = {showAccountCreationSlide: boolean;useAdvancedExcelViewer: boolean;useCustomAccessForm: boolean;+ logoOnAccessForm: boolean;};export default function DataroomDocumentViewPage({@@ -53,6 +54,7 @@ export default function DataroomDocumentViewPage({showAccountCreationSlide,useAdvancedExcelViewer,useCustomAccessForm,+ logoOnAccessForm,}: DataroomDocumentProps) {const router = useRouter();const { data: session, status } = useSession();@@ -169,6 +171,7 @@ export default function DataroomDocumentViewPage({token={storedToken}verifiedEmail={verifiedEmail}preview={!!preview}+ logoOnAccessForm={logoOnAccessForm}/></>);@@ -265,6 +268,7 @@ export async function getStaticProps(context: GetStaticPropsContext) {teamId === "cm0154tiv0000lr2t6nr5c6kp" ||teamId === "clup33by90000oewh4rfvp2eg" ||teamId === "cm76hfyvy0002q623hmen99pf",+ logoOnAccessForm: teamId === "cm7nlkrhm0000qgh0nvyrrywr",},revalidate: brand || recordMap ? 10 : false,};diff --git a/pages/view/domains/[domain]/[slug]/index.tsx b/pages/view/domains/[domain]/[slug]/index.tsxindex a4fd47ff..eae12191 100644--- a/pages/view/domains/[domain]/[slug]/index.tsx+++ b/pages/view/domains/[domain]/[slug]/index.tsx@@ -119,6 +119,9 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {teamId === "clup33by90000oewh4rfvp2eg" ||teamId === "cm76hfyvy0002q623hmen99pf" ||teamId === "cm9ztf0s70005js04i689gefn",+ logoOnAccessForm:+ teamId === "cm7nlkrhm0000qgh0nvyrrywr" ||+ teamId === "clup33by90000oewh4rfvp2eg",},revalidate: 10,};@@ -188,6 +191,9 @@ export const getStaticProps = async (context: GetStaticPropsContext) => {teamId === "clup33by90000oewh4rfvp2eg" ||teamId === "cm76hfyvy0002q623hmen99pf" ||teamId === "cm9ztf0s70005js04i689gefn",+ logoOnAccessForm:+ teamId === "cm7nlkrhm0000qgh0nvyrrywr" ||+ teamId === "clup33by90000oewh4rfvp2eg",},revalidate: 10,};@@ -212,6 +218,7 @@ export default function ViewPage({showAccountCreationSlide,useAdvancedExcelViewer,useCustomAccessForm,+ logoOnAccessForm,error,}: {linkData: DocumentLinkData | DataroomLinkData;@@ -231,6 +238,7 @@ export default function ViewPage({showAccountCreationSlide: boolean;useAdvancedExcelViewer: boolean;useCustomAccessForm: boolean;+ logoOnAccessForm: boolean;error?: boolean;}) {const router = useRouter();@@ -354,6 +362,7 @@ export default function ViewPage({useCustomAccessForm={useCustomAccessForm}token={storedToken}verifiedEmail={verifiedEmail}+ logoOnAccessForm={logoOnAccessForm}/></>);@@ -434,6 +443,7 @@ export default function ViewPage({verifiedEmail={verifiedEmail}previewToken={previewToken}preview={!!preview}+ logoOnAccessForm={logoOnAccessForm}/></>);