THIP-TextHip · heeeeyong · Aug 11, 2025 · Aug 8, 2025 · Aug 8, 2025 · Aug 8, 2025
diff --git a/public/genres.json b/public/genres.json
@@ -8,7 +8,7 @@
   },
   {
     "id": "science",
-    "title": "과학",
+    "title": "과학·IT",
     "subTitle": "과학자",
     "iconUrl": "/assets/genre/science.svg",
     "color": "#C8A5FF"

diff --git a/src/api/comments/getComments.ts b/src/api/comments/getComments.ts
@@ -11,11 +11,13 @@ export interface CommentData {
   content: string;
   likeCount: number;
   isLike: boolean;
+  isDeleted: boolean;
   replyList: ReplyData[];
 }
 
 export interface ReplyData {
-  replyId: number;
+  parentCommentCreatorNickname: string;
+  commentId: number;
   creatorId: number;
   creatorProfileImageUrl: string | null;
   creatorNickname: string;
@@ -25,6 +27,7 @@ export interface ReplyData {
   content: string;
   likeCount: number;
   isLike: boolean;
+  isDeleted: boolean;
 }
 
 export interface GetCommentsResponse {
@@ -41,9 +44,10 @@ export interface GetCommentsResponse {
 export interface GetCommentsParams {
   size?: number;
   cursor?: string | null;
+  postType: 'FEED' | 'RECORD' | 'VOTE';
 }
 
-export const getComments = async (postId: number, params?: GetCommentsParams) => {
+export const getComments = async (postId: number, params: GetCommentsParams) => {
   const searchParams = new URLSearchParams();
 
   if (params?.size) {
@@ -54,8 +58,10 @@ export const getComments = async (postId: number, params?: GetCommentsParams) =>
     searchParams.append('cursor', params.cursor);
   }
 
+  searchParams.append('postType', params.postType);
+
   const queryString = searchParams.toString();
-  const url = queryString ? `/comments/${postId}?${queryString}` : `/comments/${postId}`;
+  const url = `/comments/${postId}?${queryString}`;
 
   const response = await apiClient.get<GetCommentsResponse>(url);
   return response.data;

diff --git a/src/api/feeds/deleteFeedPost.ts b/src/api/feeds/deleteFeedPost.ts
@@ -0,0 +1,13 @@
+import { apiClient } from '../index';
+
+export interface DeleteFeedPostResponse {
+  isSuccess: boolean;
+  code: number;
+  message: string;
+  data: null;
+}
+
+export const deleteFeedPost = async (feedId: number) => {
+  const response = await apiClient.delete<DeleteFeedPostResponse>(`/feeds/${feedId}`);
+  return response.data;
+};
diff --git a/src/api/feeds/postFeedLike.ts b/src/api/feeds/postFeedLike.ts
@@ -0,0 +1,22 @@
+import { apiClient } from '../index';
+
+export interface PostFeedLikeRequest {
+  type: boolean;
+}
+
+export interface PostFeedLikeResponse {
+  isSuccess: boolean;
+  code: number;
+  message: string;
+  data: {
+    feedId: number;
+    isLiked: boolean;
+  };
+}
+
+export const postFeedLike = async (feedId: number, type: boolean) => {
+  const response = await apiClient.post<PostFeedLikeResponse>(`/feeds/${feedId}/likes`, {
+    type,
+  });
+  return response.data;
+};
diff --git a/src/api/users/getMyProfile.ts b/src/api/users/getMyProfile.ts
@@ -0,0 +1,18 @@
+import { apiClient } from '../index';
+
+export interface GetMyProfileResponse {
+  code: number;
+  status: string;
+  message: string;
+  data: {
+    profileImageUrl: string;
+    nickname: string;
+    aliasName: string;
+    aliasColor: string;
+  };
+}
+
+export const getMyProfile = async () => {
+  const response = await apiClient.get<GetMyProfileResponse>('/users/my-page');
+  return response.data.data;
+};
diff --git a/src/api/users/patchProfile.ts b/src/api/users/patchProfile.ts
@@ -0,0 +1,50 @@
+import { apiClient } from '../index';
+
+export interface PatchProfileRequest {
+  nickname: string | null;
+  aliasName: string;
+}
+
+export interface PatchProfileResponse {
+  isSuccess?: boolean;
+  code: number;
+  message: string;
+}
+
+export const patchProfile = async (data: PatchProfileRequest): Promise<PatchProfileResponse> => {
+  try {
+    const response = await apiClient.patch<PatchProfileResponse>('/users', data);
+    return response.data;
+  } catch (error) {
+    let errorMessage = '프로필 편집 중 오류가 발생했어요.';
+    let errorCode = 0;
+
+    if (error && typeof error === 'object' && 'response' in error) {
+      const axiosError = error as { response?: { data?: { code?: number; message?: string } } };
+      if (axiosError.response?.data) {
+        const serverData = axiosError.response.data;
+        errorCode = serverData.code || 0;
+
+        switch (errorCode) {
+          case 70004:
+            errorMessage = '현재 닉네임과 같은 닉네임이에요.';
+            break;
+          case 70005:
+            errorMessage = '닉네임은 6개월에 한번 변경할 수 있어요.';
+            break;
+          case 70006:
+            errorMessage = '이미 사용중인 닉네임이에요.';
+            break;
+          default:
+            errorMessage = serverData.message || '프로필 편집에 실패했어요.';
+        }
+      }
+    }
+
+    return {
+      isSuccess: false,
+      code: errorCode,
+      message: errorMessage,
+    };
+  }
+};
diff --git a/src/components/common/Modal/MoreMenu.tsx b/src/components/common/Modal/MoreMenu.tsx
@@ -19,13 +19,19 @@ const MoreMenu = ({ onEdit, onDelete, onClose }: MoreMenuProps) => {
 
 const Overlay = styled.div`
   position: fixed;
-  top: 0;
   left: 0;
   right: 0;
+  top: 0;
   bottom: 0;
-  width: 100%;
-  height: 100vh;
-  z-index: 999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  min-width: 320px;
+  max-width: 767px;
+  margin: 0 auto;
+  background-color: rgba(18, 18, 18, 0.1);
+  backdrop-filter: blur(2.5px);
+  z-index: 1200;
 `;
 
 const Container = styled.div`
@@ -43,7 +49,7 @@ const Container = styled.div`
   padding: 20px;
   border-radius: 12px 12px 0px 0px;
   background-color: ${colors.darkgrey.main};
-  z-index: 1001;
+  z-index: 1201;
 `;
 
 const Button = styled.div<{ variant: 'edit' | 'delete' }>`

diff --git a/src/components/common/Modal/PopupContainer.tsx b/src/components/common/Modal/PopupContainer.tsx
@@ -38,11 +38,7 @@ const PopupContainer = () => {
         );
       }
       case 'moremenu': {
-        return (
-          <Wrapper>
-            <MoreMenu {...(popupProps as MoreMenuProps)} />
-          </Wrapper>
-        );
+        return <MoreMenu {...(popupProps as MoreMenuProps)} />;
       }
       case 'reply-modal': {
         return <ReplyModal {...(popupProps as ReplyModalProps)} />;

diff --git a/src/components/common/Modal/ReplyModal.tsx b/src/components/common/Modal/ReplyModal.tsx
@@ -5,7 +5,7 @@ import { deleteComment } from '@/api/comments/deleteComment';
 import { usePopupActions } from '@/hooks/usePopupActions';
 import type { ReplyModalProps } from '@/stores/usePopupStore';
 
-const ReplyModal = ({ isOpen, userId, replyId, position, onClose }: ReplyModalProps) => {
+const ReplyModal = ({ isOpen, userId, commentId, position, onClose }: ReplyModalProps) => {
   const [currentUserId, setCurrentUserId] = useState<number | null>(null);
   const { openConfirm, openSnackbar, closePopup } = usePopupActions();
 
@@ -33,8 +33,8 @@ const ReplyModal = ({ isOpen, userId, replyId, position, onClose }: ReplyModalPr
       disc: '삭제 후에는 되돌릴 수 없어요.',
       onConfirm: async () => {
         try {
-          await deleteComment(replyId);
-          console.log('댓글 삭제 성공:', replyId);
+          await deleteComment(commentId);
+          console.log('댓글 삭제 성공:', commentId);
 
           openSnackbar({
             message: '댓글 삭제를 완료했어요.',

diff --git a/src/components/common/NavBar.tsx b/src/components/common/NavBar.tsx
@@ -1,7 +1,6 @@
 import { useNavigate, useLocation } from 'react-router-dom';
 import styled from '@emotion/styled';
 import Fab from './Fab';
-import type { FabProps } from '../../types/fab';
 import FeedIcon from '../../assets/navbar/feed.svg';
 import GroupIcon from '../../assets/navbar/group.svg';
 import SearchIcon from '../../assets/navbar/search.svg';
@@ -72,7 +71,12 @@ const items: RouteItem[] = [
   { path: '/mypage', label: '내 정보', icon: MyIcon, activeIcon: MyIconActive },
 ];
 
-const NavBar = ({ src, path }: FabProps) => {
+interface NavBarProps {
+  src?: string;
+  path?: string;
+}
+
+const NavBar = ({ src, path }: NavBarProps) => {
   const navigate = useNavigate();
   const { pathname } = useLocation();
 

diff --git a/src/components/common/Post/PostFooter.tsx b/src/components/common/Post/PostFooter.tsx
@@ -8,6 +8,7 @@ import save from '../../../assets/feed/save.svg';
 import activeSave from '../../../assets/feed/activeSave.svg';
 import lockIcon from '../../../assets/feed/lockIcon.svg';
 import { postSaveFeed } from '@/api/feeds/postSave';
+import { postFeedLike } from '@/api/feeds/postFeedLike';
 
 const Container = styled.div<{ isDetail: boolean }>`
   width: 100%;
@@ -70,9 +71,21 @@ const PostFooter = ({
   const [likeCount, setLikeCount] = useState<number>(initialLikeCount);
   const [saved, setSaved] = useState(isSaved);
 
-  const handleLike = () => {
-    setLiked(!liked);
-    setLikeCount(prev => (liked ? prev - 1 : prev + 1));
+  const handleLike = async () => {
+    try {
+      const response = await postFeedLike(feedId, !liked);
+
+      if (response.isSuccess) {
+        // 성공 시 상태 업데이트
+        setLiked(response.data.isLiked);
+        setLikeCount(prev => (response.data.isLiked ? prev + 1 : prev - 1));
+        console.log('좋아요 상태 변경 성공:', response.data.isLiked);
+      } else {
+        console.error('좋아요 상태 변경 실패:', response.message);
+      }
+    } catch (error) {
+      console.error('좋아요 API 호출 실패:', error);
+    }
   };
 
   const handleSave = async () => {