From 0dda1275836c19c7865b6b71aef509e24589ee41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 14:18:43 +0900
Subject: [PATCH 01/14] =?UTF-8?q?Fix:=20sideNavigation=20=EC=B2=B4?=
 =?UTF-8?q?=ED=97=98=20=EA=B4=80=EB=A6=AC=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C?=
 =?UTF-8?q?=20=EB=9D=BC=EC=9A=B0=ED=8C=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/SideNavigation/SideNavigation.tsx |  12 +-
 package-lock.json                            | 240 +++++++++----------
 2 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/components/SideNavigation/SideNavigation.tsx b/components/SideNavigation/SideNavigation.tsx
index 7a57ed1..6cbb7aa 100644
--- a/components/SideNavigation/SideNavigation.tsx
+++ b/components/SideNavigation/SideNavigation.tsx
@@ -29,8 +29,8 @@ export default function SidenNavigation() {
       case '/reservation':
         setActiveButton('reservation');
         break;
-      case '/setting':
-        setActiveButton('setting');
+      case '/myActivity':
+        setActiveButton('myActivity');
         break;
       case '/calendar':
         setActiveButton('calendar');
@@ -44,7 +44,7 @@ export default function SidenNavigation() {
   const buttonPaths: routePaths = {
     mypage: '/mypage',
     reservation: '/reservation',
-    setting: '/setting',
+    myActivity: '/myActivity',
     calendar: '/calendar',
   };
 
@@ -149,14 +149,14 @@ export default function SidenNavigation() {
         </button>
         <button
           className={`${sideNavBtnStyle} ${
-            activeButton === 'setting'
+            activeButton === 'myActivity'
               ? 'bg-var-green1 rounded-[12px] text-var-black'
               : 'text-var-gray6'
           }`}
-          onClick={() => handleBtnClick('setting')}
+          onClick={() => handleBtnClick('myActivity')}
         >
           <Image
-            src={activeButton === 'setting' ? settingIcon : graySettingIcon}
+            src={activeButton === 'myActivity' ? settingIcon : graySettingIcon}
             alt="내 체험 관리 아이콘"
           />
           <p>내 체험 관리</p>
diff --git a/package-lock.json b/package-lock.json
index cfbb0e4..0ec1a00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -248,6 +248,126 @@
         "glob": "10.3.10"
       }
     },
+    "node_modules/@next/swc-darwin-arm64": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz",
+      "integrity": "sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-darwin-x64": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz",
+      "integrity": "sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-gnu": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz",
+      "integrity": "sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-arm64-musl": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz",
+      "integrity": "sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-gnu": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz",
+      "integrity": "sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-linux-x64-musl": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz",
+      "integrity": "sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-arm64-msvc": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz",
+      "integrity": "sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@next/swc-win32-ia32-msvc": {
+      "version": "14.2.4",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz",
+      "integrity": "sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==",
+      "cpu": [
+        "ia32"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@next/swc-win32-x64-msvc": {
       "version": "14.2.4",
       "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.4.tgz",
@@ -5409,126 +5529,6 @@
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
-    },
-    "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.4.tgz",
-      "integrity": "sha512-AH3mO4JlFUqsYcwFUHb1wAKlebHU/Hv2u2kb1pAuRanDZ7pD/A/KPD98RHZmwsJpdHQwfEc/06mgpSzwrJYnNg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-darwin-x64": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.4.tgz",
-      "integrity": "sha512-QVadW73sWIO6E2VroyUjuAxhWLZWEpiFqHdZdoQ/AMpN9YWGuHV8t2rChr0ahy+irKX5mlDU7OY68k3n4tAZTg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.4.tgz",
-      "integrity": "sha512-KT6GUrb3oyCfcfJ+WliXuJnD6pCpZiosx2X3k66HLR+DMoilRb76LpWPGb4tZprawTtcnyrv75ElD6VncVamUQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.4.tgz",
-      "integrity": "sha512-Alv8/XGSs/ytwQcbCHwze1HmiIkIVhDHYLjczSVrf0Wi2MvKn/blt7+S6FJitj3yTlMwMxII1gIJ9WepI4aZ/A==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.4.tgz",
-      "integrity": "sha512-ze0ShQDBPCqxLImzw4sCdfnB3lRmN3qGMB2GWDRlq5Wqy4G36pxtNOo2usu/Nm9+V2Rh/QQnrRc2l94kYFXO6Q==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.4.tgz",
-      "integrity": "sha512-8dwC0UJoc6fC7PX70csdaznVMNr16hQrTDAMPvLPloazlcaWfdPogq+UpZX6Drqb1OBlwowz8iG7WR0Tzk/diQ==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.4.tgz",
-      "integrity": "sha512-jxyg67NbEWkDyvM+O8UDbPAyYRZqGLQDTPwvrBBeOSyVWW/jFQkQKQ70JDqDSYg1ZDdl+E3nkbFbq8xM8E9x8A==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.4.tgz",
-      "integrity": "sha512-twrmN753hjXRdcrZmZttb/m5xaCBFa48Dt3FbeEItpJArxriYDunWxJn+QFXdJ3hPkm4u7CKxncVvnmgQMY1ag==",
-      "cpu": [
-        "ia32"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 10"
-      }
     }
   }
 }

