Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add folder tree
Marc Seitzfd2b956e85bd
diff --git a/components/Sidebar.tsx b/components/Sidebar.tsxindex 0370fecb..e08662fb 100644--- a/components/Sidebar.tsx+++ b/components/Sidebar.tsx@@ -16,6 +16,8 @@ import ProfileMenu from "./profile-menu";import { AddDocumentModal } from "./documents/add-document-modal";import { Button } from "./ui/button";import { PaletteIcon, PlusIcon } from "lucide-react";+import { FileTree } from "./ui/nextra-filetree";+import SiderbarFolders from "./sidebar-folders";export default function Sidebar() {return (@@ -67,6 +69,10 @@ export const SidebarComponent = ({ className }: { className?: string }) => {}}, []);+ const createFolder = () => {+ console.log("clicked");+ };+const userPlan = plan && plan.plan;const navigation = [@@ -141,22 +147,35 @@ export const SidebarComponent = ({ className }: { className?: string }) => {<section className="flex flex-1 flex-col gap-y-6"><div className="space-y-2">- {navigation.map((item) => (- <button- key={item.name}- onClick={() => router.push(item.href)}- disabled={item.disabled}- className={cn(- item.current- ? "bg-gray-200 dark:bg-secondary text-secondary-foreground font-semibold"- : "text-muted-foreground hover:text-foreground hover:bg-gray-200 hover:dark:bg-muted duration-200",- "group flex gap-x-3 items-center rounded-md px-3 py-2 text-sm leading-6 w-full disabled:hover:bg-transparent disabled:text-muted-foreground disabled:cursor-default",- )}- >- <item.icon className="h-5 w-5 shrink-0" aria-hidden="true" />- {item.name}- </button>- ))}+ {navigation.map((item) => {+ return (+ <>+ <button+ key={item.name}+ onClick={() => router.push(item.href)}+ disabled={item.disabled}+ className={cn(+ item.current+ ? "bg-gray-200 dark:bg-secondary text-secondary-foreground font-semibold"+ : "text-muted-foreground hover:text-foreground hover:bg-gray-200 hover:dark:bg-muted duration-200",+ "group flex gap-x-3 items-center rounded-md px-3 py-2 text-sm leading-6 w-full disabled:hover:bg-transparent disabled:text-muted-foreground disabled:cursor-default",+ )}+ >+ <item.icon className="h-5 w-5 shrink-0" aria-hidden="true" />+ {item.name}+ {item.name === "Documents" ? (+ <span+ className="ml-auto text-xs bg-primary text-white rounded-full px-2 py-1"+ onClick={() => createFolder()}+ >+ addfolder+ </span>+ ) : null}+ </button>+ {item.name === "Documents" ? <SiderbarFolders /> : null}+ </>+ );+ })}</div></section><div className="mb-4">diff --git a/components/sidebar-folders.tsx b/components/sidebar-folders.tsxnew file mode 100644index 00000000..b345ae8b--- /dev/null+++ b/components/sidebar-folders.tsx@@ -0,0 +1,42 @@+import { useRouter } from "next/router";+import { FileTree } from "./ui/nextra-filetree";++export default function SidebarFolders() {+ const router = useRouter();+ return (+ <FileTree>+ <FileTree.Folder+ name="pages"+ defaultOpen+ active={router.query.name === "pages"}+ >+ <FileTree.File name="contact.md" />+ <FileTree.File name="index.mdx" />+ <FileTree.Folder name="about">+ <FileTree.File name="legal.md" />+ <FileTree.File name="index.mdx" />+ <FileTree.Folder name="pages">+ <FileTree.File name="legal.md" />+ <FileTree.File name="index.mdx" />+ <FileTree.Folder name="pages">+ <FileTree.File name="legal.md" />+ <FileTree.File name="index.mdx" />+ <FileTree.Folder name="pages">+ <FileTree.File name="legal.md" />+ <FileTree.File name="index.mdx" />+ <FileTree.Folder name="pages">+ <FileTree.File name="legal.md" />+ <FileTree.File name="index.mdx" />+ </FileTree.Folder>+ </FileTree.Folder>+ </FileTree.Folder>+ </FileTree.Folder>+ </FileTree.Folder>+ </FileTree.Folder>+ <FileTree.Folder name="pages">+ <FileTree.File name="legal.md" />+ <FileTree.File name="index.mdx" />+ </FileTree.Folder>+ </FileTree>+ );+}diff --git a/components/ui/nextra-filetree.tsx b/components/ui/nextra-filetree.tsxnew file mode 100644index 00000000..13a661c5--- /dev/null+++ b/components/ui/nextra-filetree.tsx@@ -0,0 +1,151 @@+import { cn } from "@/lib/utils";+import { createContext, memo, useCallback, useContext, useState } from "react";+import type { ReactElement, ReactNode } from "react";+import ChevronDown from "../shared/icons/chevron-down";+import ChevronRight from "../shared/icons/chevron-right";+import {+ FileIcon,+ FolderClosedIcon,+ FolderIcon,+ FolderOpenIcon,+} from "lucide-react";++const ctx = createContext(0);++function useIndent() {+ return useContext(ctx);+}++interface FolderProps {+ name: string;+ label?: ReactElement;+ open?: boolean;+ defaultOpen?: boolean;+ active?: boolean;+ onToggle?: (open: boolean) => void;+ children: ReactNode;+}++interface FileProps {+ name: string;+ label?: ReactElement;+ active?: boolean;+}++function Tree({ children }: { children: ReactNode }): ReactElement {+ return (+ <div className={cn("nextra-filetree w-full select-none text-sm")}>+ <div className="block rounded-lg">{children}</div>+ </div>+ );+}++function Ident(): ReactElement {+ const length = useIndent();+ return (+ <>+ {Array.from({ length }, (_, i) => (+ <span className="w-5" key={i} />+ ))}+ </>+ );+}++const Folder = memo<FolderProps>(+ ({ label, name, open, children, active, defaultOpen = false, onToggle }) => {+ const indent = useIndent();+ const [isOpen, setIsOpen] = useState(defaultOpen);++ const toggle = useCallback(() => {+ onToggle?.(!isOpen);+ setIsOpen(!isOpen);+ }, [isOpen, onToggle]);++ const isFolderOpen = open === undefined ? isOpen : open;++ return (+ <li className="flex list-none flex-col w-full">+ <button+ onClick={toggle}+ title={name}+ className={cn(+ "inline-flex cursor-pointer items-center py-1 w-full",+ "text-foreground hover:bg-gray-200 hover:dark:bg-muted duration-100 rounded-md",+ "px-3",+ active && "bg-gray-200 dark:bg-muted font-semibold",+ )}+ >+ <Ident />+ <ChevronRight+ className={cn(+ "h-4 w-4 shrink-0 transition-transform duration-150 chevron mr-1",+ isFolderOpen && "rotate-90",+ )}+ />+ {/* <svg width="2em" height="1em" viewBox="0 0 24 24">+ <path+ fill="none"+ stroke="currentColor"+ strokeLinecap="round"+ strokeLinejoin="round"+ strokeWidth="2"+ d={+ isFolderOpen+ ? "M5 19a2 2 0 0 1-2-2V7a2 2 0 0 1 2-2h4l2 2h4a2 2 0 0 1 2 2v1M5 19h14a2 2 0 0 0 2-2v-5a2 2 0 0 0-2-2H9a2 2 0 0 0-2 2v5a2 2 0 0 1-2 2Z"+ : "M3 7v10a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2h-6l-2-2H5a2 2 0 0 0-2 2Z"+ }+ />+ </svg> */}+ {isFolderOpen ? (+ <FolderOpenIcon+ className="h-4 w-4 shrink-0 fill-muted-foreground"+ aria-hidden="true"+ />+ ) : (+ <FolderIcon+ className="h-4 w-4 shrink-0 fill-muted-foreground"+ aria-hidden="true"+ />+ )}+ <span className="ml-2">{label ?? name}</span>+ </button>+ {isFolderOpen && (+ <ul>+ <ctx.Provider value={indent + 1}>{children}</ctx.Provider>+ </ul>+ )}+ </li>+ );+ },+);+Folder.displayName = "Folder";++const File = memo<FileProps>(({ label, name, active }) => (+ <li+ className={cn(+ "flex list-none",+ active && "text-primary-600 contrast-more:underline",+ "text-foreground hover:bg-gray-200 hover:dark:bg-muted duration-100 rounded-md",+ "px-3",+ )}+ >+ <span className="inline-flex cursor-default items-center py-1">+ <Ident />+ {/* <svg width="1em" height="1em" viewBox="0 0 24 24">+ <path+ fill="none"+ stroke="currentColor"+ strokeLinecap="round"+ strokeLinejoin="round"+ strokeWidth="2"+ d="M9 12h6m-6 4h6m2 5H7a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h5.586a1 1 0 0 1 .707.293l5.414 5.414a1 1 0 0 1 .293.707V19a2 2 0 0 1-2 2Z"+ />+ </svg> */}+ <FileIcon className="h-4 w-4 shrink-0" aria-hidden="true" />+ <span className="ml-2">{label ?? name}</span>+ </span>+ </li>+));+File.displayName = "File";++export const FileTree = Object.assign(Tree, { Folder, File });diff --git a/package-lock.json b/package-lock.jsonindex 776d24ee..eb8665a5 100644--- a/package-lock.json+++ b/package-lock.json@@ -20,7 +20,7 @@"@mdx-js/react": "^3.0.1","@next-auth/prisma-adapter": "^1.0.7","@next/mdx": "^14.1.3",- "@prisma/client": "^5.10.2",+ "@prisma/client": "^5.11.0","@radix-ui/react-accordion": "^1.1.2","@radix-ui/react-avatar": "^1.0.4","@radix-ui/react-checkbox": "^1.0.4",@@ -118,7 +118,7 @@"@types/react-dom": "^18","@types/ua-parser-js": "^0.7.39","prettier": "^3.2.5",- "prisma": "^5.10.2"+ "prisma": "^5.11.0"},"engines": {"node": ">=18.17.0"@@ -2305,9 +2305,9 @@}},"node_modules/@prisma/client": {- "version": "5.10.2",- "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.10.2.tgz",- "integrity": "sha512-ef49hzB2yJZCvM5gFHMxSFL9KYrIP9udpT5rYo0CsHD4P9IKj473MbhU1gjKKftiwWBTIyrt9jukprzZXazyag==",+ "version": "5.11.0",+ "resolved": "https://registry.npmjs.org/@prisma/client/-/client-5.11.0.tgz",+ "integrity": "sha512-SWshvS5FDXvgJKM/a0y9nDC1rqd7KG0Q6ZVzd+U7ZXK5soe73DJxJJgbNBt2GNXOa+ysWB4suTpdK5zfFPhwiw==","hasInstallScript": true,"engines": {"node": ">=16.13"@@ -2322,48 +2322,48 @@}},"node_modules/@prisma/debug": {- "version": "5.10.2",- "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.10.2.tgz",- "integrity": "sha512-bkBOmH9dpEBbMKFJj8V+Zp8IZHIBjy3fSyhLhxj4FmKGb/UBSt9doyfA6k1UeUREsMJft7xgPYBbHSOYBr8XCA==",+ "version": "5.11.0",+ "resolved": "https://registry.npmjs.org/@prisma/debug/-/debug-5.11.0.tgz",+ "integrity": "sha512-N6yYr3AbQqaiUg+OgjkdPp3KPW1vMTAgtKX6+BiB/qB2i1TjLYCrweKcUjzOoRM5BriA4idrkTej9A9QqTfl3A==","devOptional": true},"node_modules/@prisma/engines": {- "version": "5.10.2",- "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.10.2.tgz",- "integrity": "sha512-HkSJvix6PW8YqEEt3zHfCYYJY69CXsNdhU+wna+4Y7EZ+AwzeupMnUThmvaDA7uqswiHkgm5/SZ6/4CStjaGmw==",+ "version": "5.11.0",+ "resolved": "https://registry.npmjs.org/@prisma/engines/-/engines-5.11.0.tgz",+ "integrity": "sha512-gbrpQoBTYWXDRqD+iTYMirDlF9MMlQdxskQXbhARhG6A/uFQjB7DZMYocMQLoiZXO/IskfDOZpPoZE8TBQKtEw==","devOptional": true,"hasInstallScript": true,"dependencies": {- "@prisma/debug": "5.10.2",- "@prisma/engines-version": "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9",- "@prisma/fetch-engine": "5.10.2",- "@prisma/get-platform": "5.10.2"+ "@prisma/debug": "5.11.0",+ "@prisma/engines-version": "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102",+ "@prisma/fetch-engine": "5.11.0",+ "@prisma/get-platform": "5.11.0"}},"node_modules/@prisma/engines-version": {- "version": "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9",- "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9.tgz",- "integrity": "sha512-uCy/++3Jx/O3ufM+qv2H1L4tOemTNqcP/gyEVOlZqTpBvYJUe0tWtW0y3o2Ueq04mll4aM5X3f6ugQftOSLdFQ==",+ "version": "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102",+ "resolved": "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102.tgz",+ "integrity": "sha512-WXCuyoymvrS4zLz4wQagSsc3/nE6CHy8znyiMv8RKazKymOMd5o9FP5RGwGHAtgoxd+aB/BWqxuP/Ckfu7/3MA==","devOptional": true},"node_modules/@prisma/fetch-engine": {- "version": "5.10.2",- "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.10.2.tgz",- "integrity": "sha512-dSmXcqSt6DpTmMaLQ9K8ZKzVAMH3qwGCmYEZr/uVnzVhxRJ1EbT/w2MMwIdBNq1zT69Rvh0h75WMIi0mrIw7Hg==",+ "version": "5.11.0",+ "resolved": "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.11.0.tgz",+ "integrity": "sha512-994viazmHTJ1ymzvWugXod7dZ42T2ROeFuH6zHPcUfp/69+6cl5r9u3NFb6bW8lLdNjwLYEVPeu3hWzxpZeC0w==","devOptional": true,"dependencies": {- "@prisma/debug": "5.10.2",- "@prisma/engines-version": "5.10.0-34.5a9203d0590c951969e85a7d07215503f4672eb9",- "@prisma/get-platform": "5.10.2"+ "@prisma/debug": "5.11.0",+ "@prisma/engines-version": "5.11.0-15.efd2449663b3d73d637ea1fd226bafbcf45b3102",+ "@prisma/get-platform": "5.11.0"}},"node_modules/@prisma/get-platform": {- "version": "5.10.2",- "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.10.2.tgz",- "integrity": "sha512-nqXP6vHiY2PIsebBAuDeWiUYg8h8mfjBckHh6Jezuwej0QJNnjDiOq30uesmg+JXxGk99nqyG3B7wpcOODzXvg==",+ "version": "5.11.0",+ "resolved": "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.11.0.tgz",+ "integrity": "sha512-rxtHpMLxNTHxqWuGOLzR2QOyQi79rK1u1XYAVLZxDGTLz/A+uoDnjz9veBFlicrpWjwuieM4N6jcnjj/DDoidw==","devOptional": true,"dependencies": {- "@prisma/debug": "5.10.2"+ "@prisma/debug": "5.11.0"}},"node_modules/@radix-ui/colors": {@@ -14162,13 +14162,13 @@}},"node_modules/prisma": {- "version": "5.10.2",- "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.10.2.tgz",- "integrity": "sha512-hqb/JMz9/kymRE25pMWCxkdyhbnIWrq+h7S6WysJpdnCvhstbJSNP/S6mScEcqiB8Qv2F+0R3yG+osRaWqZacQ==",+ "version": "5.11.0",+ "resolved": "https://registry.npmjs.org/prisma/-/prisma-5.11.0.tgz",+ "integrity": "sha512-KCLiug2cs0Je7kGkQBN9jDWoZ90ogE/kvZTUTgz2h94FEo8pczCkPH7fPNXkD1sGU7Yh65risGGD1HQ5DF3r3g==","devOptional": true,"hasInstallScript": true,"dependencies": {- "@prisma/engines": "5.10.2"+ "@prisma/engines": "5.11.0"},"bin": {"prisma": "build/index.js"diff --git a/package.json b/package.jsonindex 4fcaca29..0f6582e1 100644--- a/package.json+++ b/package.json@@ -28,7 +28,7 @@"@mdx-js/react": "^3.0.1","@next-auth/prisma-adapter": "^1.0.7","@next/mdx": "^14.1.3",- "@prisma/client": "^5.10.2",+ "@prisma/client": "^5.11.0","@radix-ui/react-accordion": "^1.1.2","@radix-ui/react-avatar": "^1.0.4","@radix-ui/react-checkbox": "^1.0.4",@@ -119,14 +119,14 @@"@tailwindcss/forms": "^0.5.7","@types/bcryptjs": "^2.4.6","@types/js-cookie": "^3.0.6",- "@types/ms": "^0.7.34",- "@types/ua-parser-js": "^0.7.39","@types/mdx": "^2.0.11",+ "@types/ms": "^0.7.34","@types/node": "^20","@types/react": "^18","@types/react-dom": "^18",+ "@types/ua-parser-js": "^0.7.39","prettier": "^3.2.5",- "prisma": "^5.10.2"+ "prisma": "^5.11.0"},"trigger.dev": {"endpointId": "papermark-dev-Ojwu"diff --git a/pages/documents/tree/[name].tsx b/pages/documents/tree/[name].tsxnew file mode 100644index 00000000..de173b74--- /dev/null+++ b/pages/documents/tree/[name].tsx@@ -0,0 +1,11 @@+import AppLayout from "@/components/layouts/app";++export default function DocumentTreePage() {+ return (+ <AppLayout>+ <main className="relative overflow-hidden mx-2 sm:mx-3 md:mx-5 lg:mx-7 xl:mx-10 mt-4 md:mt-5 lg:mt-8 mb-10 space-y-8 px-1">+ <h1>DocumentPage</h1>+ </main>+ </AppLayout>+ );+}