The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
nav component and session provider fix
Timur Ercanc1d4dfeaf6f4
diff --git a/apps/web/components/layout.tsx b/apps/web/components/layout.tsxindex 970860612..82c7279ba 100644--- a/apps/web/components/layout.tsx+++ b/apps/web/components/layout.tsx@@ -2,7 +2,7 @@ import { Fragment } from "react";import { Disclosure, Menu, Transition } from "@headlessui/react";import Link from "next/link";import { useRouter } from "next/router";-import { signOut } from "next-auth/react";+import Navigation from "./navigation";import {Bars3Icon,@@ -12,6 +12,7 @@ import {UserCircleIcon,} from "@heroicons/react/24/outline";import Logo from "./logo";+import { signOut, useSession } from "next-auth/react";const user = {name: "Timur Ercan",@@ -47,164 +48,12 @@ export default function Layout({ children }: any) {element.current = router.route.startsWith("/" + element.href.split("/")[1]);});+ const session = useSession();+return (<><div className="min-h-full">- <Disclosure as="nav" className="border-b border-gray-200 bg-white">- {({ open }) => (- <>- <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">- <div className="flex h-16 justify-between">- <div className="flex">- <div className="flex flex-shrink-0 items-center">- <Logo></Logo>- </div>- <div className="hidden sm:-my-px sm:ml-6 sm:flex sm:space-x-8">- {navigation.map((item) => (- <Link- key={item.name}- href={item.href}- className={classNames(- item.current- ? "border-neon text-brown"- : "border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700",- "inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"- )}- aria-current={item.current ? "page" : undefined}- >- {item.name}- </Link>- ))}- </div>- </div>- <div className="hidden sm:ml-6 sm:flex sm:items-center">- <Menu as="div" className="relative ml-3">- <div>- <Menu.Button className="flex max-w-xs items-center rounded-full bg-white text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">- <span className="sr-only">Open user menu</span>- <img- className="h-8 w-8 rounded-full"- src={user.imageUrl}- alt=""- />- </Menu.Button>- </div>- <Transition- as={Fragment}- enter="transition ease-out duration-200"- enterFrom="transform opacity-0 scale-95"- enterTo="transform opacity-100 scale-100"- leave="transition ease-in duration-75"- leaveFrom="transform opacity-100 scale-100"- leaveTo="transform opacity-0 scale-95"- >- <Menu.Items className="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-white py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">- {userNavigation.map((item) => (- <Menu.Item key={item.name}>- {({ active }) => (- <Link- href={item.href}- onClick={item.click}- className={classNames(- active ? "bg-gray-100" : "",- "block px-4 py-2 text-sm text-gray-700"- )}- >- <item.icon- className="flex-shrink-0 -ml-1 mr-3 h-6 w-6 inline"- aria-hidden="true"- ></item.icon>- {item.name}- </Link>- )}- </Menu.Item>- ))}- </Menu.Items>- </Transition>- </Menu>- </div>- <div className="-mr-2 flex items-center sm:hidden">- {/* Mobile menu button */}- <Disclosure.Button className="inline-flex items-center justify-center rounded-md bg-white p-2 text-gray-400 hover:bg-gray-100 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">- <span className="sr-only">Open main menu</span>- {open ? (- <XMarkIcon- className="block h-6 w-6"- aria-hidden="true"- />- ) : (- <Bars3Icon- className="block h-6 w-6"- aria-hidden="true"- />- )}- </Disclosure.Button>- </div>- </div>- </div>-- <Disclosure.Panel className="sm:hidden">- <div className="space-y-1 pt-2 pb-3">- {navigation.map((item) => (- <Disclosure.Button- key={item.name}- as="a"- href={item.href}- className={classNames(- item.current- ? "bg-indigo-50 border-indigo-500 text-indigo-700"- : "border-transparent text-gray-600 hover:bg-gray-50 hover:border-gray-300 hover:text-gray-800",- "block pl-3 pr-4 py-2 border-l-4 text-base font-medium"- )}- aria-current={item.current ? "page" : undefined}- >- {item.name}- </Disclosure.Button>- ))}- </div>- <div className="border-t border-gray-200 pt-4 pb-3">- <div className="flex items-center px-4">- <div className="flex-shrink-0">- <img- className="h-10 w-10 rounded-full"- src={user.imageUrl}- alt=""- />- </div>- <div className="ml-3">- <div className="text-base font-medium text-gray-800">- {user.name}- </div>- <div className="text-sm font-medium text-gray-500">- {user.email}- </div>- </div>- <button- type="button"- className="ml-auto flex-shrink-0 rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"- >- <span className="sr-only">View notifications</span>- <BellIcon className="h-6 w-6" aria-hidden="true" />- </button>- </div>- <div className="mt-3 space-y-1">- {userNavigation.map((item) => (- <Disclosure.Button- key={item.name}- as="a"- href={item.href}- className="block px-4 py-2 text-base font-medium text-gray-500 hover:bg-gray-100 hover:text-gray-800"- >- {item.name}- </Disclosure.Button>- ))}- </div>- </div>- </Disclosure.Panel>- </>- )}- </Disclosure>-+ <Navigation></Navigation><main><div className="mx-auto max-w-7xl sm:px-6 lg:px-8">{children}</div></main>diff --git a/apps/web/components/navigation.tsx b/apps/web/components/navigation.tsxnew file mode 100644index 000000000..3a5d813fa--- /dev/null+++ b/apps/web/components/navigation.tsx@@ -0,0 +1,204 @@+import { Fragment } from "react";+import { Disclosure, Menu, Transition } from "@headlessui/react";+import Link from "next/link";+import { useRouter } from "next/router";+import { signOut, useSession } from "next-auth/react";++import {+ Bars3Icon,+ BellIcon,+ XMarkIcon,+ ArrowLeftOnRectangleIcon,+ UserCircleIcon,+} from "@heroicons/react/24/outline";+import Logo from "./logo";++const user = {+ name: "Timur Ercan",+ email: "[email protected]",+ imageUrl:+ "https://pbs.twimg.com/profile_images/1382036502390181888/4BT30oTM_400x400.jpg",+};+const navigation = [+ { name: "Dashboard", href: "/dashboard", current: false },+ { name: "Documents", href: "/documents", current: false },+ { name: "Settings", href: "/settings", current: true },+];+const userNavigation = [+ { name: "Your Profile", href: "/settings/profile", icon: UserCircleIcon },+ {+ name: "Sign out",+ href: "",+ click: (e: any) => {+ e.preventDefault();+ signOut({ callbackUrl: "/login" });+ },+ icon: ArrowLeftOnRectangleIcon,+ },+];++function classNames(...classes: any) {+ return classes.filter(Boolean).join(" ");+}++export default function TopNavigation() {+ // const session = useSession();++ const router = useRouter();+ navigation.forEach((element) => {+ element.current = router.route.startsWith("/" + element.href.split("/")[1]);+ });++ return (+ <>+ <Disclosure as="nav" className="border-b border-gray-200 bg-white">+ {({ open }) => (+ <>+ <div className="mx-auto max-w-7xl px-4 sm:px-6 lg:px-8">+ <div className="flex h-16 justify-between">+ <div className="flex">+ <div className="flex flex-shrink-0 items-center">+ <Logo></Logo>+ </div>+ <div className="hidden sm:-my-px sm:ml-6 sm:flex sm:space-x-8">+ {navigation.map((item) => (+ <Link+ key={item.name}+ href={item.href}+ className={classNames(+ item.current+ ? "border-neon text-brown"+ : "border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700",+ "inline-flex items-center px-1 pt-1 border-b-2 text-sm font-medium"+ )}+ aria-current={item.current ? "page" : undefined}+ >+ {item.name}+ </Link>+ ))}+ </div>+ </div>+ <div className="hidden sm:ml-6 sm:flex sm:items-center">+ <Menu as="div" className="relative ml-3">+ <div>+ <Menu.Button className="flex max-w-xs items-center rounded-full bg-white text-sm focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">+ <span className="sr-only">Open user menu</span>+ <img+ className="h-8 w-8 rounded-full"+ src={user.imageUrl}+ alt=""+ />+ </Menu.Button>+ </div>+ <Transition+ as={Fragment}+ enter="transition ease-out duration-200"+ enterFrom="transform opacity-0 scale-95"+ enterTo="transform opacity-100 scale-100"+ leave="transition ease-in duration-75"+ leaveFrom="transform opacity-100 scale-100"+ leaveTo="transform opacity-0 scale-95"+ >+ <Menu.Items className="absolute right-0 z-10 mt-2 w-48 origin-top-right rounded-md bg-white py-1 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">+ {userNavigation.map((item) => (+ <Menu.Item key={item.name}>+ {({ active }) => (+ <Link+ href={item.href}+ onClick={item.click}+ className={classNames(+ active ? "bg-gray-100" : "",+ "block px-4 py-2 text-sm text-gray-700"+ )}+ >+ <item.icon+ className="flex-shrink-0 -ml-1 mr-3 h-6 w-6 inline"+ aria-hidden="true"+ ></item.icon>+ {item.name}+ </Link>+ )}+ </Menu.Item>+ ))}+ </Menu.Items>+ </Transition>+ </Menu>+ </div>+ <div className="-mr-2 flex items-center sm:hidden">+ {/* Mobile menu button */}+ <Disclosure.Button className="inline-flex items-center justify-center rounded-md bg-white p-2 text-gray-400 hover:bg-gray-100 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">+ <span className="sr-only">Open main menu</span>+ {open ? (+ <XMarkIcon className="block h-6 w-6" aria-hidden="true" />+ ) : (+ <Bars3Icon className="block h-6 w-6" aria-hidden="true" />+ )}+ </Disclosure.Button>+ </div>+ </div>+ </div>++ <Disclosure.Panel className="sm:hidden">+ <div className="space-y-1 pt-2 pb-3">+ {navigation.map((item) => (+ <Disclosure.Button+ key={item.name}+ as="a"+ href={item.href}+ className={classNames(+ item.current+ ? "bg-indigo-50 border-indigo-500 text-indigo-700"+ : "border-transparent text-gray-600 hover:bg-gray-50 hover:border-gray-300 hover:text-gray-800",+ "block pl-3 pr-4 py-2 border-l-4 text-base font-medium"+ )}+ aria-current={item.current ? "page" : undefined}+ >+ {item.name}+ </Disclosure.Button>+ ))}+ </div>+ <div className="border-t border-gray-200 pt-4 pb-3">+ <div className="flex items-center px-4">+ <div className="flex-shrink-0">+ <img+ className="h-10 w-10 rounded-full"+ src={user.imageUrl}+ alt=""+ />+ </div>+ <div className="ml-3">+ <div className="text-base font-medium text-gray-800">+ {user.name}+ </div>+ <div className="text-sm font-medium text-gray-500">+ {user.email}+ </div>+ </div>+ <button+ type="button"+ className="ml-auto flex-shrink-0 rounded-full bg-white p-1 text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2"+ >+ <span className="sr-only">View notifications</span>+ <BellIcon className="h-6 w-6" aria-hidden="true" />+ </button>+ </div>+ <div className="mt-3 space-y-1">+ {userNavigation.map((item) => (+ <Disclosure.Button+ key={item.name}+ as="a"+ href={item.href}+ className="block px-4 py-2 text-base font-medium text-gray-500 hover:bg-gray-100 hover:text-gray-800"+ >+ {item.name}+ </Disclosure.Button>+ ))}+ </div>+ </div>+ </Disclosure.Panel>+ </>+ )}+ </Disclosure>+ </>+ );+}diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsxindex a98d61f27..3ae2996cf 100644--- a/apps/web/pages/_app.tsx+++ b/apps/web/pages/_app.tsx@@ -18,9 +18,9 @@ export default function App({pageProps: { session, ...pageProps },}: AppPropsWithLayout) {const getLayout = Component.getLayout || ((page: any) => page);- return getLayout(+ return (<SessionProvider session={session}>- <Component {...pageProps} />{" "}+ {getLayout(<Component {...pageProps} />)}</SessionProvider>);}