fixes

components/Dropdown.tsx

@@ -61,8 +61,7 @@ export default function Dropdown({
   }, [points, dropdownHeight]);
 
   return (
-    !points ||
-    (pos && (
+    (!points || pos) && (
       <ClickAwayHandler
         onMount={(e) => {
           setDropdownHeight(e.height);
@@ -104,6 +103,6 @@ export default function Dropdown({
           );
         })}
       </ClickAwayHandler>
-    ))
+    )
   );
 }

components/InputSelect/CollectionSelection.tsx

@@ -104,7 +104,7 @@ export default function CollectionSelection({
         onChange={onChange}
         options={options}
         styles={styles}
-        defaultValue={showDefaultValue && defaultValue}
+        defaultValue={showDefaultValue ? defaultValue : null}
         components={{
           Option: customOption,
         }}
@@ -120,7 +120,7 @@ export default function CollectionSelection({
         onChange={onChange}
         options={options}
         styles={styles}
-        defaultValue={showDefaultValue && defaultValue}
+        defaultValue={showDefaultValue ? defaultValue : null}
         components={{
           Option: customOption,
         }}

components/LinkViews/LinkComponents/LinkActions.tsx

@@ -12,22 +12,20 @@ import { useTranslation } from "next-i18next";
 import { useUser } from "@/hooks/store/user";
 import { useDeleteLink, useUpdateLink } from "@/hooks/store/links";
 import toast from "react-hot-toast";
+import LinkDetailModal from "@/components/ModalContent/LinkDetailModal";
+import { useRouter } from "next/router";
 
 type Props = {
   link: LinkIncludingShortenedCollectionAndTags;
   collection: CollectionIncludingMembersAndLinkCount;
   position?: string;
-  toggleShowInfo?: () => void;
-  linkInfo?: boolean;
   alignToTop?: boolean;
   flipDropdown?: boolean;
 };
 
 export default function LinkActions({
   link,
-  toggleShowInfo,
   position,
-  linkInfo,
   alignToTop,
   flipDropdown,
 }: Props) {
@@ -36,6 +34,7 @@ export default function LinkActions({
   const permissions = usePermissions(link.collection.id as number);
 
   const [editLinkModal, setEditLinkModal] = useState(false);
+  const [linkDetailModal, setLinkDetailModal] = useState(false);
   const [deleteLinkModal, setDeleteLinkModal] = useState(false);
   const [preservedFormatsModal, setPreservedFormatsModal] = useState(false);
 
@@ -70,8 +69,24 @@ export default function LinkActions({
     );
   };
 
+  const router = useRouter();
+
+  const isPublicRoute = router.pathname.startsWith("/public") ? true : false;
+
   return (
     <>
+      {isPublicRoute ? (
+        <div
+          className={`absolute ${position || "top-3 right-3"} ${
+            alignToTop ? "" : "dropdown-end"
+          } z-20`}
+          onClick={() => setLinkDetailModal(true)}
+        >
+          <div className="btn btn-ghost btn-sm btn-square text-neutral">
+            <i title="More" className="bi-three-dots text-xl" />
+          </div>
+        </div>
+      ) : (
         <div
           className={`dropdown dropdown-left absolute ${
             position || "top-3 right-3"
@@ -90,6 +105,8 @@ export default function LinkActions({
               alignToTop ? "" : "translate-y-10"
             }`}
           >
+            {permissions === true ||
+              (permissions?.canUpdate && (
                 <li>
                   <div
                     role="button"
@@ -105,21 +122,20 @@ export default function LinkActions({
                       : t("pin_to_dashboard")}
                   </div>
                 </li>
-          {linkInfo !== undefined && toggleShowInfo && (
+              ))}
             <li>
               <div
                 role="button"
                 tabIndex={0}
                 onClick={() => {
                   (document?.activeElement as HTMLElement)?.blur();
-                  toggleShowInfo();
+                  setLinkDetailModal(true);
                 }}
                 className="whitespace-nowrap"
               >
-                {!linkInfo ? t("show_link_details") : t("hide_link_details")}
+                {t("show_link_details")}
               </div>
             </li>
-          )}
             {(permissions === true || permissions?.canUpdate) && (
               <li>
                 <div
@@ -183,7 +199,7 @@ export default function LinkActions({
             )}
           </ul>
         </div>
-
+      )}
       {editLinkModal && (
         <EditLinkModal
           onClose={() => setEditLinkModal(false)}
@@ -202,6 +218,13 @@ export default function LinkActions({
           link={link}
         />
       )}
+      {linkDetailModal && (
+        <LinkDetailModal
+          onClose={() => setLinkDetailModal(false)}
+          onEdit={() => setEditLinkModal(true)}
+          link={link}
+        />
+      )}
     </>
   );
 }

components/ModalContent/EditCollectionSharingModal.tsx

@@ -132,7 +132,7 @@ export default function EditCollectionSharingModal({
         )}
 
         {collection.isPublic && (
-          <div className={permissions === true ? "pl-5" : ""}>
+          <div>
             <p className="mb-2">{t("sharable_link_guide")}</p>
             <div className="w-full hide-scrollbar overflow-x-auto whitespace-nowrap rounded-md p-2 bg-base-200 border-neutral-content border-solid border flex items-center gap-2 justify-between">
               {publicCollectionURL}

components/ModalContent/UploadFileModal.tsx

@@ -150,7 +150,7 @@ export default function UploadFileModal({ onClose }: Props) {
           <label className="btn h-10 btn-sm w-full border border-neutral-content hover:border-neutral-content flex justify-between">
             <input
               type="file"
-              accept=".pdf,.png,.jpg,.jpeg,.html"
+              accept=".pdf,.png,.jpg,.jpeg"
               className="cursor-pointer custom-file-input"
               onChange={(e) => e.target.files && setFile(e.target.files[0])}
             />

components/ToggleDarkMode.tsx

@@ -21,9 +21,8 @@ export default function ToggleDarkMode({ className }: Props) {
   useEffect(() => {
     if (theme) {
       updateSettings({ theme });
-      localStorage.setItem("theme", theme);
     }
-  }, [theme, updateSettings]);
+  }, [theme]);
 
   return (
     <div

lib/api/controllers/migration/exportData.ts

@@ -22,32 +22,5 @@ export default async function exportData(userId: number) {
 
   const { password, id, ...userData } = user;
 
-  function redactIds(data: object | object[]): void {
-    if (Array.isArray(data)) {
-      data.forEach((item) => redactIds(item));
-    } else if (data !== null && typeof data === "object") {
-      const fieldsToRedact = ["id", "parentId", "collectionId", "ownerId"];
-
-      fieldsToRedact.forEach((field) => {
-        if (field in data) {
-          delete (data as any)[field];
-        }
-      });
-
-      // Recursively call redactIds for each property that is an object or an array
-      Object.keys(data).forEach((key) => {
-        const value = (data as any)[key];
-        if (
-          value !== null &&
-          (typeof value === "object" || Array.isArray(value))
-        ) {
-          redactIds(value);
-        }
-      });
-    }
-  }
-
-  redactIds(userData);
-
   return { response: userData, status: 200 };
 }

lib/api/generatePreview.ts

@@ -16,7 +16,7 @@ const generatePreview = async (
         return;
       }
 
-      image.resize(1280, Jimp.AUTO).quality(20);
+      image.resize(1000, Jimp.AUTO).quality(20);
       const processedBuffer = await image.getBufferAsync(Jimp.MIME_JPEG);
 
       if (

pages/dashboard.tsx

@@ -135,7 +135,7 @@ export default function Dashboard() {
 
             <DashboardItem
               name={tags.length === 1 ? t("tag") : t("tags")}
-              value={tags.length * numberOfLinks}
+              value={tags.length}
               icon={"bi-hash"}
             />
           </div>

pages/public/collections/[id].tsx

@@ -88,8 +88,8 @@ export default function PublicCollections() {
     (localStorage.getItem("viewMode") as ViewMode) || ViewMode.Card
   );
 
-  if (!collection) return null;
-
+  if (!collection) return <></>;
+  else
     return (
       <div
         className="h-96"
@@ -227,7 +227,9 @@ export default function PublicCollections() {
               placeholderCount={1}
               useData={data}
             />
-          {!data.isLoading && links && !links[0] && <p>{t("nothing_found")}</p>}
+            {!data.isLoading && links && !links[0] && (
+              <p>{t("nothing_found")}</p>
+            )}
 
             {/* <p className="text-center text-neutral">
         List created with <span className="text-black">Linkwarden.</span>