Revert "undo commit"

This reverts commit 9103f67db5.

pages/collections/[id].tsx

@@ -1,5 +1,4 @@
 import {
-  AccountSettings,
   CollectionIncludingMembersAndLinkCount,
   Sort,
   ViewMode,
@@ -24,8 +23,6 @@ import { useCollections } from "@/hooks/store/collections";
 import { useUser } from "@/hooks/store/user";
 import { useLinks } from "@/hooks/store/links";
 import Links from "@/components/LinkViews/Links";
-import Icon from "@/components/Icon";
-import { IconWeight } from "@phosphor-icons/react";
 
 export default function Index() {
   const { t } = useTranslation();
@@ -57,9 +54,15 @@ export default function Index() {
 
   const { data: user = {} } = useUser();
 
-  const [collectionOwner, setCollectionOwner] = useState<
-    Partial<AccountSettings>
-  >({});
+  const [collectionOwner, setCollectionOwner] = useState({
+    id: null as unknown as number,
+    name: "",
+    username: "",
+    image: "",
+    archiveAsScreenshot: undefined as unknown as boolean,
+    archiveAsMonolith: undefined as unknown as boolean,
+    archiveAsPDF: undefined as unknown as boolean,
+  });
 
   useEffect(() => {
     const fetchOwner = async () => {
@@ -112,21 +115,10 @@ export default function Index() {
         {activeCollection && (
           <div className="flex gap-3 items-start justify-between">
             <div className="flex items-center gap-2">
-              {activeCollection.icon ? (
-                <Icon
-                  icon={activeCollection.icon}
-                  size={45}
-                  weight={
-                    (activeCollection.iconWeight || "regular") as IconWeight
-                  }
-                  color={activeCollection.color}
-                />
-              ) : (
-                <i
-                  className="bi-folder-fill text-3xl"
-                  style={{ color: activeCollection.color }}
-                ></i>
-              )}
+              <i
+                className="bi-folder-fill text-3xl drop-shadow"
+                style={{ color: activeCollection?.color }}
+              ></i>
 
               <p className="sm:text-3xl text-2xl capitalize w-full py-1 break-words hyphens-auto font-thin">
                 {activeCollection?.name}
@@ -215,14 +207,14 @@ export default function Index() {
                 className="flex items-center btn px-2 btn-ghost rounded-full w-fit"
                 onClick={() => setEditCollectionSharingModal(true)}
               >
-                {collectionOwner.id && (
+                {collectionOwner.id ? (
                   <ProfilePhoto
                     src={collectionOwner.image || undefined}
                     name={collectionOwner.name}
                   />
-                )}
+                ) : undefined}
                 {activeCollection.members
-                  .sort((a, b) => a.userId - b.userId)
+                  .sort((a, b) => (a.userId as number) - (b.userId as number))
                   .map((e, i) => {
                     return (
                       <ProfilePhoto
@@ -234,13 +226,13 @@ export default function Index() {
                     );
                   })
                   .slice(0, 3)}
-                {activeCollection.members.length - 3 > 0 && (
+                {activeCollection.members.length - 3 > 0 ? (
                   <div className={`avatar drop-shadow-md placeholder -ml-3`}>
                     <div className="bg-base-100 text-neutral rounded-full w-8 h-8 ring-2 ring-neutral-content">
                       <span>+{activeCollection.members.length - 3}</span>
                     </div>
                   </div>
-                )}
+                ) : null}
               </div>
 
               <p className="text-neutral text-sm">

pages/collections/index.tsx

@@ -10,7 +10,6 @@ import PageHeader from "@/components/PageHeader";
 import getServerSideProps from "@/lib/client/getServerSideProps";
 import { useTranslation } from "next-i18next";
 import { useCollections } from "@/hooks/store/collections";
-import { dropdownTriggerer } from "@/lib/client/utils";
 
 export default function Collections() {
   const { t } = useTranslation();
@@ -30,37 +29,12 @@ export default function Collections() {
     <MainLayout>
       <div className="p-5 flex flex-col gap-5 w-full h-full">
         <div className="flex justify-between">
-          <div className="flex items-center gap-3">
-            <PageHeader
-              icon={"bi-folder"}
-              title={t("collections")}
-              description={t("collections_you_own")}
-            />
-            <div className="relative">
-              <div className={"dropdown dropdown-bottom font-normal"}>
-                <div
-                  tabIndex={0}
-                  role="button"
-                  onMouseDown={dropdownTriggerer}
-                  className="btn btn-ghost btn-sm btn-square text-neutral"
-                >
-                  <i className={"bi-three-dots text-neutral text-2xl"}></i>
-                </div>
-                <ul className="dropdown-content z-[30] menu shadow bg-base-200 border border-neutral-content rounded-box mt-1">
-                  <li>
-                    <div
-                      role="button"
-                      tabIndex={0}
-                      onClick={() => setNewCollectionModal(true)}
-                      className="whitespace-nowrap"
-                    >
-                      {t("new_collection")}
-                    </div>
-                  </li>
-                </ul>
-              </div>
-            </div>
-          </div>
+          <PageHeader
+            icon={"bi-folder"}
+            title={t("collections")}
+            description={t("collections_you_own")}
+          />
+
           <div className="flex gap-3 justify-end">
             <div className="relative mt-2">
               <SortDropdown sortBy={sortBy} setSort={setSortBy} t={t} />
@@ -86,7 +60,7 @@ export default function Collections() {
           </div>
         </div>
 
-        {sortedCollections.filter((e) => e.ownerId !== data?.user.id)[0] && (
+        {sortedCollections.filter((e) => e.ownerId !== data?.user.id)[0] ? (
           <>
             <PageHeader
               icon={"bi-folder"}
@@ -102,11 +76,11 @@ export default function Collections() {
                 })}
             </div>
           </>
-        )}
+        ) : undefined}
       </div>
-      {newCollectionModal && (
+      {newCollectionModal ? (
         <NewCollectionModal onClose={() => setNewCollectionModal(false)} />
-      )}
+      ) : undefined}
     </MainLayout>
   );
 }