Chore: 2차 충돌해결

WePlanPlans · Jan 3, 2024 · 9e38fec · 9e38fec
2 parents 9b419e0 + 64549cb
commit 9e38fec
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/DetailSectionTop/DetailSectionTop.tsx b/src/components/DetailSectionTop/DetailSectionTop.tsx
@@ -8,7 +8,7 @@ import {
   DetailToursInfo,
   DetailToursRating,
   DetailToursMap,
-  DetailTourButtons,
+  DetailToursButtons,
 } from '.';
 
 export default function DetailSectionTop() {
@@ -32,7 +32,7 @@ export default function DetailSectionTop() {
       <DetailToursInfo infoData={detailQuery.data} />
       <DetailToursRating reviewData={reviewQuery.data.data.data} />
       <DetailToursMap mapData={detailQuery.data} />
-      <DetailTourButtons />
+      <DetailToursButtons />
     </div>
   ) : null;
 }
diff --git a/src/components/DetailSectionTop/DetailToursButtons.tsx b/src/components/DetailSectionTop/DetailToursButtons.tsx
@@ -3,12 +3,12 @@ import { ReactComponent as CalendarIcon } from '@assets/images/Calendar.svg';
 
 export default function DetailTourButtons() {
   return (
-    <div className="mt-2 flex w-full items-center justify-between py-2.5">
-      <button className="flex h-[53px] w-[157.5px] items-center justify-center gap-2 rounded-lg border border-solid border-gray3 p-2">
+    <div className="mt-2 flex w-full items-center justify-between gap-3 py-2.5">
+      <button className="flex h-[53px] w-1/2 items-center justify-center gap-2 rounded-lg border border-solid border-gray3 p-2">
         <CalendarIcon />
         <span className="text-sm">일정 추가</span>
       </button>
-      <button className="flex h-[53px] w-[157.5px] items-center justify-center gap-2 rounded-lg border border-solid border-gray3 p-2">
+      <button className="flex h-[53px] w-1/2 items-center justify-center gap-2 rounded-lg border border-solid border-gray3 p-2">
         <PenIcon />
         <span className="text-sm">리뷰 쓰기</span>
       </button>

diff --git a/src/components/DetailSectionTop/DetailToursMap.tsx b/src/components/DetailSectionTop/DetailToursMap.tsx
@@ -14,8 +14,8 @@ export default function DetailToursMap({ mapData }: DetailToursMapProps) {
   const [isMapVisible, setIsMapVisible] = useState<boolean>(false);
 
   const MapStyle = {
-    width: '372px',
-    height: isMapVisible ? 0 : '150px',
+    width: '100%',
+    height: isMapVisible ? 0 : '180px',
     marginTop: isMapVisible ? '15px' : '15px',
     marginBottom: isMapVisible ? '15px' : '15px',
     transition: 'height 0.3s ease-in-out',

diff --git a/src/components/DetailSectionTop/index.tsx b/src/components/DetailSectionTop/index.tsx
@@ -1,11 +1,12 @@
 import DetailToursInfo from './DetailToursInfo';
 import DetailToursRating from './DetailToursRating';
 import DetailToursMap from './DetailToursMap';
-import DetailTourButtons from './DetailToursButtons';
+import DetailToursButtons from './DetailToursButtons';
+
 
 export {
   DetailToursInfo,
   DetailToursRating,
   DetailToursMap,
-  DetailTourButtons,
+  DetailToursButtons,
 };