-
+
+
diff --git a/client/src/components/searchApartment/ButtonPanel.tsx b/client/src/components/apartmentPage/ButtonPanel.tsx
similarity index 100%
rename from client/src/components/searchApartment/ButtonPanel.tsx
rename to client/src/components/apartmentPage/ButtonPanel.tsx
diff --git a/client/src/components/searchApartment/SimilarAppartmentCard.tsx b/client/src/components/apartmentPage/SimilarAppartmentCard.tsx
similarity index 100%
rename from client/src/components/searchApartment/SimilarAppartmentCard.tsx
rename to client/src/components/apartmentPage/SimilarAppartmentCard.tsx
diff --git a/client/src/components/searchApartment/SimilarSlider.tsx b/client/src/components/apartmentPage/SimilarSlider.tsx
similarity index 100%
rename from client/src/components/searchApartment/SimilarSlider.tsx
rename to client/src/components/apartmentPage/SimilarSlider.tsx
diff --git a/client/src/components/searchApartment/StudioDescriptionSection.tsx b/client/src/components/apartmentPage/StudioDescriptionSection.tsx
similarity index 93%
rename from client/src/components/searchApartment/StudioDescriptionSection.tsx
rename to client/src/components/apartmentPage/StudioDescriptionSection.tsx
index 4737d5f..d833d99 100644
--- a/client/src/components/searchApartment/StudioDescriptionSection.tsx
+++ b/client/src/components/apartmentPage/StudioDescriptionSection.tsx
@@ -26,8 +26,11 @@ const StudioDescriptionSection = () => {
Up to 365,54 Sqft
- from AED {formatNumber(1668888, ",", 3, 1)}
+ Unvailiable
+ {/*
+ from AED {formatNumber(1668888, ",", 3, 1)}
+
*/}
diff --git a/client/src/components/complexWingPage/FloorSidebar/EastWingHighlighting.tsx b/client/src/components/complexWingPage/FloorSidebar/EastWingHighlighting.tsx
index d19f083..b005322 100644
--- a/client/src/components/complexWingPage/FloorSidebar/EastWingHighlighting.tsx
+++ b/client/src/components/complexWingPage/FloorSidebar/EastWingHighlighting.tsx
@@ -25,7 +25,7 @@ const EastWingHighlighting = ({
viewBox="0 0 672 280"
>
- AED 1,668,888
+ Unvailiable
diff --git a/client/src/components/searchPage/LayoutOptions.tsx b/client/src/components/searchPage/LayoutOptions.tsx
index 884f78a..4fa09bc 100644
--- a/client/src/components/searchPage/LayoutOptions.tsx
+++ b/client/src/components/searchPage/LayoutOptions.tsx
@@ -64,31 +64,10 @@ const LayoutOptions = () => {
}
useEffect(() => {
- const zohoToken = localStorage.getItem("ACCESS_TOKEN");
- setIsLoading(true);
-
- if (!zohoToken) {
- updateAccessToken().then((token) => {
- if (token) {
- getFilteredApartments(
- token,
- setApartments,
- roveHomeTypeCheckboxes,
- apartmentTypeCheckboxes,
- debouncedSliders,
- switchers,
- viewCheckboxes,
- sortList,
- pageInitial,
- perPage
- ).then(() => {
- setIsLoading(false);
- });
- }
- });
- } else {
+ const localStorageToken = `${localStorage.getItem("ACCESS_TOKEN")}`;
+ const getApartments = (token: string) =>
getFilteredApartments(
- zohoToken,
+ token,
setApartments,
roveHomeTypeCheckboxes,
apartmentTypeCheckboxes,
@@ -98,35 +77,38 @@ const LayoutOptions = () => {
sortList,
pageInitial,
perPage
- )
- .catch((error) => {
- const errorStatus = error.response.status;
+ );
- if (errorStatus === 401) {
- updateAccessToken().then((token) => {
+ setIsLoading(true);
+
+ getApartments(localStorageToken)
+ .then((res) => {
+ console.log("first2", res);
+ setIsLoading(false);
+ })
+ .catch((error) => {
+ const errorStatus = error.response.status;
+
+ if (errorStatus === 401) {
+ updateAccessToken()
+ .then((token) => {
if (token) {
- getFilteredApartments(
- token,
- setApartments,
- roveHomeTypeCheckboxes,
- apartmentTypeCheckboxes,
- debouncedSliders,
- switchers,
- viewCheckboxes,
- sortList,
- pageInitial,
- perPage
- ).then(() => {
+ getApartments(token).then(() => {
setIsLoading(false);
});
}
+ })
+ .catch((error) => {
+ setIsLoading(false);
+ console.log("first2");
+ console.error("error", error);
});
- }
- })
- .then(() => {
+ } else {
setIsLoading(false);
- });
- }
+ console.log("first");
+ console.error("error", error);
+ }
+ });
}, [
setApartments,
roveHomeTypeCheckboxes,
diff --git a/client/src/components/searchParticularApartmentsPage/ApartmentCard.tsx b/client/src/components/searchParticularApartmentsPage/ApartmentCard.tsx
deleted file mode 100644
index 344db70..0000000
--- a/client/src/components/searchParticularApartmentsPage/ApartmentCard.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import Button from "../Button";
-import HeartIcon from "../icons/Heart";
-import { useNavigate } from "react-router-dom";
-
-const ApartmentCard = () => {
- const navigate = useNavigate();
- const handleOnCardClick = () => {
- navigate("1");
- };
- return (
-
-
-
-
- Rove Home Marasi Drive
-
-
-
East Wing
-
-
Floor 11
-
-
№ 213
-
-
-
}
- buttonType="favorite"
- isCircleRounded
- />
-
-
-
-
-
-
Studio Flex, 607,08 Sqft
-
- AED 1,668,888
-
-
-
- );
-};
-
-export default ApartmentCard;
diff --git a/client/src/components/searchParticularApartmentsPage/ApartmentSidebar.tsx b/client/src/components/searchParticularApartmentsPage/ApartmentSidebar.tsx
deleted file mode 100644
index 4a99347..0000000
--- a/client/src/components/searchParticularApartmentsPage/ApartmentSidebar.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { formatNumber } from "../../calc/formatNumber";
-import Button from "../Button";
-import LeftArrowSliderIcon from "../icons/LeftArrowSliderIcon";
-import { useNavigate } from "react-router-dom";
-
-const ApartmentSidebar = () => {
- const navigate = useNavigate();
-
- const handleOnBackClick = () => {
- navigate(-1);
- };
-
- return (
-
-
-
-
- }
- buttonType="cta"
- onClick={handleOnBackClick}
- />
-
- 1 bedroom apartment
-
-
-
-
-
-
-
- Rove Home Marasi Drive
-
-
- 234 units
-
-
-
-
- East Wing
-
-
-
- Floor 11-35
-
-
-
- AED {formatNumber(1668888, ",", 3, 1)}
-
-
-
-
-
-
-
-
-
-
- );
-};
-
-export default ApartmentSidebar;
diff --git a/client/src/components/searchParticularApartmentsPage/Units.tsx b/client/src/components/searchParticularApartmentsPage/Units.tsx
deleted file mode 100644
index 9f5da38..0000000
--- a/client/src/components/searchParticularApartmentsPage/Units.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { useState, useEffect } from "react";
-import { layoutsCards } from "../../consts/initialSearchPage";
-import { initialSortList } from "../../consts/initialMasterplanFilters";
-import useSearchFilters from "../../store/useSearchFilters";
-import SearchIcon from "../icons/SearchIcon";
-import SortButton from "../searchPage/SortButton";
-import { sortCardBy } from "../../calc/sortCard";
-import ApartmentCard from "./ApartmentCard";
-import LeftArrowSliderIcon from "../icons/LeftArrowSliderIcon";
-import Button from "../Button";
-import { useNavigate } from "react-router-dom";
-
-const Units = () => {
- const [sortList, setSortList] = useState(initialSortList);
- const [cards, setCards] = useState(layoutsCards);
- const { roveHomeTypeCheckboxes, apartmentTypeCheckboxes, multirangeSliders } =
- useSearchFilters();
- const navigate = useNavigate();
-
- const handleOnSortClick = (sortId: string) => {
- const updatedSortList = sortList.map((sort) => {
- const isSelected = sort.id === sortId;
- return { ...sort, isSelected: isSelected };
- });
- setSortList(updatedSortList);
- };
-
- const handleOnBackClick = () => {
- navigate(-1);
- };
-
- useEffect(() => {
- const sortedCards = sortCardBy(sortList, layoutsCards);
-
- setCards(sortedCards);
- }, [
- sortList,
- roveHomeTypeCheckboxes,
- apartmentTypeCheckboxes,
- multirangeSliders,
- ]);
- return (
-
-
-
-
-
}
- buttonType="cta"
- onClick={handleOnBackClick}
- />
-
-
- 1 bedroom, 609 Sqft{" "}
-
-
-
- Rove Home Marasi Drive
-
-
-
- East Wing
-
-
-
- Floor 11-35
-
-
-
-
-
- AED 1,668,888
-
-
- {cards.map(() => (
-
- ))}
-
- Show 12 more apartments
-
-
- );
-};
-
-export default Units;
diff --git a/client/src/components/virtualTour/VirtualTourSidebar.tsx b/client/src/components/virtualTour/VirtualTourSidebar.tsx
index b7b1bfa..ce39640 100644
--- a/client/src/components/virtualTour/VirtualTourSidebar.tsx
+++ b/client/src/components/virtualTour/VirtualTourSidebar.tsx
@@ -121,7 +121,7 @@ const VirtualTourSidebar = ({ currentAppartment }: VirtualTourSidebarProps) => {