Merge branch 'dev' into feat/write#19

Author: EunbinJung

public/1Stars.png

@@ -2,6 +2,7 @@ import ConfirmModal from '@/shared/components/modal-pop/ConfirmModal';
 import { Dispatch, SetStateAction } from 'react';
 import useFetchMyBar from '../api/fetchMyBar';
 import useFetchAlarm from '../api/fetchAlarm';
+import { useToast } from '@/shared/hook/useToast';
 
 interface Props {
   open: boolean;
@@ -11,16 +12,23 @@ interface Props {
 }
 
 function DeleteAllModal({ open, onClose, setIsModal, type }: Props) {
+  const { toastSuccess } = useToast();
   const { deleteMyBar } = useFetchMyBar();
   const { deleteAlarm } = useFetchAlarm();
   const handleBarDelete = () => {
     deleteMyBar.mutate(undefined, {
-      onSuccess: () => setIsModal(false),
+      onSuccess: () => {
+        toastSuccess('성공적으로 삭제 되었습니다.');
+        setIsModal(false);
+      },
     });
   };
   const handleAlarmDelete = () => {
     deleteAlarm.mutate(undefined, {
-      onSuccess: () => setIsModal(false),
+      onSuccess: () => {
+        setIsModal(false);
+        toastSuccess('성공적으로 삭제 되었습니다.');
+      },
     });
   };
 

public/2Stars.png

@@ -80,7 +80,7 @@ function EditNickName({
           value={editNickName}
           className="w-full"
         />
-        <TextButton onClick={handleDefaultNickname}>전 닉네임으로 돌아가기</TextButton>
+        <TextButton onClick={handleDefaultNickname}>초기화</TextButton>
       </div>
     </ModalLayout>
   );

src/domains/mypage/components/DeleteAllModal.tsx

@@ -7,6 +7,7 @@ import Link from 'next/link';
 import useFetchAlarm from '@/domains/mypage/api/fetchAlarm';
 import { useQuery } from '@tanstack/react-query';
 import DeleteAllModal from '../../DeleteAllModal';
+import { useToast } from '@/shared/hook/useToast';
 
 interface MyAlarm {
   createdAt: Date;
@@ -21,6 +22,7 @@ interface MyAlarm {
 }
 
 function MyAlarm() {
+  const { toastInfo } = useToast();
   const [isModal, setIsModal] = useState(false);
   const { fetchAlarm } = useFetchAlarm();
   const { data } = useQuery({
@@ -29,6 +31,10 @@ function MyAlarm() {
   });
 
   const handleDelete = () => {
+    if (data.items.length == 0) {
+      toastInfo('아직 알림이 없습니다.');
+      return;
+    }
     setIsModal(!isModal);
   };
 

src/domains/mypage/components/EditNickName.tsx

@@ -8,6 +8,7 @@ import { useState } from 'react';
 import DeleteAllModal from '../../DeleteAllModal';
 import useFetchMyBar from '@/domains/mypage/api/fetchMyBar';
 import { useQuery } from '@tanstack/react-query';
+import { useToast } from '@/shared/hook/useToast';
 
 interface MyCocktail {
   cocktailId: number;
@@ -19,6 +20,7 @@ interface MyCocktail {
 }
 
 function MyBar() {
+  const { toastInfo } = useToast();
   const [isModal, setIsModal] = useState(false);
   const { fetchMyBar } = useFetchMyBar();
   const { data } = useQuery({
@@ -28,6 +30,10 @@ function MyBar() {
   });
 
   const handleDelete = () => {
+    if (data.items.length == 0) {
+      toastInfo('저장한 칵테일이 없습니다.');
+      return;
+    }
     setIsModal(!isModal);
   };