diff --git a/client/src/components/Test/FloorItem.tsx b/client/src/components/Test/FloorItem.tsx index bc24243..90d4a77 100644 --- a/client/src/components/Test/FloorItem.tsx +++ b/client/src/components/Test/FloorItem.tsx @@ -32,11 +32,11 @@ function FloorItem({ floor, onSelected }: Props) { return (

- {floor} + {floor === "Sky Garden" ? "SG" : floor}

); } diff --git a/client/src/components/complexWingPage/FloorSidebar/EastWingFloorPlan.tsx b/client/src/components/complexWingPage/FloorSidebar/EastWingFloorPlan.tsx index 83c6f27..3431fb1 100644 --- a/client/src/components/complexWingPage/FloorSidebar/EastWingFloorPlan.tsx +++ b/client/src/components/complexWingPage/FloorSidebar/EastWingFloorPlan.tsx @@ -2431,7 +2431,7 @@ function EastWingFloorPlan({ transform="translate(411.74 50.63)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2458,7 +2458,7 @@ function EastWingFloorPlan({ transform="translate(365.57 97)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2485,7 +2485,7 @@ function EastWingFloorPlan({ transform="translate(262.01 199.05)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2512,7 +2512,7 @@ function EastWingFloorPlan({ transform="translate(235.49 225.61)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2539,7 +2539,7 @@ function EastWingFloorPlan({ transform="translate(206.63 254.63)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2566,7 +2566,7 @@ function EastWingFloorPlan({ transform="translate(179.52 282.3)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2593,7 +2593,7 @@ function EastWingFloorPlan({ transform="translate(143.08 319.56)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2620,7 +2620,7 @@ function EastWingFloorPlan({ transform="translate(42.47 413.14)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2647,7 +2647,7 @@ function EastWingFloorPlan({ transform="translate(129.9 499.95)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2674,7 +2674,7 @@ function EastWingFloorPlan({ transform="translate(177.05 447.24)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2702,7 +2702,7 @@ function EastWingFloorPlan({ transform="translate(223.49 400.85)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2729,7 +2729,7 @@ function EastWingFloorPlan({ transform="translate(260.74 365.03)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2756,7 +2756,7 @@ function EastWingFloorPlan({ transform="translate(288.32 337.22)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2783,7 +2783,7 @@ function EastWingFloorPlan({ transform="translate(324.71 299.88)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2810,7 +2810,7 @@ function EastWingFloorPlan({ transform="translate(368.68 256.57)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} @@ -2837,7 +2837,7 @@ function EastWingFloorPlan({ transform="translate(416.83 227.56)" style={{ fill: "#fff", - fontFamily: "Inter-Medium, Inter", + fontFamily: "Usual", fontSize: 9, fontWeight: 500, }} diff --git a/client/src/components/complexWingPage/FloorSidebar/FloorPlanSidebar.tsx b/client/src/components/complexWingPage/FloorSidebar/FloorPlanSidebar.tsx index 453242d..7cc1b0c 100644 --- a/client/src/components/complexWingPage/FloorSidebar/FloorPlanSidebar.tsx +++ b/client/src/components/complexWingPage/FloorSidebar/FloorPlanSidebar.tsx @@ -107,7 +107,11 @@ function FloorPlanSidebar({ floor, wing, onClose }: Props) { }, [hoveredUnit]); return ( -
+

{ - setScrolled(false); - }, 250); + // setTimeout(() => { + setScrolled(false); + // }, 250); } function scrollPrev() { setScrolled(true); refFloors.current?.scrollBy({ - left: -84, - behavior: "smooth", + left: -24, + // behavior: "smooth", }); - setTimeout(() => { - setScrolled(false); - }, 250); + // setTimeout(() => { + setScrolled(false); + // }, 250); } useEffect(() => { @@ -136,7 +136,7 @@ function ComplexWingPage() { return (

@@ -162,7 +162,14 @@ function ComplexWingPage() {

-

0 units

+

+ {selectedFloorPath?.dataset["wing"] === "West" ? ( + <>{+selectedFloorPath.dataset["floor"]! < 24 ? 17 : 15} + ) : ( + 16 + )}{" "} + units +

{selectedFloorPath?.dataset["floor"] !== "Sky Garden" ? ( @@ -171,7 +178,11 @@ function ComplexWingPage() {

- 0 + {selectedFloorPath?.dataset["wing"] === "West" ? ( + <>{+selectedFloorPath.dataset["floor"]! < 24 ? 6 : 0} + ) : ( + 0 + )}

Studio Flex

@@ -180,7 +191,11 @@ function ComplexWingPage() {

- 0 + {selectedFloorPath?.dataset["wing"] === "West" ? ( + <>{+selectedFloorPath.dataset["floor"]! < 24 ? 3 : 5} + ) : ( + 7 + )}

Studio²

@@ -191,7 +206,11 @@ function ComplexWingPage() {

- 0 + {selectedFloorPath?.dataset["wing"] === "West" ? ( + <>{+selectedFloorPath.dataset["floor"]! < 24 ? 6 : 8} + ) : ( + 8 + )}

1 Bedroom²

@@ -200,7 +219,11 @@ function ComplexWingPage() {

- 0 + {selectedFloorPath?.dataset["wing"] === "West" ? ( + <>{+selectedFloorPath.dataset["floor"]! < 24 ? 2 : 2} + ) : ( + 1 + )}

2 Bedroom²

@@ -212,18 +235,18 @@ function ComplexWingPage() {

- 0 + 3

-

Indoor

+

Indoor Amenties

-
+

- 0 + 17

-

Outdoor

+

Outdoor Amenties

)} @@ -541,7 +564,7 @@ function ComplexWingPage() { >
*/}