Merge pull request #186 from FinalDoubleTen/FE-77--feat/Trips

Chore: 여졍페이지 충돌 해결
WePlanPlans · Jan 17, 2024 · 25b8f27 · 25b8f27
2 parents 4a1d3ea + 36d9547
commit 25b8f27
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/src/components/Plan/PlanItem.tsx b/src/components/Plan/PlanItem.tsx
@@ -80,9 +80,9 @@ const PlanItem = (date: any) => {
             />
           </div>
         </div>
-        <div className="flex h-8 w-[46px] cursor-pointer items-center justify-center gap-2 rounded-lg bg-[#f0f0f0] p-2 text-sm font-medium text-gray4">
+        <button className="flex h-8 w-[46px] cursor-pointer items-center justify-center gap-2 rounded-lg bg-[#f0f0f0] p-2 text-sm font-medium text-gray4">
           편집
-        </div>
+        </button>
       </div>
 
       <div className="flex flex-col gap-[5px]">

diff --git a/src/components/Plan/TripMap.tsx b/src/components/Plan/TripMap.tsx
@@ -41,7 +41,6 @@ const TripMap = ({ paths }: { paths: Paths[] }) => {
     width: '100%',
     height: '180px',
     marginTop: '15px',
-    marginBottom: '15px',
     transition: 'height 0.3s ease-in-out',
   };
 

diff --git a/src/components/Trip/TripInfo.tsx b/src/components/Trip/TripInfo.tsx
@@ -18,9 +18,6 @@ const TripInfo = () => {
             </span>
           </div>
         </div>
-        <button className="body4 rounded-[8px] bg-[#F0F0F0] px-[10px] py-[8px] text-gray4">
-          편집
-        </button>
       </div>
       <span className="body1 text-gray4">
         {trip?.startDate} ~ {trip?.endDate}

diff --git a/src/hooks/useSocket.ts b/src/hooks/useSocket.ts
@@ -49,13 +49,9 @@ export const useSocket = (tripId: string, visitDate: string) => {
         }
       });
 
-      console.log('sub외부', visitDate);
-
       subItem(tripId, visitDate, (res) => {
-        console.log('sub내부', visitDate);
         if (res) {
           setTripItem(res);
-          console.log('상태변경실행');
         }
       });
 
@@ -79,7 +75,6 @@ export const useSocket = (tripId: string, visitDate: string) => {
 
       if (socketCallback) {
         socketCallback();
-        console.log('소켓커넥트내부', socketCallback);
       }
     };