Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
chore: cleanup
Marc Seitz496bca7b7d28
diff --git a/components/Sidebar.tsx b/components/Sidebar.tsxindex ee3bd78c..a04dcadd 100644--- a/components/Sidebar.tsx+++ b/components/Sidebar.tsx@@ -64,7 +64,8 @@ export default function Sidebar() {export const SidebarComponent = ({ className }: { className?: string }) => {const [showProBanner, setShowProBanner] = useState<boolean | null>(null);const { data: session, status } = useSession();- const { plan, trial: userTrial, loading } = usePlan();+ const { plan: userPlan, trial: userTrial, loading } = usePlan();+ const isTrial = !!userTrial;const router = useRouter();const { currentTeam, teams, isLoading }: TeamContextType =@@ -78,9 +79,6 @@ export const SidebarComponent = ({ className }: { className?: string }) => {}}, []);- const userPlan = plan;- const isTrial = !!userTrial;-const navigation = [// {// name: "Overview",diff --git a/components/billing/pro-banner.tsx b/components/billing/pro-banner.tsxindex b358344f..c6c8b715 100644--- a/components/billing/pro-banner.tsx+++ b/components/billing/pro-banner.tsx@@ -6,8 +6,6 @@ import { usePlausible } from "next-plausible";import X from "@/components/shared/icons/x";import { Button } from "@/components/ui/button";-import { useAnalytics } from "@/lib/analytics";-import { UpgradePlanModal } from "./upgrade-plan-modal";export default function ProBanner({@@ -16,7 +14,6 @@ export default function ProBanner({setShowProBanner: Dispatch<SetStateAction<boolean | null>>;}) {const plausible = usePlausible();- const analytics = useAnalytics();const handleHideBanner = () => {setShowProBanner(false);diff --git a/components/layouts/app.tsx b/components/layouts/app.tsxindex a57e6a65..c96b9ddf 100644--- a/components/layouts/app.tsx+++ b/components/layouts/app.tsx@@ -1,37 +1,13 @@-import { useEffect, useState } from "react";--import Cookies from "js-cookie";--import TrialNavbar from "@/components/layouts/trialnavbar";--import { usePlan } from "@/lib/swr/use-billing";-import Sidebar from "../Sidebar";+import TrialBanner from "./trial-banner";export default function AppLayout({ children }: { children: React.ReactNode }) {- const { trial } = usePlan(); // Get trial status]- const [ShowTrialNavbar, setShowTrialNavbar] = useState<boolean | null>(null);-- useEffect(() => {- if (Cookies.get("hideTrialNavbar") !== "trial-navbarr") {- setShowTrialNavbar(true);- } else {- setShowTrialNavbar(false);- }- }, []);-return (<div className="flex min-h-screen bg-gray-50 dark:bg-black"><Sidebar /><div className="flex-1">- {trial === "drtrial" && (- <div className="mx-2 my-2 mb-2 rounded-xl border border-gray-900 bg-white p-1">- {" "}- {/* Increased margin-bottom and added horizontal margin */}- <TrialNavbar />{" "}- {/* Render TrialNavbar at the top of the main content */}- </div>- )}+ {/* Trial banner shown only on trial */}+ <TrialBanner /><main className="flex-1 lg:p-2"><div className="h-full overflow-y-auto rounded-xl bg-white ring-1 ring-gray-200 dark:border-none dark:bg-gray-900 dark:ring-gray-800">{children}diff --git a/components/layouts/trial-banner.tsx b/components/layouts/trial-banner.tsxnew file mode 100644index 00000000..578c7bf2--- /dev/null+++ b/components/layouts/trial-banner.tsx@@ -0,0 +1,89 @@+import { Dispatch, SetStateAction, useEffect, useState } from "react";++import Cookies from "js-cookie";+import { usePlausible } from "next-plausible";++import X from "@/components/shared/icons/x";++import { usePlan } from "@/lib/swr/use-billing";+import useDatarooms from "@/lib/swr/use-datarooms";+import { daysLeft } from "@/lib/utils";++import { UpgradePlanModal } from "../billing/upgrade-plan-modal";++export default function TrialBanner() {+ const { trial } = usePlan();+ const isTrial = !!trial;+ const [showTrialBanner, setShowTrialBanner] = useState<boolean | null>(null);++ useEffect(() => {+ if (Cookies.get("hideTrialBanner") !== "trial-banner") {+ setShowTrialBanner(true);+ } else {+ setShowTrialBanner(false);+ }+ }, []);++ if (isTrial && showTrialBanner) {+ return <TrialBannerComponent setShowTrialBanner={setShowTrialBanner} />;+ }++ return null;+}++function TrialBannerComponent({+ setShowTrialBanner,+}: {+ setShowTrialBanner: Dispatch<SetStateAction<boolean | null>>;+}) {+ const plausible = usePlausible();++ const handleHideBanner = () => {+ setShowTrialBanner(false);+ plausible("clickedHideTrialBanner");+ Cookies.set("hideTrialBanner", "trial-banner", {+ expires: 1,+ });+ };++ const { datarooms } = useDatarooms();++ return (+ <div className="mx-2 my-2 mb-2 rounded-xl border border-gray-900 bg-white p-1 dark:border-gray-600 dark:bg-gray-900">+ <nav className="relative flex flex-col bg-white px-4 py-3 dark:bg-gray-900">+ <button+ type="button"+ onClick={handleHideBanner}+ className="absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none"+ >+ <X className="h-4 w-4" />+ <span className="sr-only">Close</span>+ </button>+ <div className="flex flex-col space-y-2">+ <div className="text-sm font-bold">+ Data Room trial:{" "}+ {datarooms && daysLeft(new Date(datarooms[0].createdAt), 7)} days+ left+ </div>++ <div className="text-sm">+ You are on a data room trial, you have access to advanced link+ permissions and data room.{" "}+ <UpgradePlanModal+ clickedPlan={"Data Rooms"}+ trigger={"trial_navbar"}+ >+ <span+ className="cursor-pointer font-bold text-orange-500"+ onClick={() => plausible("clickedUpgradeTrialNavbar")}+ >+ Upgrade to keep access+ </span>+ </UpgradePlanModal>+ , get more data rooms and custom domains ✨+ </div>+ </div>+ </nav>+ </div>+ );+}diff --git a/components/layouts/trialnavbar.tsx b/components/layouts/trialnavbar.tsxdeleted file mode 100644index 039224f6..00000000--- a/components/layouts/trialnavbar.tsx+++ /dev/null@@ -1,98 +0,0 @@-import { Dispatch, SetStateAction } from "react";--// import { UpgradePlanModal } from "@/upgrade-plan-modal";-import Cookies from "js-cookie";-import { PhoneIcon, PlusIcon } from "lucide-react";-// Import the UpgradePlanModal-import { usePlausible } from "next-plausible";--import X from "@/components/shared/icons/x";-// Import the close icon-import { Button } from "@/components/ui/button";--import { usePlan } from "@/lib/swr/use-billing";-import useDatarooms from "@/lib/swr/use-datarooms";-import useLimits from "@/lib/swr/use-limits";-import { daysLeft } from "@/lib/utils";--import { UpgradePlanModal } from "../billing/upgrade-plan-modal";--export default function TrialNavbar({- setShowTrialNavbar,-}: {- setShowTrialNavbar: Dispatch<SetStateAction<boolean | null>>;-}) {- // Check if the navbar should be shown based on the cookie- const shouldShowNavbar = Cookies.get("hideTrialNavbar") !== "trial-navbar";-- const plausible = usePlausible();-- const handleCloseNavbar = () => {- setShowTrialNavbar(false);- plausible("clickedCloseTrialNavbar");- // Set cookie to hide navbar for 24 hours- Cookies.set("hideTrialNavbar", "trial-navbar", { expires: 1 }); // 1 day- };-- const { datarooms } = useDatarooms();-- const { plan, trial } = usePlan();- const { limits } = useLimits();-- const numDatarooms = datarooms?.length ?? 0;- const limitDatarooms = limits?.datarooms ?? 1;-- const isBusiness = plan === "business";- const isDatarooms = plan === "datarooms";-- isDatarooms || (isBusiness && numDatarooms < limitDatarooms);-- // Only render the navbar if it should be shown- if (!shouldShowNavbar) return null;-- return (- <nav className="relative flex flex-col bg-white p-4">- <button- type="button"- onClick={handleCloseNavbar}- className="absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none"- >- <X className="h-4 w-4" />- <span className="sr-only">Close</span>- </button>- <div className="flex items-center gap-x-4">- <div className="flex space-x-2">- <span className="py-2 text-sm font-bold">- Data Room trial:{" "}- {datarooms && daysLeft(new Date(datarooms[0].createdAt), 7)} days- left- </span>- </div>- </div>-- <p className="text-sm">- You are on a data room trial, you have access to advanced link- permissions and data room.{" "}- <UpgradePlanModal clickedPlan={"Data Rooms"} trigger={"trial_navbar"}>- <span- className="cursor-pointer font-bold text-orange-500"- onClick={() => plausible("clickedUpgradeTrialNavbar")}- >- Upgrade to keep access- </span>- </UpgradePlanModal>- , get more data rooms and custom domains ✨- </p>- <div className="flex items-center gap-x-2">- {/* <a- href="https://cal.com/marcseitz/papermark"- target="_blank"- rel="noopener noreferrer"- className="flex items-center justify-center p-2 text-muted-foreground hover:text-primary"- >- <PhoneIcon className="h-5 w-5" aria-hidden="true" />- </a> */}- </div>- </nav>- );-}