From 7b2af4a500d3945981eabd335cc2efe005cd8ddb Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 13 Jun 2024 10:19:29 -0700 Subject: [PATCH] [Fix] change marker content --- public/images/office/office_image.png | Bin 0 -> 17224 bytes public/svg/reservation/check.svg | 4 +- .../reservation/imageView/white_cancel.svg | 3 + .../map/components/BuildingImageSlider.tsx | 14 +++- .../components/BuildingInfoServiceView.tsx | 11 ++- .../(search)/map/components/BuildingItem.tsx | 65 +++++++++++------- .../map/components/Loader/ConfirmModal.tsx | 2 +- .../(search)/map/components/Loader/Modal.tsx | 8 +-- .../map/components/Loader/UpdateModal.tsx | 2 +- src/app/(search)/map/components/Marker.tsx | 29 ++------ .../[id]/components/MonthPassMembership.tsx | 8 ++- .../[id]/components/OnePassMembership.tsx | 12 ++-- .../[id]/components/table/SeminarRoom.tsx | 4 +- .../table/modal/ReservationFaild.tsx | 2 +- .../table/modal/ReservationSuccess.tsx | 4 +- .../components/seat/AddSeatReservation.tsx | 2 +- .../components/space/AddSpaceReservation.tsx | 2 +- .../myMembership/components/AllMembership.tsx | 40 +++++++++-- .../myMembership/resertory/[id]/page.tsx | 44 ++++++------ 19 files changed, 145 insertions(+), 111 deletions(-) create mode 100644 public/images/office/office_image.png create mode 100644 public/svg/reservation/imageView/white_cancel.svg diff --git a/public/images/office/office_image.png b/public/images/office/office_image.png new file mode 100644 index 0000000000000000000000000000000000000000..de0bfe920e96299a212f32c6210145883e0f6d7d GIT binary patch literal 17224 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 b%;f(AdFGrXI?-Ct00000NkvXXu0mjfaGz~J literal 0 HcmV?d00001 diff --git a/public/svg/reservation/check.svg b/public/svg/reservation/check.svg index b43ec73..77368e3 100644 --- a/public/svg/reservation/check.svg +++ b/public/svg/reservation/check.svg @@ -1,5 +1,3 @@ - - - + diff --git a/public/svg/reservation/imageView/white_cancel.svg b/public/svg/reservation/imageView/white_cancel.svg new file mode 100644 index 0000000..74f604b --- /dev/null +++ b/public/svg/reservation/imageView/white_cancel.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/app/(search)/map/components/BuildingImageSlider.tsx b/src/app/(search)/map/components/BuildingImageSlider.tsx index ee65313..2ff4d2a 100644 --- a/src/app/(search)/map/components/BuildingImageSlider.tsx +++ b/src/app/(search)/map/components/BuildingImageSlider.tsx @@ -1,4 +1,6 @@ import Image from 'next/image'; +import { useSetRecoilState } from 'recoil'; +import { currentBuildingState } from '../../atom/search'; interface ImageViewProps { // images: string; buildingId: number; @@ -7,10 +9,20 @@ export default function BuildingImageSlider({ // images, buildingId, }: ImageViewProps) { + const setCurrentBuilding = useSetRecoilState(currentBuildingState); // if (!images) return
이미지 준비중
; return ( //h-[17.25rem] -
+
+ setCurrentBuilding(null)} + src="/svg/reservation/imageView/white_cancel.svg" + width={18} + height={18} + alt="취소" + /> +
{ - console.log('우씌'); const session = await getSession(); if (!session) { - console.log('session이 없뗘어어', session); setModal(true); } else if (session) { - console.log('session', session); router.push(`/reservation/${id}`); } }; @@ -39,7 +36,7 @@ export default function BuildingServiceView({ return ( <> <> -
+

{currentBuilding?.location} @@ -55,7 +52,7 @@ export default function BuildingServiceView({

- {currentBuilding?.region} {currentBuilding?.city}{' '} + {currentBuilding?.region} {currentBuilding?.city} {currentBuilding?.address}
@@ -258,13 +255,13 @@ export default function BuildingServiceView({ 우편함

-
+
{rules}
handleReservationClick()} - className="w-[5.5rem] mb-20 bg-blue-400 px-4 py-2 rounded-lg text-white font-bold text-md text-center cursor-pointer" + className="w-[5.5rem] mb-10 bg-blue-400 px-4 py-2 rounded-lg text-white font-bold text-md text-center cursor-pointer" > 예약하기
diff --git a/src/app/(search)/map/components/BuildingItem.tsx b/src/app/(search)/map/components/BuildingItem.tsx index fd7a6c9..7dc7da3 100644 --- a/src/app/(search)/map/components/BuildingItem.tsx +++ b/src/app/(search)/map/components/BuildingItem.tsx @@ -16,9 +16,16 @@ export default function BuildingItem() { const [currentBuilding, setCurrentBuilding] = useRecoilState( currentBuildingState, ); + const [click, setClick] = useState(false); const [officeBuildings, setOfficeBuildings] = useRecoilState(buildingState); const [loading, setLoading] = useState(true); + const handleItemClick = (office: Building) => { + setClick(true); + setCurrentBuilding(office); + setShowInfo(true); + }; + useEffect(() => { const timer = setTimeout(() => { setLoading(false); @@ -26,7 +33,7 @@ export default function BuildingItem() { return () => clearTimeout(timer); }, []); - + console.log('뭐뭐', officeBuildings); return ( <> {loading && @@ -36,31 +43,31 @@ export default function BuildingItem() {
{ - setCurrentBuilding(office); - setShowInfo(true); - }} + onClick={() => handleItemClick(office)} >
{`${office.location}`}
-
+
-

+

{office.location}

- {/* {office.reviews && - office.reviews.avg_rating && - office.reviews.review_count && ( + + {/* {office.rating.avg_rating && office.rating.count && (
별 - {office.reviews.avg_rating}.0 ( - {office.reviews.review_count}) + {office.rating.avg_rating}.0 ({office.rating.count})
)} */}
-

- {office.traffic_info} -

+
-

- {office.street} {office.address} -

+
+ {office.traffic_info} + + {office.city}구 {office.street} {office.address} + +
-
@@ -100,8 +109,8 @@ export default function BuildingItem() { }} >
{office.traffic_info}

+

+ {office.city} +

- {office.street} {office.address} + {office.city} {office.street} {office.address}

diff --git a/src/app/(search)/map/components/Loader/UpdateModal.tsx b/src/app/(search)/map/components/Loader/UpdateModal.tsx index d9e199a..18ee48d 100644 --- a/src/app/(search)/map/components/Loader/UpdateModal.tsx +++ b/src/app/(search)/map/components/Loader/UpdateModal.tsx @@ -24,7 +24,7 @@ export default function UpdateModal() { return ( <> {loading && ( -
+
)} diff --git a/src/app/(search)/map/components/Marker.tsx b/src/app/(search)/map/components/Marker.tsx index a31c36f..d39566a 100644 --- a/src/app/(search)/map/components/Marker.tsx +++ b/src/app/(search)/map/components/Marker.tsx @@ -21,6 +21,7 @@ export default function Marker() { try { const response = await API.get('/office/search?page=0&size=44'); const content = response.data.data.content; + console.log(response); setOfficeBuildings(content); } catch (error) { console.error('error :', error); @@ -62,25 +63,15 @@ export default function Marker() { if (map) { buildingOverlayContent?.forEach((office) => { const customContent = ` -
+

${office.location}

-
@@ -105,7 +96,6 @@ export default function Marker() { const overlays = document.querySelectorAll('.overlay'); overlays.forEach((overlay) => { overlay.addEventListener('click', (e: Event) => { - console.log('마커눌렀다'); const buildingId = Number((e.currentTarget as HTMLDivElement).id); const office = officeBuildings?.filter((office: Building) => { return office.id === buildingId; @@ -119,24 +109,14 @@ export default function Marker() { if (map && filterData.length > 0) { filterOverlayContent?.forEach((office) => { const customContent = ` -
+

${office.location}

-
-
도도레레미미{error}
+ {(seatList || selectedSeatAll) && (

diff --git a/src/app/(search)/reservation/[id]/components/table/SeminarRoom.tsx b/src/app/(search)/reservation/[id]/components/table/SeminarRoom.tsx index 5a0a675..6d12fa3 100644 --- a/src/app/(search)/reservation/[id]/components/table/SeminarRoom.tsx +++ b/src/app/(search)/reservation/[id]/components/table/SeminarRoom.tsx @@ -1,12 +1,10 @@ import Image from 'next/image'; -import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil'; +import { useRecoilState, useRecoilValue } from 'recoil'; import { seatListReservation, selectedSeatAllState, confirmedState, searchRemainingState, - infoMsgState, - reservationErrorMsgState, } from '@/app/(search)/atom/office'; import { currentBuildingState } from '@/app/(search)/atom/search'; import { userUpdateRlistPutState } from '@/app/(search)/atom/membership'; diff --git a/src/app/(search)/reservation/[id]/components/table/modal/ReservationFaild.tsx b/src/app/(search)/reservation/[id]/components/table/modal/ReservationFaild.tsx index b0f3ec4..9257ce4 100644 --- a/src/app/(search)/reservation/[id]/components/table/modal/ReservationFaild.tsx +++ b/src/app/(search)/reservation/[id]/components/table/modal/ReservationFaild.tsx @@ -25,7 +25,7 @@ export default function ReservationFaild() { return ( <> {loading && ( -

+
)} diff --git a/src/app/(search)/reservation/[id]/components/table/modal/ReservationSuccess.tsx b/src/app/(search)/reservation/[id]/components/table/modal/ReservationSuccess.tsx index dd548e9..e1eab00 100644 --- a/src/app/(search)/reservation/[id]/components/table/modal/ReservationSuccess.tsx +++ b/src/app/(search)/reservation/[id]/components/table/modal/ReservationSuccess.tsx @@ -22,7 +22,7 @@ export function ReservationDelete() { return ( <> {loading && ( -
+
)} @@ -68,7 +68,7 @@ export default function ReservationSuccess() { return ( <> {loading && ( -
+
)} diff --git a/src/app/(search)/reservation/myMembership/addtory/components/seat/AddSeatReservation.tsx b/src/app/(search)/reservation/myMembership/addtory/components/seat/AddSeatReservation.tsx index 30ed210..c345516 100644 --- a/src/app/(search)/reservation/myMembership/addtory/components/seat/AddSeatReservation.tsx +++ b/src/app/(search)/reservation/myMembership/addtory/components/seat/AddSeatReservation.tsx @@ -263,7 +263,7 @@ export default function AddSeatReservation() {

@@ -211,7 +211,7 @@ export default function Resertory() { reservation.type, ) } - className="bg-blue-500 text-white rounded-lg px-2 text-sm h-auto py-2" + className="bg-blue-500 text-white rounded-2xl px-2 text-sm h-auto py-2" > 예약 수정 @@ -231,10 +231,10 @@ export default function Resertory() { handleRsClick(reservation.id, reservation.type) } key={index} - className="bg-white w-full h-auto mb-4 rounded-lg cursor-pointer" + className="bg-white shadow-xl w-full h-auto mb-4 rounded-lg cursor-pointer" >
-
+
{reservation.seat_type}
@@ -254,7 +254,7 @@ export default function Resertory() { reservation.type, ) } - className="bg-red-500 text-white rounded-lg px-2 text-sm h-auto py-2" + className="bg-blue-950 text-white rounded-2xl px-2 text-sm h-auto py-2" > 예약 취소 @@ -265,7 +265,7 @@ export default function Resertory() { reservation.type, ) } - className="bg-blue-500 text-white rounded-lg px-2 text-sm h-auto py-2" + className="bg-blue-500 text-white rounded-2xl px-2 text-sm h-auto py-2" > 예약 수정 @@ -274,9 +274,11 @@ export default function Resertory() {
))} +
+ {loading && } {!loading && ( -

공간

+

공간

)} {loading && @@ -291,19 +293,19 @@ export default function Resertory() { className="bg-white w-full h-auto mb-4 rounded-lg cursor-pointer" >
-
+
{reservation.seat_type}
-
+
{reservation.seat_code}
-
+
{reservation.start_date}
-
+
@@ -322,7 +324,7 @@ export default function Resertory() { reservation.type, ) } - className="bg-blue-500 text-white rounded-lg px-2 text-sm h-auto py-2" + className="bg-blue-500 text-white rounded-2xl px-2 text-sm h-auto py-2" > 예약 수정