From 4fae8f04f546d2b3f6053870d93385fa36af4742 Mon Sep 17 00:00:00 2001
From: MohamedBassem <me@mbassem.com>
Date: Fri, 9 Feb 2024 15:32:04 +0000
Subject: [ui] Adding the favourites and archive pages

---
 .../web/app/dashboard/bookmarks/archive/page.tsx   |  5 +++
 .../dashboard/bookmarks/components/Bookmarks.tsx   | 38 ++++++++++++++++++++++
 .../bookmarks/components/BookmarksGrid.tsx         | 16 +++------
 .../app/dashboard/bookmarks/favourites/page.tsx    |  5 +++
 packages/web/app/dashboard/bookmarks/layout.tsx    | 23 +++++++++++++
 packages/web/app/dashboard/bookmarks/page.tsx      | 21 ++----------
 6 files changed, 79 insertions(+), 29 deletions(-)
 create mode 100644 packages/web/app/dashboard/bookmarks/archive/page.tsx
 create mode 100644 packages/web/app/dashboard/bookmarks/components/Bookmarks.tsx
 create mode 100644 packages/web/app/dashboard/bookmarks/favourites/page.tsx
 create mode 100644 packages/web/app/dashboard/bookmarks/layout.tsx

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

diff --git a/packages/web/app/dashboard/bookmarks/archive/page.tsx b/packages/web/app/dashboard/bookmarks/archive/page.tsx
new file mode 100644
index 00000000..0d105fbd
--- /dev/null
+++ b/packages/web/app/dashboard/bookmarks/archive/page.tsx
@@ -0,0 +1,5 @@
+import Bookmarks from "../components/Bookmarks";
+
+export default async function ArchivedBookmarkPage() {
+  return <Bookmarks title="Archive" archived={true} favourited={false} />;
+}
diff --git a/packages/web/app/dashboard/bookmarks/components/Bookmarks.tsx b/packages/web/app/dashboard/bookmarks/components/Bookmarks.tsx
new file mode 100644
index 00000000..6a9ffe1b
--- /dev/null
+++ b/packages/web/app/dashboard/bookmarks/components/Bookmarks.tsx
@@ -0,0 +1,38 @@
+import { redirect } from "next/navigation";
+import BookmarksGrid from "./BookmarksGrid";
+import { authOptions } from "@/lib/auth";
+import { getServerSession } from "next-auth";
+import { getBookmarks } from "@/lib/services/bookmarks";
+import { ZGetBookmarksRequest } from "@/lib/types/api/bookmarks";
+
+export default async function Bookmarks({
+  favourited,
+  archived,
+  title,
+}: ZGetBookmarksRequest & { title: string }) {
+  const session = await getServerSession(authOptions);
+  if (!session) {
+    redirect("/");
+  }
+  const bookmarks = await getBookmarks(session.user.id, {
+    favourited,
+    archived,
+  });
+
+  if (bookmarks.length == 0) {
+    // TODO: This needs to be polished
+    return (
+      <>
+        <div className="container pb-4 text-2xl">{title}</div>
+        <div className="container">No bookmarks</div>
+      </>
+    );
+  }
+
+  return (
+    <>
+      <div className="container pb-4 text-2xl">{title}</div>
+      <BookmarksGrid bookmarks={bookmarks} />
+    </>
+  );
+}
diff --git a/packages/web/app/dashboard/bookmarks/components/BookmarksGrid.tsx b/packages/web/app/dashboard/bookmarks/components/BookmarksGrid.tsx
index f52ef910..11845ca3 100644
--- a/packages/web/app/dashboard/bookmarks/components/BookmarksGrid.tsx
+++ b/packages/web/app/dashboard/bookmarks/components/BookmarksGrid.tsx
@@ -1,7 +1,3 @@
-import { getServerSession } from "next-auth";
-import { redirect } from "next/navigation";
-import { authOptions } from "@/lib/auth";
-import { getBookmarks } from "@/lib/services/bookmarks";
 import LinkCard from "./LinkCard";
 import { ZBookmark } from "@/lib/types/api/bookmarks";
 
@@ -12,13 +8,11 @@ function renderBookmark(bookmark: ZBookmark) {
   }
 }
 
-export default async function BookmarksGrid() {
-  const session = await getServerSession(authOptions);
-  if (!session) {
-    redirect("/");
-  }
-  const bookmarks = await getBookmarks(session.user.id);
-
+export default function BookmarksGrid({
+  bookmarks,
+}: {
+  bookmarks: ZBookmark[];
+}) {
   return (
     <div className="container grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
       {bookmarks.map((b) => renderBookmark(b))}
diff --git a/packages/web/app/dashboard/bookmarks/favourites/page.tsx b/packages/web/app/dashboard/bookmarks/favourites/page.tsx
new file mode 100644
index 00000000..990b087d
--- /dev/null
+++ b/packages/web/app/dashboard/bookmarks/favourites/page.tsx
@@ -0,0 +1,5 @@
+import Bookmarks from "../components/Bookmarks";
+
+export default async function FavouritesBookmarkPage() {
+  return <Bookmarks title="Favourites" archived={false} favourited={true} />;
+}
diff --git a/packages/web/app/dashboard/bookmarks/layout.tsx b/packages/web/app/dashboard/bookmarks/layout.tsx
new file mode 100644
index 00000000..14f7bb40
--- /dev/null
+++ b/packages/web/app/dashboard/bookmarks/layout.tsx
@@ -0,0 +1,23 @@
+import React from "react";
+import AddLink from "./components/AddLink";
+import type { Metadata } from "next";
+
+export const metadata: Metadata = {
+  title: "Remember - Bookmarks",
+};
+
+export default function BookmarksLayout({
+  children,
+}: Readonly<{
+  children: React.ReactNode;
+}>) {
+  return (
+    <div className="flex flex-col">
+      <div>
+        <AddLink />
+      </div>
+      <hr />
+      <div className="mt-4">{children}</div>
+    </div>
+  );
+}
diff --git a/packages/web/app/dashboard/bookmarks/page.tsx b/packages/web/app/dashboard/bookmarks/page.tsx
index b9eabfe8..3d125fad 100644
--- a/packages/web/app/dashboard/bookmarks/page.tsx
+++ b/packages/web/app/dashboard/bookmarks/page.tsx
@@ -1,20 +1,5 @@
-import AddLink from "./components/AddLink";
-import BookmarksGrid from "./components/BookmarksGrid";
-import type { Metadata } from "next";
+import Bookmarks from "./components/Bookmarks";
 
-export const metadata: Metadata = {
-  title: "Remember - Bookmarks",
-};
-
-export default async function Bookmarks() {
-  return (
-    <div className="flex flex-col">
-      <div>
-        <AddLink />
-      </div>
-      <div>
-        <BookmarksGrid />
-      </div>
-    </div>
-  );
+export default async function BookmarksPage() {
+  return <Bookmarks title="Bookmarks" archived={false} favourited={false} />;
 }
-- 
cgit v1.2.3-70-g09d2