From 44e6f3658c34c7828e9048146d52b083fe2e4a36 Mon Sep 17 00:00:00 2001
From: Park Sumin <fhsjdvs@gmail.com>
Date: Thu, 1 Aug 2024 18:48:58 +0900
Subject: [PATCH 1/4] =?UTF-8?q?Fix:=20null=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ActivityDetails/ActivityDetails.tsx       | 36 +++++++------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/components/ActivityDetails/ActivityDetails.tsx b/components/ActivityDetails/ActivityDetails.tsx
index dcbef29..d242e77 100644
--- a/components/ActivityDetails/ActivityDetails.tsx
+++ b/components/ActivityDetails/ActivityDetails.tsx
@@ -26,17 +26,15 @@ import { ActivityDetailsPageMeta } from '../MetaData/MetaData';
 import useDeleteActivity from '@/hooks/myActivity/useDeleteActivity';
 import { usePopup } from '@/hooks/usePopup';
 import { darkModeState } from '@/states/themeState';
-import SendChat from '../Chat/SendChat';
 import { ShareButton } from '../ShareButton/ShareButton';
-import { loginState } from '@/states/loginState';
 import { ViewedActivitiesState } from '@/states/ViewedState';
 import { ViewedActivityProps } from '../ViewedActivities/ViewedActivities.type';
