Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

feat: global branding fixes

Marc Seitzf29cf2e28a14
diff --git a/lib/api/links/link-data.ts b/lib/api/links/link-data.ts
index 11a5f008..71c62127 100644
--- a/lib/api/links/link-data.ts
+++ b/lib/api/links/link-data.ts
@@ -213,17 +213,19 @@ export async function fetchDataroomLinkData({
},
select: {
logo: true,
+ banner: true,
brandColor: true,
accentColor: true,
+ welcomeMessage: true,
},
});
const brand = {
logo: dataroomBrand?.logo || teamBrand?.logo,
- banner: dataroomBrand?.banner || null,
+ banner: dataroomBrand?.banner || teamBrand?.banner || null,
brandColor: dataroomBrand?.brandColor || teamBrand?.brandColor,
accentColor: dataroomBrand?.accentColor || teamBrand?.accentColor,
- welcomeMessage: dataroomBrand?.welcomeMessage,
+ welcomeMessage: dataroomBrand?.welcomeMessage || teamBrand?.welcomeMessage,
};
// Extract access controls from either ViewerGroup or PermissionGroup
diff --git a/lib/utils/generate-jwt.ts b/lib/utils/generate-jwt.ts
index 4af42f1c..b00a41b7 100644
--- a/lib/utils/generate-jwt.ts
+++ b/lib/utils/generate-jwt.ts
@@ -15,7 +15,7 @@ type JWTPayload = {
*/
export function generateJWT(
payload: JWTPayload,
- expiresInSeconds: number = 60 * 60 * 24,
+ expiresInSeconds: number = 60 * 60 * 24, // 24 hours
): string {
const tokenPayload = {
...payload,
diff --git a/pages/api/teams/[teamId]/branding.ts b/pages/api/teams/[teamId]/branding.ts
index a075fdc2..fefb4707 100644
--- a/pages/api/teams/[teamId]/branding.ts
+++ b/pages/api/teams/[teamId]/branding.ts
@@ -59,8 +59,9 @@ export default async function handle(
return res.status(200).json(brand);
} else if (req.method === "POST") {
// POST /api/teams/:teamId/branding
- const { logo, brandColor, accentColor, welcomeMessage } = req.body as {
+ const { logo, banner, brandColor, accentColor, welcomeMessage } = req.body as {
logo?: string;
+ banner?: string;
brandColor?: string;
accentColor?: string;
welcomeMessage?: string;
@@ -70,6 +71,7 @@ export default async function handle(
const brand = await prisma.brand.create({
data: {
logo: logo,
+ banner,
brandColor,
accentColor,
welcomeMessage,
@@ -85,19 +87,30 @@ export default async function handle(
return res.status(200).json(brand);
} else if (req.method === "PUT") {
// PUT /api/teams/:teamId/branding
- const { logo, brandColor, accentColor, welcomeMessage } = req.body as {
+ const { logo, banner, brandColor, accentColor, welcomeMessage } = req.body as {
logo?: string;
+ banner?: string;
brandColor?: string;
accentColor?: string;
welcomeMessage?: string;
};
- const brand = await prisma.brand.update({
+ // Use upsert to handle both create and update cases
+ const brand = await prisma.brand.upsert({
where: {
teamId: teamId,
},
- data: {
+ create: {
+ logo,
+ banner,
+ brandColor,
+ accentColor,
+ welcomeMessage,
+ teamId: teamId,
+ },
+ update: {
logo,
+ banner,
brandColor,
accentColor,
welcomeMessage,
@@ -119,12 +132,18 @@ export default async function handle(
where: {
teamId: teamId,
},
- select: { id: true, logo: true },
+ select: { id: true, logo: true, banner: true },
});
- if (brand && brand.logo) {
+ if (brand) {
// delete the logo from vercel blob
- await del(brand.logo);
+ if (brand.logo) {
+ await del(brand.logo);
+ }
+ // delete the banner from vercel blob
+ if (brand.banner) {
+ await del(brand.banner);
+ }
}
// delete the branding from database
diff --git a/pages/api/teams/[teamId]/invite.ts b/pages/api/teams/[teamId]/invite.ts
index 69e0d97c..488efa21 100644
--- a/pages/api/teams/[teamId]/invite.ts
+++ b/pages/api/teams/[teamId]/invite.ts
@@ -157,7 +157,7 @@ export default async function handle(
const verifyParamsObject = Object.fromEntries(verifyParams.entries());
- const jwtToken = generateJWT(verifyParamsObject);
+ const jwtToken = generateJWT(verifyParamsObject, 60 * 60 * 24 * 7); // 7 days
const verifyUrl = `${process.env.NEXT_PUBLIC_BASE_URL}/verify/invitation?token=${jwtToken}`;
diff --git a/pages/branding.tsx b/pages/branding.tsx
index aded1248..cdf5a61b 100644
--- a/pages/branding.tsx
+++ b/pages/branding.tsx
@@ -36,12 +36,14 @@ export default function Branding() {
const teamInfo = useTeam();
const router = useRouter();
const { brand } = useBrand();
- const { plan, isTrial } = usePlan();
+ const { plan, isTrial, isBusiness, isDatarooms, isDataroomsPlus } = usePlan();
const [brandColor, setBrandColor] = useState<string>("#000000");
const [accentColor, setAccentColor] = useState<string>("#030712");
const [logo, setLogo] = useState<string | null>(null);
const [blobUrl, setBlobUrl] = useState<string | null>(null);
+ const [banner, setBanner] = useState<string | null>(null);
+ const [bannerBlobUrl, setBannerBlobUrl] = useState<string | null>(null);
const [welcomeMessage, setWelcomeMessage] = useState<string>(
"Your action is requested to continue",
);
@@ -51,11 +53,17 @@ export default function Branding() {
const [isLoading, setIsLoading] = useState<boolean>(false);
const [fileError, setFileError] = useState<string | null>(null);
+ const [bannerError, setBannerError] = useState<string | null>(null);
const [dragActive, setDragActive] = useState(false);
+ const [bannerDragActive, setBannerDragActive] = useState(false);
const [welcomeMessageError, setWelcomeMessageError] = useState<string | null>(
null,
);
+ // Check if user has access to dataroom branding features
+ const hasDataroomAccess =
+ isBusiness || isDatarooms || isDataroomsPlus || isTrial;
+
// Welcome message validation
const MAX_WELCOME_MESSAGE_LENGTH = 80; // Roughly 2 lines of text
@@ -107,11 +115,38 @@ export default function Branding() {
[setLogo],
);
+ const onChangeBanner = useCallback(
+ (e: any) => {
+ setBannerError(null);
+ const file = e.target.files[0];
+ if (file) {
+ if (file.size / 1024 / 1024 > 2) {
+ setBannerError("File size too big (max 2MB)");
+ } else if (file.type !== "image/png" && file.type !== "image/jpeg") {
+ setBannerError("File type not supported (.png or .jpg only)");
+ } else {
+ const reader = new FileReader();
+ reader.onload = (e) => {
+ const dataUrl = e.target?.result as string;
+ setBanner(dataUrl);
+ // create a blob url for preview
+ const blob = convertDataUrlToFile({ dataUrl });
+ const blobUrl = URL.createObjectURL(blob);
+ setBannerBlobUrl(blobUrl);
+ };
+ reader.readAsDataURL(file);
+ }
+ }
+ },
+ [setBanner],
+ );
+
useEffect(() => {
if (brand) {
setBrandColor(brand.brandColor || "#000000");
setAccentColor(brand.accentColor || "#FFFFFF");
setLogo(brand.logo || null);
+ setBanner(brand.banner || null);
const message =
brand.welcomeMessage || "Your action is requested to continue";
setWelcomeMessage(message);
@@ -140,11 +175,20 @@ export default function Branding() {
}
setIsLoading(true);
- let blobUrl: string | null = logo && logo.startsWith("data:") ? null : logo;
+ let logoBlobUrl: string | null =
+ logo && logo.startsWith("data:") ? null : logo;
if (logo && logo.startsWith("data:")) {
const blob = convertDataUrlToFile({ dataUrl: logo });
- blobUrl = await uploadImage(blob);
- setLogo(blobUrl);
+ logoBlobUrl = await uploadImage(blob);
+ setLogo(logoBlobUrl);
+ }
+
+ let bannerBlobUrl: string | null =
+ banner && banner.startsWith("data:") ? null : banner;
+ if (banner && banner.startsWith("data:")) {
+ const blob = convertDataUrlToFile({ dataUrl: banner });
+ bannerBlobUrl = await uploadImage(blob);
+ setBanner(bannerBlobUrl);
}
const data = {
@@ -152,7 +196,9 @@ export default function Branding() {
welcomeMessage.trim() || "Your action is requested to continue",
brandColor: brandColor,
accentColor: accentColor,
- logo: blobUrl,
+ logo: logoBlobUrl,
+ // Only include banner if user has dataroom access (Business+)
+ ...(hasDataroomAccess && { banner: bannerBlobUrl }),
};
const res = await fetch(
@@ -170,6 +216,11 @@ export default function Branding() {
mutate(`/api/teams/${teamInfo?.currentTeam?.id}/branding`);
setIsLoading(false);
toast.success("Branding updated successfully");
+ } else {
+ setIsLoading(false);
+ const errorData = await res.json().catch(() => ({}));
+ console.error("Save error:", errorData);
+ toast.error(errorData.message || "Failed to save branding");
}
};
@@ -187,6 +238,7 @@ export default function Branding() {
if (res.ok) {
setLogo(null);
+ setBanner(null);
setBrandColor("#000000");
setAccentColor("#030712");
setWelcomeMessage("Your action is requested to continue");
@@ -364,6 +416,126 @@ export default function Branding() {
</CardContent>
</Card>
+ {/* Banner Card - Only for Business+ users */}
+ {hasDataroomAccess && (
+ <Card>
+ <CardContent className="pt-6">
+ <div className="space-y-2">
+ <Label htmlFor="banner">
+ Banner{" "}
+ <span className="font-normal text-muted-foreground">
+ (for data rooms, max 2 MB)
+ </span>
+ </Label>
+ <label
+ htmlFor="banner"
+ className="group relative mt-2 flex h-32 w-full cursor-pointer flex-col items-center justify-center rounded-lg border-2 border-dashed border-gray-300 bg-gray-50 transition-all hover:border-gray-400 hover:bg-gray-100"
+ >
+ <div
+ className="absolute z-[5] h-full w-full rounded-lg"
+ onDragOver={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ setBannerDragActive(true);
+ }}
+ onDragEnter={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ setBannerDragActive(true);
+ }}
+ onDragLeave={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ setBannerDragActive(false);
+ }}
+ onDrop={(e) => {
+ e.preventDefault();
+ e.stopPropagation();
+ setBannerDragActive(false);
+ setBannerError(null);
+ const file =
+ e.dataTransfer.files && e.dataTransfer.files[0];
+ if (file) {
+ if (file.size / 1024 / 1024 > 2) {
+ setBannerError("File size too big (max 2MB)");
+ } else if (
+ file.type !== "image/png" &&
+ file.type !== "image/jpeg"
+ ) {
+ setBannerError(
+ "File type not supported (.png or .jpg only)",
+ );
+ } else {
+ const reader = new FileReader();
+ reader.onload = (e) => {
+ const dataUrl = e.target?.result as string;
+ setBanner(dataUrl);
+ const blob = convertDataUrlToFile({
+ dataUrl,
+ });
+ const blobUrl = URL.createObjectURL(blob);
+ setBannerBlobUrl(blobUrl);
+ };
+ reader.readAsDataURL(file);
+ }
+ }
+ }}
+ />
+ {!banner ? (
+ <div
+ className={cn(
+ "flex flex-col items-center justify-center gap-2",
+ bannerDragActive && "scale-105",
+ )}
+ >
+ <UploadIcon
+ className="h-8 w-8 text-gray-400"
+ aria-hidden="true"
+ />
+ <p className="text-xs text-muted-foreground">
+ Upload banner image
+ </p>
+ </div>
+ ) : (
+ <div className="relative flex h-full w-full items-center justify-center p-4">
+ <img
+ src={banner}
+ alt="Banner preview"
+ className="max-h-full max-w-full object-cover"
+ />
+ </div>
+ )}
+ </label>
+ <input
+ id="banner"
+ name="banner"
+ type="file"
+ accept="image/jpeg,image/png"
+ className="sr-only"
+ onChange={onChangeBanner}
+ />
+ {bannerError && (
+ <p className="text-sm text-red-500">{bannerError}</p>
+ )}
+ {banner && (
+ <Button
+ type="button"
+ variant="ghost"
+ size="sm"
+ onClick={() => {
+ setBanner(null);
+ setBannerBlobUrl(null);
+ }}
+ className="text-xs"
+ >
+ Remove banner
+ </Button>
+ )}
+ </div>
+ </CardContent>
+ </Card>
+ )}
+
{/* Brand Color Card */}
<Card>
<CardContent className="pt-6">
@@ -565,9 +737,19 @@ export default function Branding() {
{/* Preview Column */}
<div className="flex-1 lg:pl-4">
<Tabs defaultValue="document-view" className="w-full">
- <TabsList className="grid w-full grid-cols-2">
+ <TabsList
+ className={cn(
+ "grid w-full",
+ hasDataroomAccess ? "grid-cols-3" : "grid-cols-2",
+ )}
+ >
<TabsTrigger value="document-view">Document View</TabsTrigger>
- <TabsTrigger value="front-page">Front page</TabsTrigger>
+ {hasDataroomAccess && (
+ <TabsTrigger value="dataroom-view">
+ Dataroom View
+ </TabsTrigger>
+ )}
+ <TabsTrigger value="front-page">Front Page</TabsTrigger>
</TabsList>
<TabsContent value="document-view" className="mt-6">
<div className="flex justify-center">
@@ -633,6 +815,72 @@ export default function Branding() {
</div>
</div>
</TabsContent>
+ {hasDataroomAccess && (
+ <TabsContent value="dataroom-view" className="mt-6">
+ <div className="flex justify-center">
+ <div
+ className="relative w-full max-w-[698px] rounded-lg bg-gray-200 p-1 shadow-lg"
+ style={{ aspectRatio: "698 / 450" }}
+ >
+ <div className="relative h-full overflow-x-auto rounded-lg bg-gray-100 lg:overflow-x-hidden">
+ <div className="mx-auto flex h-7 items-center justify-center">
+ <div className="pointer-events-none absolute left-3">
+ <div className="flex flex-row flex-nowrap justify-start">
+ <div className="pointer-events-auto">
+ <div className="mr-1 inline-block size-2 rounded-full bg-gray-300"></div>
+ </div>
+ <div className="pointer-events-auto">
+ <div className="mr-1 inline-block size-2 rounded-full bg-gray-300"></div>
+ </div>
+ <div className="pointer-events-auto">
+ <div className="mr-1 inline-block size-2 rounded-full bg-gray-300"></div>
+ </div>
+ </div>
+ </div>
+ <div className="flex w-[70%] items-center justify-center rounded-xl bg-white p-1 opacity-70">
+ <div
+ aria-hidden="true"
+ className="mr-1 mt-0.5 flex text-muted-foreground"
+ >
+ <svg
+ aria-hidden="true"
+ height="8"
+ width="8"
+ viewBox="0 0 16 16"
+ fill="currentColor"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path d="M8.75 11.25a1.25 1.25 0 1 0-1.5 0v1a.75.75 0 0 0 1.5 0v-1Z"></path>
+ <path
+ fillRule="evenodd"
+ clipRule="evenodd"
+ d="M3.5 4v2h-1a1 1 0 0 0-1 1v6a3 3 0 0 0 3 3h7a3 3 0 0 0 3-3V7a1 1 0 0 0-1-1h-1V4a4 4 0 0 0-4-4h-1a4 4 0 0 0-4 4ZM11 6V4a2.5 2.5 0 0 0-2.5-2.5h-1A2.5 2.5 0 0 0 5 4v2h6Zm-8 7V7.5h10V13a1.5 1.5 0 0 1-1.5 1.5h-7A1.5 1.5 0 0 1 3 13Z"
+ ></path>
+ </svg>
+ </div>
+ <span className="whitespace-normal text-xs text-muted-foreground">
+ papermark.com/dataroom/...
+ </span>
+ </div>
+ </div>
+ <iframe
+ key={`dataroom-view-${debouncedBrandColor}-${debouncedAccentColor}-${banner}`}
+ name="dataroom-view"
+ id="dataroom-view"
+ src={`/room_ppreview_demo?brandColor=${encodeURIComponent(debouncedBrandColor)}&accentColor=${encodeURIComponent(debouncedAccentColor)}&brandLogo=${blobUrl ? encodeURIComponent(blobUrl) : logo ? encodeURIComponent(logo) : ""}&brandBanner=${banner === "no-banner" ? encodeURIComponent("no-banner") : bannerBlobUrl ? encodeURIComponent(bannerBlobUrl) : banner ? encodeURIComponent(banner) : ""}`}
+ className="absolute left-0 top-0 h-full w-full origin-top-left scale-50 overflow-hidden rounded-b-lg border-0 bg-white"
+ style={{
+ width: "200%",
+ height: "200%",
+ pointerEvents: "none",
+ marginTop: "29px",
+ }}
+ />
+ </div>
+ </div>
+ </div>
+ </TabsContent>
+ )}
<TabsContent value="front-page" className="mt-6">
<div className="flex justify-center">
<div
diff --git a/pages/datarooms/[id]/branding/index.tsx b/pages/datarooms/[id]/branding/index.tsx
index d9ea5360..d30ae590 100644
--- a/pages/datarooms/[id]/branding/index.tsx
+++ b/pages/datarooms/[id]/branding/index.tsx
@@ -10,7 +10,7 @@ import { toast } from "sonner";
import { mutate } from "swr";
import { useDebounce } from "use-debounce";
-import { useDataroomBrand } from "@/lib/swr/use-brand";
+import { useBrand, useDataroomBrand } from "@/lib/swr/use-brand";
import { useDataroom } from "@/lib/swr/use-dataroom";
import { cn, convertDataUrlToFile, uploadImage } from "@/lib/utils";
@@ -35,15 +35,16 @@ export default function DataroomBrandPage() {
const router = useRouter();
const teamInfo = useTeam();
const { dataroom } = useDataroom();
- const { brand } = useDataroomBrand({ dataroomId: dataroom?.id });
+ const { brand: dataroomBrand } = useDataroomBrand({
+ dataroomId: dataroom?.id,
+ });
+ const { brand: globalBrand } = useBrand();
const [brandColor, setBrandColor] = useState<string>("#000000");
const [accentColor, setAccentColor] = useState<string>("#FFFFFF");
const [logo, setLogo] = useState<string | null>(null);
- const [banner, setBanner] = useState<string | null>(DEFAULT_BANNER_IMAGE);
- const [originalBanner, setOriginalBanner] = useState<string | null>(
- DEFAULT_BANNER_IMAGE,
- );
+ const [banner, setBanner] = useState<string | null>(null);
+ const [originalBanner, setOriginalBanner] = useState<string | null>(null);
const [blobUrl, setBlobUrl] = useState<string | null>(null);
const [bannerBlobUrl, setBannerBlobUrl] = useState<string | null>(null);
const [welcomeMessage, setWelcomeMessage] = useState<string>(
@@ -139,21 +140,28 @@ export default function DataroomBrandPage() {
);
useEffect(() => {
- if (brand) {
- setBrandColor(brand.brandColor || "#000000");
- setAccentColor(brand.accentColor || "#FFFFFF");
- setLogo(brand.logo || null);
- const bannerValue = brand.banner || DEFAULT_BANNER_IMAGE;
+ // Merge dataroom brand with global brand as fallback
+ if (dataroomBrand || globalBrand) {
+ setBrandColor(
+ dataroomBrand?.brandColor || globalBrand?.brandColor || "#000000",
+ );
+ setAccentColor(
+ dataroomBrand?.accentColor || globalBrand?.accentColor || "#FFFFFF",
+ );
+ setLogo(dataroomBrand?.logo || globalBrand?.logo || null);
+ const bannerValue = dataroomBrand?.banner || globalBrand?.banner || null;
setBanner(bannerValue);
setOriginalBanner(bannerValue);
const message =
- brand.welcomeMessage || "Your action is requested to continue";
+ dataroomBrand?.welcomeMessage ||
+ globalBrand?.welcomeMessage ||
+ "Your action is requested to continue";
setWelcomeMessage(message);
// Validate existing message
const error = validateWelcomeMessage(message);
setWelcomeMessageError(error);
}
- }, [brand]);
+ }, [dataroomBrand, globalBrand]);
// Handle welcome message change with validation
const handleWelcomeMessageChange = (value: string) => {
@@ -215,7 +223,7 @@ export default function DataroomBrandPage() {
const res = await fetch(
`/api/teams/${teamInfo?.currentTeam?.id}/datarooms/${dataroom.id}/branding`,
{
- method: brand ? "PUT" : "POST",
+ method: dataroomBrand ? "PUT" : "POST",
body: JSON.stringify(data),
headers: {
"Content-Type": "application/json",
@@ -272,7 +280,7 @@ export default function DataroomBrandPage() {
<div className="mb-4 flex items-center justify-between md:mb-8 lg:mb-12">
<div className="space-y-1">
<h3 className="text-2xl font-semibold tracking-tight text-foreground">
- Branding
+ Data Room Branding
</h3>
<p className="flex flex-row items-center gap-2 text-sm text-muted-foreground">
Customize your data room&apos;s branding for a cohesive user
@@ -712,7 +720,11 @@ export default function DataroomBrandPage() {
>
Save changes
</Button>
- <Button variant="ghost" onClick={handleDelete} disabled={!brand}>
+ <Button
+ variant="ghost"
+ onClick={handleDelete}
+ disabled={!dataroomBrand}
+ >
Reset branding
</Button>
</div>
diff --git a/pages/room_ppreview_demo.tsx b/pages/room_ppreview_demo.tsx
index e316bfd8..f7055b1f 100644
--- a/pages/room_ppreview_demo.tsx
+++ b/pages/room_ppreview_demo.tsx
@@ -44,11 +44,11 @@ export default function ViewPage() {
</div>
{/* Banner section */}
- {brandBanner !== "no-banner" && (
+ {brandBanner && brandBanner !== "no-banner" && (
<div className="relative h-[30vh]">
<img
className="h-[30vh] w-full object-cover"
- src={brandBanner || DEFAULT_BANNER_IMAGE}
+ src={brandBanner}
alt="Banner"
width={1920}
height={320}
diff --git a/prisma/migrations/20251027000000_add_banner_to_brand/migration.sql b/prisma/migrations/20251027000000_add_banner_to_brand/migration.sql
new file mode 100644
index 00000000..d15949d5
--- /dev/null
+++ b/prisma/migrations/20251027000000_add_banner_to_brand/migration.sql
@@ -0,0 +1,6 @@
+-- AlterTable
+ALTER TABLE "Brand" ADD COLUMN IF NOT EXISTS "banner" TEXT;
+
+-- AlterTable
+ALTER TABLE "Brand" ADD COLUMN IF NOT EXISTS "welcomeMessage" TEXT;
+
diff --git a/prisma/schema/schema.prisma b/prisma/schema/schema.prisma
index 63e5eee8..309074fc 100644
--- a/prisma/schema/schema.prisma
+++ b/prisma/schema/schema.prisma
@@ -73,6 +73,7 @@ model User {
model Brand {
id String @id @default(cuid())
logo String? // This should be a reference to where the file is stored (S3, Google Cloud Storage, etc.)
+ banner String? // Banner image for dataroom view (fallback)
brandColor String? // This should be a reference to the brand color
accentColor String? // This should be a reference to the accent color
welcomeMessage String? // This should be a reference to the welcome message