⚡️⚡️⚡️ 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
improved user experience
daniel31x13c38c5b2cc5ff
diff --git a/components/CollectionCard.tsx b/components/CollectionCard.tsxindex 2a0bb567..76a27067 100644--- a/components/CollectionCard.tsx+++ b/components/CollectionCard.tsx@@ -1,5 +1,5 @@import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";-import { faEllipsis, faLink } from "@fortawesome/free-solid-svg-icons";+import { faEllipsis, faGlobe, faLink } from "@fortawesome/free-solid-svg-icons";import Link from "next/link";import { CollectionIncludingMembersAndLinkCount } from "@/types/global";import Dropdown from "./Dropdown";@@ -82,6 +82,13 @@ export default function CollectionCard({ collection, className }: Props) {</div><div className="text-right w-40"><div className="text-black dark:text-white font-bold text-sm flex justify-end gap-1 items-center">+ {collection.isPublic ? (+ <FontAwesomeIcon+ icon={faGlobe}+ title="This collection is being shared publicly."+ className="w-4 h-4 drop-shadow text-gray-500 dark:text-gray-300"+ />+ ) : undefined}<FontAwesomeIconicon={faLink}className="w-5 h-5 text-gray-500 dark:text-gray-300"diff --git a/components/Sidebar.tsx b/components/Sidebar.tsxindex 7254bde3..eb8cfad3 100644--- a/components/Sidebar.tsx+++ b/components/Sidebar.tsx@@ -6,6 +6,7 @@ import {faChartSimple,faChevronDown,faLink,+ faGlobe,} from "@fortawesome/free-solid-svg-icons";import useTagStore from "@/store/tags";import Link from "next/link";@@ -151,10 +152,17 @@ export default function Sidebar({ className }: { className?: string }) {className="w-6 h-6 drop-shadow"style={{ color: e.color }}/>-- <p className="text-black dark:text-white truncate w-full pr-7">+ <p className="text-black dark:text-white truncate w-full">{e.name}</p>++ {e.isPublic ? (+ <FontAwesomeIcon+ icon={faGlobe}+ title="This collection is being shared publicly."+ className="w-4 h-4 drop-shadow text-gray-500 dark:text-gray-300"+ />+ ) : undefined}</div></Link>);diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsxindex d4ca3db4..59a7fc2e 100644--- a/pages/collections/[id].tsx+++ b/pages/collections/[id].tsx@@ -220,7 +220,7 @@ export default function Index() {if (target.id !== "expand-dropdown")setExpandDropdown(false);}}- className="absolute top-8 right-0 z-10 w-fit"+ className="absolute top-8 right-0 z-10 w-40"/>) : null}</div>diff --git a/pages/collections/index.tsx b/pages/collections/index.tsxindex 806562ad..a252e1d1 100644--- a/pages/collections/index.tsx+++ b/pages/collections/index.tsx@@ -26,7 +26,7 @@ export default function Collections() {const [sortBy, setSortBy] = useState<Sort>(Sort.DateNewestFirst);const [sortedCollections, setSortedCollections] = useState(collections);- const session = useSession();+ const { data } = useSession();const { setModal } = useModalStore();@@ -35,18 +35,24 @@ export default function Collections() {return (<MainLayout><div className="p-5">- <div className="flex gap-3 items-center justify-between mb-5">- <div className="flex gap-3 items-end">- <div className="flex gap-2">+ <div className="flex gap-3 justify-between mb-5">+ <div className="flex gap-3">+ <div className="flex items-center gap-3"><FontAwesomeIconicon={faFolder}- className="sm:w-8 sm:h-8 w-6 h-6 mt-2 text-sky-500 dark:text-sky-500 drop-shadow"+ className="sm:w-10 sm:h-10 w-6 h-6 text-sky-500 dark:text-sky-500 drop-shadow"/>- <p className="sm:text-4xl text-3xl capitalize text-black dark:text-white font-thin">- All Collections- </p>+ <div>+ <p className="text-3xl capitalize text-black dark:text-white font-thin">+ Your Collections+ </p>++ <p className="capitalize text-black dark:text-white">+ Collections you own+ </p>+ </div></div>- <div className="relative">+ <div className="relative mt-2"><divonClick={() => setExpandDropdown(!expandDropdown)}id="expand-dropdown"@@ -79,13 +85,13 @@ export default function Collections() {if (target.id !== "expand-dropdown")setExpandDropdown(false);}}- className="absolute top-8 left-0 w-36"+ className="absolute top-8 sm:left-0 right-0 sm:right-auto w-36"/>) : null}</div></div>- <div className="relative">+ <div className="relative mt-2"><divonClick={() => setSortDropdown(!sortDropdown)}id="sort-dropdown"@@ -109,9 +115,11 @@ export default function Collections() {</div><div className="grid xl:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-5">- {sortedCollections.map((e, i) => {- return <CollectionCard key={i} collection={e} />;- })}+ {sortedCollections+ .filter((e) => e.ownerId !== data?.user.id)+ .map((e, i) => {+ return <CollectionCard key={i} collection={e} />;+ })}<divclassName="p-5 bg-gray-50 dark:bg-neutral-800 self-stretch border border-solid border-sky-100 dark:border-neutral-700 min-h-[12rem] rounded-2xl cursor-pointer shadow duration-100 hover:shadow-none flex flex-col gap-4 justify-center items-center group"@@ -132,6 +140,34 @@ export default function Collections() {/></div></div>++ {sortedCollections.filter((e) => e.ownerId !== data?.user.id)[0] ? (+ <>+ <div className="flex items-center gap-3 my-5">+ <FontAwesomeIcon+ icon={faFolder}+ className="sm:w-10 sm:h-10 w-6 h-6 text-sky-500 dark:text-sky-500 drop-shadow"+ />+ <div>+ <p className="text-3xl capitalize text-black dark:text-white font-thin">+ Other Collections+ </p>++ <p className="capitalize text-black dark:text-white">+ Shared collections you're a member of+ </p>+ </div>+ </div>++ <div className="grid xl:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-5">+ {sortedCollections+ .filter((e) => e.ownerId !== data?.user.id)+ .map((e, i) => {+ return <CollectionCard key={i} collection={e} />;+ })}+ </div>+ </>+ ) : undefined}</div></MainLayout>);diff --git a/pages/links.tsx b/pages/links.tsxindex dbfec53d..b0d5967e 100644--- a/pages/links.tsx+++ b/pages/links.tsx@@ -20,18 +20,24 @@ export default function Links() {return (<MainLayout><div className="p-5 flex flex-col gap-5 w-full h-full">- <div className="flex gap-3 justify-between items-center">- <div className="flex gap-2">+ <div className="flex gap-3 justify-between">+ <div className="flex items-center gap-3"><FontAwesomeIconicon={faLink}- className="sm:w-8 sm:h-8 w-6 h-6 mt-2 text-sky-500 dark:text-sky-500 drop-shadow"+ className="sm:w-10 sm:h-10 w-6 h-6 text-sky-500 dark:text-sky-500 drop-shadow"/>- <p className="sm:text-4xl text-3xl capitalize text-black dark:text-white font-thin">- All Links- </p>+ <div>+ <p className="text-3xl capitalize text-black dark:text-white font-thin">+ All Links+ </p>++ <p className="capitalize text-black dark:text-white">+ All Links from every Collections+ </p>+ </div></div>- <div className="relative">+ <div className="relative mt-2"><divonClick={() => setSortDropdown(!sortDropdown)}id="sort-dropdown"