changes and improvements

components/ModalContent/BulkDeleteLinksModal.tsx

@@ -4,6 +4,7 @@ import Modal from "../Modal";
 import Button from "../ui/Button";
 import { useTranslation } from "next-i18next";
 import { useBulkDeleteLinks } from "@/hooks/store/links";
+import toast from "react-hot-toast";
 
 type Props = {
   onClose: Function;
@@ -16,12 +17,21 @@ export default function BulkDeleteLinksModal({ onClose }: Props) {
   const deleteLinksById = useBulkDeleteLinks();
 
   const deleteLink = async () => {
+    const load = toast.loading(t("deleting"));
+
     await deleteLinksById.mutateAsync(
       selectedLinks.map((link) => link.id as number),
       {
-        onSuccess: () => {
-          setSelectedLinks([]);
-          onClose();
+        onSettled: (data, error) => {
+          toast.dismiss(load);
+
+          if (error) {
+            toast.error(error.message);
+          } else {
+            setSelectedLinks([]);
+            onClose();
+            toast.success(t("deleted"));
+          }
         },
       }
     );

components/ModalContent/BulkEditLinksModal.tsx

@@ -36,6 +36,8 @@ export default function BulkEditLinksModal({ onClose }: Props) {
     if (!submitLoader) {
       setSubmitLoader(true);
 
+      const load = toast.loading(t("updating"));
+
       await updateLinks.mutateAsync(
         {
           links: selectedLinks,
@@ -43,9 +45,16 @@ export default function BulkEditLinksModal({ onClose }: Props) {
           removePreviousTags,
         },
         {
-          onSuccess: () => {
-            setSelectedLinks([]);
-            onClose();
+          onSettled: (data, error) => {
+            toast.dismiss(load);
+
+            if (error) {
+              toast.error(error.message);
+            } else {
+              setSelectedLinks([]);
+              onClose();
+              toast.success(t("updated"));
+            }
           },
         }
       );

components/ModalContent/DeleteCollectionModal.tsx

@@ -7,6 +7,7 @@ import Modal from "../Modal";
 import Button from "../ui/Button";
 import { useTranslation } from "next-i18next";
 import { useDeleteCollection } from "@/hooks/store/collections";
+import toast from "react-hot-toast";
 
 type Props = {
   onClose: Function;
@@ -39,10 +40,19 @@ export default function DeleteCollectionModal({
 
       setSubmitLoader(true);
 
+      const load = toast.loading(t("deleting_collection"));
+
       deleteCollection.mutateAsync(collection.id as number, {
-        onSuccess: () => {
-          onClose();
-          router.push("/collections");
+        onSettled: (data, error) => {
+          toast.dismiss(load);
+
+          if (error) {
+            toast.error(error.message);
+          } else {
+            onClose();
+            router.push("/collections");
+            toast.success(t("deleted"));
+          }
         },
       });
 

components/ModalContent/DeleteLinkModal.tsx

@@ -5,6 +5,7 @@ import { useRouter } from "next/router";
 import Button from "../ui/Button";
 import { useTranslation } from "next-i18next";
 import { useDeleteLink } from "@/hooks/store/links";
+import toast from "react-hot-toast";
 
 type Props = {
   onClose: Function;
@@ -24,13 +25,21 @@ export default function DeleteLinkModal({ onClose, activeLink }: Props) {
   }, []);
 
   const submit = async () => {
-    await deleteLink.mutateAsync(link.id as number, {
-      onSuccess: () => {
-        if (router.pathname.startsWith("/links/[id]")) {
-          router.push("/dashboard");
-        }
+    const load = toast.loading(t("deleting"));
 
-        onClose();
+    await deleteLink.mutateAsync(link.id as number, {
+      onSettled: (data, error) => {
+        toast.dismiss(load);
+
+        if (error) {
+          toast.error(error.message);
+        } else {
+          if (router.pathname.startsWith("/links/[id]")) {
+            router.push("/dashboard");
+          }
+          onClose();
+          toast.success(t("deleted"));
+        }
       },
     });
   };

components/ModalContent/EditCollectionModal.tsx

@@ -5,6 +5,7 @@ import { CollectionIncludingMembersAndLinkCount } from "@/types/global";
 import Modal from "../Modal";
 import { useTranslation } from "next-i18next";
 import { useUpdateCollection } from "@/hooks/store/collections";
+import toast from "react-hot-toast";
 
 type Props = {
   onClose: Function;
@@ -29,9 +30,18 @@ export default function EditCollectionModal({
 
       setSubmitLoader(true);
 
+      const load = toast.loading(t("updating_collection"));
+
       await updateCollection.mutateAsync(collection, {
-        onSuccess: () => {
-          onClose();
+        onSettled: (data, error) => {
+          toast.dismiss(load);
+
+          if (error) {
+            toast.error(error.message);
+          } else {
+            onClose();
+            toast.success(t("updated"));
+          }
         },
       });
 

components/ModalContent/EditCollectionSharingModal.tsx

@@ -36,9 +36,18 @@ export default function EditCollectionSharingModal({
 
       setSubmitLoader(true);
 
+      const load = toast.loading(t("updating_collection"));
+
       await updateCollection.mutateAsync(collection, {
-        onSuccess: () => {
-          onClose();
+        onSettled: (data, error) => {
+          toast.dismiss(load);
+
+          if (error) {
+            toast.error(error.message);
+          } else {
+            onClose();
+            toast.success(t("updated"));
+          }
         },
       });
 

components/ModalContent/EditLinkModal.tsx

@@ -8,6 +8,7 @@ import Link from "next/link";
 import Modal from "../Modal";
 import { useTranslation } from "next-i18next";
 import { useUpdateLink } from "@/hooks/store/links";
+import toast from "react-hot-toast";
 
 type Props = {
   onClose: Function;
@@ -51,9 +52,18 @@ export default function EditLinkModal({ onClose, activeLink }: Props) {
     if (!submitLoader) {
       setSubmitLoader(true);
 
+      const load = toast.loading(t("updating"));
+
       await updateLink.mutateAsync(link, {
-        onSuccess: () => {
-          onClose();
+        onSettled: (data, error) => {
+          toast.dismiss(load);
+
+          if (error) {
+            toast.error(error.message);
+          } else {
+            onClose();
+            toast.success(t("updated"));
+          }
         },
       });
 

components/ModalContent/NewCollectionModal.tsx

@@ -6,6 +6,7 @@ import Modal from "../Modal";
 import { CollectionIncludingMembersAndLinkCount } from "@/types/global";
 import { useTranslation } from "next-i18next";
 import { useCreateCollection } from "@/hooks/store/collections";
+import toast from "react-hot-toast";
 
 type Props = {
   onClose: Function;
@@ -37,9 +38,18 @@ export default function NewCollectionModal({ onClose, parent }: Props) {
 
     setSubmitLoader(true);
 
+    const load = toast.loading(t("creating"));
+
     await createCollection.mutateAsync(collection, {
-      onSuccess: () => {
-        onClose();
+      onSettled: (data, error) => {
+        toast.dismiss(load);
+
+        if (error) {
+          toast.error(error.message);
+        } else {
+          onClose();
+          toast.success(t("created"));
+        }
       },
     });
 

components/ModalContent/NewLinkModal.tsx

@@ -10,6 +10,7 @@ import Modal from "../Modal";
 import { useTranslation } from "next-i18next";
 import { useCollections } from "@/hooks/store/collections";
 import { useAddLink } from "@/hooks/store/links";
+import toast from "react-hot-toast";
 
 type Props = {
   onClose: Function;
@@ -88,9 +89,18 @@ export default function NewLinkModal({ onClose }: Props) {
     if (!submitLoader) {
       setSubmitLoader(true);
 
+      const load = toast.loading(t("creating_link"));
+
       await addLink.mutateAsync(link, {
-        onSuccess: () => {
-          onClose();
+        onSettled: (data, error) => {
+          toast.dismiss(load);
+
+          if (error) {
+            toast.error(error.message);
+          } else {
+            onClose();
+            toast.success(t("link_created"));
+          }
         },
       });
 

components/ModalContent/NewTokenModal.tsx

@@ -29,9 +29,17 @@ export default function NewTokenModal({ onClose }: Props) {
     if (!submitLoader) {
       setSubmitLoader(true);
 
+      const load = toast.loading(t("creating_token"));
+
       await addToken.mutateAsync(token, {
-        onSuccess: (data) => {
-          setNewToken(data.secretKey);
+        onSettled: (data, error) => {
+          toast.dismiss(load);
+
+          if (error) {
+            toast.error(error.message);
+          } else {
+            setNewToken(data.secretKey);
+          }
         },
       });
 

components/ModalContent/RevokeTokenModal.tsx

@@ -4,6 +4,7 @@ import Button from "../ui/Button";
 import { useTranslation } from "next-i18next";
 import { AccessToken } from "@prisma/client";
 import { useRevokeToken } from "@/hooks/store/tokens";
+import toast from "react-hot-toast";
 
 type Props = {
   onClose: Function;
@@ -21,9 +22,18 @@ export default function DeleteTokenModal({ onClose, activeToken }: Props) {
   }, [activeToken]);
 
   const deleteLink = async () => {
+    const load = toast.loading(t("deleting"));
+
     await revokeToken.mutateAsync(token.id, {
-      onSuccess: () => {
-        onClose();
+      onSettled: (data, error) => {
+        toast.dismiss(load);
+
+        if (error) {
+          toast.error(error.message);
+        } else {
+          onClose();
+          toast.success(t("token_revoked"));
+        }
       },
     });
   };

components/ModalContent/UploadFileModal.tsx

@@ -116,11 +116,20 @@ export default function UploadFileModal({ onClose }: Props) {
 
       setSubmitLoader(true);
 
+      const load = toast.loading(t("creating"));
+
       await uploadFile.mutateAsync(
         { link, file },
         {
-          onSuccess: () => {
-            onClose();
+          onSettled: (data, error) => {
+            toast.dismiss(load);
+
+            if (error) {
+              toast.error(error.message);
+            } else {
+              onClose();
+              toast.success(t("created_success"));
+            }
           },
         }
       );