3 files changed, 19 insertions, 29 deletions
diff --git a/apps/web/app/dashboard/bookmarks/layout.tsx b/apps/web/app/dashboard/bookmarks/layout.tsx
deleted file mode 100644
index a2356d23..00000000
--- a/apps/web/app/dashboard/bookmarks/layout.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React from "react";
-import TopNav from "@/components/dashboard/bookmarks/TopNav";
-import UploadDropzone from "@/components/dashboard/UploadDropzone";
-import { Separator } from "@/components/ui/separator";
-
-export default function BookmarksLayout({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) {
-  return (
-    <UploadDropzone>
-      <div className="flex h-full flex-col">
-        <div>
-          <TopNav />
-        </div>
-        <Separator />
-        <div className="my-4 flex-1 pb-4">{children}</div>
-      </div>
-    </UploadDropzone>
-  );
-}
diff --git a/apps/web/app/dashboard/bookmarks/page.tsx b/apps/web/app/dashboard/bookmarks/page.tsx
index 02964482..9907df4d 100644
--- a/apps/web/app/dashboard/bookmarks/page.tsx
+++ b/apps/web/app/dashboard/bookmarks/page.tsx
@@ -1,11 +1,23 @@
+import React from "react";
 import Bookmarks from "@/components/dashboard/bookmarks/Bookmarks";
+import TopNav from "@/components/dashboard/bookmarks/TopNav";
+import UploadDropzone from "@/components/dashboard/UploadDropzone";
+import { Separator } from "@/components/ui/separator";
 
 export default async function BookmarksPage() {
   return (
-    <Bookmarks
-      header={<p className="text-2xl">Bookmarks</p>}
-      query={{ archived: false }}
-      showEditorCard={true}
-    />
+    <div>
+      <UploadDropzone>
+        <TopNav />
+        <Separator />
+        <div className="my-4 flex-1">
+          <Bookmarks
+            header={<p className="text-2xl">Bookmarks</p>}
+            query={{ archived: false }}
+            showEditorCard={true}
+          />
+        </div>
+      </UploadDropzone>
+    </div>
   );
 }
diff --git a/apps/web/app/dashboard/bookmarks/loading.tsx b/apps/web/components/ui/full-page-spinner.tsx
index 4e56c3c4..3817a04f 100644
--- a/apps/web/app/dashboard/bookmarks/loading.tsx
+++ b/apps/web/components/ui/full-page-spinner.tsx
@@ -1,6 +1,6 @@
-import Spinner from "@/components/ui/spinner";
+import Spinner from "./spinner";
 
-export default function Loading() {
+export function FullPageSpinner() {
   return (
     <div className="flex size-full">
       <div className="m-auto">