From fe13408831dce4bdae4911098d6079a097cae9e8 Mon Sep 17 00:00:00 2001
From: MohamedBassem <me@mbassem.com>
Date: Tue, 9 Apr 2024 15:49:24 +0100
Subject: feature(web): Allow uploading directly into lists/tags. Fixes #69

---
 apps/web/app/dashboard/archive/page.tsx        |  1 +
 apps/web/app/dashboard/bookmarks/page.tsx      | 21 +++++++++----------
 apps/web/app/dashboard/favourites/page.tsx     |  1 +
 apps/web/app/dashboard/layout.tsx              |  2 +-
 apps/web/app/dashboard/lists/[listId]/page.tsx | 28 ++++++++++++--------------
 apps/web/app/dashboard/tags/[tagName]/page.tsx |  1 +
 6 files changed, 26 insertions(+), 28 deletions(-)

(limited to 'apps/web/app')

diff --git a/apps/web/app/dashboard/archive/page.tsx b/apps/web/app/dashboard/archive/page.tsx
index b2b4df4f..26ec45e9 100644
--- a/apps/web/app/dashboard/archive/page.tsx
+++ b/apps/web/app/dashboard/archive/page.tsx
@@ -14,6 +14,7 @@ export default async function ArchivedBookmarkPage() {
       }
       query={{ archived: true }}
       showDivider={true}
+      showEditorCard={true}
     />
   );
 }
diff --git a/apps/web/app/dashboard/bookmarks/page.tsx b/apps/web/app/dashboard/bookmarks/page.tsx
index 9907df4d..90f4f2cb 100644
--- a/apps/web/app/dashboard/bookmarks/page.tsx
+++ b/apps/web/app/dashboard/bookmarks/page.tsx
@@ -1,23 +1,20 @@
 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 (
     <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>
+      <TopNav />
+      <Separator />
+      <div className="my-4 flex-1">
+        <Bookmarks
+          header={<p className="text-2xl">Bookmarks</p>}
+          query={{ archived: false }}
+          showEditorCard={true}
+        />
+      </div>
     </div>
   );
 }
diff --git a/apps/web/app/dashboard/favourites/page.tsx b/apps/web/app/dashboard/favourites/page.tsx
index 13d793c6..423a8e69 100644
--- a/apps/web/app/dashboard/favourites/page.tsx
+++ b/apps/web/app/dashboard/favourites/page.tsx
@@ -6,6 +6,7 @@ export default async function FavouritesBookmarkPage() {
       header={<p className="text-2xl">⭐️ Favourites</p>}
       query={{ favourited: true }}
       showDivider={true}
+      showEditorCard={true}
     />
   );
 }
diff --git a/apps/web/app/dashboard/layout.tsx b/apps/web/app/dashboard/layout.tsx
index 628c3a34..3b6908f8 100644
--- a/apps/web/app/dashboard/layout.tsx
+++ b/apps/web/app/dashboard/layout.tsx
@@ -21,7 +21,7 @@ export default async function Dashboard({
           <MobileSidebar />
           <Separator />
         </div>
-        <div className="container p-4">{children}</div>
+        <div className="container min-h-screen p-4">{children}</div>
       </main>
     </div>
   );
diff --git a/apps/web/app/dashboard/lists/[listId]/page.tsx b/apps/web/app/dashboard/lists/[listId]/page.tsx
index 2b8025e5..49bf77f7 100644
--- a/apps/web/app/dashboard/lists/[listId]/page.tsx
+++ b/apps/web/app/dashboard/lists/[listId]/page.tsx
@@ -1,7 +1,6 @@
 import { notFound } from "next/navigation";
 import Bookmarks from "@/components/dashboard/bookmarks/Bookmarks";
 import DeleteListButton from "@/components/dashboard/lists/DeleteListButton";
-import { BookmarkListContextProvider } from "@/lib/hooks/list-context";
 import { api } from "@/server/api/client";
 import { TRPCError } from "@trpc/server";
 
@@ -23,19 +22,18 @@ export default async function ListPage({
   }
 
   return (
-    <BookmarkListContextProvider listId={list.id}>
-      <Bookmarks
-        query={{ listId: list.id }}
-        showDivider={true}
-        header={
-          <div className="flex justify-between">
-            <span className="text-2xl">
-              {list.icon} {list.name}
-            </span>
-            <DeleteListButton list={list} />
-          </div>
-        }
-      />
-    </BookmarkListContextProvider>
+    <Bookmarks
+      query={{ listId: list.id }}
+      showDivider={true}
+      showEditorCard={true}
+      header={
+        <div className="flex justify-between">
+          <span className="text-2xl">
+            {list.icon} {list.name}
+          </span>
+          <DeleteListButton list={list} />
+        </div>
+      }
+    />
   );
 }
diff --git a/apps/web/app/dashboard/tags/[tagName]/page.tsx b/apps/web/app/dashboard/tags/[tagName]/page.tsx
index 6bbb5234..b8bf351d 100644
--- a/apps/web/app/dashboard/tags/[tagName]/page.tsx
+++ b/apps/web/app/dashboard/tags/[tagName]/page.tsx
@@ -32,6 +32,7 @@ export default async function TagPage({
         </div>
       }
       query={{ tagId: tag.id }}
+      showEditorCard={true}
     />
   );
 }
-- 
cgit v1.2.3-70-g09d2