Skip to content

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

feat: add ui changes to visitor table

Marc Seitza3adef5779e4
diff --git a/components/visitors/contacts-document-table.tsx b/components/visitors/contacts-document-table.tsx
index 4773d32f..eaeb111e 100644
--- a/components/visitors/contacts-document-table.tsx
+++ b/components/visitors/contacts-document-table.tsx
@@ -350,7 +350,7 @@ export function ContactsDocumentsTable({
colSpan={columns.length}
className="h-24 text-center"
>
- No results.
+ No visits yet.
</TableCell>
</TableRow>
)}
diff --git a/components/visitors/contacts-table.tsx b/components/visitors/contacts-table.tsx
index cdd6da66..0eea5f15 100644
--- a/components/visitors/contacts-table.tsx
+++ b/components/visitors/contacts-table.tsx
@@ -271,7 +271,7 @@ export function ContactsTable({
colSpan={columns.length}
className="h-24 text-center"
>
- No results.
+ No visitors yet.
</TableCell>
</TableRow>
)}
diff --git a/pages/api/teams/[teamId]/viewers/[id]/index.ts b/pages/api/teams/[teamId]/viewers/[id]/index.ts
index 7c42a4d5..89f6d7f0 100644
--- a/pages/api/teams/[teamId]/viewers/[id]/index.ts
+++ b/pages/api/teams/[teamId]/viewers/[id]/index.ts
@@ -35,12 +35,15 @@ export default async function handle(
},
});
- if (!team) {
- return res.status(404).json({ error: "Team not found" });
+ if (
+ !team ||
+ (team.plan.includes("free") && !team.plan.includes("trial"))
+ ) {
+ return res.status(404).json({ message: "Team not found" });
}
const viewer = await prisma.viewer.findUnique({
- where: { id },
+ where: { id, teamId },
include: {
views: {
where: {
@@ -149,6 +152,8 @@ export default async function handle(
views: groupedViews,
};
+ console.log("newViewer", newViewer);
+
return res.status(200).json(newViewer);
} catch (error) {
errorhandler(error, res);
diff --git a/pages/api/teams/[teamId]/viewers/index.ts b/pages/api/teams/[teamId]/viewers/index.ts
index fe1ff26a..0781d9f5 100644
--- a/pages/api/teams/[teamId]/viewers/index.ts
+++ b/pages/api/teams/[teamId]/viewers/index.ts
@@ -34,7 +34,7 @@ export default async function handle(
},
});
- if (!team) {
+ if (!team || team.plan.includes("free")) {
return res.status(404).json({ error: "Team not found" });
}
diff --git a/pages/visitors/[id]/index.tsx b/pages/visitors/[id]/index.tsx
index e855bb5e..2e2c4bab 100644
--- a/pages/visitors/[id]/index.tsx
+++ b/pages/visitors/[id]/index.tsx
@@ -1,6 +1,8 @@
+import ErrorPage from "next/error";
import Link from "next/link";
+import { useRouter } from "next/router";
-import { useState } from "react";
+import { useEffect } from "react";
import AppLayout from "@/components/layouts/app";
import {
@@ -12,39 +14,61 @@ import {
BreadcrumbSeparator,
} from "@/components/ui/breadcrumb";
import { Separator } from "@/components/ui/separator";
+import { Skeleton } from "@/components/ui/skeleton";
import { ContactsDocumentsTable } from "@/components/visitors/contacts-document-table";
+import { VisitorAvatar } from "@/components/visitors/visitor-avatar";
+import { usePlan } from "@/lib/swr/use-billing";
import useViewer from "@/lib/swr/use-viewer";
export default function VisitorDetailPage() {
- const { viewer } = useViewer();
+ const router = useRouter();
+ const { plan, trial } = usePlan();
+ const { viewer, error } = useViewer();
const views = viewer?.views;
+ const isTrial = !!trial;
+ const isFree = plan == "free";
+
+ useEffect(() => {
+ if (isFree && !isTrial) router.push("/documents");
+ }, [isTrial, isFree]);
+
+ if (error) {
+ return <ErrorPage statusCode={404} />;
+ }
+
return (
<AppLayout>
<div className="p-4 pb-0 sm:m-4 sm:py-4">
- <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">
- <h2 className="text-xl font-semibold tracking-tight text-foreground sm:text-2xl">
- {viewer?.email}
- </h2>
- </div>
- </section>
-
- <Separator className="mb-2 bg-gray-200 dark:bg-gray-800" />
+ {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} />
+
+ <h2 className="text-xl font-semibold tracking-tight text-foreground sm:text-2xl">
+ {viewer.email}
+ </h2>
+ </div>
+ </section>
+ ) : (
+ <VisitorDetailHeaderSkeleton />
+ )}
+
+ <Separator className="bg-gray-200 dark:bg-gray-800" />
</div>
<div className="relative p-4 pt-0 sm:mx-4 sm:mt-4">
@@ -54,3 +78,27 @@ export default function VisitorDetailPage() {
</AppLayout>
);
}
+
+const VisitorDetailHeaderSkeleton = () => {
+ return (
+ <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>
+ <Skeleton className="h-6 w-24 rounded-md" />
+ </BreadcrumbItem>
+ </BreadcrumbList>
+ </Breadcrumb>
+ <div className="mt-2 flex items-center gap-x-2">
+ <Skeleton className="hidden h-10 w-10 flex-shrink-0 rounded-full sm:inline-flex" />
+ <Skeleton className="h-8 w-48 rounded-md sm:w-64" />
+ </div>
+ </section>
+ );
+};
diff --git a/pages/visitors/index.tsx b/pages/visitors/index.tsx
index 6e77a2a8..1da966d3 100644
--- a/pages/visitors/index.tsx
+++ b/pages/visitors/index.tsx
@@ -1,6 +1,6 @@
import { useRouter } from "next/router";
-import { useEffect, useState } from "react";
+import { useEffect } from "react";
import AppLayout from "@/components/layouts/app";
import { Separator } from "@/components/ui/separator";
@@ -30,11 +30,11 @@ export default function Visitors() {
All visitors
</h2>
<p className="text-xs text-muted-foreground sm:text-sm">
- Manage all your visitors in one place.
+ See all your visitors in one place.
</p>
</div>
</section>
- <Separator className="mb-2 bg-gray-200 dark:bg-gray-800" />
+ <Separator className="bg-gray-200 dark:bg-gray-800" />
</div>
<div className="relative p-4 pt-0 sm:mx-4 sm:mt-4">