Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/app/taskmate/my/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ import MyProfileForm from "@/components/my/MyProfileForm";

const Mypage = () => {
return (
<AsyncBoundary>
<MyProfileForm />
</AsyncBoundary>
<div className="tablet:max-w-[560px] tablet:pl-6 mx-auto w-full max-w-[335px]">
<AsyncBoundary>
<MyProfileForm />
</AsyncBoundary>
</div>
);
};

Expand Down
2 changes: 1 addition & 1 deletion src/app/taskmate/trash/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Trash from "@/components/trash";

const TrashPage = () => {
return (
<div className="tablet:max-w-[560px] mx-auto w-full max-w-[335px]">
<div className="tablet:max-w-[560px] tablet:pl-6 mx-auto w-full max-w-[335px]">
<AsyncBoundary>
<Trash />
</AsyncBoundary>
Expand Down
6 changes: 3 additions & 3 deletions src/components/NavigationBar/UserProfile/UserProfile.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -12,14 +13,13 @@ export const UserProfile = () => {
const avatarSrc = profileImageUrl?.trim()
? profileImageUrl
: defaultAvatar.src;
const router = useRouter();

return (
<div
className="relative flex w-[150px] cursor-pointer items-center justify-start gap-2 rounded-full border border-gray-300 bg-white py-3 pr-4 pl-3"
role="button"
onClick={() => {
// @TODO: 마이페이지로 이동
}}
onClick={() => router.push("/taskmate/my")}
>
<div className="relative flex h-10 w-10 shrink-0 items-center justify-center">
<Image
Expand Down
9 changes: 9 additions & 0 deletions src/components/NavigationBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@ export const NavigationBar = () => {
<Item.Icon name="Home" />
<Item.Name>홈</Item.Name>
</Item.Wrapper>
<Item.Wrapper
value="trash"
onClick={() => {
router.push("/taskmate/trash");
}}
>
<Item.Icon name="TrashFill" />
<Item.Name>휴지통</Item.Name>
</Item.Wrapper>
</List.Container>

<Spacing size={12} />
Expand Down
2 changes: 2 additions & 0 deletions src/components/common/Icon/iconMap.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -102,6 +103,7 @@ export const iconMap = {
AlertSuccess,
Info,
TrashEmpty,
TrashFill,
} as const;

export type IconName = keyof typeof iconMap;
4 changes: 4 additions & 0 deletions src/components/common/Icon/svg/TrashFill.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/my/MyProfileForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const MyProfileForm = () => {
};

return (
<div className="tablet:w-[560px] mx-auto w-[335px]">
<div className="mt-20 flex w-full flex-col">
<p className="tablet:block text-title-3 mb-10 ml-2 hidden font-semibold">
내 정보 관리
</p>
Expand Down
Loading