From d3f5e188fe06fbeb450b3f2819fd49a959cb4e53 Mon Sep 17 00:00:00 2001
From: Hojin <wkdghwls0623@gmail.com>
Date: Mon, 22 Jan 2024 11:23:01 +0900
Subject: [PATCH 1/6] =?UTF-8?q?Fix:=20=EC=97=AC=EC=A0=95=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=ED=85=9C=20toLocaleString=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/Plan/PlanItemBox.tsx b/src/components/Plan/PlanItemBox.tsx
index 1ff3d1ca..3244d0cc 100644
--- a/src/components/Plan/PlanItemBox.tsx
+++ b/src/components/Plan/PlanItemBox.tsx
@@ -122,7 +122,7 @@ const PlanItemBox = ({
                     {item.category}
                   </div>
                   <div className="mt-[15px] text-sm font-bold text-black">
-                    {item.price} 원
+                    {item.price.toLocaleString()} 원
                   </div>
                 </div>
               </div>

From f2500015d2cc9976e9225787926ba5a382767a34 Mon Sep 17 00:00:00 2001
From: sue <dldustn2040@gmail.com>
Date: Mon, 22 Jan 2024 11:33:34 +0900
Subject: [PATCH 2/6] =?UTF-8?q?Fix:=20=EC=97=AC=EC=A0=95=EC=9E=A5=EC=86=8C?=
 =?UTF-8?q?=20=EC=97=86=EC=9D=84=20=EB=95=8C=20default=20=EC=A7=80?=
 =?UTF-8?q?=EB=8F=84=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Plan/TripMap.tsx | 71 +++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/src/components/Plan/TripMap.tsx b/src/components/Plan/TripMap.tsx
index 94dac763..60b40607 100644
--- a/src/components/Plan/TripMap.tsx
+++ b/src/components/Plan/TripMap.tsx
@@ -6,12 +6,16 @@ import { getColor } from '@utils/getColor';
 const VITE_KAKAO_MAP_API_KEY = import.meta.env.VITE_KAKAO_MAP_API_KEY;
 
 const TripMap = ({ paths }: { paths: Paths[] }) => {
+  const DEFAULT_LATITUDE = 36.34;
+  const DEFAULT_LONGITUDE = 127.77;
+
   const firstPath = paths[0];
-  const latitude = firstPath?.fromLatitude;
-  const longitude = firstPath?.fromLongitude;
+  const latitude = firstPath ? firstPath.fromLatitude : DEFAULT_LATITUDE;
+  const longitude = firstPath ? firstPath.fromLongitude : DEFAULT_LONGITUDE;
 
   const mapRef = useRef<kakao.maps.Map | null>(null);
   const [selectedMarker, setSelectedMarker] = useState<number | null>(null);
+  const [maplevel, setMapLevel] = useState(4);
 
   const defaultPosition = { lat: Number(latitude), lng: Number(longitude) };
 
@@ -84,7 +88,13 @@ const TripMap = ({ paths }: { paths: Paths[] }) => {
   };
 
   useEffect(() => {
-    setBounds();
+    if (paths.length > 0) {
+      setTimeout(() => {
+        setBounds();
+      }, 100);
+    } else {
+      setMapLevel(15);
+    }
   }, [paths]);
 
   // 마커를 클릭할 때 호출되는 함수
@@ -186,39 +196,40 @@ const TripMap = ({ paths }: { paths: Paths[] }) => {
         key={VITE_KAKAO_MAP_API_KEY}
         center={centerPosition}
         style={MapStyle}
-        level={4}
+        level={maplevel}
         className="relative object-fill"
         ref={mapRef}>
-        {paths.map((path, index) => (
-          <div key={path.toSeqNum}>
-            <MapMarker
-              position={{
-                lat: Number(path.fromLatitude),
-                lng: Number(path.fromLongitude),
-              }}
-              onClick={() => handleMarkerClick(path.toSeqNum)}
-              image={getSequenceIconUrl(path.toSeqNum - 1)}
-            />
-            {/* 마지막 항목인 경우, 목적지 위치에 마커 추가 */}
-            {index === paths.length - 1 && (
+        {paths.length !== 0 &&
+          paths.map((path, index) => (
+            <div key={path.toSeqNum}>
               <MapMarker
                 position={{
-                  lat: Number(path.toLatitude),
-                  lng: Number(path.toLongitude),
+                  lat: Number(path.fromLatitude),
+                  lng: Number(path.fromLongitude),
                 }}
-                onClick={() => handleMarkerClick(path.toSeqNum + 1)}
-                image={getSequenceIconUrl(path.toSeqNum)}
+                onClick={() => handleMarkerClick(path.toSeqNum)}
+                image={getSequenceIconUrl(path.toSeqNum - 1)}
               />
-            )}
-            <Polyline
-              path={polylinePath}
-              strokeWeight={2}
-              strokeColor={'black'}
-              strokeOpacity={0.5}
-              strokeStyle={'longdash'}
-            />
-          </div>
-        ))}
+              {/* 마지막 항목인 경우, 목적지 위치에 마커 추가 */}
+              {index === paths.length - 1 && (
+                <MapMarker
+                  position={{
+                    lat: Number(path.toLatitude),
+                    lng: Number(path.toLongitude),
+                  }}
+                  onClick={() => handleMarkerClick(path.toSeqNum + 1)}
+                  image={getSequenceIconUrl(path.toSeqNum)}
+                />
+              )}
+              <Polyline
+                path={polylinePath}
+                strokeWeight={2}
+                strokeColor={'black'}
+                strokeOpacity={0.5}
+                strokeStyle={'longdash'}
+              />
+            </div>
+          ))}
       </Map>
     </div>
   );

From e9612e91186a56b97cfb697de5cae48dd7e0048a Mon Sep 17 00:00:00 2001
From: sue <dldustn2040@gmail.com>
Date: Mon, 22 Jan 2024 11:40:41 +0900
Subject: [PATCH 3/6] =?UTF-8?q?Design:=20=EA=B3=84=ED=9A=8D=EC=8A=A4?=
 =?UTF-8?q?=EC=BC=80=EC=A4=84=20=EB=82=A0=EC=A7=9C=20=EB=B3=80=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Plan/PlanSchedule.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Plan/PlanSchedule.tsx b/src/components/Plan/PlanSchedule.tsx
index 4e96dc4f..2571a865 100644
--- a/src/components/Plan/PlanSchedule.tsx
+++ b/src/components/Plan/PlanSchedule.tsx
@@ -20,7 +20,8 @@ const PlanSchedule = () => {
         </div>
       </div>
       <span className="body1 text-gray4">
-        {trip?.startDate} ~ {trip?.endDate}
+        {trip?.startDate?.substring(2).replace(/-/g, '.') || ''} -{' '}
+        {trip?.endDate?.substring(5).replace(/-/g, '.') || ''}
       </span>
     </div>
   );

From caf099228f2e130e2d130eeee5e18cf35124dc8a Mon Sep 17 00:00:00 2001
From: sue <dldustn2040@gmail.com>
Date: Mon, 22 Jan 2024 11:49:41 +0900
Subject: [PATCH 4/6] =?UTF-8?q?Design:=20=EC=97=AC=EC=A0=95=ED=8E=B8?=
 =?UTF-8?q?=EC=A7=91=20=EB=AA=A8=EB=8B=AC=20width=20=EC=9E=AC=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/components/Trip/EditCodeModal.tsx b/src/components/Trip/EditCodeModal.tsx
index 7d3ca648..372d5b89 100644
--- a/src/components/Trip/EditCodeModal.tsx
+++ b/src/components/Trip/EditCodeModal.tsx
@@ -69,7 +69,7 @@ const EditCodeModal = () => {
           {isEditModal && (
             <Dialog.Portal>
               <Dialog.Overlay className="data-[state=open]:animate-overlayShow fixed inset-0 z-10 bg-black opacity-70" />
-              <Dialog.Content className="data-[state=open]:animate-contentShow fixed bottom-0 left-[50%] z-10 flex w-[412px] translate-x-[-50%] flex-col items-center rounded-t-2xl bg-white px-5 pb-8 pt-9">
+              <Dialog.Content className="data-[state=open]:animate-contentShow fixed bottom-0 left-[50%] z-10 flex w-full max-w-[412px] translate-x-[-50%] flex-col items-center rounded-t-2xl bg-white px-5 pb-8 pt-9">
                 <Dialog.Title className="headline2 mr-auto pb-2.5 text-gray7">
                   나의 여정
                 </Dialog.Title>

From 48f8ca1996749d77e3b097d226be4a7ec738a6c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=96=B4=EC=8A=B9=EC=A4=80?= <eoseungjun7@naver.com>
Date: Mon, 22 Jan 2024 12:06:24 +0900
Subject: [PATCH 5/6] =?UTF-8?q?Fix:=20=EC=97=AC=ED=96=89=EC=B7=A8=ED=96=A5?=
 =?UTF-8?q?=20=EB=94=94=ED=8F=B4=ED=8A=B8=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84=20=EB=B0=8F=20=EB=94=94=EB=B2=84=EA=B9=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Plan/PlanSectionTop.tsx        |  4 +-
 src/components/Trip/TripPreference.tsx        | 68 ++++++++++++-------
 ...ltimeEditor.tsx => TripRealtimeMember.tsx} |  4 +-
 src/components/common/tab/Tab.tsx             |  4 +-
 src/utils/calculatePercentage.ts              |  9 ++-
 5 files changed, 57 insertions(+), 32 deletions(-)
 rename src/components/Trip/{TripRealtimeEditor.tsx => TripRealtimeMember.tsx} (96%)

diff --git a/src/components/Plan/PlanSectionTop.tsx b/src/components/Plan/PlanSectionTop.tsx
index 480ec571..fada423c 100644
--- a/src/components/Plan/PlanSectionTop.tsx
+++ b/src/components/Plan/PlanSectionTop.tsx
@@ -1,4 +1,4 @@
-import TripRealtimeEditor from '@components/Trip/TripRealtimeEditor';
+import TripRealtimeMember from '@components/Trip/TripRealtimeMember';
 import { BackBox } from '@components/common';
 import { useNavigate } from 'react-router-dom';
 import TripBudget from './TripBudget';
@@ -92,7 +92,7 @@ const PlanSectionTop = () => {
           navigate(`/trip/${tripId}/share`);
         }}
       />
-      <TripRealtimeEditor />
+      <TripRealtimeMember />
       <PlanSchedule />
       <TripBudget />
       <Tab
diff --git a/src/components/Trip/TripPreference.tsx b/src/components/Trip/TripPreference.tsx
index 432c72f2..1ec926f8 100644
--- a/src/components/Trip/TripPreference.tsx
+++ b/src/components/Trip/TripPreference.tsx
@@ -11,6 +11,7 @@ import { getTripsSurveyMembers } from '@api/trips';
 import { useSetRecoilState, useRecoilState } from 'recoil';
 import { participantsState } from '@recoil/trip';
 import { useGetTripsAuthority } from '@hooks/useGetTripsAuthority';
+import { useNavigate } from 'react-router-dom';
 
 interface RatioBarParams {
   value: number;
@@ -27,8 +28,16 @@ interface PercentageParams {
 }
 
 const TripPreferenceButton: React.FC = () => {
+  const navigate = useNavigate();
+
+  const handleClickButton = () => {
+    navigate('/signup/survey');
+  };
+
   return (
-    <button className="mb-[17.5px] mt-[20px] flex w-[335px] items-center rounded-full bg-white px-6 py-4 text-sm">
+    <button
+      onClick={handleClickButton}
+      className="mb-[17.5px] mt-[20px] flex w-[335px] items-center rounded-full bg-white px-6 py-4 text-sm">
       <div className="flex items-center text-gray6">
         <div>
           <HeartIcon fill="#888888" color="#888888" size={20} />
@@ -49,11 +58,17 @@ const RatioBar = ({ value, total, color, label1, label2 }: RatioBarParams) => {
     value >= total - value
       ? Math.round((175 * value) / total)
       : Math.round((175 * (total - value)) / total);
+  const isZeroColor =
+    total === 0 && value === 0 ? 'text-gray6' : `text-${color}`;
+  const isZeroWeight = total === 0 && value === 0 ? '' : 'font-bold';
+
   return (
     <div className="mb-1 flex items-center text-sm">
       {value >= total - value ? (
         <>
-          <div className={`w-[65px] font-bold text-${color}`}>{label1}</div>
+          <div className={`w-[65px] ${isZeroWeight} ${isZeroColor}`}>
+            {label1}
+          </div>
           <div className="flex h-[10px] w-[175px] rounded-full bg-gray2">
             <div style={{ width }} className={`rounded-full bg-${color}`}></div>
           </div>
@@ -74,27 +89,33 @@ const RatioBar = ({ value, total, color, label1, label2 }: RatioBarParams) => {
   );
 };
 
-const Percentage = ({ value, total, color }: PercentageParams) => (
-  <div className="flex justify-between text-gray6">
-    {value >= total - value ? (
-      <>
-        <div className={`font-bold text-${color}`}>
-          {calculatePercentage(value, total)}%
-        </div>
-        <div className="text-gray6">
-          {calculatePercentageRemain(value, total)}%
-        </div>
-      </>
-    ) : (
-      <>
-        <div className="text-gray6">{calculatePercentage(value, total)}%</div>
-        <div className={`font-bold text-${color}`}>
-          {calculatePercentageRemain(value, total)}%
-        </div>
-      </>
-    )}
-  </div>
-);
+const Percentage = ({ value, total, color }: PercentageParams) => {
+  const isZeroColor =
+    total === 0 && value === 0 ? 'text-gray6' : `text-${color}`;
+  const isZeroWeight = total === 0 && value === 0 ? '' : 'font-bold';
+
+  return (
+    <div className="flex justify-between text-gray6">
+      {value >= total - value ? (
+        <>
+          <div className={`${isZeroWeight} ${isZeroColor}`}>
+            {calculatePercentage(value, total)}%
+          </div>
+          <div className="text-gray6">
+            {calculatePercentageRemain(value, total)}%
+          </div>
+        </>
+      ) : (
+        <>
+          <div className="text-gray6">{calculatePercentage(value, total)}%</div>
+          <div className={`font-bold text-${color}`}>
+            {calculatePercentageRemain(value, total)}%
+          </div>
+        </>
+      )}
+    </div>
+  );
+};
 
 const TripPreference: React.FC = () => {
   const { tripId } = useGetTripsAuthority();
@@ -132,6 +153,7 @@ const TripPreference: React.FC = () => {
 
   useEffect(() => {
     if (tripPreference) {
+      console.log('tripPreference', tripPreference);
       setA([
         tripPreference?.data?.data?.planningCount,
         tripPreference?.data?.data?.planningTotalCount,
diff --git a/src/components/Trip/TripRealtimeEditor.tsx b/src/components/Trip/TripRealtimeMember.tsx
similarity index 96%
rename from src/components/Trip/TripRealtimeEditor.tsx
rename to src/components/Trip/TripRealtimeMember.tsx
index 3e47bee2..5dd0fd86 100644
--- a/src/components/Trip/TripRealtimeEditor.tsx
+++ b/src/components/Trip/TripRealtimeMember.tsx
@@ -4,7 +4,7 @@ import { UserIcon } from '@components/common/icons/Icons';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import { Navigation } from 'swiper/modules';
 
-const TripRealtimeEditor = () => {
+const TripRealtimeMember = () => {
   const { tripMember } = useContext(socketContext);
 
   const tripMemberData = tripMember?.data;
@@ -60,4 +60,4 @@ const TripRealtimeEditor = () => {
   );
 };
 
-export default TripRealtimeEditor;
+export default TripRealtimeMember;
diff --git a/src/components/common/tab/Tab.tsx b/src/components/common/tab/Tab.tsx
index f3a799c9..3109b337 100644
--- a/src/components/common/tab/Tab.tsx
+++ b/src/components/common/tab/Tab.tsx
@@ -29,7 +29,7 @@ const Tab = ({ lists, contents }: TabProps) => {
       defaultValue="tab0"
       onValueChange={handleTabChange}>
       <Tabs.List
-        className="border-b-1 no-scrollbar flex shrink-0 overflow-x-scroll"
+        className="border-b-1 no-scrollbar flex shrink-0"
         aria-label="Manage your account">
         {lists.map((list, index) => {
           return (
@@ -37,7 +37,7 @@ const Tab = ({ lists, contents }: TabProps) => {
               key={index}
               className={`${
                 isDayTab ? 'caption1' : 'headline1 flex-1'
-              } flex min-w-[57px] cursor-pointer select-none items-center justify-center overflow-x-scroll border-b-2 border-solid border-gray2 py-[8px] leading-none text-gray4 outline-none data-[state=active]:border-b-2 data-[state=active]:border-solid data-[state=active]:border-black data-[state=active]:text-black`}
+              } flex min-w-[57px] cursor-pointer select-none items-center justify-center border-b-2 border-solid border-gray2 py-[8px] leading-none text-gray4 outline-none data-[state=active]:border-b-2 data-[state=active]:border-solid data-[state=active]:border-black data-[state=active]:text-black`}
               value={`tab${index}`}>
               {list}
             </Tabs.Trigger>
diff --git a/src/utils/calculatePercentage.ts b/src/utils/calculatePercentage.ts
index 8ca8e8cc..09f866b9 100644
--- a/src/utils/calculatePercentage.ts
+++ b/src/utils/calculatePercentage.ts
@@ -1,6 +1,9 @@
-// utils.ts
 export const calculatePercentage = (count: number, totalCount: number) =>
-  ((count / totalCount) * 100).toFixed(0);
+  totalCount === 0 && count === 0
+    ? '0'
+    : ((count / totalCount) * 100).toFixed(0);
 
 export const calculatePercentageRemain = (count: number, totalCount: number) =>
-  (((totalCount - count) / totalCount) * 100).toFixed(0);
+  totalCount === 0 && count === 0
+    ? '0'
+    : (((totalCount - count) / totalCount) * 100).toFixed(0);

From 7f7145c8fdec209cb9dce221d225d999343caff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=96=B4=EC=8A=B9=EC=A4=80?= <eoseungjun7@naver.com>
Date: Mon, 22 Jan 2024 12:11:23 +0900
Subject: [PATCH 6/6] =?UTF-8?q?Fix:=20=EB=B9=8C=EB=93=9C=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/plan/addToOurPlace/AddtoListBtn.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/plan/addToOurPlace/AddtoListBtn.tsx b/src/pages/plan/addToOurPlace/AddtoListBtn.tsx
index 86cb0bb1..316f5cbe 100644
--- a/src/pages/plan/addToOurPlace/AddtoListBtn.tsx
+++ b/src/pages/plan/addToOurPlace/AddtoListBtn.tsx
@@ -24,9 +24,9 @@ const AddToListButton = ({
   const handleAddClick = async () => {
     if (tripId) {
       try {
-        let response;
+        // let response;
         if (apiType === 'postTripsLike') {
-          response = await postTripsLike(tripId, selectedTourItemIds);
+          // response = await postTripsLike(tripId, selectedTourItemIds);
           navigate(`/trip/${tripId}`);
         } else if (apiType === 'putTrips' && visitDate) {
           const newTripItems = selectedTourItemIds.map((tourItemId) => ({