diff --git a/src/app/taskmate/my/page.tsx b/src/app/taskmate/my/page.tsx index a36b5e2d..5018a949 100644 --- a/src/app/taskmate/my/page.tsx +++ b/src/app/taskmate/my/page.tsx @@ -5,9 +5,11 @@ import MyProfileForm from "@/components/my/MyProfileForm"; const Mypage = () => { return ( - - - +
+ + + +
); }; diff --git a/src/app/taskmate/trash/page.tsx b/src/app/taskmate/trash/page.tsx index 89eb240c..66b0f5c0 100644 --- a/src/app/taskmate/trash/page.tsx +++ b/src/app/taskmate/trash/page.tsx @@ -5,7 +5,7 @@ import Trash from "@/components/trash"; const TrashPage = () => { return ( -
+
diff --git a/src/components/NavigationBar/UserProfile/UserProfile.tsx b/src/components/NavigationBar/UserProfile/UserProfile.tsx index 8537fcf1..754a62aa 100644 --- a/src/components/NavigationBar/UserProfile/UserProfile.tsx +++ b/src/components/NavigationBar/UserProfile/UserProfile.tsx @@ -1,5 +1,6 @@ import { useSuspenseQuery } from "@tanstack/react-query"; import Image from "next/image"; +import { useRouter } from "next/navigation"; import defaultAvatar from "@/assets/images/avatar.png"; import { Icon } from "@/components/common/Icon"; @@ -12,14 +13,13 @@ export const UserProfile = () => { const avatarSrc = profileImageUrl?.trim() ? profileImageUrl : defaultAvatar.src; + const router = useRouter(); return (
{ - // @TODO: 마이페이지로 이동 - }} + onClick={() => router.push("/taskmate/my")} >
{ + { + router.push("/taskmate/trash"); + }} + > + + 휴지통 + diff --git a/src/components/common/Icon/iconMap.ts b/src/components/common/Icon/iconMap.ts index b19f69b2..6a467865 100644 --- a/src/components/common/Icon/iconMap.ts +++ b/src/components/common/Icon/iconMap.ts @@ -48,6 +48,7 @@ import Plus from "./svg/Plus.svg"; import Search from "./svg/Search/Search.svg"; import Trash from "./svg/Trash.svg"; import TrashEmpty from "./svg/TrashEmpty.svg"; +import TrashFill from "./svg/TrashFill.svg"; import User from "./svg/User/User.svg"; export const iconMap = { @@ -102,6 +103,7 @@ export const iconMap = { AlertSuccess, Info, TrashEmpty, + TrashFill, } as const; export type IconName = keyof typeof iconMap; diff --git a/src/components/common/Icon/svg/TrashFill.svg b/src/components/common/Icon/svg/TrashFill.svg new file mode 100644 index 00000000..937be114 --- /dev/null +++ b/src/components/common/Icon/svg/TrashFill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/my/MyProfileForm.tsx b/src/components/my/MyProfileForm.tsx index 902aeeef..de3397c4 100644 --- a/src/components/my/MyProfileForm.tsx +++ b/src/components/my/MyProfileForm.tsx @@ -67,7 +67,7 @@ const MyProfileForm = () => { }; return ( -
+

내 정보 관리