From 30c8bc394100f2348a1f9c193036f95e045d4d6d Mon Sep 17 00:00:00 2001
From: MohamedBassem <me@mbassem.com>
Date: Fri, 29 Mar 2024 21:33:15 +0000
Subject: fix(web): Consistent spacing in the content container in all pages.
 Fixes #40

---
 apps/web/app/dashboard/bookmarks/layout.tsx  | 22 ----------------------
 apps/web/app/dashboard/bookmarks/loading.tsx | 11 -----------
 apps/web/app/dashboard/bookmarks/page.tsx    | 22 +++++++++++++++++-----
 3 files changed, 17 insertions(+), 38 deletions(-)
 delete mode 100644 apps/web/app/dashboard/bookmarks/layout.tsx
 delete mode 100644 apps/web/app/dashboard/bookmarks/loading.tsx

(limited to 'apps/web/app/dashboard/bookmarks')

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/loading.tsx b/apps/web/app/dashboard/bookmarks/loading.tsx
deleted file mode 100644
index 4e56c3c4..00000000
--- a/apps/web/app/dashboard/bookmarks/loading.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import Spinner from "@/components/ui/spinner";
-
-export default function Loading() {
-  return (
-    <div className="flex size-full">
-      <div className="m-auto">
-        <Spinner />
-      </div>
-    </div>
-  );
-}
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>
   );
 }
-- 
cgit v1.2.3-70-g09d2