update link action icons

components/ModalContent/DeleteLinkModal.tsx

@@ -1,15 +1,7 @@
 import React, { useEffect, useState } from "react";
-import { Toaster } from "react-hot-toast";
-import CollectionSelection from "@/components/InputSelect/CollectionSelection";
-import TagSelection from "@/components/InputSelect/TagSelection";
-import TextInput from "@/components/TextInput";
-import unescapeString from "@/lib/client/unescapeString";
 import useLinkStore from "@/store/links";
 import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 import toast from "react-hot-toast";
-import Link from "next/link";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faLink, faTrashCan } from "@fortawesome/free-solid-svg-icons";
 import Modal from "../Modal";
 import { useRouter } from "next/router";
 
@@ -57,19 +49,7 @@ export default function DeleteLinkModal({ onClose, activeLink }: Props) {
         <p>Are you sure you want to delete this Link?</p>
 
         <div role="alert" className="alert alert-warning">
-          <svg
-            xmlns="http://www.w3.org/2000/svg"
-            className="stroke-current shrink-0 h-6 w-6"
-            fill="none"
-            viewBox="0 0 24 24"
-          >
-            <path
-              strokeLinecap="round"
-              strokeLinejoin="round"
-              strokeWidth="2"
-              d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"
-            />
-          </svg>
+          <i className="bi-exclamation-triangle text-xl"/>
           <span>
             <b>Warning:</b> This action is irreversible!
           </span>
@@ -84,7 +64,7 @@ export default function DeleteLinkModal({ onClose, activeLink }: Props) {
           className={`ml-auto btn w-fit text-white flex items-center gap-2 duration-100 bg-red-500 hover:bg-red-400 hover:dark:bg-red-600 cursor-pointer`}
           onClick={deleteLink}
         >
-          <FontAwesomeIcon icon={faTrashCan} className="h-5" />
+          <i className="bi-trash text-xl"/>
           Delete
         </button>
       </div>

components/ModalContent/EditLinkModal.tsx

@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from "react";
-import { Toaster } from "react-hot-toast";
 import CollectionSelection from "@/components/InputSelect/CollectionSelection";
 import TagSelection from "@/components/InputSelect/TagSelection";
 import TextInput from "@/components/TextInput";
@@ -8,8 +7,6 @@ import useLinkStore from "@/store/links";
 import { LinkIncludingShortenedCollectionAndTags } from "@/types/global";
 import toast from "react-hot-toast";
 import Link from "next/link";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import { faLink } from "@fortawesome/free-solid-svg-icons";
 import Modal from "../Modal";
 
 type Props = {
@@ -89,10 +86,7 @@ export default function EditLinkModal({ onClose, activeLink }: Props) {
           title={link.url}
           target="_blank"
         >
-          <FontAwesomeIcon
-            icon={faLink}
-            className="mt-1 w-5 h-5 min-w-[1.25rem]"
-          />
+          <i className="bi-link-45deg text-xl"/>
           <p>{shortendURL}</p>
         </Link>
       ) : undefined}
@@ -122,13 +116,13 @@ export default function EditLinkModal({ onClose, activeLink }: Props) {
                 defaultValue={
                   link.collection.id
                     ? {
-                        value: link.collection.id,
-                        label: link.collection.name,
-                      }
+                      value: link.collection.id,
+                      label: link.collection.name,
+                    }
                     : {
-                        value: null as unknown as number,
-                        label: "Unorganized",
-                      }
+                      value: null as unknown as number,
+                      label: "Unorganized",
+                    }
                 }
               />
             ) : null}

components/ModalContent/PreservedFormatsModal.tsx

@@ -1,32 +1,13 @@
 import React, { useEffect, useState } from "react";
 import useLinkStore from "@/store/links";
-import {
-  ArchivedFormat,
-  LinkIncludingShortenedCollectionAndTags,
-} from "@/types/global";
+import { ArchivedFormat, LinkIncludingShortenedCollectionAndTags, } from "@/types/global";
 import toast from "react-hot-toast";
 import Link from "next/link";
-import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
-import {
-  faArrowUpRightFromSquare,
-  faCloudArrowDown,
-  faLink,
-  faTrashCan,
-  faUpRightFromSquare,
-} from "@fortawesome/free-solid-svg-icons";
 import Modal from "../Modal";
-import {
-  faFileImage,
-  faFileLines,
-  faFilePdf,
-} from "@fortawesome/free-regular-svg-icons";
 import { useRouter } from "next/router";
 import { useSession } from "next-auth/react";
-import {
-  pdfAvailable,
-  readabilityAvailable,
-  screenshotAvailable,
-} from "@/lib/shared/getArchiveValidity";
+import { pdfAvailable, readabilityAvailable, screenshotAvailable, } from "@/lib/shared/getArchiveValidity";
+import PreservedFormatRow from "@/components/PreserverdFormatRow";
 
 type Props = {
   onClose: Function;
@@ -92,25 +73,6 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
     } else toast.error(data.response);
   };
 