From ebe6cc4332daa5d3bb0d2c71a80720dc60febd50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 14:20:00 +0900
Subject: [PATCH 02/14] =?UTF-8?q?Feat:=20=EB=82=B4=20=EC=B2=B4=ED=97=98=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=82=AC?=
 =?UTF-8?q?=EC=9D=B4=EB=93=9C=20=EB=84=A4=EB=B9=84=EA=B2=8C=EC=9D=B4?=
 =?UTF-8?q?=EC=85=98=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/myActivity/index.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pages/myActivity/index.tsx b/pages/myActivity/index.tsx
index 6c4cfc4..0a2d7e6 100644
--- a/pages/myActivity/index.tsx
+++ b/pages/myActivity/index.tsx
@@ -1,13 +1,14 @@
 import { PrimaryButton } from '@/components/Button/Button';
 import Card from '@/components/MyActivity/Card';
+import SidenNavigation from '@/components/SideNavigation/SideNavigation';
 
 function MyActivity() {
   const handleClickAdd = () => {};
 
   return (
     <div className="flex gap-[20px] py-[72px] m:gap-0">
-      <div className="w-[384px] t:w-[251px] h-[432px] bg-var-gray7 flex-shrink-0 m:hidden">
-        프로필
+      <div className="m:hidden">
+        <SidenNavigation />
       </div>
       <div className="flex flex-col gap-[20px] t:w-full m:w-[calc(100vw-50px)] flex-shrink">
         <div className="flex justify-between">

From f9eacaeb88bb13382ad287dbb4256de2c37ddec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 14:55:26 +0900
Subject: [PATCH 03/14] =?UTF-8?q?Feat:=20=EB=82=B4=20=EC=B2=B4=ED=97=98=20?=
 =?UTF-8?q?=EB=82=B4=EC=97=AD=20api=20=EC=97=B0=EA=B2=B0=20=EB=B0=8F=20?=
 =?UTF-8?q?=EB=AC=B4=ED=95=9C=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hooks/useMyActivityList.ts | 41 +++++++++++++++++++++++++
 pages/myActivity/index.tsx | 62 ++++++++++++++++++++------------------
 2 files changed, 74 insertions(+), 29 deletions(-)
 create mode 100644 hooks/useMyActivityList.ts

diff --git a/hooks/useMyActivityList.ts b/hooks/useMyActivityList.ts
new file mode 100644
index 0000000..c82706b
--- /dev/null
+++ b/hooks/useMyActivityList.ts
@@ -0,0 +1,41 @@
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { getMyActivityList } from '@/pages/api/myActivities/apimyActivities';
+import { getMyActivityListResponse } from '@/pages/api/myActivities/apimyActivities.types';
+import { useMemo } from 'react';
+
+const INITIAL_SIZE = 4;
+const REFETCH_SIZE = 1;
+
+export const useMyActivityList = () => {
+  const { data, fetchNextPage, hasNextPage, isLoading, isFetchingNextPage } =
+    useInfiniteQuery<getMyActivityListResponse>({
+      queryKey: ['myActivityList'],
+      queryFn: ({ pageParam = undefined }) => {
+        const size = pageParam === undefined ? INITIAL_SIZE : REFETCH_SIZE;
+        return getMyActivityList({
+          size,
+          cursorId: pageParam as number | undefined,
+        });
+      },
+      getNextPageParam: (lastPage) => {
+        return lastPage.totalCount === lastPage.activities.length
+          ? undefined
+          : lastPage.cursorId;
+      },
+      initialPageParam: undefined,
+    });
+
+  const myActivityList = useMemo(() => {
+    if (data) {
+      return data.pages.flatMap((page) => page.activities);
+    }
+  }, [data]);
+
+  return {
+    myActivityList,
+    fetchNextPage,
+    hasNextPage,
+    isLoading,
+    isFetchingNextPage,
+  };
+};
diff --git a/pages/myActivity/index.tsx b/pages/myActivity/index.tsx
index 0a2d7e6..2801e9e 100644
--- a/pages/myActivity/index.tsx
+++ b/pages/myActivity/index.tsx
@@ -1,9 +1,25 @@
+import { useRouter } from 'next/router';
 import { PrimaryButton } from '@/components/Button/Button';
 import Card from '@/components/MyActivity/Card';
 import SidenNavigation from '@/components/SideNavigation/SideNavigation';
+import { useInView } from 'react-intersection-observer';
+import { useMyActivityList } from '@/hooks/useMyActivityList';
+import { useEffect, useState } from 'react';
 
 function MyActivity() {
-  const handleClickAdd = () => {};
+  const router = useRouter();
+  const { ref, inView } = useInView();
+  const { fetchNextPage, myActivityList, hasNextPage } = useMyActivityList();
+
+  useEffect(() => {
+    if (inView && hasNextPage) {
+      fetchNextPage();
+    }
+  }, [inView]);
+
+  const handleClickAdd = () => {
+    router.push('myActivity/register');
+  };
 
   return (
     <div className="flex gap-[20px] py-[72px] m:gap-0">
@@ -18,34 +34,22 @@ function MyActivity() {
           </PrimaryButton>
         </div>
         <div className="flex flex-col gap-[20px] overflow-y-auto">
-          <Card
-            activityImage="/image/VR 게임 마스터 하는 법.png"
-            rating={4.9}
-            reviewCount={249}
-            title="VR 게임 마스터 하는 법"
-            price={10000}
-          />
-          <Card
-            activityImage="/image/VR 게임 마스터 하는 법.png"
-            rating={4.9}
-            reviewCount={249}
-            title="VR 게임 마스터 하는 법"
-            price={10000}
-          />
-          <Card
-            activityImage="/image/VR 게임 마스터 하는 법.png"
-            rating={4.9}
-            reviewCount={249}
-            title="VR 게임 마스터 하는 법"
-            price={10000}
-          />
-          <Card
-            activityImage="/image/VR 게임 마스터 하는 법.png"
-            rating={4.9}
-            reviewCount={249}
-            title="VR 게임 마스터 하는 법"
-            price={10000}
-          />
+          {myActivityList?.map((activity) => {
+            return (
+              <Card
+                activityImage={activity.bannerImageUrl}
+                rating={activity.rating}
+                reviewCount={activity.reviewCount}
+                title={activity.title}
+                price={activity.price}
+              />
+            );
+          })}
+          {hasNextPage && (
+            <div className="text-[35px] font-bold text-center" ref={ref}>
+              ...
+            </div>
+          )}
         </div>
       </div>
     </div>

From 7e5d0489e04284ee0d2dc9d3571224d50234607a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 15:43:07 +0900
Subject: [PATCH 04/14] =?UTF-8?q?Style:=20hooks=20=ED=8F=B4=EB=8D=94=20?=
 =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hooks/{ => myActivity}/useActivityImage.ts    | 0
 hooks/myActivity/useDeleteActivity.ts         | 0
 hooks/{ => myActivity}/useMyActivityList.ts   | 0
 hooks/{ => myActivity}/useRegisterActivity.ts | 0
 pages/myActivity/index.tsx                    | 4 ++--
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename hooks/{ => myActivity}/useActivityImage.ts (100%)
 create mode 100644 hooks/myActivity/useDeleteActivity.ts
 rename hooks/{ => myActivity}/useMyActivityList.ts (100%)
 rename hooks/{ => myActivity}/useRegisterActivity.ts (100%)

diff --git a/hooks/useActivityImage.ts b/hooks/myActivity/useActivityImage.ts
similarity index 100%
rename from hooks/useActivityImage.ts
rename to hooks/myActivity/useActivityImage.ts
diff --git a/hooks/myActivity/useDeleteActivity.ts b/hooks/myActivity/useDeleteActivity.ts
new file mode 100644
index 0000000..e69de29
diff --git a/hooks/useMyActivityList.ts b/hooks/myActivity/useMyActivityList.ts
similarity index 100%
rename from hooks/useMyActivityList.ts
rename to hooks/myActivity/useMyActivityList.ts
diff --git a/hooks/useRegisterActivity.ts b/hooks/myActivity/useRegisterActivity.ts
similarity index 100%
rename from hooks/useRegisterActivity.ts
rename to hooks/myActivity/useRegisterActivity.ts
diff --git a/pages/myActivity/index.tsx b/pages/myActivity/index.tsx
index 2801e9e..4ff5cd1 100644
--- a/pages/myActivity/index.tsx
+++ b/pages/myActivity/index.tsx
@@ -3,8 +3,8 @@ import { PrimaryButton } from '@/components/Button/Button';
 import Card from '@/components/MyActivity/Card';
 import SidenNavigation from '@/components/SideNavigation/SideNavigation';
 import { useInView } from 'react-intersection-observer';
-import { useMyActivityList } from '@/hooks/useMyActivityList';
-import { useEffect, useState } from 'react';
+import { useMyActivityList } from '@/hooks/myActivity/useMyActivityList';
+import { useEffect } from 'react';
 
 function MyActivity() {
   const router = useRouter();

From 4d0eed5c38b568f8e61e2b4dced0703895c0f044 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 15:43:51 +0900
Subject: [PATCH 05/14] =?UTF-8?q?Style:=20hooks=20=ED=8F=B4=EB=8D=94=20?=
 =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/myActivity/register.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/myActivity/register.tsx b/pages/myActivity/register.tsx
index 35a7f13..3b263fe 100644
--- a/pages/myActivity/register.tsx
+++ b/pages/myActivity/register.tsx
@@ -19,9 +19,9 @@ import {
   startTimeState,
   timeSlotCountState,
 } from '@/states/registerState';
-import useRegisterActivity from '@/hooks/useRegisterActivity';
+import useRegisterActivity from '@/hooks/myActivity/useRegisterActivity';
 import { formatDate } from '@/utils/formatDate';
-import useActivityImage from '@/hooks/useActivityImage';
+import useActivityImage from '@/hooks/myActivity/useActivityImage';
 import SidenNavigation from '@/components/SideNavigation/SideNavigation';
 
 function RegisterActivity() {

From 34f40476fb0cd88680b42fdac61fbf4bf25c7b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 16:06:21 +0900
Subject: [PATCH 06/14] =?UTF-8?q?Feat:=20=EB=82=B4=20=EC=B2=B4=ED=97=98=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/MyActivity/Card.tsx        | 24 ++++++++++++++++++++----
 components/MyActivity/Card.types.ts   |  2 ++
 hooks/myActivity/useDeleteActivity.ts | 13 +++++++++++++
 pages/myActivity/index.tsx            |  2 ++
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/components/MyActivity/Card.tsx b/components/MyActivity/Card.tsx
index c6ada4d..91352e3 100644
--- a/components/MyActivity/Card.tsx
+++ b/components/MyActivity/Card.tsx
@@ -7,6 +7,7 @@ import { formatCurrency } from '@/utils/formatCurrency';
 import { formatNumberToFixed } from '@/utils/formatNumberToFixed';
 import { usePopup } from '@/hooks/usePopup';
 import useClickOutside from '@/hooks/useClickOutside';
+import useDeleteActivity from '@/hooks/myActivity/useDeleteActivity';
 
 function PopoverButton({ children, onClick }: PopoverButtonProps) {
   return (
@@ -19,10 +20,11 @@ function PopoverButton({ children, onClick }: PopoverButtonProps) {
   );
 }
 
-function Popover({ closePopover }: PopoverProps) {
+function Popover({ activityId, closePopover }: PopoverProps) {
   const popoverRef = useClickOutside<HTMLDivElement>(closePopover);
   const router = useRouter();
   const { openPopup } = usePopup();
+  const { deleteMyActivityMutation } = useDeleteActivity();
 
   const handleClickEdit = () => {
     router.push('/myActivity/edit');
@@ -32,7 +34,9 @@ function Popover({ closePopover }: PopoverProps) {
       popupType: 'select',
       content: '체험을 삭제하시겠어요?',
       btnName: ['아니오', '삭제하기'],
-      callBackFnc: () => alert('체험 삭제 테스트'),
+      callBackFnc: () => {
+        deleteMyActivityMutation.mutate(activityId);
+      },
     });
   };
 
@@ -48,7 +52,14 @@ function Popover({ closePopover }: PopoverProps) {
   );
 }
 
-function Card({ activityImage, rating, reviewCount, title, price }: CardProps) {
+function Card({
+  activityId,
+  activityImage,
+  rating,
+  reviewCount,
+  title,
+  price,
+}: CardProps) {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 
   const handleClickMeatball = () => {
@@ -88,7 +99,12 @@ function Card({ activityImage, rating, reviewCount, title, price }: CardProps) {
             <span className="font-[500] text-var-gray8">/인</span>
           </div>
           <MeatballButton onClick={handleClickMeatball} />
-          {isPopoverOpen ? <Popover closePopover={handleClosePopover} /> : null}
+          {isPopoverOpen ? (
+            <Popover
+              activityId={activityId}
+              closePopover={handleClosePopover}
+            />
+          ) : null}
         </div>
       </div>
     </div>
diff --git a/components/MyActivity/Card.types.ts b/components/MyActivity/Card.types.ts
index 07436a1..478454e 100644
--- a/components/MyActivity/Card.types.ts
+++ b/components/MyActivity/Card.types.ts
@@ -1,4 +1,5 @@
 export interface CardProps {
+  activityId: number;
   activityImage: string;
   rating: number;
   reviewCount: number;
@@ -12,5 +13,6 @@ export interface PopoverButtonProps {
 }
 
 export interface PopoverProps {
+  activityId: number;
   closePopover: () => void;
 }
diff --git a/hooks/myActivity/useDeleteActivity.ts b/hooks/myActivity/useDeleteActivity.ts
index e69de29..608b574 100644
--- a/hooks/myActivity/useDeleteActivity.ts
+++ b/hooks/myActivity/useDeleteActivity.ts
@@ -0,0 +1,13 @@
+import { deleteMyActivities } from '@/pages/api/myActivities/apimyActivities';
+import { useMutation } from '@tanstack/react-query';
+
+export default function useDeleteActivity() {
+  const deleteMyActivityMutation = useMutation({
+    mutationFn: deleteMyActivities,
+    onSuccess: () => {
+      window.location.reload();
+    },
+  });
+
+  return { deleteMyActivityMutation };
+}
diff --git a/pages/myActivity/index.tsx b/pages/myActivity/index.tsx
index 4ff5cd1..49ec27c 100644
--- a/pages/myActivity/index.tsx
+++ b/pages/myActivity/index.tsx
@@ -37,6 +37,8 @@ function MyActivity() {
           {myActivityList?.map((activity) => {
             return (
               <Card
+                key={activity.id}
+                activityId={activity.id}
                 activityImage={activity.bannerImageUrl}
                 rating={activity.rating}
                 reviewCount={activity.reviewCount}

From 52b9b7db50883a5e2a11ad8b90c697579c10d7b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 17:09:03 +0900
Subject: [PATCH 07/14] =?UTF-8?q?Fix:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EC=A0=84=EC=97=90=20=EC=B2=B4=ED=97=98=EC=9D=84=20=EB=B6=88?=
 =?UTF-8?q?=EB=9F=AC=EC=98=A4=EB=8D=98=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/MyActivity/Card.tsx        | 2 +-
 hooks/myActivity/useMyActivityList.ts | 4 ++++
 pages/myActivity/index.tsx            | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/MyActivity/Card.tsx b/components/MyActivity/Card.tsx
index 91352e3..dd77328 100644
--- a/components/MyActivity/Card.tsx
+++ b/components/MyActivity/Card.tsx
@@ -42,7 +42,7 @@ function Popover({ activityId, closePopover }: PopoverProps) {
 
   return (
     <div
-      className="flex flex-col absolute rounded-[6px] border border-solid border-var-gray3 right-0 top-[50px] bg-white"
+      className="flex flex-col absolute rounded-[6px] border border-solid border-var-gray3 right-0 top-[50px] bg-white z-10"
       ref={popoverRef}
     >
       <PopoverButton onClick={handleClickEdit}>수정하기</PopoverButton>
diff --git a/hooks/myActivity/useMyActivityList.ts b/hooks/myActivity/useMyActivityList.ts
index c82706b..2fec64b 100644
--- a/hooks/myActivity/useMyActivityList.ts
+++ b/hooks/myActivity/useMyActivityList.ts
@@ -2,11 +2,14 @@ import { useInfiniteQuery } from '@tanstack/react-query';
 import { getMyActivityList } from '@/pages/api/myActivities/apimyActivities';
 import { getMyActivityListResponse } from '@/pages/api/myActivities/apimyActivities.types';
 import { useMemo } from 'react';
+import useLoginState from '../useLoginState';
 
 const INITIAL_SIZE = 4;
 const REFETCH_SIZE = 1;
 
 export const useMyActivityList = () => {
+  const loginState = useLoginState();
+
   const { data, fetchNextPage, hasNextPage, isLoading, isFetchingNextPage } =
     useInfiniteQuery<getMyActivityListResponse>({
       queryKey: ['myActivityList'],
@@ -23,6 +26,7 @@ export const useMyActivityList = () => {
           : lastPage.cursorId;
       },
       initialPageParam: undefined,
+      enabled: loginState.isLoggedIn,
     });
 
   const myActivityList = useMemo(() => {
diff --git a/pages/myActivity/index.tsx b/pages/myActivity/index.tsx
index 49ec27c..2302d1d 100644
--- a/pages/myActivity/index.tsx
+++ b/pages/myActivity/index.tsx
@@ -1,10 +1,10 @@
+import { useEffect } from 'react';
 import { useRouter } from 'next/router';
 import { PrimaryButton } from '@/components/Button/Button';
 import Card from '@/components/MyActivity/Card';
 import SidenNavigation from '@/components/SideNavigation/SideNavigation';
 import { useInView } from 'react-intersection-observer';
 import { useMyActivityList } from '@/hooks/myActivity/useMyActivityList';
-import { useEffect } from 'react';
 
 function MyActivity() {
   const router = useRouter();
@@ -22,18 +22,18 @@ function MyActivity() {
   };
 
   return (
-    <div className="flex gap-[20px] py-[72px] m:gap-0">
+    <div className="flex gap-[20px] py-[72px] m:gap-0 m:pl-[20px]">
       <div className="m:hidden">
         <SidenNavigation />
       </div>
-      <div className="flex flex-col gap-[20px] t:w-full m:w-[calc(100vw-50px)] flex-shrink">
+      <div className="flex flex-col gap-[20px] t:w-full m:w-full flex-shrink">
         <div className="flex justify-between">
           <h1 className="text-[32px] font-[700]">내 체험 관리</h1>
           <PrimaryButton size="small" style="dark" onClick={handleClickAdd}>
             체험 등록하기
           </PrimaryButton>
         </div>
-        <div className="flex flex-col gap-[20px] overflow-y-auto">
+        <div className="flex flex-col gap-[20px] overflow-visible">
           {myActivityList?.map((activity) => {
             return (
               <Card

From 1c543f0bb2b8858cceb2167a7788e0cab91a1069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 18:01:53 +0900
Subject: [PATCH 08/14] =?UTF-8?q?Feat:=20=EC=A3=BC=EC=86=8C=20daum=20?=
 =?UTF-8?q?=EC=9A=B0=ED=8E=B8=20api=20=EC=82=AC=EC=9A=A9=ED=95=98=EB=8A=94?=
 =?UTF-8?q?=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MyActivity/Register/AddressInput.tsx      | 40 +++++++++++++++++++
 components/Popup/AddressPopup.tsx             | 40 +++++++++++++++++++
 components/Popup/Popup.types.ts               |  4 ++
 package-lock.json                             |  9 +++++
 package.json                                  |  3 +-
 pages/myActivity/register.tsx                 | 19 ++++-----
 states/registerState.tsx                      |  5 +++
 7 files changed, 107 insertions(+), 13 deletions(-)
 create mode 100644 components/MyActivity/Register/AddressInput.tsx
 create mode 100644 components/Popup/AddressPopup.tsx

diff --git a/components/MyActivity/Register/AddressInput.tsx b/components/MyActivity/Register/AddressInput.tsx
new file mode 100644
index 0000000..97f22c5
--- /dev/null
+++ b/components/MyActivity/Register/AddressInput.tsx
@@ -0,0 +1,40 @@
+import AddressPopup from '@/components/Popup/AddressPopup';
+import { addressState } from '@/states/registerState';
+import { useState } from 'react';
+import { useRecoilValue } from 'recoil';
+
+function AddressInput() {
+  const address = useRecoilValue(addressState);
+  const [isPopupOpen, setIsPopupOpen] = useState(false);
+
+  const handleInputClick = () => {
+    setIsPopupOpen(!isPopupOpen);
+  };
+
+  const closePopup = () => {
+    setIsPopupOpen(false);
+  };
+
+  return (
+    <div>
+      <label
+        className="text-[24px] font-bold block mb-[16px]"
+        htmlFor="address"
+      >
+        주소
+      </label>
+      <input
+        type="text"
+        id="address"
+        value={address}
+        onClick={handleInputClick}
+        className="w-full h-[56px] py-[8px] px-[16px] rounded-md border border-var-gray6 bg-white"
+        readOnly
+        placeholder="주소"
+      />
+      {isPopupOpen && <AddressPopup closePopup={closePopup} />}
+    </div>
+  );
+}
+
+export default AddressInput;
diff --git a/components/Popup/AddressPopup.tsx b/components/Popup/AddressPopup.tsx
new file mode 100644
index 0000000..dcace79
--- /dev/null
+++ b/components/Popup/AddressPopup.tsx
@@ -0,0 +1,40 @@
+import { addressState } from '@/states/registerState';
+import React, { useEffect, useState } from 'react';
+import DaumPostcode from 'react-daum-postcode';
+import { useRecoilState } from 'recoil';
+import { AddressPopupProps } from './Popup.types';
+
+const style = {
+  width: '400px',
+  height: '600px',
+};
+
+const AddressPopup = ({ closePopup }: AddressPopupProps) => {
+  const [address, setAddress] = useRecoilState(addressState);
+
+  const handleComplete = (data: any) => {
+    let fullAddress = data.address;
+    setAddress(fullAddress);
+  };
+
+  const handleClose = (state: string) => {
+    if (state === 'FORCE_CLOSE') {
+      closePopup();
+    } else if (state === 'COMPLETE_CLOSE') {
+      closePopup();
+    }
+  };
+
+  return (
+    <div className="flex items-center justify-center bg-black bg-opacity-70 fixed inset-0 z-50">
+      <DaumPostcode
+        style={style}
+        autoClose
+        onComplete={handleComplete}
+        onClose={handleClose}
+      />
+    </div>
+  );
+};
+
+export default AddressPopup;
diff --git a/components/Popup/Popup.types.ts b/components/Popup/Popup.types.ts
index 72f2c45..54cf988 100644
--- a/components/Popup/Popup.types.ts
+++ b/components/Popup/Popup.types.ts
@@ -5,3 +5,7 @@ export interface PopupProps {
   btnName: [string, string?];
   callBackFnc?: () => void;
 }
+
+export interface AddressPopupProps {
+  closePopup: () => void;
+}
diff --git a/package-lock.json b/package-lock.json
index 0ec1a00..3f0119d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,6 +14,7 @@
         "next": "14.2.4",
         "react": "^18",
         "react-calendar": "^5.0.0",
+        "react-daum-postcode": "^3.1.3",
         "react-dom": "^18",
         "react-hook-form": "^7.52.1",
         "react-intersection-observer": "^9.13.0",
@@ -4248,6 +4249,14 @@
         }
       }
     },
+    "node_modules/react-daum-postcode": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/react-daum-postcode/-/react-daum-postcode-3.1.3.tgz",
+      "integrity": "sha512-qTyzUb1BeszPFO4FXSj6p83Wrn5Zpo6YqI2EZ46XSVRZT+du9CrKg9p3KshBRFKYxXmFE1Mv7wEynzXdRFNlmQ==",
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
     "node_modules/react-dom": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
diff --git a/package.json b/package.json
index 9bb3469..b366f5a 100644
--- a/package.json
+++ b/package.json
@@ -15,12 +15,13 @@
     "next": "14.2.4",
     "react": "^18",
     "react-calendar": "^5.0.0",
+    "react-daum-postcode": "^3.1.3",
     "react-dom": "^18",
     "react-hook-form": "^7.52.1",
+    "react-intersection-observer": "^9.13.0",
     "react-slick": "^0.30.2",
     "recoil": "^0.7.7",
     "recoil-persist": "^5.1.0",
-    "react-intersection-observer": "^9.13.0",
     "slick-carousel": "^1.8.1",
     "tailwind-scrollbar-hide": "^1.1.7"
   },
diff --git a/pages/myActivity/register.tsx b/pages/myActivity/register.tsx
index 3b263fe..328cf7c 100644
--- a/pages/myActivity/register.tsx
+++ b/pages/myActivity/register.tsx
@@ -12,6 +12,7 @@ import { validation } from '@/components/MyActivity/Register/validation';
 import { useRecoilValue } from 'recoil';
 import { KategoriedDropState } from '@/states/KategorieDropState';
 import {
+  addressState,
   bannerImageState,
   detailImageState,
   endTimeState,
@@ -23,6 +24,7 @@ import useRegisterActivity from '@/hooks/myActivity/useRegisterActivity';
 import { formatDate } from '@/utils/formatDate';
 import useActivityImage from '@/hooks/myActivity/useActivityImage';
 import SidenNavigation from '@/components/SideNavigation/SideNavigation';
+import AddressInput from '@/components/MyActivity/Register/AddressInput';
 
 function RegisterActivity() {
   const {
@@ -38,6 +40,7 @@ function RegisterActivity() {
   const timeSlotCount = useRecoilValue(timeSlotCountState);
   const startTime = useRecoilValue(startTimeState);
   const endTime = useRecoilValue(endTimeState);
+  const address = useRecoilValue(addressState);
 
   const { postActivityMutation } = useRegisterActivity();
   const { postActivityImageMutation } = useActivityImage();
@@ -60,7 +63,7 @@ function RegisterActivity() {
   };
 
   const onSubmit = async (data: FieldValues) => {
-    const { title, description, price, address } = data;
+    const { title, description, price } = data;
     const schedules = formatSchedules();
     const bannerUrl = bannerImage[0] ? await uploadImage(bannerImage[0]) : '';
     const detailUrls = await Promise.all(detailImage.map(uploadImage));
@@ -86,17 +89,16 @@ function RegisterActivity() {
     );
 
   const isAllFieldsValid = () => {
-    const { title, description, price, address } = getValues();
+    const { title, description, price } = getValues();
     return (
       !!title &&
       !!description &&
       !!price &&
-      !!address &&
       !errors.title &&
       !errors.description &&
       !errors.price &&
-      !errors.address &&
       selectedKateogorie.name !== '' &&
+      address !== '' &&
       bannerImage.length !== 0 &&
       detailImage.length !== 0 &&
       isTimeFieldValid()
@@ -146,14 +148,7 @@ function RegisterActivity() {
               register={register}
               errors={errors}
             />
-            <InputBox
-              label="주소"
-              placeholder="주소"
-              name="address"
-              validation={validation.address}
-              register={register}
-              errors={errors}
-            />
+            <AddressInput />
             <TimeSlot />
             <UploadBannerImage />
             <UploadDetailImage />
diff --git a/states/registerState.tsx b/states/registerState.tsx
index 1a900f2..b5df2a2 100644
--- a/states/registerState.tsx
+++ b/states/registerState.tsx
@@ -33,3 +33,8 @@ export const endTimeState = atom<string[]>({
   key: 'endTimeState',
   default: initialTimeArray,
 });
+
+export const addressState = atom<string>({
+  key: 'addressState',
+  default: '',
+});

From 0d6b0ef4a0b62bd820fd555acd8146e9af083902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 18:03:57 +0900
Subject: [PATCH 09/14] =?UTF-8?q?Fix:=20=EB=82=B4=20=EC=B2=B4=ED=97=98=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20>=20=EC=B9=B4=EB=93=9C=20=EC=9D=B4?=
 =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/MyActivity/Card.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/MyActivity/Card.tsx b/components/MyActivity/Card.tsx
index dd77328..b79b1a9 100644
--- a/components/MyActivity/Card.tsx
+++ b/components/MyActivity/Card.tsx
@@ -74,7 +74,7 @@ function Card({
   return (
     <div className="flex rounded-[24px] w-[800px] h-[204px] bg-white shadow-card t:w-full m:w-[calc(100vw-50px)]">
       <Image
-        className="rounded-l-[24px]"
+        className="rounded-l-[24px] shrink-0"
         src={activityImage}
         alt={title}
         width={210}

From 442a9d070c90cd9a6b3c4b6309cc9134808162ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Mon, 15 Jul 2024 18:08:32 +0900
Subject: [PATCH 10/14] =?UTF-8?q?Fix:=20form=20=EC=A0=9C=EC=B6=9C=20?=
 =?UTF-8?q?=EC=8B=9C=20=EB=82=B4=20=EC=B2=B4=ED=97=98=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C=20=EC=9D=B4=EB=8F=99?=
 =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hooks/myActivity/useRegisterActivity.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hooks/myActivity/useRegisterActivity.ts b/hooks/myActivity/useRegisterActivity.ts
index 9c459b4..3ae2a12 100644
--- a/hooks/myActivity/useRegisterActivity.ts
+++ b/hooks/myActivity/useRegisterActivity.ts
@@ -4,8 +4,11 @@ import {
   postActivityParams,
 } from '@/pages/api/activities/apiactivities.types';
 import { postActivity } from '@/pages/api/activities/apiactivities';
+import { useRouter } from 'next/router';
 
 export default function useRegisterActivity() {
+  const router = useRouter();
+
   const postActivityMutation: UseMutationResult<
     postActivityResponse,
     unknown,
@@ -13,7 +16,7 @@ export default function useRegisterActivity() {
   > = useMutation({
     mutationFn: postActivity,
     onSuccess: () => {
-      window.location.reload();
+      router.push('/myActivity');
     },
   });
 

From 0545ca9efe12483882e1d7159823246923740af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Tue, 16 Jul 2024 11:38:33 +0900
Subject: [PATCH 11/14] =?UTF-8?q?Fix:=20=EB=B9=8C=EB=93=9C=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/Lander/AllActivities.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/Lander/AllActivities.tsx b/components/Lander/AllActivities.tsx
index b27cbd2..98e64ef 100644
--- a/components/Lander/AllActivities.tsx
+++ b/components/Lander/AllActivities.tsx
@@ -37,7 +37,7 @@ function AllActivity({
           backgroundImage: `linear-gradient(180deg, rgba(0, 0, 0, 0.10) 20.33%, rgba(0, 0, 0, 0.60) 100%),url(${backgroundImage})`,
         }}
       ></div>
-      <div className='hover:bg-gray-200 rounded px-[4px]'>
+      <div className="hover:bg-gray-200 rounded px-[4px]">
         <div className="flex items-center mt-[16.5px]">
           <Image
             src={StarImg}

From 94cf8ff6bc25d6b9bf9dec6fe0001fcff98a9d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Tue, 16 Jul 2024 12:53:01 +0900
Subject: [PATCH 12/14] =?UTF-8?q?Fix:=20url=20=EC=86=8C=EB=AC=B8=EC=9E=90?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/SideNavigation/SideNavigation.tsx | 12 ++++++------
 pages/myActivity/index.tsx                   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/SideNavigation/SideNavigation.tsx b/components/SideNavigation/SideNavigation.tsx
index 6cbb7aa..c5fdb7a 100644
--- a/components/SideNavigation/SideNavigation.tsx
+++ b/components/SideNavigation/SideNavigation.tsx
@@ -29,8 +29,8 @@ export default function SidenNavigation() {
       case '/reservation':
         setActiveButton('reservation');
         break;
-      case '/myActivity':
-        setActiveButton('myActivity');
+      case '/myactivity':
+        setActiveButton('myactivity');
         break;
       case '/calendar':
         setActiveButton('calendar');
@@ -44,7 +44,7 @@ export default function SidenNavigation() {
   const buttonPaths: routePaths = {
     mypage: '/mypage',
     reservation: '/reservation',
-    myActivity: '/myActivity',
+    myactivity: '/myactivity',
     calendar: '/calendar',
   };
 
@@ -149,14 +149,14 @@ export default function SidenNavigation() {
         </button>
         <button
           className={`${sideNavBtnStyle} ${
-            activeButton === 'myActivity'
+            activeButton === 'myactivity'
               ? 'bg-var-green1 rounded-[12px] text-var-black'
               : 'text-var-gray6'
           }`}
-          onClick={() => handleBtnClick('myActivity')}
+          onClick={() => handleBtnClick('myactivity')}
         >
           <Image
-            src={activeButton === 'myActivity' ? settingIcon : graySettingIcon}
+            src={activeButton === 'myactivity' ? settingIcon : graySettingIcon}
             alt="내 체험 관리 아이콘"
           />
           <p>내 체험 관리</p>
diff --git a/pages/myActivity/index.tsx b/pages/myActivity/index.tsx
index 2302d1d..99f591e 100644
--- a/pages/myActivity/index.tsx
+++ b/pages/myActivity/index.tsx
@@ -18,7 +18,7 @@ function MyActivity() {
   }, [inView]);
 
   const handleClickAdd = () => {
-    router.push('myActivity/register');
+    router.push('myactivity/register');
   };
 
   return (

From 4e617e0a09805245e21667cb6de35c4ef160b010 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Tue, 16 Jul 2024 12:53:23 +0900
Subject: [PATCH 13/14] =?UTF-8?q?Fix:=20=ED=8F=B4=EB=8D=94=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EC=86=8C=EB=AC=B8=EC=9E=90=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/{myActivity => temp}/edit.tsx     | 0
 pages/{myActivity => temp}/index.tsx    | 0
 pages/{myActivity => temp}/register.tsx | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename pages/{myActivity => temp}/edit.tsx (100%)
 rename pages/{myActivity => temp}/index.tsx (100%)
 rename pages/{myActivity => temp}/register.tsx (100%)

diff --git a/pages/myActivity/edit.tsx b/pages/temp/edit.tsx
similarity index 100%
rename from pages/myActivity/edit.tsx
rename to pages/temp/edit.tsx
diff --git a/pages/myActivity/index.tsx b/pages/temp/index.tsx
similarity index 100%
rename from pages/myActivity/index.tsx
rename to pages/temp/index.tsx
diff --git a/pages/myActivity/register.tsx b/pages/temp/register.tsx
similarity index 100%
rename from pages/myActivity/register.tsx
rename to pages/temp/register.tsx

From be88012980cabf8a8428445906f744a28b0f0c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9D=80=EC=A7=80?=
 <103625348+eunji-0623@users.noreply.github.com>
Date: Tue, 16 Jul 2024 12:53:52 +0900
Subject: [PATCH 14/14] =?UTF-8?q?Fix:=20=ED=8F=B4=EB=8D=94=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EC=86=8C=EB=AC=B8=EC=9E=90=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/{temp => myactivity}/edit.tsx     | 0
 pages/{temp => myactivity}/index.tsx    | 0
 pages/{temp => myactivity}/register.tsx | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename pages/{temp => myactivity}/edit.tsx (100%)
 rename pages/{temp => myactivity}/index.tsx (100%)
 rename pages/{temp => myactivity}/register.tsx (100%)

diff --git a/pages/temp/edit.tsx b/pages/myactivity/edit.tsx
similarity index 100%
rename from pages/temp/edit.tsx
rename to pages/myactivity/edit.tsx
diff --git a/pages/temp/index.tsx b/pages/myactivity/index.tsx
similarity index 100%
rename from pages/temp/index.tsx
rename to pages/myactivity/index.tsx
diff --git a/pages/temp/register.tsx b/pages/myactivity/register.tsx
similarity index 100%
rename from pages/temp/register.tsx
rename to pages/myactivity/register.tsx