sync w/ fork

.gitignore

@@ -57,4 +57,13 @@ lib/emails/marketing
 .vscode
 
 # trigger.dev
-.trigger
+.trigger
+
+# python venv
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/

.python-version

@@ -0,0 +1 @@
+3.11

app/(auth)/login/page.tsx

@@ -18,7 +18,7 @@ import { Input } from "@/components/ui/input";
 import { Label } from "@/components/ui/label";
 
 import { cn } from "@/lib/utils";
-import { simpleEmailRegex, validateEmail } from "@/lib/utils/validate-email";
+import { validateEmail } from "@/lib/utils/validate-email";
 
 export default function Login() {
   const { next } = useParams as { next?: string };
@@ -91,7 +91,7 @@ export default function Login() {
               autoComplete="email"
               autoCorrect="off"
               disabled={clickedMethod === "email"}
-              pattern={simpleEmailRegex.source}
+              // pattern={patternSimpleEmailRegex}
               value={email}
               onChange={(e) => setEmail(e.target.value)}
               className={cn(
@@ -221,7 +221,7 @@ export default function Login() {
               <div className="mb-4 h-64 w-64">
                 <img
                   className="h-full w-full rounded-2xl object-cover shadow-2xl"
-                  src="https://www.papermark.io/_static/testimonials/jaski.jpeg"
+                  src="/_static/testimonials/jaski.jpeg"
                   alt="Jaski"
                 />
               </div>

app/(auth)/verify/page.tsx

@@ -94,7 +94,7 @@ export default function VerifyPage({
               <div className="mb-4 h-64 w-64">
                 <img
                   className="h-full w-full rounded-2xl object-cover shadow-2xl"
-                  src="https://www.papermark.io/_static/testimonials/jaski.jpeg"
+                  src="/_static/testimonials/jaski.jpeg"
                   alt="Jaski"
                 />
               </div>

app/api/cron/year-in-review/route.ts

@@ -0,0 +1,33 @@
+import { NextResponse } from "next/server";
+
+import { receiver } from "@/lib/cron";
+import { log } from "@/lib/utils";
+import { processEmailQueue } from "@/lib/year-in-review/send-emails";
+
+// Runs every hour (0 * * * *)
+export const maxDuration = 300; // 5 minutes in seconds
+
+export async function POST(req: Request) {
+  const body = await req.json();
+  if (process.env.VERCEL === "1") {
+    const isValid = await receiver.verify({
+      signature: req.headers.get("Upstash-Signature") || "",
+      body: JSON.stringify(body),
+    });
+    if (!isValid) {
+      return new Response("Unauthorized", { status: 401 });
+    }
+  }
+
+  try {
+    await processEmailQueue();
+    return NextResponse.json({ success: true });
+  } catch (error) {
+    await log({
+      message: `Year in review email cron failed. \n\nError: ${(error as Error).message}`,
+      type: "cron",
+      mention: true,
+    });
+    return NextResponse.json({ error: (error as Error).message });
+  }
+}

app/api/csp-report/route.ts

@@ -0,0 +1,16 @@
+import { NextResponse } from "next/server";
+
+export async function POST(request: Request) {
+  const report = await request.json();
+
+  // Log the report or send to your logging service
+  // console.log("CSP Violation:", report);
+
+  // You could send this to your logging service
+  // await fetch('your-logging-service', {
+  //   method: 'POST',
+  //   body: JSON.stringify(report)
+  // })
+
+  return NextResponse.json({ success: true });
+}

app/api/og/yir/route.tsx

@@ -0,0 +1,100 @@
+import { ImageResponse } from "next/og";
+import { NextRequest } from "next/server";
+
+export const runtime = "edge";
+
+export async function GET(req: NextRequest) {
+  const inter = await fetch(
+    new URL("@/styles/Inter-Regular.ttf", import.meta.url),
+  ).then((res) => res.arrayBuffer());
+
+  const interBold = await fetch(
+    new URL("@/public/_static/Inter-Bold.ttf", import.meta.url),
+  ).then((res) => res.arrayBuffer());
+
+  const year = req.nextUrl.searchParams.get("year") || "2024";
+  const minutesSpentOnDocs =
+    req.nextUrl.searchParams.get("minutesSpentOnDocs") || "1000";
+  const uploadedDocuments =
+    req.nextUrl.searchParams.get("uploadedDocuments") || "100";
+  const sharedLinks = req.nextUrl.searchParams.get("sharedLinks") || "10";
+  const receivedViews = req.nextUrl.searchParams.get("receivedViews") || "1000";
+
+  return new ImageResponse(
+    (
+      <div
+        tw="flex bg-black w-full h-full items-center justify-between"
+        style={{ padding: "48px" }}
+      >
+        {/* Left Side Text */}
+        <div tw="flex flex-col text-white" style={{ marginLeft: "48px" }}>
+          <div tw="flex text-7xl font-bold mb-4 tracking-tighter">
+            Papermark
+          </div>
+          <div tw="flex text-5xl mb-4">Year in Review</div>
+          <div tw="flex text-7xl font-bold">{year}</div>
+        </div>
+
+        {/* Ticket Container */}
+        <div
+          tw="flex flex-col bg-[#fb7a00] rounded-3xl relative overflow-hidden justify-between"
+          style={{
+            width: "400px",
+            height: "480px",
+            marginRight: "48px",
+            boxShadow: "0 0 100px -15px rgba(251, 122, 0, 0.3)",
+            border: "1px solid rgba(255, 255, 255, 0.1)",
+          }}
+        >
+          {/* Header Section */}
+          <div tw="flex items-start p-8 items-center">
+            <div tw="flex text-2xl font-bold text-white tracking-tighter">
+              Papermark
+            </div>
+          </div>
+
+          {/* Main Content */}
+          <div tw="flex flex-col p-8 border-t border-white/20 h-[240px] justify-center">
+            <div tw="flex text-7xl font-bold text-white mb-2">
+              {minutesSpentOnDocs}
+            </div>
+            <div tw="flex text-2xl font-normal text-white/80">
+              minutes viewed
+            </div>
+          </div>
+
+          {/* Year */}
+          <div tw="flex p-8 text-xl text-white/80 border-t border-white/20 items-center">
+            {year}
+          </div>
+
+          {/* Footer */}
+          <div tw="flex p-8 text-sm text-white/60 border-t border-white/20 items-center">
+            YEAR IN REVIEW
+          </div>
+        </div>
+      </div>
+    ),
+    {
+      width: 1200,
+      height: 630,
+      headers: {
+        "Cache-Control": "public, max-age=3600, immutable",
+      },
+      fonts: [
+        {
+          name: "Inter",
+          data: inter,
+          weight: 400,
+          style: "normal",
+        },
+        {
+          name: "Inter",
+          data: interBold,
+          weight: 700,
+          style: "normal",
+        },
+      ],
+    },
+  );
+}

app/api/webhooks/callback/route.ts

@@ -0,0 +1,44 @@
+import { receiver } from "@/lib/cron";
+import { recordWebhookEvent } from "@/lib/tinybird/publish";
+import {
+  webhookCallbackSchema,
+  webhookPayloadSchema,
+} from "@/lib/zod/schemas/webhooks";
+
+// POST /api/webhooks/callback – listen to webhooks status from QStash
+export const POST = async (req: Request) => {
+  const rawBody = await req.json();
+
+  const isValid = await receiver.verify({
+    signature: req.headers.get("Upstash-Signature") || "",
+    body: JSON.stringify(rawBody),
+  });
+  if (!isValid) {
+    return new Response("Unauthorized", { status: 401 });
+  }
+
+  const { url, status, body, sourceBody, sourceMessageId } =
+    webhookCallbackSchema.parse(rawBody);
+
+  const request = Buffer.from(sourceBody, "base64").toString("utf-8");
+  const response = Buffer.from(body, "base64").toString("utf-8");
+
+  const { id: eventId, event } = webhookPayloadSchema.parse(
+    JSON.parse(request),
+  );
+
+  const webhookId = new URL(req.url).searchParams.get("webhookId");
+
+  await recordWebhookEvent({
+    url,
+    event,
+    event_id: eventId,
+    http_status: status,
+    webhook_id: webhookId || "",
+    request_body: request,
+    response_body: response,
+    message_id: sourceMessageId,
+  });
+
+  return new Response("OK");
+};

components/Sidebar.tsx

@@ -129,9 +129,11 @@ export const SidebarComponent = ({ className }: { className?: string }) => {
     },
     {
       name: "Branding",
-      href: "/settings/branding",
+      href: "/branding",
       icon: PaletteIcon,
-      current: router.pathname.includes("branding"),
+      current:
+        router.pathname.includes("branding") &&
+        !router.pathname.includes("datarooms"),
       active: false,
       disabled: false,
     },

components/billing/upgrade-plan-modal.tsx

@@ -5,24 +5,18 @@ import { useEffect, useMemo, useState } from "react";
 import React from "react";
 
 import { useTeam } from "@/context/team-context";
-import { motion } from "framer-motion";
 import { CheckIcon } from "lucide-react";
 
 import { Button } from "@/components/ui/button";
-import { Checkbox } from "@/components/ui/checkbox";
 import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog";
 import { Switch } from "@/components/ui/switch";
 
 import { useAnalytics } from "@/lib/analytics";
-import { STAGGER_CHILD_VARIANTS } from "@/lib/constants";
 import { getStripe } from "@/lib/stripe/client";
 import { PLANS } from "@/lib/stripe/utils";
 import { usePlan } from "@/lib/swr/use-billing";
 import { capitalize } from "@/lib/utils";
 
-import { DataroomTrialModal } from "../datarooms/dataroom-trial-modal";
-import { Badge } from "../ui/badge";
-
 export function UpgradePlanModal({
   clickedPlan,
   trigger,
@@ -37,17 +31,13 @@ export function UpgradePlanModal({
   children?: React.ReactNode;
 }) {
   const router = useRouter();
-  const [plan, setPlan] = useState<"Pro" | "Business" | "Data Rooms">(
-    clickedPlan,
-  );
+
   const [period, setPeriod] = useState<"yearly" | "monthly">("yearly");
   const [selectedPlan, setSelectedPlan] = useState<string | null>(null); // Track the clicked plan
   const teamInfo = useTeam();
   const { plan: teamPlan, trial, isCustomer, isOldAccount } = usePlan();
   const analytics = useAnalytics();
 
-  const isTrial = !!trial;
-
   const planFeatures = useMemo(
     () => ({
       Pro: {

components/datarooms/dataroom-items-list.tsx

@@ -14,14 +14,14 @@ import {
   useSensor,
   useSensors,
 } from "@dnd-kit/core";
-import { motion } from "framer-motion";
 import {
   ArchiveXIcon,
   FileIcon,
   FolderIcon,
   FolderInputIcon,
   XIcon,
 } from "lucide-react";
+import { motion } from "motion/react";
 
 import { EmptyDocuments } from "@/components/documents/empty-document";
 import FolderCard from "@/components/documents/folder-card";

components/datarooms/groups/group-permissions.tsx

@@ -453,37 +453,34 @@ export default function ExpandableTable({
 
         // Ensure all parent folders are viewable if the item is being set to viewable
         // and downloadable if the item is being set to downloadable
-        // if (updatedPermissions.view || updatedPermissions.download) {
-        //   parents.forEach((parent) => {
-        //     changes[parent.id] = {
-        //       view: updatedPermissions.view || parent.permissions.view,
-        //       download:
-        //         updatedPermissions.download || parent.permissions.download,
-        //       itemType: parent.itemType,
-        //     };
-        //   });
-
-        // } else {
-        // If turning off view, recalculate parent permissions
-        [...parents].reverse().forEach((parent) => {
-          const someSubItemViewable = parent.subItems?.some((subItem) =>
-            subItem.id === item.id
-              ? updatedPermissions.view
-              : subItem.permissions.view,
-          );
-          const someSubItemDownloadable = parent.subItems?.some((subItem) =>
-            subItem.id === item.id
-              ? updatedPermissions.download
-              : subItem.permissions.download,
-          );
-
-          changes[parent.id] = {
-            view: someSubItemViewable || false,
-            download: someSubItemDownloadable || false,
-            itemType: parent.itemType,
-          };
-        });
-        // }
+        if (updatedPermissions.view) {
+          parents.forEach((parent) => {
+            changes[parent.id] = {
+              view: true, // Always enable view for parent folders
+              download: parent.permissions.download, // Maintain existing download permission
+              itemType: parent.itemType,
+            };
+          });
+        } else {
+          // If turning off view, recalculate parent permissions
+          [...parents].reverse().forEach((parent) => {
+            const otherChildren =
+              parent.subItems?.filter((subItem) => subItem.id !== item.id) ||
+              [];
+            const someSubItemViewable = otherChildren.some(
+              (subItem) => subItem.permissions.view,
+            );
+            const someSubItemDownloadable = otherChildren.some(
+              (subItem) => subItem.permissions.download,
+            );
+
+            changes[parent.id] = {
+              view: someSubItemViewable,
+              download: someSubItemDownloadable,
+              itemType: parent.itemType,
+            };
+          });
+        }
 
         return changes;
       };