diff --git a/src/app/login/_temp/login-temp-actions.tsx b/src/app/login/_temp/login-temp-actions.tsx
index e210e745..c7b5db3d 100644
--- a/src/app/login/_temp/login-temp-actions.tsx
+++ b/src/app/login/_temp/login-temp-actions.tsx
@@ -1,6 +1,6 @@
'use client';
-import { MyPageActionButton } from '@/components/pages/user/mypage/mypage-setting-button';
+import { MyPageActionButton } from '@/components/pages/user/mypage/mypage-setting/mypage-setting-button';
import { useLogout, useWithdraw } from '@/hooks/use-auth';
const LoginTempActions = () => {
diff --git a/src/components/pages/user/mypage/mypage-setting/index.tsx b/src/components/pages/user/mypage/mypage-setting/index.tsx
index ce35258b..17eaed82 100644
--- a/src/components/pages/user/mypage/mypage-setting/index.tsx
+++ b/src/components/pages/user/mypage/mypage-setting/index.tsx
@@ -1,27 +1,19 @@
'use client';
import { useLogout, useWithdraw } from '@/hooks/use-auth';
-// import { useUpdateMyNotification } from '@/hooks/use-user/use-user-notification';
import { User } from '@/types/service/user';
-import { MyPageActionButton, MyPageToggleButton as _ } from '../mypage-setting-button';
+import { MyPageActionButton } from './mypage-setting-button';
interface Props {
user: User;
}
export const MyPageSetting = ({ user: _ }: Props) => {
- // const { mutate } = useUpdateMyNotification();
const logout = useLogout();
const withdraw = useWithdraw();
return (
- {/* mutate({ isNotificationEnabled: !user.isNotificationEnabled })}
- >
- 알림 받기
- */}
로그아웃
회원탈퇴
diff --git a/src/components/pages/user/mypage/mypage-setting-button/index.tsx b/src/components/pages/user/mypage/mypage-setting/mypage-setting-button/index.tsx
similarity index 100%
rename from src/components/pages/user/mypage/mypage-setting-button/index.tsx
rename to src/components/pages/user/mypage/mypage-setting/mypage-setting-button/index.tsx
diff --git a/src/components/pages/user/profile/index.ts b/src/components/pages/user/profile/index.ts
index e7b7d6e9..2b85edde 100644
--- a/src/components/pages/user/profile/index.ts
+++ b/src/components/pages/user/profile/index.ts
@@ -1,6 +1,5 @@
export { ProfileCard } from './profile-card';
export { ProfileDescription } from './profile-description';
-export { ProfileDescriptionBadge } from './profile-description-badge';
export { ProfileEditModal } from './profile-edit-modal';
export { ProfileFollowsBadge } from './profile-follows-badge';
export { ProfileFollowsModal } from './profile-follows-modal';
diff --git a/src/components/pages/user/profile/profile-description-badge/index.tsx b/src/components/pages/user/profile/profile-description-badge/index.tsx
deleted file mode 100644
index d9e769b4..00000000
--- a/src/components/pages/user/profile/profile-description-badge/index.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { Icon, IconId } from '@/components/icon';
-import { cn } from '@/lib/utils';
-
-export interface ProfileDescriptionBadgeProps {
- label: string;
- iconId: IconId;
- value: string;
-}
-
-interface Props {
- badgeItems: ProfileDescriptionBadgeProps;
-}
-
-export const ProfileDescriptionBadge = ({ badgeItems }: Props) => {
- const PLACEHOLDER = '-';
-
- return (
-
-
-
-
-
- {badgeItems.label}
-
- {badgeItems.value || PLACEHOLDER}
-
-
-
- );
-};
diff --git a/src/components/pages/user/profile/profile-description/index.tsx b/src/components/pages/user/profile/profile-description/index.tsx
index bad483f2..993195e0 100644
--- a/src/components/pages/user/profile/profile-description/index.tsx
+++ b/src/components/pages/user/profile/profile-description/index.tsx
@@ -1,10 +1,7 @@
+import { Icon, IconId } from '@/components/icon';
+import { cn } from '@/lib/utils';
import { User } from '@/types/service/user';
-import {
- ProfileDescriptionBadge,
- ProfileDescriptionBadgeProps,
-} from '../profile-description-badge';
-
const formatISO = (dateString: string) => {
const date = new Date(dateString);
const y = date.getFullYear();
@@ -18,7 +15,11 @@ interface Props {
}
export const ProfileDescription = ({ user }: Props) => {
- const listMap: ProfileDescriptionBadgeProps[] = [
+ const listMap: {
+ label: string;
+ iconId: IconId;
+ value: string;
+ }[] = [
{
label: 'MBTI',
iconId: 'symbol',
@@ -41,10 +42,27 @@ export const ProfileDescription = ({ user }: Props) => {
},
];
+ const PLACEHOLDER = '-';
+
return (
-
+
{listMap.map((item) => (
-
+
+
+
+
+
+ {item.label}
+
+ {item.value || PLACEHOLDER}
+
+
+
))}
);
diff --git a/src/components/pages/user/profile/profile-edit-modal/index.tsx b/src/components/pages/user/profile/profile-edit-modal/index.tsx
index ff478cd1..e6caa707 100644
--- a/src/components/pages/user/profile/profile-edit-modal/index.tsx
+++ b/src/components/pages/user/profile/profile-edit-modal/index.tsx
@@ -21,7 +21,7 @@ import {
} from '@/lib/schema/mypage';
import { UpdateMyInfoPayloads, User } from '@/types/service/user';
-import { ImageField, MBTIField, MessageField, NickNameField } from '../profile-edit-fields';
+import { ImageField, MBTIField, MessageField, NickNameField } from './profile-edit-fields';
interface Props {
user: User;
diff --git a/src/components/pages/user/profile/profile-edit-fields/image-field/index.tsx b/src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/image-field/index.tsx
similarity index 100%
rename from src/components/pages/user/profile/profile-edit-fields/image-field/index.tsx
rename to src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/image-field/index.tsx
diff --git a/src/components/pages/user/profile/profile-edit-fields/index.ts b/src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/index.ts
similarity index 100%
rename from src/components/pages/user/profile/profile-edit-fields/index.ts
rename to src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/index.ts
diff --git a/src/components/pages/user/profile/profile-edit-fields/mbti-field/index.tsx b/src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/mbti-field/index.tsx
similarity index 100%
rename from src/components/pages/user/profile/profile-edit-fields/mbti-field/index.tsx
rename to src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/mbti-field/index.tsx
diff --git a/src/components/pages/user/profile/profile-edit-fields/message-field/index.tsx b/src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/message-field/index.tsx
similarity index 100%
rename from src/components/pages/user/profile/profile-edit-fields/message-field/index.tsx
rename to src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/message-field/index.tsx
diff --git a/src/components/pages/user/profile/profile-edit-fields/nickname-field/index.tsx b/src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/nickname-field/index.tsx
similarity index 100%
rename from src/components/pages/user/profile/profile-edit-fields/nickname-field/index.tsx
rename to src/components/pages/user/profile/profile-edit-modal/profile-edit-fields/nickname-field/index.tsx
diff --git a/src/components/pages/user/profile/profile-follows-badge/index.tsx b/src/components/pages/user/profile/profile-follows-badge/index.tsx
index 72cc0d90..1087579b 100644
--- a/src/components/pages/user/profile/profile-follows-badge/index.tsx
+++ b/src/components/pages/user/profile/profile-follows-badge/index.tsx
@@ -63,7 +63,7 @@ export const ProfileFollowsBadge = ({ user }: Props) => {
}, [queryClient, user.userId]);
return (
-
+
{listMap.map((item, index) => (