⚡️⚡️⚡️ Self-hosted collaborative bookmark manager to collect, read, annotate, and fully preserve what matters, all in one place.
TypeScript bookmarkbookmark-managercollaborationnextjsreact-nativeread-it-laterself-hostedtypescript
added dashboard + sorting functionality done partially
Daniel90106279975c
diff --git a/components/CollectionCard.tsx b/components/CollectionCard.tsxindex a85a7ee6..7b207823 100644--- a/components/CollectionCard.tsx+++ b/components/CollectionCard.tsx@@ -5,10 +5,12 @@import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";import { faChevronRight } from "@fortawesome/free-solid-svg-icons";-import { Collection } from "@prisma/client";import Link from "next/link";+import { ExtendedCollection } from "@/types/global";+import useLinkStore from "@/store/links";-export default function ({ collection }: { collection: Collection }) {+export default function ({ collection }: { collection: ExtendedCollection }) {+ const { links } = useLinkStore();const formattedDate = new Date(collection.createdAt).toLocaleString("en-US", {year: "numeric",month: "short",@@ -17,20 +19,37 @@ export default function ({ collection }: { collection: Collection }) {return (<Link href={`/collections/${collection.id}`}>- <div className="p-5 bg-gray-100 h-40 w-60 rounded-md border-sky-100 border-solid border flex flex-col justify-between cursor-pointer hover:bg-gray-50 duration-100">+ <div className="p-5 bg-gray-100 min-h-[10rem] w-72 rounded-md border-sky-100 border-solid border flex flex-col gap-2 justify-between cursor-pointer hover:bg-gray-50 duration-100"><div><div className="flex justify-between text-sky-900 items-center">- <p className="text-lg w-max">{collection.name}</p>+ <p className="text-lg w-max font-bold">{collection.name}</p><FontAwesomeIconicon={faChevronRight}className="w-3 h-3 text-gray-500"/></div>- <p className="text-sm font-bold text-gray-500">- {collection.description}+ <p className="text-sky-400">{collection.description}</p>+ </div>+ <div className="text-sky-400 flex gap-1 flex-wrap">+ <p>Members:</p>+ {collection.members.map((e, i) => {+ return (+ <p+ className="text-sky-500 font-semibold"+ title={e.user.email}+ key={i}+ >+ {e.user.name}+ </p>+ );+ })}+ </div>+ <div className="flex gap-2 items-baseline">+ <p className="text-sky-300 font-bold text-sm">{formattedDate}</p>+ <p className="text-sky-500 font-bold">+ {links.filter((e) => e.collectionId === collection.id).length} Links</p></div>- <p className="text-sm text-sky-300 font-bold">{formattedDate}</p></div></Link>);diff --git a/components/Dashboard/CollectionItem.tsx b/components/Dashboard/CollectionItem.tsxnew file mode 100644index 00000000..ded9cb51--- /dev/null+++ b/components/Dashboard/CollectionItem.tsx@@ -0,0 +1,59 @@+// Copyright (C) 2022-present Daniel31x13 <[email protected]>+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3.+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.+// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.++import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";+import { faChevronRight } from "@fortawesome/free-solid-svg-icons";+import Link from "next/link";+import { ExtendedCollection } from "@/types/global";+import useLinkStore from "@/store/links";++export default function ({ collection }: { collection: ExtendedCollection }) {+ const { links } = useLinkStore();+ const formattedDate = new Date(collection.createdAt).toLocaleString("en-US", {+ year: "numeric",+ month: "short",+ day: "numeric",+ });++ return (+ <Link href={`/collections/${collection.id}`}>+ <div className="p-5 bg-white rounded-md flex flex-col gap-2 justify-between cursor-pointer hover:bg-gray-50 duration-100">+ <div>+ <div className="flex justify-between text-sky-900 items-center">+ <div className="flex items-baseline gap-1">+ <p className="text-lg w-max font-bold">{collection.name}</p>+ <p className="text-sky-400">{collection.description}</p>+ </div>++ <FontAwesomeIcon+ icon={faChevronRight}+ className="w-3 h-3 text-gray-500"+ />+ </div>+ </div>+ <div className="text-sky-400 flex gap-1 flex-wrap">+ <p>Members:</p>+ {collection.members.map((e, i) => {+ return (+ <p+ className="text-sky-500 font-semibold"+ title={e.user.email}+ key={i}+ >+ {e.user.name}+ </p>+ );+ })}+ </div>+ <div className="flex gap-2 items-baseline">+ <p className="text-sky-300 font-bold text-sm">{formattedDate}</p>+ <p className="text-sky-500 font-bold">+ {links.filter((e) => e.collectionId === collection.id).length} Links+ </p>+ </div>+ </div>+ </Link>+ );+}diff --git a/components/Dashboard/LinkItem.tsx b/components/Dashboard/LinkItem.tsxnew file mode 100644index 00000000..fd4c34ca--- /dev/null+++ b/components/Dashboard/LinkItem.tsx@@ -0,0 +1,131 @@+// Copyright (C) 2022-present Daniel31x13 <[email protected]>+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3.+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.+// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.++import { ExtendedLink } from "@/types/global";+import {+ faFolder,+ faArrowUpRightFromSquare,+} from "@fortawesome/free-solid-svg-icons";+import { faFileImage, faFilePdf } from "@fortawesome/free-regular-svg-icons";+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";+import { useState } from "react";+import Image from "next/image";+import Link from "next/link";++export default function ({+ link,+ count,+}: {+ link: ExtendedLink;+ count: number;+}) {+ const [editModal, setEditModal] = useState(false);++ const url = new URL(link.url);+ const formattedDate = new Date(link.createdAt).toLocaleString("en-US", {+ year: "numeric",+ month: "short",+ day: "numeric",+ });++ return (+ <div className="bg-white p-5 rounded-md flex items-start relative gap-5 sm:gap-14 group/item">+ <Image+ src={`https://t2.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${url.origin}&size=32`}+ width={32}+ height={32}+ alt=""+ className="select-none mt-3 z-10 rounded-md"+ draggable="false"+ onError={(e) => {+ const target = e.target as HTMLElement;+ target.style.opacity = "0";+ }}+ />+ <Image+ src={`https://t2.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${url.origin}&size=32`}+ width={80}+ height={80}+ alt=""+ className="blur-sm absolute left-2 opacity-40 select-none hidden sm:block"+ draggable="false"+ onError={(e) => {+ const target = e.target as HTMLElement;+ target.style.opacity = "0";+ }}+ />+ <div className="flex justify-between gap-5 w-full z-0">+ <div>+ <div className="flex items-baseline gap-1">+ <p className="text-sm text-sky-300 font-bold">{count + 1}.</p>+ <p className="text-lg text-sky-600">{link.name}</p>+ </div>+ <p className="text-sky-400 text-sm font-medium">{link.title}</p>+ <div className="flex gap-3 items-center flex-wrap my-3">+ <Link href={`/collections/${link.collection.id}`}>+ <div className="flex items-center gap-1 cursor-pointer hover:opacity-60 duration-100">+ <FontAwesomeIcon icon={faFolder} className="w-4 text-sky-300" />+ <p className="text-sky-900">{link.collection.name}</p>+ </div>+ </Link>++ <div className="flex gap-1 items-center flex-wrap">+ {link.tags.map((e, i) => (+ <Link key={i} href={`/tags/${e.id}`}>+ <p className="px-2 py-1 bg-sky-200 text-sky-700 text-xs rounded-3xl cursor-pointer hover:bg-sky-100 duration-100">+ # {e.name}+ </p>+ </Link>+ ))}+ </div>+ </div>+ <div className="flex gap-2 items-center flex-wrap">+ <p className="text-gray-500">{formattedDate}</p>+ <a href={link.url} target="_blank" className="group/url">+ <div className="text-gray-500 font-bold flex items-center gap-1">+ <p>{url.host}</p>+ <FontAwesomeIcon+ icon={faArrowUpRightFromSquare}+ className="w-3 opacity-0 group-hover/url:opacity-100 duration-75"+ />+ </div>+ </a>+ </div>+ </div>++ <div className="flex flex-col justify-between items-end relative">+ <a+ href={`/api/archives/${link.collectionId}/${encodeURIComponent(+ link.screenshotPath+ )}`}+ target="_blank"+ title="Screenshot"+ >+ <FontAwesomeIcon+ icon={faFileImage}+ className="w-8 h-8 text-sky-600 cursor-pointer hover:text-sky-500 duration-100"+ />+ </a>+ <a+ href={`/api/archives/${link.collectionId}/${encodeURIComponent(+ link.pdfPath+ )}`}+ target="_blank"+ title="PDF"+ >+ <FontAwesomeIcon+ icon={faFilePdf}+ className="w-8 h-8 text-sky-600 cursor-pointer hover:text-sky-500 duration-100"+ />+ </a>+ <FontAwesomeIcon+ icon={faArrowUpRightFromSquare}+ className="w-8 h-8 text-sky-600 cursor-pointer hover:text-sky-500 duration-100"+ />+ </div>+ </div>+ </div>+ );+}diff --git a/components/LinkList.tsx b/components/LinkList.tsxindex a666a7ee..1445a5ce 100644--- a/components/LinkList.tsx+++ b/components/LinkList.tsx@@ -144,6 +144,7 @@ export default function ({)}`}onMouseEnter={() => setArchiveLabel("Screenshot")}target="_blank"+ title="Screenshot"><FontAwesomeIconicon={faFileImage}@@ -156,6 +157,7 @@ export default function ({)}`}target="_blank"onMouseEnter={() => setArchiveLabel("PDF")}+ title="PDF"><FontAwesomeIconicon={faFilePdf}diff --git a/components/Search.tsx b/components/Search.tsxindex 0ed444cc..c2685dec 100644--- a/components/Search.tsx+++ b/components/Search.tsx@@ -1,6 +1,6 @@import { faMagnifyingGlass } from "@fortawesome/free-solid-svg-icons";import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";-import { useState } from "react";+import { useEffect, useState } from "react";import ClickAwayHandler from "./ClickAwayHandler";import useSearchSettingsStore from "@/store/search";import { useRouter } from "next/router";@@ -15,6 +15,10 @@ export default function Search() {const { searchSettings, toggleCheckbox, setSearchQuery } =useSearchSettingsStore();+ useEffect(() => {+ if (router.pathname !== "/search") setSearchQuery("");+ }, [router]);+return (<ClickAwayHandler onClickOutside={() => setSearchBox(false)}><divdiff --git a/components/Sidebar/index.tsx b/components/Sidebar/index.tsxindex 89fa8f3c..4ced79f5 100644--- a/components/Sidebar/index.tsx+++ b/components/Sidebar/index.tsx@@ -10,6 +10,7 @@ import {faBox,faHashtag,faBookmark,+ faChartSimple,} from "@fortawesome/free-solid-svg-icons";import SidebarItem from "./SidebarItem";import useTagStore from "@/store/tags";@@ -35,6 +36,30 @@ export default function () {Linkwarden</p>+ <Link href="/dashboard">+ <div+ className={`${+ active === "/dashboard"+ ? "bg-sky-500"+ : "hover:bg-gray-50 hover:outline bg-gray-100"+ } outline-sky-100 outline-1 duration-100 rounded-md my-1 p-2 cursor-pointer flex items-center gap-2`}+ >+ <FontAwesomeIcon+ icon={faChartSimple}+ className={`w-4 ${+ active === "/dashboard" ? "text-white" : "text-sky-300"+ }`}+ />+ <p+ className={`${+ active === "/dashboard" ? "text-white" : "text-sky-900"+ }`}+ >+ Dashboard+ </p>+ </div>+ </Link>+<Link href="/links"><divclassName={`${diff --git a/layouts/Dashboard.tsx b/layouts/MainLayout.tsxsimilarity index 100%rename from layouts/Dashboard.tsxrename to layouts/MainLayout.tsxdiff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsxindex ab8fe6fc..f0921b84 100644--- a/pages/collections/[id].tsx+++ b/pages/collections/[id].tsx@@ -22,7 +22,7 @@ import {import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";import { useRouter } from "next/router";import { useEffect, useState } from "react";-import Dashboard from "@/layouts/Dashboard";+import MainLayout from "@/layouts/MainLayout";export default function () {const router = useRouter();@@ -62,7 +62,7 @@ export default function () {}, [links, router, collections]);return (- <Dashboard>+ <MainLayout><div className="p-5 flex flex-col gap-5 w-full"><div className="flex gap-3 items-center"><div className="flex gap-2 items-center">@@ -146,6 +146,6 @@ export default function () {return <LinkList key={i} link={e} count={i} />;})}</div>- </Dashboard>+ </MainLayout>);}diff --git a/pages/collections/index.tsx b/pages/collections/index.tsxindex 080e7c1e..45dd2548 100644--- a/pages/collections/index.tsx+++ b/pages/collections/index.tsx@@ -7,75 +7,162 @@ import useCollectionStore from "@/store/collections";import {faAdd,faBox,+ faCheck,faEllipsis,faPlus,+ faSort,} from "@fortawesome/free-solid-svg-icons";import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";import CollectionCard from "@/components/CollectionCard";import Dropdown from "@/components/Dropdown";-import { useState } from "react";+import { ChangeEvent, useState } from "react";import Modal from "@/components/Modal";import AddCollection from "@/components/Modal/AddCollection";-import Dashboard from "@/layouts/Dashboard";+import MainLayout from "@/layouts/MainLayout";+import ClickAwayHandler from "@/components/ClickAwayHandler";export default function () {const { collections } = useCollectionStore();const [expandDropdown, setExpandDropdown] = useState(false);+ const [sortDropdown, setSortDropdown] = useState(false);- const [linkModal, setLinkModal] = useState(false);+ const [collectionModal, setCollectionModal] = useState(false);const toggleCollectionModal = () => {- setLinkModal(!linkModal);+ setCollectionModal(!collectionModal);+ };++ const [sortBy, setSortBy] = useState("");++ const handleSortChange = (event: ChangeEvent<HTMLInputElement>) => {+ setSortBy(event.target.value);};return (// ml-80- <Dashboard>+ <MainLayout><div className="p-5">- <div className="flex gap-3 items-center mb-5">- <div className="flex gap-2 items-center">- <FontAwesomeIcon icon={faBox} className="w-5 h-5 text-sky-300" />- <p className="text-lg text-sky-900">All Collections</p>+ <div className="flex gap-3 items-center justify-between mb-5">+ <div className="flex gap-3 items-center">+ <div className="flex gap-2 items-center">+ <FontAwesomeIcon icon={faBox} className="w-5 h-5 text-sky-300" />+ <p className="text-lg text-sky-900">All Collections</p>+ </div>+ <div className="relative">+ <div+ onClick={() => setExpandDropdown(!expandDropdown)}+ id="edit-dropdown"+ className="inline-flex rounded-md cursor-pointer hover:bg-white hover:border-sky-500 border-sky-100 border duration-100 p-1"+ >+ <FontAwesomeIcon+ icon={faEllipsis}+ id="edit-dropdown"+ className="w-5 h-5 text-gray-500"+ />+ </div>++ {expandDropdown ? (+ <Dropdown+ items={[+ {+ name: "New",+ icon: <FontAwesomeIcon icon={faAdd} />,+ onClick: () => {+ toggleCollectionModal();+ setExpandDropdown(false);+ },+ },+ ]}+ onClickOutside={(e: Event) => {+ const target = e.target as HTMLInputElement;+ if (target.id !== "edit-dropdown") setExpandDropdown(false);+ }}+ className="absolute top-8 left-0 w-36"+ />+ ) : null}+ </div></div>+<div className="relative"><div- onClick={() => setExpandDropdown(!expandDropdown)}- id="edit-dropdown"+ onClick={() => setSortDropdown(!sortDropdown)}+ id="sort-dropdown"className="inline-flex rounded-md cursor-pointer hover:bg-white hover:border-sky-500 border-sky-100 border duration-100 p-1"><FontAwesomeIcon- icon={faEllipsis}- id="edit-dropdown"+ icon={faSort}+ id="sort-dropdown"className="w-5 h-5 text-gray-500"/></div>- {expandDropdown ? (- <Dropdown- items={[- {- name: "New",- icon: <FontAwesomeIcon icon={faAdd} />,- onClick: () => {- toggleCollectionModal();- setExpandDropdown(false);- },- },- ]}++ {sortDropdown ? (+ <ClickAwayHandleronClickOutside={(e: Event) => {const target = e.target as HTMLInputElement;- if (target.id !== "edit-dropdown") setExpandDropdown(false);+ if (target.id !== "sort-dropdown") setSortDropdown(false);}}- className="absolute top-8 left-0 w-36"- />+ className="absolute top-8 right-0 shadow-md bg-gray-50 rounded-md p-2 z-10 border border-sky-100 w-36"+ >+ <p className="mb-2 text-sky-900 text-sm text-center">Sort by</p>+ <div className="flex flex-col gap-2">+ <label className="cursor-pointer flex items-center gap-2">+ <input+ type="radio"+ name="Sort"+ value="Name"+ className="peer sr-only"+ checked={sortBy === "Name"}+ onChange={handleSortChange}+ />+ <span className="text-sky-900 peer-checked:bg-sky-500 hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">+ Name+ </span>+ <FontAwesomeIcon+ icon={faCheck}+ className="w-5 h-5 text-sky-500 peer-checked:block hidden"+ />+ </label>+ <label className="cursor-pointer flex items-center gap-2">+ <input+ type="radio"+ name="Sort"+ value="Description"+ className="peer sr-only"+ checked={sortBy === "Description"}+ onChange={handleSortChange}+ />+ <span className="text-sky-900 peer-checked:bg-sky-500 hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">+ Description+ </span>+ <FontAwesomeIcon+ icon={faCheck}+ className="w-5 h-5 text-sky-500 peer-checked:block hidden"+ />+ </label>+ <label className="cursor-pointer flex items-center gap-2">+ <input+ type="radio"+ name="Sort"+ value="Date"+ className="peer sr-only"+ checked={sortBy === "Date"}+ onChange={handleSortChange}+ />+ <span className="text-sky-900 peer-checked:bg-sky-500 hover:bg-sky-200 duration-75 peer-checked:text-white rounded p-1 select-none">+ Date+ </span>+ <FontAwesomeIcon+ icon={faCheck}+ className="w-5 h-5 text-sky-500 peer-checked:block hidden"+ />+ </label>+ </div>+ </ClickAwayHandler>) : null}</div>-- {linkModal ? (- <Modal toggleModal={toggleCollectionModal}>- <AddCollection toggleCollectionModal={toggleCollectionModal} />- </Modal>- ) : null}</div>+<div className="flex flex-wrap gap-5">{collections.map((e, i) => {return <CollectionCard key={i} collection={e} />;@@ -90,6 +177,12 @@ export default function () {</div></div></div>- </Dashboard>++ {collectionModal ? (+ <Modal toggleModal={toggleCollectionModal}>+ <AddCollection toggleCollectionModal={toggleCollectionModal} />+ </Modal>+ ) : null}+ </MainLayout>);}diff --git a/pages/dashboard.tsx b/pages/dashboard.tsxnew file mode 100644index 00000000..393ca833--- /dev/null+++ b/pages/dashboard.tsx@@ -0,0 +1,117 @@+// Copyright (C) 2022-present Daniel31x13 <[email protected]>+// This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 3.+// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.+// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.++import useCollectionStore from "@/store/collections";+import { faArrowRight, faChartSimple } from "@fortawesome/free-solid-svg-icons";+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";+import MainLayout from "@/layouts/MainLayout";+import useLinkStore from "@/store/links";+import useTagStore from "@/store/tags";+import LinkItem from "@/components/Dashboard/LinkItem";+import Link from "next/link";+import CollectionItem from "@/components/Dashboard/CollectionItem";+import { useEffect, useState } from "react";++export default function () {+ const { collections } = useCollectionStore();+ const { links } = useLinkStore();+ const { tags } = useTagStore();++ const [sortedCollections, setSortedCollections] = useState([]);++ useEffect(() => {+ const collectionsWithLinkCount = collections.map((collection) => {+ const linkCount = links.filter(+ (link) => link.collectionId === collection.id+ ).length;+ return { ...collection, linkCount };+ });++ setSortedCollections(+ collectionsWithLinkCount.sort((a, b) => b.linkCount - a.linkCount) as any+ );+ }, [collections]);++ return (+ // ml-80+ <MainLayout>+ <div className="p-5">+ <div className="flex gap-3 items-center mb-5">+ <div className="flex gap-2 items-center">+ <FontAwesomeIcon+ icon={faChartSimple}+ className="w-5 h-5 text-sky-300"+ />+ <p className="text-lg text-sky-900">Dashboard</p>+ </div>+ </div>++ <div className="flex flex-col md:flex-row md:items-center justify-evenly gap-2 mb-10">+ <div className="flex items-baseline gap-2">+ <p className="text-sky-500 font-bold text-6xl">{links.length}</p>+ <p className="text-sky-900 text-xl">Links</p>+ </div>++ <div className="flex items-baseline gap-2">+ <p className="text-sky-500 font-bold text-6xl">+ {collections.length}+ </p>+ <p className="text-sky-900 text-xl">Collections</p>+ </div>++ <div className="flex items-baseline gap-2">+ <p className="text-sky-500 font-bold text-6xl">{tags.length}</p>+ <p className="text-sky-900 text-xl">Tags</p>+ </div>+ </div>++ <div className="flex flex-col md:flex-row items-start justify-evenly gap-5">+ <div className="flex flex-col gap-2 p-2 bg-sky-50 rounded-md w-full">+ <div className="flex justify-between gap-2 items-baseline">+ <p className="text-sky-600 text-xl mb-2">Recently added Links</p>+ <Link href="/links">+ <div className="text-sky-600 flex items-center gap-1">+ View All+ <FontAwesomeIcon+ icon={faArrowRight}+ className="w-4 h-4 text-sky-300"+ />+ </div>+ </Link>+ </div>+ {links+ .sort(+ (a, b) =>+ new Date(b.createdAt).getTime() -+ new Date(a.createdAt).getTime()+ )+ .slice(0, 5)+ .map((e, i) => (+ <LinkItem key={i} link={e} count={i} />+ ))}+ </div>++ <div className="flex flex-col gap-2 p-2 bg-sky-50 rounded-md w-full">+ <div className="flex justify-between gap-2 items-baseline">+ <p className="text-sky-600 text-xl mb-2">Top Collections</p>+ <Link href="/collections">+ <div className="text-sky-600 flex items-center gap-1">+ View All+ <FontAwesomeIcon+ icon={faArrowRight}+ className="w-4 h-4 text-sky-300"+ />+ </div>+ </Link>+ </div>+ {sortedCollections.map((e, i) => (+ <CollectionItem key={i} collection={e} />+ ))}+ </div>+ </div>+ </div>+ </MainLayout>+ );+}diff --git a/pages/index.tsx b/pages/index.tsxindex c0c4a0f0..d82e2869 100644--- a/pages/index.tsx+++ b/pages/index.tsx@@ -10,6 +10,6 @@ export default function Home() {const router = useRouter();useEffect(() => {- router.push("/collections");+ router.push("/MainLayout");}, []);}diff --git a/pages/links.tsx b/pages/links.tsxindex 8923dc61..68ad3503 100644--- a/pages/links.tsx+++ b/pages/links.tsx@@ -4,7 +4,7 @@// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.import LinkList from "@/components/LinkList";-import Dashboard from "@/layouts/Dashboard";+import MainLayout from "@/layouts/MainLayout";import useLinkStore from "@/store/links";import { faBookmark } from "@fortawesome/free-solid-svg-icons";import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";@@ -13,7 +13,7 @@ export default function Links() {const { links } = useLinkStore();return (- <Dashboard>+ <MainLayout><div className="p-5 flex flex-col gap-5 w-full"><div className="flex gap-3 items-center"><div className="flex gap-2 items-center">@@ -28,6 +28,6 @@ export default function Links() {return <LinkList key={i} link={e} count={i} />;})}</div>- </Dashboard>+ </MainLayout>);}diff --git a/pages/search.tsx b/pages/search.tsxindex cbbfa7b9..8bb25cbf 100644--- a/pages/search.tsx+++ b/pages/search.tsx@@ -4,7 +4,7 @@// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.import LinkList from "@/components/LinkList";-import Dashboard from "@/layouts/Dashboard";+import MainLayout from "@/layouts/MainLayout";import useLinkStore from "@/store/links";import useSearchSettingsStore from "@/store/search";import { ExtendedLink } from "@/types/global";@@ -40,7 +40,7 @@ export default function Links() {}, [searchSettings, links]);return (- <Dashboard>+ <MainLayout><div className="p-5 flex flex-col gap-5 w-full"><div className="flex gap-3 items-center"><div className="flex gap-2 items-center">@@ -48,12 +48,19 @@ export default function Links() {<p className="text-lg text-sky-900">Search Results</p></div></div>- {filteredLinks[0]- ? filteredLinks.map((e, i) => {- return <LinkList key={i} link={e} count={i} />;- })- : "No results..."}+ {filteredLinks[0] ? (+ filteredLinks.map((e, i) => {+ return <LinkList key={i} link={e} count={i} />;+ })+ ) : (+ <p className="text-sky-900">+ Nothing found.{" "}+ <span className="text-sky-500 font-bold text-xl" title="Shruggie">+ ¯\_(ツ)_/¯+ </span>+ </p>+ )}</div>- </Dashboard>+ </MainLayout>);}diff --git a/pages/tags/[id].tsx b/pages/tags/[id].tsxindex 4a06f141..70d0f876 100644--- a/pages/tags/[id].tsx+++ b/pages/tags/[id].tsx@@ -3,7 +3,7 @@// This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.// You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.-import Dashboard from "@/layouts/Dashboard";+import MainLayout from "@/layouts/MainLayout";import { useRouter } from "next/router";export default function () {@@ -12,8 +12,8 @@ export default function () {const tagId = Number(router.query.id);return (- <Dashboard>+ <MainLayout><div>{"HI"}</div>- </Dashboard>+ </MainLayout>);}