Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat(layout): add breadcrumbs to app layout
Marc Seitzcb4a2c1beaca
diff --git a/components/datarooms/dataroom-header.tsx b/components/datarooms/dataroom-header.tsxindex 7972117e..15593570 100644--- a/components/datarooms/dataroom-header.tsx+++ b/components/datarooms/dataroom-header.tsx@@ -1,15 +1,6 @@-import Link from "next/link";-import { useState } from "react";import LinkSheet from "@/components/links/link-sheet";-import {- Breadcrumb,- BreadcrumbItem,- BreadcrumbLink,- BreadcrumbList,- BreadcrumbSeparator,-} from "@/components/ui/breadcrumb";import { Button } from "@/components/ui/button";export const DataroomHeader = ({@@ -32,20 +23,7 @@ export const DataroomHeader = ({return (<section className="mb-4">- <Breadcrumb>- <BreadcrumbList>- <BreadcrumbItem>- <BreadcrumbLink asChild>- <Link href="/datarooms">All Datarooms</Link>- </BreadcrumbLink>- </BreadcrumbItem>- <BreadcrumbSeparator />- <BreadcrumbItem>- <span className="font-medium text-foreground">{title}</span>- </BreadcrumbItem>- </BreadcrumbList>- </Breadcrumb>- <div className="mt-2 flex items-center justify-between">+ <div className="flex items-center justify-between"><div className="flex min-h-10 items-center space-y-1"><h1 className="text-xl font-semibold tracking-tight text-foreground sm:text-2xl">{title}diff --git a/components/datarooms/dataroom-items-list.tsx b/components/datarooms/dataroom-items-list.tsxindex 4386863a..c28e7723 100644--- a/components/datarooms/dataroom-items-list.tsx+++ b/components/datarooms/dataroom-items-list.tsx@@ -283,7 +283,7 @@ export function DataroomItemsList({);} else {return (- <div className="mb-2 flex items-center gap-x-2 pt-5">+ <div className="mb-2 flex min-h-10 items-center gap-x-2">{folderCount > 0 ? (<p className="flex items-center gap-x-1 text-sm text-gray-400"><FolderIcon className="h-5 w-5" />diff --git a/components/layouts/app.tsx b/components/layouts/app.tsxindex e9f91e26..2fc5bbdd 100644--- a/components/layouts/app.tsx+++ b/components/layouts/app.tsx@@ -9,13 +9,13 @@ import TrialBanner from "./trial-banner";export default function AppLayout({ children }: { children: React.ReactNode }) {return (<SidebarProvider>- <div className="flex flex-1 flex-col gap-x-1 bg-gray-50 dark:bg-black lg:flex-row">+ <div className="flex flex-1 flex-col gap-x-1 bg-gray-50 dark:bg-black md:flex-row"><AppSidebar />- <SidebarInset>+ <SidebarInset className="ring-1 ring-gray-200 dark:ring-gray-800"><header className="flex h-10 shrink-0 items-center gap-2"><div className="flex items-center gap-2 px-4"><SidebarTrigger className="-ml-1" />- <Separator orientation="vertical" className="mr-2 h-4" />+ <Separator orientation="vertical" className="mr-1 h-4" /><AppBreadcrumb /></div></header>diff --git a/components/layouts/breadcrumb.tsx b/components/layouts/breadcrumb.tsxindex a3d1c05f..d73eabd6 100644--- a/components/layouts/breadcrumb.tsx+++ b/components/layouts/breadcrumb.tsx@@ -23,6 +23,7 @@ import {import { useDataroom } from "@/lib/swr/use-dataroom";import { useDocument } from "@/lib/swr/use-document";import { useFolderWithParents } from "@/lib/swr/use-folders";+import useViewer from "@/lib/swr/use-viewer";const FOLDERS_TO_DISPLAY = 1; // Only show the last folder in the path@@ -275,6 +276,42 @@ const DocumentsBreadcrumb = () => {);};+const VisitorsBreadcrumb = () => {+ return (+ <Breadcrumb>+ <BreadcrumbList>+ <BreadcrumbItem>+ <BreadcrumbLink asChild>+ <Link href="/visitors">Visitors</Link>+ </BreadcrumbLink>+ </BreadcrumbItem>+ </BreadcrumbList>+ </Breadcrumb>+ );+};++const SingleVisitorBreadcrumb = () => {+ const { viewer } = useViewer();++ return (+ <Breadcrumb>+ <BreadcrumbList>+ <BreadcrumbItem>+ <BreadcrumbLink asChild>+ <Link href="/visitors">Visitors</Link>+ </BreadcrumbLink>+ </BreadcrumbItem>+ <BreadcrumbSeparator />+ <BreadcrumbItem>+ <BreadcrumbPage className="max-w-[200px] truncate">+ {viewer?.email || "Loading..."}+ </BreadcrumbPage>+ </BreadcrumbItem>+ </BreadcrumbList>+ </Breadcrumb>+ );+};+export const AppBreadcrumb = () => {const router = useRouter();const path = router.pathname;@@ -339,6 +376,16 @@ export const AppBreadcrumb = () => {);}+ // Root visitors route+ if (path === "/visitors") {+ return <VisitorsBreadcrumb />;+ }++ // Single visitor route+ if (path === "/visitors/[id]" && id) {+ return <SingleVisitorBreadcrumb />;+ }+return null;}, [path, id]);diff --git a/components/sidebar/app-sidebar.tsx b/components/sidebar/app-sidebar.tsxindex cf58f218..72c753ad 100644--- a/components/sidebar/app-sidebar.tsx+++ b/components/sidebar/app-sidebar.tsx@@ -12,6 +12,7 @@ import {AudioWaveform,BookOpen,Bot,+ BrushIcon,CogIcon,Command,ContactIcon,@@ -27,6 +28,7 @@ import {ServerIcon,Settings2,SquareTerminal,+ SwatchBookIcon,} from "lucide-react";import { NavMain } from "@/components/sidebar/nav-main";@@ -94,7 +96,7 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {{title: "Branding",url: "/branding",- icon: PaletteIcon,+ icon: BrushIcon,current:router.pathname.includes("branding") &&!router.pathname.includes("datarooms"),@@ -137,6 +139,7 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {return (<SidebarclassName="bg-gray-50 dark:bg-black"+ sidebarClassName="bg-gray-50 dark:bg-black"side="left"variant="inset"collapsible="icon"@@ -173,8 +176,6 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {</SidebarHeader><SidebarContent><NavMain items={data.navMain} />- {/* <NavProjects projects={data.projects} /> */}- {/* <NavSecondary items={data.navSecondary} className="mt-auto" /> */}</SidebarContent><SidebarFooter><SidebarMenu className="group-data-[collapsible=icon]:hidden">diff --git a/components/sidebar/team-switcher.tsx b/components/sidebar/team-switcher.tsxindex ae984b20..c0546560 100644--- a/components/sidebar/team-switcher.tsx+++ b/components/sidebar/team-switcher.tsx@@ -55,8 +55,8 @@ export function TeamSwitcher({size="lg"className="data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground border">- <Avatar className="size-8 rounded-lg">- <AvatarFallback className="rounded-lg">+ <Avatar className="size-8 rounded">+ <AvatarFallback className="rounded">{activeTeam?.name?.slice(0, 2).toUpperCase()}</AvatarFallback></Avatar>diff --git a/components/ui/sidebar.tsx b/components/ui/sidebar.tsxindex db069e3f..e0902afe 100644--- a/components/ui/sidebar.tsx+++ b/components/ui/sidebar.tsx@@ -170,6 +170,7 @@ const Sidebar = React.forwardRef<side?: "left" | "right";variant?: "sidebar" | "floating" | "inset";collapsible?: "offcanvas" | "icon" | "none";+ sidebarClassName?: string;}>((@@ -178,6 +179,7 @@ const Sidebar = React.forwardRef<variant = "sidebar",collapsible = "offcanvas",className,+ sidebarClassName,children,...props},@@ -256,7 +258,10 @@ const Sidebar = React.forwardRef<><divdata-sidebar="sidebar"- className="bg-sidebar group-data-[variant=floating]:border-sidebar-border flex h-full w-full flex-col group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:shadow"+ className={cn(+ "bg-sidebar group-data-[variant=floating]:border-sidebar-border flex h-full w-full flex-col group-data-[variant=floating]:rounded-lg group-data-[variant=floating]:border group-data-[variant=floating]:shadow",+ sidebarClassName,+ )}>{children}</div>diff --git a/pages/datarooms/[id]/documents/[...name].tsx b/pages/datarooms/[id]/documents/[...name].tsxindex 763a5fb2..14a6c696 100644--- a/pages/datarooms/[id]/documents/[...name].tsx+++ b/pages/datarooms/[id]/documents/[...name].tsx@@ -51,10 +51,10 @@ export default function Documents() {<Buttonsize="sm"className="group flex items-center justify-start gap-x-3 px-3 text-left"- title="Add New Document"+ title="Add Document"><PlusIcon className="h-5 w-5 shrink-0" aria-hidden="true" />- <span>Add New Document</span>+ <span>Add Document</span></Button></AddDocumentModal><AddFolderModal isDataroom={true} dataroomId={dataroom?.id} key={2}>@@ -64,7 +64,7 @@ export default function Documents() {className="group flex items-center justify-start gap-x-3 px-3 text-left"><FolderPlusIcon className="h-5 w-5 shrink-0" aria-hidden="true" />- <span>Add New Folder</span>+ <span>Add Folder</span></Button></AddFolderModal><div id="dataroom-reordering-action">@@ -90,11 +90,6 @@ export default function Documents() {</ScrollArea></div><div className="space-y-4 md:col-span-3">- <div className="flex items-center justify-between">- <div className="space-y-2">- <BreadcrumbComponent />- </div>- </div><section id="documents-header-count" className="min-h-8" />{isLoading ? <LoadingDocuments count={3} /> : null}diff --git a/pages/datarooms/[id]/documents/index.tsx b/pages/datarooms/[id]/documents/index.tsxindex 253647ba..9f06dc70 100644--- a/pages/datarooms/[id]/documents/index.tsx+++ b/pages/datarooms/[id]/documents/index.tsx@@ -3,7 +3,6 @@ import { useState } from "react";import { useTeam } from "@/context/team-context";import { ArrowUpDownIcon, FolderPlusIcon, PlusIcon } from "lucide-react";-import { BreadcrumbComponent } from "@/components/datarooms/dataroom-breadcrumb";import { DataroomHeader } from "@/components/datarooms/dataroom-header";import { DataroomItemsList } from "@/components/datarooms/dataroom-items-list";import { DataroomNavigation } from "@/components/datarooms/dataroom-navigation";@@ -45,10 +44,10 @@ export default function Documents() {<Buttonsize="sm"className="group flex items-center justify-start gap-x-3 px-3 text-left"- title="Add New Document"+ title="Add Document"><PlusIcon className="h-5 w-5 shrink-0" aria-hidden="true" />- <span>Add New Document</span>+ <span>Add Document</span></Button></AddDocumentModal><AddFolderModal isDataroom={true} dataroomId={dataroom?.id} key={2}>@@ -58,7 +57,7 @@ export default function Documents() {className="group flex items-center justify-start gap-x-3 px-3 text-left"><FolderPlusIcon className="h-5 w-5 shrink-0" aria-hidden="true" />- <span>Add New Folder</span>+ <span>Add Folder</span></Button></AddFolderModal><div id="dataroom-reordering-action">@@ -84,11 +83,6 @@ export default function Documents() {</ScrollArea></div><div className="space-y-4 md:col-span-3">- <div className="flex items-center justify-between">- <div className="space-y-2">- <BreadcrumbComponent />- </div>- </div><section id="documents-header-count" className="min-h-8" />{isLoading ? <LoadingDocuments count={3} /> : null}diff --git a/pages/datarooms/index.tsx b/pages/datarooms/index.tsxindex bfeaf5ea..a3edfa3d 100644--- a/pages/datarooms/index.tsx+++ b/pages/datarooms/index.tsx@@ -114,7 +114,10 @@ export default function DataroomsPage() {<ul className="grid grid-cols-1 gap-x-6 gap-y-8 lg:grid-cols-2 xl:grid-cols-3">{datarooms &&datarooms.map((dataroom) => (- <Link key={dataroom.id} href={`/datarooms/${dataroom.id}`}>+ <Link+ key={dataroom.id}+ href={`/datarooms/${dataroom.id}/documents`}+ ><Card className="group relative overflow-hidden duration-500 hover:border-primary/50"><CardHeader><div className="flex items-center justify-between">diff --git a/pages/documents/index.tsx b/pages/documents/index.tsxindex 12ee6809..a710cfeb 100644--- a/pages/documents/index.tsx+++ b/pages/documents/index.tsx@@ -19,7 +19,7 @@ export default function Documents() {const { documents, isValidating, isFiltered } = useDocuments();return (- <AppLayout breadcrumbs={[{ title: "All Documents", href: "/documents" }]}>+ <AppLayout><div className="sticky top-0 z-50 bg-white p-4 pb-0 dark:bg-gray-900 sm:mx-4 sm:pt-8"><section className="mb-4 flex items-center justify-between space-x-2 sm:space-x-0"><div className="space-y-0 sm:space-y-1">@@ -34,10 +34,10 @@ export default function Documents() {<AddDocumentModal><ButtonclassName="group flex flex-1 items-center justify-start gap-x-1 whitespace-nowrap px-1 text-left sm:gap-x-3 sm:px-3"- title="Add New Document"+ title="Add Document"><PlusIcon className="h-5 w-5 shrink-0" aria-hidden="true" />- <span className="text-xs sm:text-base">Add New Document</span>+ <span className="text-xs sm:text-base">Add Document</span></Button></AddDocumentModal><AddFolderModal>diff --git a/pages/documents/tree/[...name].tsx b/pages/documents/tree/[...name].tsxindex 507c0e44..e4062beb 100644--- a/pages/documents/tree/[...name].tsx+++ b/pages/documents/tree/[...name].tsx@@ -4,7 +4,6 @@ import { useTeam } from "@/context/team-context";import { FileIcon, FolderIcon, FolderPlusIcon, PlusIcon } from "lucide-react";import { AddDocumentModal } from "@/components/documents/add-document-modal";-import { BreadcrumbComponent } from "@/components/documents/breadcrumb";import { DocumentsList } from "@/components/documents/documents-list";import { AddFolderModal } from "@/components/folders/add-folder-modal";import AppLayout from "@/components/layouts/app";@@ -24,8 +23,6 @@ export default function DocumentTreePage() {return (<AppLayout><main className="p-4 sm:m-4 sm:px-4 sm:py-4">- <BreadcrumbComponent />-<section className="mb-4 mt-4 flex items-center justify-between md:mb-8 lg:mb-12"><div className="space-y-1"><h2 className="text-xl font-semibold tracking-tight text-foreground sm:text-2xl">@@ -48,26 +45,24 @@ export default function DocumentTreePage() {</Button></AddDocumentModal></div> */}- <div className="flex items-center gap-x-1">+ <div className="flex items-center gap-x-2"><AddDocumentModal>- <Button- className="group flex flex-1 items-center justify-start gap-x-3 px-3 text-left"- title="Add New Document"- >+ <Button className="gap-x-3 px-3" title="Add Document"><PlusIcon className="h-5 w-5 shrink-0" aria-hidden="true" />- <span>Add New Document</span>+ <span>Add Document</span></Button></AddDocumentModal><AddFolderModal><Button- size="icon"+ // size="icon"variant="outline"- className="border-gray-500 bg-gray-50 hover:bg-gray-200 dark:bg-black hover:dark:bg-muted"+ className="gap-x-3 px-3"><FolderPlusIconclassName="h-5 w-5 shrink-0"aria-hidden="true"/>+ <span>Add Folder</span></Button></AddFolderModal></div>diff --git a/pages/visitors/[id]/index.tsx b/pages/visitors/[id]/index.tsxindex 2e2c4bab..3262a3fb 100644--- a/pages/visitors/[id]/index.tsx+++ b/pages/visitors/[id]/index.tsx@@ -43,19 +43,6 @@ export default function VisitorDetailPage() {<div className="p-4 pb-0 sm:m-4 sm:py-4">{viewer ? (<section className="mb-4 flex flex-col justify-between md:mb-8 lg:mb-12">- <Breadcrumb className="hidden md:flex">- <BreadcrumbList>- <BreadcrumbItem>- <BreadcrumbLink asChild>- <Link href="/visitors">All Visitors</Link>- </BreadcrumbLink>- </BreadcrumbItem>- <BreadcrumbSeparator />- <BreadcrumbItem>- <BreadcrumbPage>{viewer.email}</BreadcrumbPage>- </BreadcrumbItem>- </BreadcrumbList>- </Breadcrumb><div className="mt-2 flex items-center gap-x-2"><VisitorAvatar viewerEmail={viewer.email} />