diff --git a/components/CollectionCard.tsx b/components/CollectionCard.tsx index 2a0bb56..76a2706 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) {
+ {collection.isPublic ? ( + + ) : undefined} - -

+

{e.name}

+ + {e.isPublic ? ( + + ) : undefined}
); diff --git a/pages/collections/[id].tsx b/pages/collections/[id].tsx index d4ca3db..59a7fc2 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}
diff --git a/pages/collections/index.tsx b/pages/collections/index.tsx index 806562a..a252e1d 100644 --- a/pages/collections/index.tsx +++ b/pages/collections/index.tsx @@ -26,7 +26,7 @@ export default function Collections() { const [sortBy, setSortBy] = useState(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 (
-
-
-
+
+
+
-

- All Collections -

+
+

+ Your Collections +

+ +

+ Collections you own +

+
-
+
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}
-
+
setSortDropdown(!sortDropdown)} id="sort-dropdown" @@ -109,9 +115,11 @@ export default function Collections() {
- {sortedCollections.map((e, i) => { - return ; - })} + {sortedCollections + .filter((e) => e.ownerId !== data?.user.id) + .map((e, i) => { + return ; + })}
+ + {sortedCollections.filter((e) => e.ownerId !== data?.user.id)[0] ? ( + <> +
+ +
+

+ Other Collections +

+ +

+ Shared collections you're a member of +

+
+
+ +
+ {sortedCollections + .filter((e) => e.ownerId !== data?.user.id) + .map((e, i) => { + return ; + })} +
+ + ) : undefined}
); diff --git a/pages/links.tsx b/pages/links.tsx index dbfec53..b0d5967 100644 --- a/pages/links.tsx +++ b/pages/links.tsx @@ -20,18 +20,24 @@ export default function Links() { return (
-
-
+
+
-

- All Links -

+
+

+ All Links +

+ +

+ All Links from every Collections +

+
-
+
setSortDropdown(!sortDropdown)} id="sort-dropdown"