-  const handleDownload = (format: ArchivedFormat) => {
-    const path = `/api/v1/archives/${link?.id}?format=${format}`;
-    fetch(path)
-      .then((response) => {
-        if (response.ok) {
-          // Create a temporary link and click it to trigger the download
-          const link = document.createElement("a");
-          link.href = path;
-          link.download = format === ArchivedFormat.png ? "Screenshot" : "PDF";
-          link.click();
-        } else {
-          console.error("Failed to download file");
-        }
-      })
-      .catch((error) => {
-        console.error("Error:", error);
-      });
-  };
-
   return (
     <Modal toggleModal={onClose}>
       <p className="text-xl font-thin">Preserved Formats</p>
@@ -129,112 +91,18 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
 
       <div className={`flex flex-col gap-3`}>
         {readabilityAvailable(link) ? (
-          <div className="flex justify-between items-center pr-1 border border-neutral-content rounded-md">
-            <div className="flex gap-2 items-center">
-              <div className="bg-primary text-primary-content p-2 rounded-l-md">
-                <FontAwesomeIcon icon={faFileLines} className="w-6 h-6" />
-              </div>
-
-              <p>Readable</p>
-            </div>
-
-            <div className="flex gap-1">
-              {/* <div
-                onClick={() => handleDownload(ArchivedFormat.pdf)}
-                className="cursor-pointer hover:opacity-60 duration-100 p-2 rounded-md"
-              >
-                <FontAwesomeIcon
-                  icon={faCloudArrowDown}
-                  className="w-5 h-5 cursor-pointer text-neutral"
-                />
-              </div> */}
-
-              <Link
-                href={`/preserved/${link?.id}?format=${ArchivedFormat.readability}`}
-                target="_blank"
-                className="cursor-pointer hover:opacity-60 duration-100 p-2 rounded-md"
-              >
-                <FontAwesomeIcon
-                  icon={faArrowUpRightFromSquare}
-                  className="w-5 h-5 text-neutral"
-                />
-              </Link>
-            </div>
-          </div>
+          <PreservedFormatRow name={'Readable'} icon={'bi-file-earmark-text'} format={ArchivedFormat.readability}
+                              activeLink={link}/>
         ) : undefined}
 
         {screenshotAvailable(link) ? (
-          <div className="flex justify-between items-center pr-1 border border-neutral-content rounded-md">
-            <div className="flex gap-2 items-center">
-              <div className="bg-primary text-primary-content p-2 rounded-l-md">
-                <FontAwesomeIcon icon={faFileImage} className="w-6 h-6" />
-              </div>
-
-              <p>Screenshot</p>
-            </div>
-
-            <div className="flex gap-1">
-              <div
-                onClick={() => handleDownload(ArchivedFormat.png)}
-                className="cursor-pointer hover:opacity-60 duration-100 p-2 rounded-md"
-              >
-                <FontAwesomeIcon
-                  icon={faCloudArrowDown}
-                  className="w-5 h-5 cursor-pointer text-neutral"
-                />
-              </div>
-
-              <Link
-                href={`/api/v1/archives/${link?.id}?format=${
-                  link.screenshotPath?.endsWith("png")
-                    ? ArchivedFormat.png
-                    : ArchivedFormat.jpeg
-                }`}
-                target="_blank"
-                className="cursor-pointer hover:opacity-60 duration-100 p-2 rounded-md"
-              >
-                <FontAwesomeIcon
-                  icon={faUpRightFromSquare}
-                  className="w-5 h-5 text-neutral"
-                />
-              </Link>
-            </div>
-          </div>
+          <PreservedFormatRow name={'Screenshot'} icon={'bi-file-earmark-image'} format={ArchivedFormat.png}
+                              activeLink={link} downloadable={true}/>
         ) : undefined}
 
         {pdfAvailable(link) ? (
-          <div className="flex justify-between items-center pr-1 border border-neutral-content rounded-md">
-            <div className="flex gap-2 items-center">
-              <div className="bg-primary text-primary-content p-2 rounded-l-md">
-                <FontAwesomeIcon icon={faFilePdf} className="w-6 h-6" />
-              </div>
-
-              <p>PDF</p>
-            </div>
-
-            <div className="flex gap-1">
-              <div
-                onClick={() => handleDownload(ArchivedFormat.pdf)}
-                className="cursor-pointer hover:opacity-60 duration-100 p-2 rounded-md"
-              >
-                <FontAwesomeIcon
-                  icon={faCloudArrowDown}
-                  className="w-5 h-5 cursor-pointer text-neutral"
-                />
-              </div>
-
-              <Link
-                href={`/api/v1/archives/${link?.id}?format=${ArchivedFormat.pdf}`}
-                target="_blank"
-                className="cursor-pointer hover:opacity-60 duration-100 p-2 rounded-md"
-              >
-                <FontAwesomeIcon
-                  icon={faArrowUpRightFromSquare}
-                  className="w-5 h-5 text-neutral"
-                />
-              </Link>
-            </div>
-          </div>
+          <PreservedFormatRow name={'PDF'} icon={'bi-file-earmark-pdf'} format={ArchivedFormat.pdf}
+                              activeLink={link} downloadable={true}/>
         ) : undefined}
 
         <div className="flex flex-col-reverse sm:flex-row sm:gap-3 items-center justify-center">
@@ -272,10 +140,7 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
             <p className="whitespace-nowrap">
               View latest snapshot on archive.org
             </p>
-            <FontAwesomeIcon
-              icon={faArrowUpRightFromSquare}
-              className="w-4 h-4"
-            />
+            <i className="bi-box-arrow-up-right"/>
           </Link>
         </div>
       </div>