+import profileThumbnail from '@/public/image/profile-circle-icon-512x512-zxne30hp.png';
 
 export default function ActivityDetails({ id }: ActivityDetailsProps) {
   const router = useRouter();
   const [isOpen, setIsOpen] = useState(false);
   const isDarkMode = useRecoilValue(darkModeState);
-  const isLogined = useRecoilValue(loginState);
   const [currentPage, setCurrentPage] = useState<number>(
     router.query.page ? parseInt(router.query.page as string, 10) : 1
   );
@@ -205,24 +203,14 @@ export default function ActivityDetails({ id }: ActivityDetailsProps) {
               </div>
             </div>
           </div>
-          <div className="flex items-center t:items-center m:items-center">
-            <div className="flex gap-[12px]">
-              {isLogined && !isAuthor && (
-                <SendChat
-                  receiver={Number(activityData?.userId)}
-                  activityId={Number(activityData?.id)}
-                  activityTitle={String(activityData?.title)}
-                  activityImage={String(activityData?.bannerImageUrl)}
-                />
-              )}
-              <ShareButton
-                type="none-bg"
-                title={activityData?.title}
-                bannerImageUrl={activityData?.bannerImageUrl}
-                description={activityData?.description}
-                activityId={id}
-              />
-            </div>
+          <div className="flex t:items-center m:items-end">
+            <ShareButton
+              type="none-bg"
+              title={activityData?.title}
+              bannerImageUrl={activityData?.bannerImageUrl}
+              description={activityData?.description}
+              activityId={id}
+            />
             {isAuthor && (
               <div className="flex items-center">
                 <MeatballButton onClick={toggleMenu} />
@@ -256,7 +244,7 @@ export default function ActivityDetails({ id }: ActivityDetailsProps) {
           />
         )}
         <div className="flex gap-4 m:block m:relative">
-          <div className="mb-20 ipad-pro:w-[725px] w-full m:px-[24px]">
+          <div className="mb-20 ipad-pro:w-[725px] t:w-full m:w-full m:px-[24px]">
             <div className="border-t-2 border-var-gray3 dark:border-var-dark4 border-solid pt-10 m:pt-6" />
             <div className="flex flex-col gap-4">
               <p className="text-nomad-black dark:text-var-gray2 font-bold text-xl">
@@ -306,7 +294,9 @@ export default function ActivityDetails({ id }: ActivityDetailsProps) {
                   >
                     <div className="flex-shrink-0">
                       <Image
-                        src={review.user.profileImageUrl}
+                        src={
+                          review.user.profileImageUrl || profileThumbnail
+                        }
                         alt={`${review.user.nickname}의 프로필 이미지`}
                         width={45}
                         height={45}

From dce5f9ef4070a2e2d11c246a1ef6ba4e9c19d66e Mon Sep 17 00:00:00 2001
From: Park Sumin <fhsjdvs@gmail.com>
Date: Thu, 1 Aug 2024 23:22:46 +0900
Subject: [PATCH 2/4] =?UTF-8?q?Style:=20=EB=A6=AC=ED=8C=A9=ED=86=A0?=
 =?UTF-8?q?=EB=A7=81=20=EB=B0=8F=20=EB=B0=A9=EB=AC=B8=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=20=EB=8B=A4=ED=81=AC=EB=AA=A8=EB=93=9C=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/CatergoryBtn/CatergoryBtn.tsx       |  2 +-
 components/Lander/AllActivities.tsx            |  2 +-
 components/PriceFilterBtn/PriceFilterBtn.tsx   |  4 ++--
 .../ViewedActivities/ViewedActivities.tsx      | 18 +++++++++++-------
 components/ViewedActivities/ViewedActivity.tsx |  2 +-
 public/icon/History_black.svg                  |  1 +
 public/icon/History_white.svg                  |  1 +
 public/icon/close_black.svg                    |  1 +
 public/icon/close_white.svg                    |  1 +
 states/mainPageState.tsx                       |  2 +-
 10 files changed, 21 insertions(+), 13 deletions(-)
 create mode 100644 public/icon/History_black.svg
 create mode 100644 public/icon/History_white.svg
 create mode 100644 public/icon/close_black.svg
 create mode 100644 public/icon/close_white.svg

diff --git a/components/CatergoryBtn/CatergoryBtn.tsx b/components/CatergoryBtn/CatergoryBtn.tsx
index 8ba2aa2..c3430d0 100644
--- a/components/CatergoryBtn/CatergoryBtn.tsx
+++ b/components/CatergoryBtn/CatergoryBtn.tsx
@@ -37,7 +37,7 @@ export default function CatergoryBtn({ categoryName }: CategoryBtnProps) {
 
   return (
     <button
-      className={`flex items-center justify-center rounded-[15px] border-[1px] border-solid border-2 m:border-[1px] border-var-green2 dark:border-none w-[127px] h-[53px] t:min-w-[120px] m:min-w-[80px] m:h-[41px] ${backgroundColor}`}
+      className={`flex items-center justify-center rounded-[15px] border-[2px] border-solid border-2 m:border-[1px] border-var-green2 dark:border-none w-[127px] h-[53px] t:min-w-[120px] m:min-w-[80px] m:h-[41px] ${backgroundColor}`}
       onClick={handleClick}
     >
       <p className={`text-[18px] p:font-[600] m:text-[14px] ${textColor}`}>
diff --git a/components/Lander/AllActivities.tsx b/components/Lander/AllActivities.tsx
index 49564db..5cc966e 100644
--- a/components/Lander/AllActivities.tsx
+++ b/components/Lander/AllActivities.tsx
@@ -157,7 +157,7 @@ function AllActivities() {
 
   return (
     <div ref={PaginationScrollRef}>
-      <div className="flex justify-between">
+      <div className="flex justify-between mt-[120px]">
         <div className="relative t:w-[520px] m:w-[230px]">
           <div className="flex gap-[24px] t:gap-[14px] m:gap-[8px] t:w-[520px] m:w-[230px] overflow-auto scrollbar-hide">
             {Kategories.map((Kategorie, index) => (
diff --git a/components/PriceFilterBtn/PriceFilterBtn.tsx b/components/PriceFilterBtn/PriceFilterBtn.tsx
index 753ae9a..c865c66 100644
--- a/components/PriceFilterBtn/PriceFilterBtn.tsx
+++ b/components/PriceFilterBtn/PriceFilterBtn.tsx
@@ -31,10 +31,10 @@ export default function PriceFilterBtn() {
   return (
     <div className="relative" ref={dropDownElement}>
       <button
-        className="flex justify-between items-center w-[147px] h-[53px] border-solid border-[1px] rounded-[15px] t:w-[140px] m:w-[94px] m:h-[41px] border-var-green2 px-[20px] m:px-[10px] bg-white dark:bg-var-dark2 dark:border-none"
+        className="flex justify-between items-center w-[147px] h-[53px] border-solid border-[2px] m:border-[1px] rounded-[15px] t:w-[140px] m:w-[94px] m:h-[41px] border-var-green2 px-[20px] m:px-[10px] bg-white dark:bg-var-dark2 dark:border-none"
         onClick={() => setShowMenuList((prev) => !prev)}
       >
-        <p className="text-[18px] t:text-[16px] m:text-[12px] text-var-green2 dark:text-var-gray2">
+        <p className="text-[18px] t:text-[16px] m:text-[12px] text-var-green2 dark:text-var-gray2 font-[600]">
           {isClient && !showMenuList ? sortedName || '정렬' : sortedName}
         </p>
         <Image
diff --git a/components/ViewedActivities/ViewedActivities.tsx b/components/ViewedActivities/ViewedActivities.tsx
index f962b77..003e456 100644
--- a/components/ViewedActivities/ViewedActivities.tsx
+++ b/components/ViewedActivities/ViewedActivities.tsx
@@ -1,11 +1,14 @@
-import RecordImg from '@/public/icon/Record.svg';
-import Ximg from '@/public/icon/btn_x_big.svg';
 import Image from 'next/image';
-import { useEffect, useState } from 'react';
+import { useState } from 'react';
 import ViewedActivity from './ViewedActivity';
 import useClickOutside from '@/hooks/useClickOutside';
 import { useRecoilValue } from 'recoil';
 import { ViewedActivitiesState } from '@/states/ViewedState';
+import HistoryImg_black from '@/public/icon/History_black.svg';
+import HistoryImg_white from '@/public/icon/History_white.svg';
+import CloseImg_black from '@/public/icon/close_black.svg';
+import CloseImg_white from '@/public/icon/close_white.svg';
+import { darkModeState } from '@/states/themeState';
 
 function ViewedActivities() {
   const [isOpen, setIsOpen] = useState(false);
@@ -15,6 +18,7 @@ function ViewedActivities() {
     setIsOpen(false)
   );
   const ViewedActivitiesVlue = useRecoilValue(ViewedActivitiesState);
+  const isDarkMode = useRecoilValue(darkModeState);
 
   const openModal = () => {
     setAnimationClass('rotate-open');
@@ -29,10 +33,10 @@ function ViewedActivities() {
 
   return (
     <div ref={ViewedActivitiesElement}>
-      <div className="fixed right-[32px] m:right-[14px] bottom-[90px] z-30 w-[40px] h-[40px] bg-gray-200 flex items-center justify-center rounded-xl cursor-pointer hover:bg-gray-300">
+      <div className="fixed right-[32px] m:right-[14px] bottom-[90px] z-30 w-[40px] h-[40px] bg-gray-200 border-[1px] dark:bg-black dark:border-[2px] dark:bg-var-dark2 border-solid dark:border-var-dark3 flex items-center justify-center rounded-xl cursor-pointer hover:bg-gray-300">
         {!isOpen ? (
           <Image
-            src={RecordImg}
+            src={isDarkMode ? HistoryImg_white : HistoryImg_black}
             alt="방문한 체험 표시 이미지"
             width={32}
             height={32}
@@ -41,7 +45,7 @@ function ViewedActivities() {
           />
         ) : (
           <Image
-            src={Ximg}
+            src={isDarkMode ? CloseImg_white : CloseImg_black}
             alt="닫기 이미지"
             width={32}
             height={32}
@@ -52,7 +56,7 @@ function ViewedActivities() {
       </div>
       {isOpen && (
         <div
-          className={`w-[180px] h-[300px] rounded-lg fixed right-[32px] m:right-[14px] bottom-[138px] z-30 bg-white border-solid border-4 border-gray-800 ${faded} flex flex-col items-center px-[10px] pt-[10px] gap-[10px] overflow-y-auto overflow-x-hidden pb-[10px] custom-scrollbar`}
+          className={`w-[180px] h-[300px] rounded-lg fixed right-[32px] m:right-[14px] bottom-[138px] z-30 bg-white border-solid border-4 border-gray-800 ${faded} flex flex-col items-center px-[10px] pt-[10px] gap-[10px] overflow-y-auto overflow-x-hidden pb-[10px] custom-scrollbar dark:border-white dark:bg-gray-900`}
         >
           <div className="font-sans text-[14px] font-[600]">
             최근 방문한 체험
diff --git a/components/ViewedActivities/ViewedActivity.tsx b/components/ViewedActivities/ViewedActivity.tsx
index 4513a98..b5529c7 100644
--- a/components/ViewedActivities/ViewedActivity.tsx
+++ b/components/ViewedActivities/ViewedActivity.tsx
@@ -12,7 +12,7 @@ function ViewedActivity({ id, bannerImage, title }: ViewedActivityProps) {
 
   return (
     <div
-      className="min-w-[140px] min-h-[80px] rounded bg-gray-200 flex items-center justify-between cursor-pointer block hover:bg-gray-300"
+      className="min-w-[140px] min-h-[80px] rounded bg-gray-200 flex items-center justify-between cursor-pointer block hover:bg-gray-300 dark:bg-gray-600"
       onClick={linkToClick}
     >
       <Image
diff --git a/public/icon/History_black.svg b/public/icon/History_black.svg
new file mode 100644
index 0000000..dc74deb
--- /dev/null
+++ b/public/icon/History_black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#000000"><path d="M478-120q-145.33 0-248.83-100.83-103.5-100.84-108.5-246.5H188q4.67 118 88.17 199.33 83.5 81.33 201.83 81.33 123.67 0 209.5-86.5t85.83-210.16q0-121.67-86.5-205.84-86.5-84.16-208.83-84.16-68.33 0-128 31.33t-102.67 84H354v66.67H134.67V-810h66.66v102q51.67-62 123.84-97 72.16-35 152.83-35 75 0 140.83 28.17 65.84 28.16 115 76.66Q783-686.67 811.5-621.5T840-481.33q0 75-28.5 140.83-28.5 65.83-77.67 114.67-49.16 48.83-115 77.33Q553-120 478-120Zm122.67-195.33-153.34-152V-682H514v187.33l134 132-47.33 47.34Z"/></svg>
\ No newline at end of file
diff --git a/public/icon/History_white.svg b/public/icon/History_white.svg
new file mode 100644
index 0000000..9c82aa4
--- /dev/null
+++ b/public/icon/History_white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#FFFFFF"><path d="M478-120q-145.33 0-248.83-100.83-103.5-100.84-108.5-246.5H188q4.67 118 88.17 199.33 83.5 81.33 201.83 81.33 123.67 0 209.5-86.5t85.83-210.16q0-121.67-86.5-205.84-86.5-84.16-208.83-84.16-68.33 0-128 31.33t-102.67 84H354v66.67H134.67V-810h66.66v102q51.67-62 123.84-97 72.16-35 152.83-35 75 0 140.83 28.17 65.84 28.16 115 76.66Q783-686.67 811.5-621.5T840-481.33q0 75-28.5 140.83-28.5 65.83-77.67 114.67-49.16 48.83-115 77.33Q553-120 478-120Zm122.67-195.33-153.34-152V-682H514v187.33l134 132-47.33 47.34Z"/></svg>
\ No newline at end of file
diff --git a/public/icon/close_black.svg b/public/icon/close_black.svg
new file mode 100644
index 0000000..9fa34c5
--- /dev/null
+++ b/public/icon/close_black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#000000"><path d="m251.33-204.67-46.66-46.66L433.33-480 204.67-708.67l46.66-46.66L480-526.67l228.67-228.66 46.66 46.66L526.67-480l228.66 228.67-46.66 46.66L480-433.33 251.33-204.67Z"/></svg>
\ No newline at end of file
diff --git a/public/icon/close_white.svg b/public/icon/close_white.svg
new file mode 100644
index 0000000..eeafc65
--- /dev/null
+++ b/public/icon/close_white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="40px" viewBox="0 -960 960 960" width="40px" fill="#FFFFFF"><path d="m251.33-204.67-46.66-46.66L433.33-480 204.67-708.67l46.66-46.66L480-526.67l228.67-228.66 46.66 46.66L526.67-480l228.66 228.67-46.66 46.66L480-433.33 251.33-204.67Z"/></svg>
\ No newline at end of file
diff --git a/states/mainPageState.tsx b/states/mainPageState.tsx
index 671bb9c..c21df97 100644
--- a/states/mainPageState.tsx
+++ b/states/mainPageState.tsx
@@ -20,7 +20,7 @@ export const mainPageState = atom<mainPageStateProps>({
     itemsPerPage: 8,
     selectedKategorie: '',
     selectedSorted: '',
-    sortedName: '',
+    sortedName: '정렬',
   },
   effects_UNSTABLE: [persistAtom],
 });

From 750d9fa086ddff9f331f32baa101613fabc7bd04 Mon Sep 17 00:00:00 2001
From: Park Sumin <fhsjdvs@gmail.com>
Date: Thu, 1 Aug 2024 23:23:31 +0900
Subject: [PATCH 3/4] =?UTF-8?q?Fix:=20Lint=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ActivityDetails/ActivityDetails.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/components/ActivityDetails/ActivityDetails.tsx b/components/ActivityDetails/ActivityDetails.tsx
index d242e77..6c07551 100644
--- a/components/ActivityDetails/ActivityDetails.tsx
+++ b/components/ActivityDetails/ActivityDetails.tsx
@@ -294,9 +294,7 @@ export default function ActivityDetails({ id }: ActivityDetailsProps) {
                   >
                     <div className="flex-shrink-0">
                       <Image
-                        src={
-                          review.user.profileImageUrl || profileThumbnail
-                        }
+                        src={review.user.profileImageUrl || profileThumbnail}
                         alt={`${review.user.nickname}의 프로필 이미지`}
                         width={45}
                         height={45}

From eed71529f5850ab9d5214346552883983a2fa093 Mon Sep 17 00:00:00 2001
From: Park Sumin <fhsjdvs@gmail.com>
Date: Thu, 1 Aug 2024 23:55:59 +0900
Subject: [PATCH 4/4] =?UTF-8?q?Style:=20=EB=B0=A9=EB=AC=B8=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EB=B3=B4=EB=8D=94=EC=83=89=EC=83=81=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

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

diff --git a/components/ViewedActivities/ViewedActivities.tsx b/components/ViewedActivities/ViewedActivities.tsx
index 003e456..08de79c 100644
--- a/components/ViewedActivities/ViewedActivities.tsx
+++ b/components/ViewedActivities/ViewedActivities.tsx
@@ -56,7 +56,7 @@ function ViewedActivities() {
       </div>
       {isOpen && (
         <div
-          className={`w-[180px] h-[300px] rounded-lg fixed right-[32px] m:right-[14px] bottom-[138px] z-30 bg-white border-solid border-4 border-gray-800 ${faded} flex flex-col items-center px-[10px] pt-[10px] gap-[10px] overflow-y-auto overflow-x-hidden pb-[10px] custom-scrollbar dark:border-white dark:bg-gray-900`}
+          className={`w-[180px] h-[300px] rounded-lg fixed right-[32px] m:right-[14px] bottom-[138px] z-30 bg-white border-solid border-4 border-gray-800 ${faded} flex flex-col items-center px-[10px] pt-[10px] gap-[10px] overflow-y-auto overflow-x-hidden pb-[10px] custom-scrollbar dark:border-gray-400 dark:bg-gray-900`}
         >
           <div className="font-sans text-[14px] font-[600]">
             최근 방문한 체험