+
}
onlyIcon
- onClick={() => navigate("/")}
+ onClick={() => (isMobile ? navigate("/") : navigate("/masterplan/1"))}
/>
-
-
-
ROVE Home Marasi Drive
-
Select a wing
-
-
}
@@ -30,9 +25,14 @@ const ComplexTopPanel = () => {
>
About Projects
+
+
+
ROVE Home Marasi Drive
+
+
}
+ icon={
}
onlyIcon
className="sm:hidden"
onClick={() => navigate("/about-projects")}
diff --git a/client/src/components/multiRangeSlider.css b/client/src/components/multiRangeSlider.css
index 47c24e6..e1dc835 100644
--- a/client/src/components/multiRangeSlider.css
+++ b/client/src/components/multiRangeSlider.css
@@ -75,7 +75,7 @@
}
.range-slider input[type="range"] {
- -webkit-appearance: none;
+ appearance: none;
pointer-events: none;
position: absolute;
z-index: 2;
diff --git a/client/src/pages/ComplexWingPage.tsx b/client/src/pages/ComplexWingPage.tsx
index 54c8a80..fcc9c43 100644
--- a/client/src/pages/ComplexWingPage.tsx
+++ b/client/src/pages/ComplexWingPage.tsx
@@ -66,7 +66,7 @@ function ComplexWingPage() {
if (path["data-name"].includes("floor")) {
const wing = path["data-name"].split(" ")[0].toLowerCase() as "east" | "west";
const floor = path["data-name"].split(" ")[1];
-
+
setSidebarComponent({
element:
,
name: "Floor",
@@ -122,20 +122,14 @@ function ComplexWingPage() {
-
-
+
+
}
onlyIcon
onClick={() => (isMobile ? navigate("/") : navigate("/masterplan/1"))}
/>
-
-
-
ROVE Home Marasi Drive
-
Select a wing
-
-
}
@@ -144,9 +138,19 @@ function ComplexWingPage() {
>
About Projects
+
+
+
ROVE Home Marasi Drive
+
Select a {isMobile ? "wing" : "floor"}
+
+
}
+ icon={
}
onlyIcon
className="sm:hidden"
onClick={() => navigate("/about-projects")}
diff --git a/client/src/pages/FloorSelectionMobilePage.tsx b/client/src/pages/FloorSelectionMobilePage.tsx
index ccd3cd2..3641329 100644
--- a/client/src/pages/FloorSelectionMobilePage.tsx
+++ b/client/src/pages/FloorSelectionMobilePage.tsx
@@ -254,7 +254,7 @@ function FloorSelectionMobilePage({ wing, onUnselectWing, onSelectPath }: Props)
-
{selectedPathName?.split(" ")[1]} floor
+
{selectedPathName?.replace(/west|east/gi, "")}
{wing} Wing
{/*
*/}
diff --git a/client/src/pages/SearchPage.tsx b/client/src/pages/SearchPage.tsx
index b1adc63..349511d 100644
--- a/client/src/pages/SearchPage.tsx
+++ b/client/src/pages/SearchPage.tsx
@@ -18,6 +18,8 @@ import { isMobile } from "react-device-detect";
import CloseIcon from "../components/icons/CloseIcon";
import FiltersIcon from "../components/icons/FiltersIcon";
import Button3 from "../components/Button3";
+// import "react-range-slider-input/dist/style.css";
+import "../components/multiRangeSlider.css";
function SearchPage() {
const [units, setUnits] = useState
([]);
diff --git a/client/yarn.lock b/client/yarn.lock
index 67ba08f..8df2e22 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -1191,9 +1191,9 @@ convert-source-map@^2.0.0:
integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
core-js@^3.22.4:
- version "3.37.1"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.37.1.tgz#d21751ddb756518ac5a00e4d66499df981a62db9"
- integrity sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==
+ version "3.38.1"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.38.1.tgz#aa375b79a286a670388a1a363363d53677c0383e"
+ integrity sha512-OP35aUorbU3Zvlx7pjsFdu1rGNnD4pgw/CWoYzRY3t2EzoVT7shKHY1dlAy3f41cGIO7ZDPQimhGFTlEYkG/Hw==
cross-env@^7.0.3:
version "7.0.3"