prography
diff --git a/‎api/generated/motimo/Api.ts‎
Lines changed: 44 additions & 2 deletions b/‎api/generated/motimo/Api.ts‎
Lines changed: 44 additions & 2 deletions
diff --git a/‎api/hooks.ts‎
Lines changed: 26 additions & 7 deletions b/‎api/hooks.ts‎
Lines changed: 26 additions & 7 deletions
diff --git a/‎app/feed/page.tsx‎
Lines changed: 30 additions & 0 deletions b/‎app/feed/page.tsx‎
Lines changed: 30 additions & 0 deletions
diff --git a/‎app/mypage/done/[id]/page.tsx‎
Lines changed: 13 additions & 94 deletions b/‎app/mypage/done/[id]/page.tsx‎
Lines changed: 13 additions & 94 deletions
diff --git a/‎app/mypage/edit/page.tsx‎
Lines changed: 52 additions & 24 deletions b/‎app/mypage/edit/page.tsx‎
Lines changed: 52 additions & 24 deletions
diff --git a/‎app/onboarding/_components/CompletionScreen.tsx‎
Lines changed: 0 additions & 8 deletions b/‎app/onboarding/_components/CompletionScreen.tsx‎
Lines changed: 0 additions & 8 deletions
@@ -1181,6 +1181,25 @@ export class Api<SecurityDataType extends unknown> {
         ...params,
       }),
 
+    /**
+     * No description
+     *
+     * @tags 사용자 API
+     * @name DeleteUser
+     * @summary 유저 탈퇴
+     * @request DELETE:/v1/users
+     * @secure
+     * @response `200` `void` 탈퇴 성공
+     * @response `401` `void` 인증되지 않은 사용자
+     */
+    deleteUser: (params: RequestParams = {}) =>
+      this.http.request<void, void>({
+        path: `/v1/users`,
+        method: "DELETE",
+        secure: true,
+        ...params,
+      }),
+
     /**
      * @description 사용자가 보유한 관심사를 수정합니다.
      *
@@ -1566,18 +1585,41 @@ export class Api<SecurityDataType extends unknown> {
       }),
 
     /**
-     * @description 목표 ID에 해당하는 목표 정보와 모든 세부 목표 및 오늘의 미완료 투두 목록을 조회합니다.
+     * @description 목표 ID에 해당하는 목표 정보와 모든 세부 목표 및 투두 목록을 조회합니다.
      *
      * @tags 목표 API
      * @name GetGoalWithSubGoalAndTodos
+     * @summary 목표 + 세부목표 + 투두 조회 API
+     * @request GET:/v1/goals/{goalId}/sub-goals/todos/all
+     * @secure
+     * @response `200` `GoalWithSubGoalTodoRs` 목표, 세부목표, 투두 목록 반환
+     * @response `401` `void` 인증되지 않은 사용자
+     * @response `404` `void` 해당 목표를 찾을 수 없음
+     */
+    getGoalWithSubGoalAndTodos: (goalId: string, params: RequestParams = {}) =>
+      this.http.request<GoalWithSubGoalTodoRs, void>({
+        path: `/v1/goals/${goalId}/sub-goals/todos/all`,
+        method: "GET",
+        secure: true,
+        ...params,
+      }),
+
+    /**
+     * @description 목표 ID에 해당하는 목표 정보와 모든 세부 목표 및 오늘의 미완료 투두 목록을 조회합니다.
+     *
+     * @tags 목표 API
+     * @name GetGoalWithSubGoalAndIncompleteOrTodayTodos
      * @summary 목표 + 세부목표 + 오늘의 미완료 투두 조회 API
      * @request GET:/v1/goals/{goalId}/sub-goals/all
      * @secure
      * @response `200` `GoalWithSubGoalTodoRs` 목표, 세부목표, 오늘의 미완료 투두 목록 반환
      * @response `401` `void` 인증되지 않은 사용자
      * @response `404` `void` 해당 목표를 찾을 수 없음
      */
