{
}}
>
{
const { hoveredMarker } = useMarker();
@@ -17,6 +19,39 @@ const Map = () => {
};
});
+ useEffect(() => {
+ const handleOnGestureStart = (e: any) => {
+ e.preventDefault();
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-expect-error
+ document.body.style.zoom = 0.99;
+ };
+
+ const handleOnGestureChange = (e: any) => {
+ e.preventDefault();
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-expect-error
+ document.body.style.zoom = 0.99;
+ };
+
+ const handleOnGestureEnd = (e: any) => {
+ e.preventDefault();
+ // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+ // @ts-expect-error
+ document.body.style.zoom = 1;
+ };
+
+ document.addEventListener("gesturestart", handleOnGestureStart);
+ document.addEventListener("gesturechange", handleOnGestureChange);
+ document.addEventListener("gestureend", handleOnGestureEnd);
+
+ return () => {
+ document.removeEventListener("gesturestart", handleOnGestureStart);
+ document.removeEventListener("gesturechange", handleOnGestureChange);
+ document.removeEventListener("gestureend", handleOnGestureEnd);
+ };
+ }, []);
+
return (
{
};
const handleOnClick = () => {
+ if (!currentMarker || currentMarker?.isDisabled) return;
navigate(`../masterplan/${currentMarker?.itemNumber}`);
setHoveredMarker(null);
};
@@ -37,28 +38,55 @@ const Marker = (props: MarkerComponentProps) => {
className="relative transition-transform zoom-280"
style={{ transform: `scale(${markerScale})` }}
>
-
-
-
-
- {currentMarker && (
- 
- )}
-
-
-
+ {!currentMarker?.isDisabled ? (
+
+ ) : (
+
+
-
+
+ {currentMarker && (
+
+ )}
+
+
+
+
+
+ )}
+
+
+ Coming Soon
+
+
+
+
+ {
>
-
-
);
};
diff --git a/client/src/components/modals/AboutComplexModal.tsx b/client/src/components/modals/AboutComplexModal.tsx
index 098da6c..26a090c 100644
--- a/client/src/components/modals/AboutComplexModal.tsx
+++ b/client/src/components/modals/AboutComplexModal.tsx
@@ -186,7 +186,7 @@ const AboutComplexModal = ({
-
-
-
- {currentMarker && (
-
- )}
+ {!currentMarker?.isDisabled && (
+
+ )}
+
-
+
+
+
+
+ {currentMarker && (
+
+ )}
+
- Unvailiable + Unavailable {/* AED {formatNumber(1668888, ",", 3, 1)} */}
diff --git a/client/src/components/modals/LoaderModal.tsx b/client/src/components/modals/LoaderModal.tsx
index fd3f393..1681b78 100644
--- a/client/src/components/modals/LoaderModal.tsx
+++ b/client/src/components/modals/LoaderModal.tsx
@@ -1,7 +1,7 @@
const LoaderModal = () => {
return (
-
))}
-
+
diff --git a/client/src/components/modals/MasterplanFilters.tsx b/client/src/components/modals/MasterplanFilters.tsx
index 13d2aee..c509cfc 100644
--- a/client/src/components/modals/MasterplanFilters.tsx
+++ b/client/src/components/modals/MasterplanFilters.tsx
@@ -3,15 +3,17 @@ import Button from "../Button";
import CrossIcon from "../icons/CrossIcon";
import ResetIcon from "../icons/ResetIcon";
import Checkbox from "../Checkbox";
-import Switch from "../Switch";
+// import Switch from "../Switch";
import MultiRangeSlider from "../MultiRangeSlider";
import {
initialAparmentTypeCheckboxes,
initialSliders,
initialSwitchers,
initialViewCheckboxes,
+ pageInitial,
} from "../../consts/initialMasterplanFilters";
import useMasterplanFilters from "../../store/useMasterplanFilters";
+import { perPageInitial } from "../../consts/initialMasterplanFilters";
const MasterplanFilters = () => {
const { setModal } = useModal();
@@ -22,8 +24,9 @@ const MasterplanFilters = () => {
setViewCheckboxes,
multirangeSliders,
setMultirangeSliders,
- switchers,
setSwitchers,
+ setPage,
+ setPerPage,
} = useMasterplanFilters();
const handleOnCloseClick = () => setModal(null);
@@ -67,22 +70,24 @@ const MasterplanFilters = () => {
setMultirangeSliders(updatedSliders);
};
- const handleOnSwitcherClick = (switcherId: string) => {
- const updatedSwitchers = switchers.map((switcher) => {
- if (switcherId !== switcher.id) return switcher;
- const { isSwitched } = switcher;
+ // const handleOnSwitcherClick = (switcherId: string) => {
+ // const updatedSwitchers = switchers.map((switcher) => {
+ // if (switcherId !== switcher.id) return switcher;
+ // const { isSwitched } = switcher;
- return { ...switcher, isSwitched: !isSwitched };
- });
+ // return { ...switcher, isSwitched: !isSwitched };
+ // });
- setSwitchers(updatedSwitchers);
- };
+ // setSwitchers(updatedSwitchers);
+ // };
const handleOnResetClick = () => {
setApartmentTypeCheckboxes(initialAparmentTypeCheckboxes);
setViewCheckboxes(initialViewCheckboxes);
setMultirangeSliders(initialSliders);
setSwitchers(initialSwitchers);
+ setPage(pageInitial);
+ setPerPage(perPageInitial);
};
return (
@@ -124,14 +129,14 @@ const MasterplanFilters = () => {
+ {/*
*/}
{switchers.map((switcher) => (
+ {switcher.title}
View
diff --git a/client/src/components/modals/SendEnquryModal.tsx b/client/src/components/modals/SendEnquryModal.tsx index 9b231e6..a1c826e 100644 --- a/client/src/components/modals/SendEnquryModal.tsx +++ b/client/src/components/modals/SendEnquryModal.tsx @@ -43,7 +43,7 @@ const SendEnquiryModal = () => { 1 bedroom, 609 Sqft{" "}- Unvailiable + Unavailable
{/*AED {formatNumber(1668888, ",", 3, 1)} diff --git a/client/src/components/modals/mobile/MasterplanFiltersModal.tsx b/client/src/components/modals/mobile/MasterplanFiltersModal.tsx index a545eb8..5e678b0 100644 --- a/client/src/components/modals/mobile/MasterplanFiltersModal.tsx +++ b/client/src/components/modals/mobile/MasterplanFiltersModal.tsx @@ -5,7 +5,7 @@ import CrossIcon from "../../icons/CrossIcon"; import { MobileModalWrapperContext } from "./MobileModalWrapper"; import Checkbox from "../../Checkbox"; import MultiRangeSlider from "../../MultiRangeSlider"; -import Switch from "../../Switch"; +// import Switch from "../../Switch"; import ResetIcon from "../../icons/ResetIcon"; import { useSwipeable } from "react-swipeable"; import { @@ -61,16 +61,16 @@ const MasterplanFiltersModal = () => { setLocalApartmentTypeCheckboxes(updatedCheckboxes); }; - const handleOnSwitcherClick = (switcherId: string) => { - const updatedSwitchers = localSwitchers.map((switcher) => { - if (switcherId !== switcher.id) return switcher; - const { isSwitched } = switcher; + // const handleOnSwitcherClick = (switcherId: string) => { + // const updatedSwitchers = localSwitchers.map((switcher) => { + // if (switcherId !== switcher.id) return switcher; + // const { isSwitched } = switcher; - return { ...switcher, isSwitched: !isSwitched }; - }); + // return { ...switcher, isSwitched: !isSwitched }; + // }); - setLocalSwitchers(updatedSwitchers); - }; + // setLocalSwitchers(updatedSwitchers); + // }; const handleOnSliderValueChange = ( sliderId: string, @@ -147,7 +147,7 @@ const MasterplanFiltersModal = () => {
{localMultirangeSliders.map((slider) => (
-
+
))}
-
(null);
+ const { setIsAnimate } = useContext(MobileModalWrapperContext);
const [selectedImageIndex, setSelectedImageIndex] = useState(-1);
const [rightImageOffset, setRightImageOffset] = useState("");
- const { setIsAnimate } = useContext(MobileModalWrapperContext);
const { setModal } = useModal();
const handlers = useSwipeable({
@@ -48,6 +54,7 @@ const MobileHelpModal = () => {
onSwipedLeft: next,
onSwipedRight: prev,
});
+
const handleOnCloseClick = () => {
if (setIsAnimate) {
setIsAnimate(false);
@@ -62,7 +69,7 @@ const MobileHelpModal = () => {
const lastIndex = tipsSlides.length - 2;
if (selectedImageIndex === lastIndex) return;
- setSelectedImageIndex((prev) => prev + 1);
+ // setSelectedImageIndex((prev) => prev + 1);
}
function prev() {
@@ -70,20 +77,15 @@ const MobileHelpModal = () => {
setSelectedImageIndex((prev) => prev - 1);
}
- useLayoutEffect(() => {
- const gapOffset = 45;
+ // useLayoutEffect(() => {
+ // const gapOffset = 45;
- const _rightImageOffset = `${
- (selectedImageIndex + 1) * (imageWidth + gapOffset)
- }px`;
+ // const _rightImageOffset = `${
+ // (selectedImageIndex + 1) * (imageWidth + gapOffset)
+ // }px`;
- setRightImageOffset(_rightImageOffset);
- }, [
- imageWidth,
- selectedImageIndex,
- window.innerWidth,
- imageRef.current?.width,
- ]);
+ // setRightImageOffset(_rightImageOffset);
+ // }, [imageWidth, selectedImageIndex, imageRef?.current?.width]);
return (
diff --git a/client/src/components/searchPage/LayoutOptions.tsx b/client/src/components/searchPage/LayoutOptions.tsx
index 48ee968..0fbe8b8 100644
--- a/client/src/components/searchPage/LayoutOptions.tsx
+++ b/client/src/components/searchPage/LayoutOptions.tsx
@@ -12,10 +12,7 @@ import { updateAccessToken } from "../../api/updateAccessToken";
import useApartments from "../../store/useApartments";
import useSearchFilters from "../../store/useSearchFilters";
import { useDebounce } from "@uidotdev/usehooks";
-import {
- perPageInitial,
- pageInitial,
-} from "../../consts/initialMasterplanFilters";
+import { perPageInitial } from "../../consts/initialMasterplanFilters";
import { getFilteredApartments } from "../../calc/getFilteredApartments";
import SearchLoader from "./SearchLoader";
@@ -37,6 +34,7 @@ const LayoutOptions = () => {
setPerPage,
perPage,
} = useSearchFilters();
+
const debouncedSliders = useDebounce(multirangeSliders, 300);
const handleOnSortClick = (sortId: string) => {
@@ -75,7 +73,7 @@ const LayoutOptions = () => {
switchers,
viewCheckboxes,
sortList,
- pageInitial,
+ page,
perPage
);
@@ -117,6 +115,7 @@ const LayoutOptions = () => {
viewCheckboxes,
sortList,
perPage,
+ page,
]);
return (
diff --git a/client/src/components/virtualTour/LabelMarker.tsx b/client/src/components/virtualTour/LabelMarker.tsx
index d7f5694..26958db 100644
--- a/client/src/components/virtualTour/LabelMarker.tsx
+++ b/client/src/components/virtualTour/LabelMarker.tsx
@@ -12,7 +12,14 @@ const LabelMarker = ({ sphereLink, apartment }: LaberlMarkerProps) => {
return (
<>
{
-
+
{sphereLink.type === "default" && (
{slider.title}
{slider.unit}
@@ -158,14 +158,14 @@ const MasterplanFiltersModal = () => { />
+ {/*
*/}
{localSwitchers.map((switcher) => (
+ {switcher.title}
Views
diff --git a/client/src/components/modals/mobile/MobileHelpModal.tsx b/client/src/components/modals/mobile/MobileHelpModal.tsx index 7ba9166..925797f 100644 --- a/client/src/components/modals/mobile/MobileHelpModal.tsx +++ b/client/src/components/modals/mobile/MobileHelpModal.tsx @@ -2,7 +2,13 @@ import { useSwipeable } from "react-swipeable"; import Button from "../../Button"; import CrossIcon from "../../icons/CrossIcon"; import { ISlider } from "../../../types/slide"; -import { useState, useRef, useLayoutEffect, useContext } from "react"; +import { + useState, + useRef, + useLayoutEffect, + useContext, + useEffect, +} from "react"; import LeftArrowSliderIcon from "../../icons/LeftArrowSliderIcon"; import RightArrowSliderIcon from "../../icons/RightArrowSliderIcon"; import { MobileModalWrapperContext } from "./MobileModalWrapper"; @@ -38,9 +44,9 @@ const tipsSlides: ISlider[] = [ const MobileHelpModal = () => { const [imageWidth] = useState(0); const imageRef = useRef {
@@ -26,7 +28,6 @@ const SearchFiltersModal = () => {
const {
multirangeSliders,
setMultirangeSliders,
- switchers,
setSwitchers,
apartmentTypeCheckboxes,
setApartmentTypeCheckboxes,
@@ -34,6 +35,8 @@ const SearchFiltersModal = () => {
setRoveHomeTypeCheckboxes,
setViewCheckboxes,
viewCheckboxes,
+ setPage,
+ setPerPage,
} = useSearchFilters();
const handlers = useSwipeable({
onSwipedDown: () => handleOnCrossClick(),
@@ -82,16 +85,16 @@ const SearchFiltersModal = () => {
setRoveHomeTypeCheckboxes(updatedCheckboxes);
};
- const handleOnSwitcherClick = (switcherId: string) => {
- const updatedSwitchers = switchers.map((switcher) => {
- if (switcherId !== switcher.id) return switcher;
- const { isSwitched } = switcher;
+ // const handleOnSwitcherClick = (switcherId: string) => {
+ // const updatedSwitchers = switchers.map((switcher) => {
+ // if (switcherId !== switcher.id) return switcher;
+ // const { isSwitched } = switcher;
- return { ...switcher, isSwitched: !isSwitched };
- });
+ // return { ...switcher, isSwitched: !isSwitched };
+ // });
- setSwitchers(updatedSwitchers);
- };
+ // setSwitchers(updatedSwitchers);
+ // };
const handleOnSliderValueChange = (
sliderId: string,
@@ -122,6 +125,8 @@ const SearchFiltersModal = () => {
setApartmentTypeCheckboxes(initialAparmentTypeCheckboxes);
setRoveHomeTypeCheckboxes(initialRoveHomeCheckboxes);
setSwitchers(initialSwitchers);
+ setPage(pageInitial);
+ setPerPage(perPageInitial);
};
return (
@@ -169,7 +174,7 @@ const SearchFiltersModal = () => {
{multirangeSliders.map((slider) => (
-
+
))}
-
{slider.title} @@ -184,14 +189,14 @@ const SearchFiltersModal = () => { />
+ {/*
*/}
{switchers.map((switcher) => (
+ {switcher.title}
{viewCheckboxes.map((checkbox) => (
diff --git a/client/src/components/modals/mobile/SendEnquiryMobileModal.tsx b/client/src/components/modals/mobile/SendEnquiryMobileModal.tsx
index 4ee004a..5ae1172 100644
--- a/client/src/components/modals/mobile/SendEnquiryMobileModal.tsx
+++ b/client/src/components/modals/mobile/SendEnquiryMobileModal.tsx
@@ -82,7 +82,7 @@ const SendEnquiryMobileModal = () => {
- Unvailiable + Unavailable
+
![]()
{
diff --git a/client/src/pages/Search.tsx b/client/src/pages/Search.tsx
index d4c6b73..a76b0a1 100644
--- a/client/src/pages/Search.tsx
+++ b/client/src/pages/Search.tsx
@@ -6,7 +6,6 @@ const Search = () => {
return (
-
@@ -337,7 +337,7 @@ const AboutComplex = () => {
+
+
diff --git a/client/src/components/virtualTour/VirtualTourSidebar.tsx b/client/src/components/virtualTour/VirtualTourSidebar.tsx
index e124138..091f427 100644
--- a/client/src/components/virtualTour/VirtualTourSidebar.tsx
+++ b/client/src/components/virtualTour/VirtualTourSidebar.tsx
@@ -183,7 +183,7 @@ const VirtualTourSidebar = ({
{sphereLink.videoTitle}
- Unvailiable + Unavailable
609 Sqft
-Unvailiable
+Unavailable
891 Sqft
-Unvailiable
+Unavailable
{/* AED 2,408,888 */}
- {/*
diff --git a/client/src/pages/VirtualTour.tsx b/client/src/pages/VirtualTour.tsx
index d7cb1f5..73befef 100644
--- a/client/src/pages/VirtualTour.tsx
+++ b/client/src/pages/VirtualTour.tsx
@@ -12,6 +12,7 @@ import { updateAccessToken } from "../api/updateAccessToken";
import { IAparmentRes } from "../types/apartmentsRes";
import useModal from "../store/useModal";
import LoaderModal from "../components/modals/LoaderModal";
+import { useProgress } from "@react-three/drei";
const appartments = _appartment as IAppartmentComplex[];
const defaultApartment = appartments[0];
@@ -26,6 +27,7 @@ const VirtualTour = () => {
const navigate = useNavigate();
const { appartmentTypeId } = useParams();
const { setModal } = useModal();
+ const { progress } = useProgress();
useEffect(() => {
setIsLoading(true);
@@ -100,11 +102,16 @@ const VirtualTour = () => {
appartmentSphere={currentAppartmentSphere}
apartment={currentApartment}
/>
-