diff --git a/client/src/components/Popups/DeleteMessage.tsx b/client/src/components/Popups/DeleteMessage.tsx index 352a0e0..1b6d168 100644 --- a/client/src/components/Popups/DeleteMessage.tsx +++ b/client/src/components/Popups/DeleteMessage.tsx @@ -1,7 +1,7 @@ import { deleteMessage } from "@controllers/MessageController"; import { useQueryClient } from "@tanstack/react-query"; -import { toast } from "react-toastify"; import Modal from "../Modal"; +import { toastError, toastSuccess } from "@controllers/Toasts"; const DeleteMessage = ({ authorId, @@ -21,25 +21,9 @@ const DeleteMessage = ({ queryClient.invalidateQueries(['messages']); setShowDelete(false); if (response.error) { - toast.error(response.error, { - position: 'top-right', - autoClose: 5000, - hideProgressBar: false, - closeOnClick: true, - pauseOnHover: true, - draggable: true, - progress: undefined, - }); + toastError(response.error); } else { - toast.success(response.message, { - position: 'top-right', - autoClose: 5000, - hideProgressBar: false, - closeOnClick: true, - pauseOnHover: true, - draggable: true, - progress: undefined, - }); + toastSuccess(response.message); } setShowDelete(false); }; diff --git a/client/src/components/Popups/EditMessage.tsx b/client/src/components/Popups/EditMessage.tsx index b73ee3a..dde0d8c 100644 --- a/client/src/components/Popups/EditMessage.tsx +++ b/client/src/components/Popups/EditMessage.tsx @@ -3,7 +3,7 @@ import { useQueryClient } from '@tanstack/react-query'; import { useState } from 'react'; import { FaTimes } from 'react-icons/fa'; import { editMessage } from '@controllers/MessageController'; -import { toast } from 'react-toastify'; +import { toastSuccess, toastError } from '@controllers/Toasts'; const EditMessage = ({ message, @@ -23,27 +23,11 @@ const EditMessage = ({ const response = await editMessage(message.id, data); if (response.error) { - toast.error(response.error, { - position: 'top-right', - autoClose: 5000, - hideProgressBar: false, - closeOnClick: true, - pauseOnHover: true, - draggable: true, - progress: undefined, - }); + toastError(response.error); return; } - toast.success('Message édité avec succès !', { - position: 'top-right', - autoClose: 5000, - hideProgressBar: false, - closeOnClick: true, - pauseOnHover: true, - draggable: true, - progress: undefined, - }); + toastSuccess('Message edité avec succès'); queryClient.invalidateQueries(['messages']); setShowEdit(false); }; diff --git a/client/src/components/Toasts/ToastError.tsx b/client/src/components/Toasts/ToastError.tsx deleted file mode 100644 index 513704c..0000000 --- a/client/src/components/Toasts/ToastError.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { FaTimes } from "react-icons/fa"; - -const ToastError = ({ message }: { message: string }) => { - return ( -
-
- -
-
{message}
-
- ); -}; - -export default ToastError; \ No newline at end of file diff --git a/client/src/components/Toasts/ToastSuccess.tsx b/client/src/components/Toasts/ToastSuccess.tsx deleted file mode 100644 index bd0f31b..0000000 --- a/client/src/components/Toasts/ToastSuccess.tsx +++ /dev/null @@ -1,14 +0,0 @@ -import { FaCheckCircle } from "react-icons/fa"; - -const ToastSuccess = ({ message }: { message: string }) => { - return ( -
-
- -
-
{message}
-
- ); -}; - -export default ToastSuccess; \ No newline at end of file diff --git a/client/src/controllers/Toasts.ts b/client/src/controllers/Toasts.ts new file mode 100644 index 0000000..6ccac77 --- /dev/null +++ b/client/src/controllers/Toasts.ts @@ -0,0 +1,27 @@ +import { toast } from "react-toastify"; + +const toastSuccess = (message: string) => { + toast.success(message, { + position: 'top-right', + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: true, + draggable: true, + progress: undefined, + }); +} + +const toastError = (message: string) => { + toast.error(message, { + position: 'top-right', + autoClose: 5000, + hideProgressBar: false, + closeOnClick: true, + pauseOnHover: true, + draggable: true, + progress: undefined, + }); +} + +export { toastSuccess, toastError }; \ No newline at end of file