-    getGoalWithSubGoalAndTodos: (goalId: string, params: RequestParams = {}) =>
+    getGoalWithSubGoalAndIncompleteOrTodayTodos: (
+      goalId: string,
+      params: RequestParams = {},
+    ) =>
       this.http.request<GoalWithSubGoalTodoRs, void>({
         path: `/v1/goals/${goalId}/sub-goals/all`,
         method: "GET",
 
@@ -29,10 +29,10 @@ export const useQuery = {
       config,
     ),
 
-  goalWithSubGoals: (goalId: string | null, config?: SWRConfiguration) =>
+  goalWithSubGoal: (goalId: string | null, config?: SWRConfiguration) =>
     useApiQuery(
       "목표Api",
-      "getGoalWithSubGoalAndTodos",
+      "getGoalWithSubGoal",
       goalId ? [goalId] : null,
       undefined,
       config,
@@ -41,6 +41,18 @@ export const useQuery = {
   goalsNotInGroup: (config?: SWRConfiguration) =>
     useApiQuery("목표Api", "getGoalNotJoinGroup", [], undefined, config),
 
+  completedGoals: (config?: SWRConfiguration) =>
+    useApiQuery("목표Api", "getCompletedGoals", [], undefined, config),
+
+  // // Sub Goal API
+  // subGoalTodos: (subGoalId: string | null, config?: SWRConfiguration) =>
+  //   useApiQuery(
+  //     "세부목표Api",
+  //     "getIncompleteOrTodayTodos",
+  //     subGoalId ? [subGoalId] : null,
+  //     undefined,
+  //     config,
+  //   ),
   // Sub Goal API
   subGoalTodos: (
     subGoalId: string | null,
@@ -132,9 +144,14 @@ export const useQuery = {
   cheerPhrase: (config?: SWRConfiguration) =>
     useApiQuery("응원Api", "getCheerPhrase", [], undefined, config),
 
-  // Completed Goals API
-  completedGoals: (config?: SWRConfiguration) =>
-    useApiQuery("목표Api", "getCompletedGoals", [], undefined, config),
+  goalWithSubGoalAndTodos: (goalId: string | null, config?: SWRConfiguration) =>
+    useApiQuery(
+      "목표Api",
+      "getGoalWithSubGoalAndTodos",
+      goalId ? [goalId] : null,
+      undefined,
+      config,
+    ),
 
   // Health API
   health: (config?: SWRConfiguration) =>
@@ -156,8 +173,11 @@ export const useTodos = useQuery.myTodos;
 export const useTodoResult = useQuery.todoResult;
 export const useGoals = useQuery.goals;
 export const useGoalDetail = useQuery.goalDetail;
-export const useGoalWithSubGoals = useQuery.goalWithSubGoals;
+export const useGoalWithSubGoals = useQuery.goalWithSubGoal;
+export const useGoalWithSubGoalsAndTodos = useQuery.goalWithSubGoalAndTodos;
 export const useGoalsNotInGroup = useQuery.goalsNotInGroup;
+export const useCompletedGoals = useQuery.completedGoals;
+// export const useSubGoalTodos = useQuery.subGoalTodos;
 export const useSubGoalTodos = useQuery.subGoalTodos;
 export const useMyProfile = useQuery.myProfile;
 export const useGroupMembers = useQuery.groupMembers;
@@ -168,6 +188,5 @@ export const useJoinedGroups = useQuery.joinedGroups;
 export const usePoints = useQuery.points;
 export const useCheerPhrase = useQuery.cheerPhrase;
 export const useNotifications = useQuery.notifications;
-export const useCompletedGoals = useQuery.completedGoals;
 export const useHealth = useQuery.health;
 export const useAllSubGoalTodos = useQuery.allSubGoalTodos;
@@ -0,0 +1,30 @@
+"use client";
+
+import dynamic from "next/dynamic";
+import { FeedPage } from "@/components/feed";
+
+// 클라이언트에서만 렌더링되는 BottomTabBar (SSR 제외)
+const BottomTabBar = dynamic(
+  () =>
+    import("@/components/shared/BottomTabBar/BottomTabBar").then((mod) => ({
+      default: mod.BottomTabBar,
+    })),
+  { ssr: false },
+);
+
+export default function FeedRoute() {
+  const handleNotificationClick = () => {
+    console.log("Notification clicked");
+    // TODO: Implement notification logic
+  };
+
+  return (
+    <>
+      <FeedPage onNotificationClick={handleNotificationClick} />
+
+      {/* Bottom Tab Bar */}
+      <BottomTabBar type="3" />
+    </>
+  );
+}
+
@@ -1,104 +1,23 @@
 "use client";
 
+import { useGoalDetail, useGoalWithSubGoalsAndTodos } from "@/api/hooks";
 import { DoneItemDetail } from "@/components/mypage";
 import { useParams } from "next/navigation";
 
 export default function DoneItemDetailPage() {
-    const params = useParams();
-    const goalId = params.id as string;
+  const params = useParams();
+  const goalId = params.id as string;
 
-    // Mock data - in a real app, this would come from an API based on goalId
-    const getGoalDetailById = (id: string) => {
-        const goalDetails = {
-            "1": {
-                id: "1",
-                title: "해외로 취업하자!",
-                subGoals: [
-                    {
-                        id: "1",
-                        title: "포트폴리오 및 이력서 준비하기",
-                        completedTodos: [
-                            {
-                                id: "1",
-                                title: "투두 리스트 타이틀이 들어갑니다.",
-                                completedDate: "2025.05.12",
-                                attachment: {
-                                    type: "image" as const,
-                                    url: "https://picsum.photos/200",
-                                },
-                            },
-                            {
-                                id: "2",
-                                title: "투두 리스트 타이틀이 들어갑니다.",
-                                completedDate: "2025.05.12",
-                                attachment: {
-                                    type: "file" as const,
-                                    url: "https://picsum.photos/200",
-                                    name: "파일명이 여기에.pdf",
-                                },
-                            },
-                            {
-                                id: "3",
-                                title: "투두 리스트 타이틀이 들어갑니다.",
-                                completedDate: "2025.05.12",
-                            },
-                        ],
-                    },
-                    {
-                        id: "2",
-                        title: "세부목표명이 여기에 들어갑니다.",
-                        completedTodos: [
-                            {
-                                id: "4",
-                                title: "투두 리스트 타이틀이 들어갑니다.",
-                                completedDate: "2025.05.12",
-                                attachment: {
-                                    type: "image" as const,
-                                    url: "https://picsum.photos/200",
-                                },
-                            },
-                            {
-                                id: "5",
-                                title: "투두 리스트 타이틀이 들어갑니다.",
-                                completedDate: "2025.05.12",
-                            },
-                        ],
-                    },
-                ],
-            },
-            "2": {
-                id: "2",
-                title: "건강한 생활 습관 만들기",
-                subGoals: [
-                    {
-                        id: "3",
-                        title: "매일 운동하기",
-                        completedTodos: [
-                            {
-                                id: "6",
-                                title: "헬스장 등록하기",
-                                completedDate: "2025.03.01",
-                            },
-                            {
-                                id: "7",
-                                title: "운동 계획표 작성",
-                                completedDate: "2025.03.02",
-                                attachment: {
-                                    type: "file" as const,
-                                    url: "/workout-plan.pdf",
-                                    name: "운동계획표.pdf",
-                                },
-                            },
-                        ],
-                    },
-                ],
-            },
-        };
+  const { data } = useGoalWithSubGoalsAndTodos(goalId);
 
-        return goalDetails[id as keyof typeof goalDetails] || goalDetails["1"];
-    };
+  if (!data) {
+    return (
+      <div className="flex items-center justify-center min-h-screen">
+        <p>Loading...</p>
+      </div>
+    );
+  }
 
-    const goalDetail = getGoalDetailById(goalId);
+  return <DoneItemDetail goalDetail={data} />;
+}
 
-    return <DoneItemDetail goalDetail={goalDetail} />;
-} 
@@ -1,31 +1,59 @@
 "use client";
 
+import {
+  UserUpdateRq,
+  UserUpdateRqInterestsEnum,
+} from "@/api/generated/motimo/Api";
+import { userApi } from "@/api/service";
 import { EditProfile } from "@/components/mypage";
+import useToast from "@/hooks/useToast";
+import useAuthStore from "@/stores/useAuthStore";
+import { useSearchParams } from "next/navigation";
+import { Suspense } from "react";
 
-export default function EditProfilePage() {
-    const handleSave = (data: { name: string; bio: string }) => {
-        console.log("Saving profile data:", data);
-        // TODO: Implement actual save logic
-    };
+function EditProfileContent() {
+  const searchParams = useSearchParams();
+  const openInterests = searchParams.get("openInterests") === "true";
+  const handleSave = (request: UserUpdateRq, file?: File) => {
+    userApi.updateMyProfile({
+      request,
+      file,
+    });
+  };
+
+  const { toastInfo, setToast } = useToast();
+  const { logout } = useAuthStore();
 
-    const handleDeleteAccount = () => {
-        console.log("Delete account requested");
-        // TODO: Implement account deletion logic
-    };
+  const handleDeleteAccount = () => {
+    userApi.deleteUser().then(() => {
+      setToast("User 가 삭제 되었습니다");
+      // wait 2 sec and redirect to home
+      setTimeout(() => {
+        logout();
+        window.location.href = "/";
+      }, 2000);
+    });
+  };
 
-    const handleAddInterests = () => {
-        console.log("Add interests requested");
-        // TODO: Navigate to interests selection page
-    };
+  const handleAddInterests = () => {
+    console.log("Add interests requested");
+    // TODO: Navigate to interests selection page
+  };
 
-    return (
-        <EditProfile
-            initialName="홍길동"
-            initialBio=""
-            profileImageUrl="/profile-default.png"
-            onSave={handleSave}
-            onDeleteAccount={handleDeleteAccount}
-            onAddInterests={handleAddInterests}
-        />
-    );
-} 
+  return (
+    <EditProfile
+      onSave={handleSave}
+      onDeleteAccount={handleDeleteAccount}
+      onAddInterests={handleAddInterests}
+      openInterests={openInterests}
+    />
+  );
+}
+
+export default function EditProfilePage() {
+  return (
+    <Suspense fallback={<div>Loading...</div>}>
+      <EditProfileContent />
+    </Suspense>
+  );
+}
@@ -29,14 +29,6 @@ export default function CompletionScreen({
 
   return (
     <div className="min-h-screen bg-background-alternative flex flex-col">
-      {/* Status Bar */}
-      <div className="flex justify-between items-end gap-[286px] px-6 py-[10px] h-[52px]">
-        {/* <div className="text-sm font-medium text-label-normal">9:30</div> */}
-        <div className="flex items-center gap-4">
-          <div className="w-[46px] h-[17px]"></div>
-        </div>
-      </div>
-
       {/* Content */}
       <div className="flex-1 flex flex-col items-center justify-center px-6">
         {/* Check Icon Animation */}