-
-
+
-
+
- {Project_Name}
-
@@ -38,7 +38,7 @@ const SimilarAppartmentCard = ({ layoutCard, elementRef }: LayoutCardProps) => {
{Total_Area_Sqft} units
{wing}
+{wing}
-+
Floor {Floor}
+
diff --git a/client/src/components/apartmentPage/StudioDescriptionSection.tsx b/client/src/components/apartmentPage/StudioDescriptionSection.tsx
index 44d1959..a5061b1 100644
--- a/client/src/components/apartmentPage/StudioDescriptionSection.tsx
+++ b/client/src/components/apartmentPage/StudioDescriptionSection.tsx
@@ -22,7 +22,8 @@ const apartmentDescriptions: IApartmentDesc[] = [
"Every inch is designed to provide more space for comfort and convenience. This feature increase your unit size by 33%",
id: "1",
totalArea: "Up to 365.54 Sqft",
- cost: "Unavailable",
+ // cost: "Unavailable",
+ cost: "",
apartmentType: "Studio Flex",
},
{
@@ -33,7 +34,8 @@ const apartmentDescriptions: IApartmentDesc[] = [
"When folded, it unveils a spacious living room creating a cohesive space that blends both style and functionality.",
id: "2",
totalArea: "Up to 416.13 Sqft",
- cost: "Unavailable",
+ // cost: "Unavailable",
+ cost: "",
apartmentType: "Studio Squared",
},
{
@@ -44,7 +46,8 @@ const apartmentDescriptions: IApartmentDesc[] = [
"With pocket walls that disappear and a Flexibed that seamlessly converts, you can transform your living room into an extra bedroom, anytime you want!",
id: "3",
totalArea: "Up to 770.05 Sqft",
- cost: "Unavailable",
+ // cost: "Unavailable",
+ cost: "",
apartmentType: "1 BR Squared",
},
{
@@ -55,7 +58,8 @@ const apartmentDescriptions: IApartmentDesc[] = [
"Whether you want to add a multipurpose spare room or double up your living space as a bedroom - every inch of space feels larger and works exactly how you want.",
id: "4",
totalArea: "Up to 1057.55 Sqft",
- cost: "Unavailable",
+ // cost: "Unavailable",
+ cost: "",
apartmentType: "2 BR Squared",
},
];
@@ -71,8 +75,8 @@ const StudioDescriptionSection = ({
(aprt) => aprt.apartmentType === apartment.Unit_Type
);
return (
-
@@ -47,7 +47,7 @@ const SimilarAppartmentCard = ({ layoutCard, elementRef }: LayoutCardProps) => {
{/* AED {formatNumber(cost, ",", 3, 1)} */} - Unavailable + {/* Unavailable */}
+
+
-
{apartmentDesc?.title} @@ -101,11 +105,11 @@ const StudioDescriptionSection = ({ */}
+
diff --git a/client/src/components/complexWingPage/FloorDescription.tsx b/client/src/components/complexWingPage/FloorDescription.tsx
index 0b58d2b..6523bfa 100644
--- a/client/src/components/complexWingPage/FloorDescription.tsx
+++ b/client/src/components/complexWingPage/FloorDescription.tsx
@@ -8,11 +8,7 @@ interface FloorDescriptionProps {
isLeft: boolean;
}
-const FloorDescription = ({
- descriptionFloor,
- floorApartments,
- isLeft,
-}: FloorDescriptionProps) => {
+const FloorDescription = ({ descriptionFloor, floorApartments, isLeft }: FloorDescriptionProps) => {
const { isSidebar } = useWingSidebar();
return (
<>
@@ -22,16 +18,12 @@ const FloorDescription = ({
}`}
>
-
+
-
{floorApartments.length > 0 && (
+
{descriptionFloor?.floor} Floor
-- {descriptionFloor?.wing} -
+{descriptionFloor?.wing}
@@ -40,84 +32,59 @@ const FloorDescription = ({
)}
- {floorApartments.filter((apart) => apart.unitType === "Studio Flex")
- .length > 0 && (
+ {floorApartments.filter((apart) => apart.unitType === "Studio Flex").length > 0 && (
-
+
-
)}
- {floorApartments.filter(
- (apart) => apart.unitType === "Studio Squared"
- ).length > 0 && (
+ {floorApartments.filter((apart) => apart.unitType === "Studio Squared").length > 0 && (
-
- { - floorApartments.filter( - (apart) => apart.unitType === "Studio Flex" - ).length - } +
+ {floorApartments.filter((apart) => apart.unitType === "Studio Flex").length}
Studio Flex
Unavailable
+{/* Unavailable */}
-
+
-
)}
- {floorApartments.filter(
- (apart) => apart.unitType === "1 BR Squared"
- ).length > 0 && (
+ {floorApartments.filter((apart) => apart.unitType === "1 BR Squared").length > 0 && (
-
- { - floorApartments.filter( - (apart) => apart.unitType === "Studio Squared" - ).length - } +
+ {floorApartments.filter((apart) => apart.unitType === "Studio Squared").length}
Studio²
Unavailable
+{/* Unavailable */}
-
+
-
)}
- {floorApartments.filter(
- (apart) => apart.unitType === "2 BR Squared"
- ).length > 0 && (
+ {floorApartments.filter((apart) => apart.unitType === "2 BR Squared").length > 0 && (
-
- { - floorApartments.filter( - (apart) => apart.unitType === "1 BR Squared" - ).length - } +
+ {floorApartments.filter((apart) => apart.unitType === "1 BR Squared").length}
1 Bedroom²
Unavailable
+{/* Unavailable */}
-
diff --git a/client/src/components/complexWingPage/FloorSidebar/ApartmentDescription.tsx b/client/src/components/complexWingPage/FloorSidebar/ApartmentDescription.tsx
index a34485f..0c4a5b0 100644
--- a/client/src/components/complexWingPage/FloorSidebar/ApartmentDescription.tsx
+++ b/client/src/components/complexWingPage/FloorSidebar/ApartmentDescription.tsx
@@ -42,16 +42,16 @@ const ApartmentDescription = ({
Number(hoveredApartment?.Total_Area_Sqft).toFixed(2)}{" "}
Sqft
-
+
-
)}
-
- - { - floorApartments.filter( - (apart) => apart.unitType === "2 BR Squared" - ).length - } +
+ {floorApartments.filter((apart) => apart.unitType === "2 BR Squared").length}
- 2 Bedroom² -
+2 Bedroom²
Unavailable
+{/* Unavailable */}
+
-
diff --git a/client/src/components/searchPage/LayoutCard.tsx b/client/src/components/searchPage/LayoutCard.tsx
index 3a44b31..46ed7d4 100644
--- a/client/src/components/searchPage/LayoutCard.tsx
+++ b/client/src/components/searchPage/LayoutCard.tsx
@@ -26,9 +26,7 @@ const LayoutCard = ({ apartmentCard, price }: LayoutCardProps) => {
const totalArea = Number(_totalArea).toFixed(2);
const [isFavorite, setIsFavorite] = useState(false);
// const { setFavorites } = useFavorites();
- const layoutImage = apartmentRoutes.find(
- (apr) => apr.type === unitType
- )?.layout;
+ const layoutImage = apartmentRoutes.find((apr) => apr.type === unitType)?.layout;
const navigate = useNavigate();
@@ -71,33 +69,22 @@ const LayoutCard = ({ apartmentCard, price }: LayoutCardProps) => {
useEffect(() => {
const favorites = localStorage.getItem("Favorites");
if (favorites) {
- const _isFavorite = (JSON.parse(favorites) as IAparmentRes[]).some(
- (apart) => apart.id === apartmentCard.id
- );
+ const _isFavorite = (JSON.parse(favorites) as IAparmentRes[]).some((apart) => apart.id === apartmentCard.id);
setIsFavorite(_isFavorite);
}
}, [apartmentCard.id]);
return (
- {wing}
Floor {hoveredApartment.Floor}
{hoveredApartment.Unit_No}
+
) => void;
}
-const MobileFloorDescription = ({
- descriptionFloor,
- floorApartments,
- isLeft,
-}: MobileFloorDescriptionProps) => {
+const MobileFloorDescription = ({ descriptionFloor, floorApartments, isLeft }: MobileFloorDescriptionProps) => {
return (
<>
{
diff --git a/client/src/components/modals/AboutComplexModal.tsx b/client/src/components/modals/AboutComplexModal.tsx
index 99a30f2..1b5aeec 100644
--- a/client/src/components/modals/AboutComplexModal.tsx
+++ b/client/src/components/modals/AboutComplexModal.tsx
@@ -192,7 +192,7 @@ const AboutComplexModal = ({
diff --git a/client/src/components/modals/VirtualTourVideoModal.tsx b/client/src/components/modals/VirtualTourVideoModal.tsx
index 0b0da3e..b578d67 100644
--- a/client/src/components/modals/VirtualTourVideoModal.tsx
+++ b/client/src/components/modals/VirtualTourVideoModal.tsx
@@ -13,7 +13,7 @@ const VirtualTourVideoModal = ({ videoHref }: VirtualTourVideoModalProps) => {
};
return (
- - Unavailable + {/* Unavailable */}
{/*
AED 1,668,888
diff --git a/client/src/components/complexWingPage/FloorSidebar/EastWingFloorPlan.tsx b/client/src/components/complexWingPage/FloorSidebar/EastWingFloorPlan.tsx
index 3431fb1..b488f9a 100644
--- a/client/src/components/complexWingPage/FloorSidebar/EastWingFloorPlan.tsx
+++ b/client/src/components/complexWingPage/FloorSidebar/EastWingFloorPlan.tsx
@@ -5,1293 +5,8 @@ interface Props {
onClick: (e: React.MouseEvent
-
+
{descriptionFloor?.floor} Floor
-
- {descriptionFloor?.wing} -
+{descriptionFloor?.wing}
-- {floorApartments.length} units -
+{floorApartments.length} units
- { - floorApartments.filter( - (apart) => apart.unitType === "Studio Flex" - ).length - } + {floorApartments.filter((apart) => apart.unitType === "Studio Flex").length}
Studio Flex
Unavailable
+{/* Unavailable */}
- { - floorApartments.filter( - (apart) => apart.unitType === "Studio Squared" - ).length - } + {floorApartments.filter((apart) => apart.unitType === "Studio Squared").length}
Studio Squared
Unavailable
+{/* Unavailable */}
- { - floorApartments.filter( - (apart) => apart.unitType === "1 BR Squared" - ).length - } + {floorApartments.filter((apart) => apart.unitType === "1 BR Squared").length}
1 BR Squared
Unavailable
+{/* Unavailable */}
- { - floorApartments.filter( - (apart) => apart.unitType === "2 BR Squared" - ).length - } + {floorApartments.filter((apart) => apart.unitType === "2 BR Squared").length}
- 2 BR Squared -
+2 BR Squared
Unavailable
+{/* Unavailable */}
{/* AED {formatNumber(cost, ",", 3, 1)} */} - Unavailable + {/* Unavailable */}
Price
- Unavailable + {/* Unavailable */} {/* AED {formatNumber(card.cost, ",", 3, 1)} */}
- Unavailable + {/* Unavailable */} {/* AED {formatNumber(1668888, ",", 3, 1)} */}
diff --git a/client/src/components/modals/SendEnquryModal.tsx b/client/src/components/modals/SendEnquryModal.tsx
index c25fcaf..935e454 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{" "}
@@ -337,11 +338,7 @@ function UnitModal({ unit, type }: Props) {
3D tour
)}
- - Unavailable + {/* Unavailable */}
{/*AED {formatNumber(1668888, ",", 3, 1)} diff --git a/client/src/components/modals/UnitModal.tsx b/client/src/components/modals/UnitModal.tsx index c1099ac..45fc1a4 100644 --- a/client/src/components/modals/UnitModal.tsx +++ b/client/src/components/modals/UnitModal.tsx @@ -322,7 +322,8 @@ function UnitModal({ unit, type }: Props) { .replaceAll(",", " ")} ) : ( - "Unavailable" + // "Unavailable" + "" )}
+
- Unavailable + {/* Unavailable */}
+
{
/>
diff --git a/client/src/components/virtualTour/VirtualTourCard.tsx b/client/src/components/virtualTour/VirtualTourCard.tsx
index ed11a53..f1dd211 100644
--- a/client/src/components/virtualTour/VirtualTourCard.tsx
+++ b/client/src/components/virtualTour/VirtualTourCard.tsx
@@ -153,9 +153,7 @@ function VirtualTourCard({ unit, type }: Props) {
if (!favoriteUnits.some((favoriteUnit) => favoriteUnit.id === unit.id)) {
setFavoriteUnits([...favoriteUnits, unit]);
} else {
- setFavoriteUnits(
- favoriteUnits.filter((favoriteUnit) => favoriteUnit.id !== unit.id)
- );
+ setFavoriteUnits(favoriteUnits.filter((favoriteUnit) => favoriteUnit.id !== unit.id));
}
}
@@ -181,12 +179,7 @@ function VirtualTourCard({ unit, type }: Props) {
>
{projectName}
-
- {wing} Wing -
+{wing} Wing
-- Floor {floor} -
+Floor {floor}
-- № {unitNumber} -
+№ {unitNumber}
- 
+
@@ -124,7 +107,8 @@ const LayoutCard = ({ apartmentCard, price }: LayoutCardProps) => { currency: "AED", minimumFractionDigits: 0, }).format(price)) || - "Unavailable"} + // "Unavailable" + ""}
-
diff --git a/client/src/components/virtualTour/VirtualTourSidebar.tsx b/client/src/components/virtualTour/VirtualTourSidebar.tsx
index a7e293c..2501cb7 100644
--- a/client/src/components/virtualTour/VirtualTourSidebar.tsx
+++ b/client/src/components/virtualTour/VirtualTourSidebar.tsx
@@ -155,7 +155,7 @@ const VirtualTourSidebar = ({ appartmentSphere, apartment }: VirtualTourSidebarP
{unit.unitName}, {unit.totalArea} Sqft
@@ -229,7 +222,8 @@ function VirtualTourCard({ unit, type }: Props) { .replaceAll(",", " ")} ) : ( - "Unavailable" + // "Unavailable" + "" )}
@@ -239,9 +233,7 @@ function VirtualTourCard({ unit, type }: Props) {
className="sm:w-[216px] w-full justify-center"
disabled
>
-
- Send Enquiry
-
+ Send Enquiry
favoriteUnit.id === unit.id
- ) ? (
+ favoriteUnits.some((favoriteUnit) => favoriteUnit.id === unit.id) ? (
-
Unavailable
+{/* Unavailable */}
- Favorites{" "} - {favoriteUnits.length} + Favorites {favoriteUnits.length}
{favoriteUnits.map((unit) => (
-
unitViewFilter === "Park"
- )}
+ checked={unitViewFilters.some((unitViewFilter) => unitViewFilter === "Park")}
onChange={(isChecked, filterName) => {
if (isChecked) {
setUnitViewFilters((prev) => [...prev, filterName]);
} else {
- setUnitViewFilters(
- unitViewFilters.filter(
- (unitViewFilter) => unitViewFilter !== filterName
- )
- );
+ setUnitViewFilters(unitViewFilters.filter((unitViewFilter) => unitViewFilter !== filterName));
}
}}
/>
@@ -823,10 +698,7 @@ function SearchPage() {
@@ -835,10 +707,7 @@ function SearchPage() {
+
diff --git a/client/src/pages/FloorSelectionMobilePage.tsx b/client/src/pages/FloorSelectionMobilePage.tsx
index 5a5e1b4..ccd3cd2 100644
--- a/client/src/pages/FloorSelectionMobilePage.tsx
+++ b/client/src/pages/FloorSelectionMobilePage.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/exhaustive-deps */
import { useEffect, useRef, useState } from "react";
import _eastWingPaths from "../data/EastWingMobilePaths.json";
import _westWingPaths from "../data/WestWingMobilePaths.json";
@@ -75,10 +76,9 @@ function FloorSelectionMobilePage({ wing, onUnselectWing, onSelectPath }: Props)
if (name?.includes("floor")) {
const floor = name.split(" ")[1];
- const wing = name.split(" ")[0];
setName(`${floor} floor`);
- if (wing === "East") {
+ if (wing === "east") {
setItems([
{
count: 7,
@@ -222,7 +222,7 @@ function FloorSelectionMobilePage({ wing, onUnselectWing, onSelectPath }: Props)
key={index}
{...path}
className={`fill-[#00bed766] transition-[fill] ${
- selectedPath && path["data-name"] === selectedPathName ? "fill-[#00bed7]/80" : "fill-[#00bed7]/40"
+ selectedPath && path["data-name"] === selectedPathName ? "fill-[#00bed7]/70" : "fill-[#00bed7]/20"
}`}
onClick={() => handleClickPath(path)}
/>
@@ -235,7 +235,7 @@ function FloorSelectionMobilePage({ wing, onUnselectWing, onSelectPath }: Props)
key={index}
{...path}
className={`fill-[#00bed766] transition-[fill] ${
- selectedPath && path["data-name"] === selectedPathName ? "fill-[#00bed7]/80" : "fill-[#00bed7]/40"
+ selectedPath && path["data-name"] === selectedPathName ? "fill-[#00bed7]/70" : "fill-[#00bed7]/20"
}`}
onClick={() => (setSelectedPath(path), setSelectedPathName(path["data-name"]))}
/>
@@ -254,7 +254,7 @@ function FloorSelectionMobilePage({ wing, onUnselectWing, onSelectPath }: Props)
unitTypeFilter === "2 BR Squared"
- )}
+ checked={unitTypeFilters.some((unitTypeFilter) => unitTypeFilter === "2 BR Squared")}
onChange={(isChecked, filterName) => {
if (isChecked) {
setUnitTypeFilters((prev) => [...prev, filterName]);
} else {
- setUnitTypeFilters(
- unitTypeFilters.filter(
- (unitTypeFilter) => unitTypeFilter !== filterName
- )
- );
+ setUnitTypeFilters(unitTypeFilters.filter((unitTypeFilter) => unitTypeFilter !== filterName));
}
}}
/>
@@ -546,10 +470,7 @@ function SearchPage() {
@@ -615,9 +536,7 @@ function SearchPage() {
max={maxTotalArea}
onlyNumbers
className="rounded-r-none"
- onChange={(value) =>
- setTotalArea([value as number, totalArea[1]])
- }
+ onChange={(value) => setTotalArea([value as number, totalArea[1]])}
/>
- setTotalArea([totalArea[0], value as number])
- }
+ onChange={(value) => setTotalArea([totalArea[0], value as number])}
/>
unitViewFilter === "Business Bay"
- )}
+ checked={unitViewFilters.some((unitViewFilter) => unitViewFilter === "Business Bay")}
onChange={(isChecked, filterName) => {
if (isChecked) {
setUnitViewFilters((prev) => [...prev, filterName]);
} else {
- setUnitViewFilters(
- unitViewFilters.filter(
- (unitViewFilter) => unitViewFilter !== filterName
- )
- );
+ setUnitViewFilters(unitViewFilters.filter((unitViewFilter) => unitViewFilter !== filterName));
}
}}
/>
@@ -733,10 +635,7 @@ function SearchPage() {
@@ -744,18 +643,12 @@ function SearchPage() {
unitViewFilter === "Amenities"
- )}
+ checked={unitViewFilters.some((unitViewFilter) => unitViewFilter === "Amenities")}
onChange={(isChecked, filterName) => {
if (isChecked) {
setUnitViewFilters((prev) => [...prev, filterName]);
} else {
- setUnitViewFilters(
- unitViewFilters.filter(
- (unitViewFilter) => unitViewFilter !== filterName
- )
- );
+ setUnitViewFilters(unitViewFilters.filter((unitViewFilter) => unitViewFilter !== filterName));
}
}}
/>
@@ -763,10 +656,7 @@ function SearchPage() {
@@ -774,18 +664,12 @@ function SearchPage() {
unitViewFilter === "Canal"
- )}
+ checked={unitViewFilters.some((unitViewFilter) => unitViewFilter === "Canal")}
onChange={(isChecked, filterName) => {
if (isChecked) {
setUnitViewFilters((prev) => [...prev, filterName]);
} else {
- setUnitViewFilters(
- unitViewFilters.filter(
- (unitViewFilter) => unitViewFilter !== filterName
- )
- );
+ setUnitViewFilters(unitViewFilters.filter((unitViewFilter) => unitViewFilter !== filterName));
}
}}
/>
@@ -793,10 +677,7 @@ function SearchPage() {
@@ -804,18 +685,12 @@ function SearchPage() {
{unit.projectName}
-
- unitType.type === getTypeByUnitNo(unit.unitNo)
- )?.type || ""
- }
+ type={unitTypes.find((unitType) => unitType.type === getTypeByUnitNo(unit.unitNo))?.type || ""}
/>
)
}
>
- })
+
- {unit.unitNo[0] === "E" ? "East" : "West"} Wing -
+{unit.unitNo[0] === "E" ? "East" : "West"} Wing
{unit.floor}
@@ -242,9 +234,7 @@ function FavoritesPage() { className="w-10 h-10 flex items-center justify-center border border-[#E2E2DC] rounded-full bg-[#FFFFFF] bg-opacity-80 hover:text-[#0D1922] hover:bg-opacity-100 hover:border-[#00BED7] transition-all" onClick={() => addOrRemoveFromFavorites(unit)} > - {favoriteUnits.some( - (favoriteUnit) => favoriteUnit.id === unit.id - ) ? ( + {favoriteUnits.some((favoriteUnit) => favoriteUnit.id === unit.id) ? (
- unitType.type === getTypeByUnitNo(unit.unitNo)
- )?.type || ""
- }
+ type={unitTypes.find((unitType) => unitType.type === getTypeByUnitNo(unit.unitNo))?.type || ""}
/>
)
}
@@ -293,17 +269,13 @@ function FavoritesPage() {
{unit.unitType}, {unit.totalArea} Sqft
- {(unit.unitPrice && - `AED ${unit.unitPrice.toLocaleString()}`) || - "Unavailable"} + {(unit.unitPrice && `AED ${unit.unitPrice.toLocaleString()}`) || + // "Unavailable" + ""}
-
@@ -319,10 +291,7 @@ function FavoritesPage() {
in your favorites
-
- Use the search function and add the ones you like to your - favorites. -
+Use the search function and add the ones you like to your favorites.
Apartments added from the 3D model will also appear here.
-
([minCost, maxCost]);
const [minTotalArea] = useState(341);
const [maxTotalArea] = useState(1058);
- const [totalArea, setTotalArea] = useState([
- minTotalArea,
- maxTotalArea,
- ]);
+ const [totalArea, setTotalArea] = useState([minTotalArea, maxTotalArea]);
const [minFloor] = useState(5);
const [maxFloor] = useState(31);
const [floor, setFloor] = useState([minFloor, maxFloor]);
@@ -245,9 +242,7 @@ function SearchPage() {
if (!favoriteUnits.some((favoriteUnit) => favoriteUnit.id === unit.id)) {
setFavoriteUnits([...favoriteUnits, unit]);
} else {
- setFavoriteUnits(
- favoriteUnits.filter((favoriteUnit) => favoriteUnit.id !== unit.id)
- );
+ setFavoriteUnits(favoriteUnits.filter((favoriteUnit) => favoriteUnit.id !== unit.id));
}
}
@@ -255,11 +250,7 @@ function SearchPage() {
setModal(
unitType.type === getTypeByUnitNo(unit.unitNo)
- )?.type || ""
- }
+ type={unitTypes.find((unitType) => unitType.type === getTypeByUnitNo(unit.unitNo))?.type || ""}
/>
);
@@ -269,55 +260,30 @@ function SearchPage() {
useEffect(() => {
let newFilteredUnits = units
+ .filter((unit) => (unitTypeFilters.length ? unitTypeFilters.includes(unit.unitType) : unit))
.filter((unit) =>
- unitTypeFilters.length ? unitTypeFilters.includes(unit.unitType) : unit
- )
- .filter((unit) =>
- unitViewFilters.length
- ? unitViewFilters.some((unitViewFilter) =>
- unit.unitView.includes(unitViewFilter)
- )
- : unit
- )
- .filter(
- (unit) =>
- unit.totalArea >= totalArea[0] && unit.totalArea <= totalArea[1]
+ unitViewFilters.length ? unitViewFilters.some((unitViewFilter) => unit.unitView.includes(unitViewFilter)) : unit
)
+ .filter((unit) => unit.totalArea >= totalArea[0] && unit.totalArea <= totalArea[1])
.filter((unit) => unit.floor >= floor[0] && unit.floor <= floor[1]);
console.log("isSortPriceAsc", isSortPriceAsc);
if (isSortPriceAsc !== undefined) {
if (isSortPriceAsc) {
- newFilteredUnits = newFilteredUnits.sort(
- (a, b) => (b.unitPrice || 0) - (a.unitPrice || 0)
- );
+ newFilteredUnits = newFilteredUnits.sort((a, b) => (b.unitPrice || 0) - (a.unitPrice || 0));
} else {
- newFilteredUnits = newFilteredUnits.sort(
- (a, b) => (a.unitPrice || 0) - (b.unitPrice || 0)
- );
+ newFilteredUnits = newFilteredUnits.sort((a, b) => (a.unitPrice || 0) - (b.unitPrice || 0));
}
}
setFilteredUnits(newFilteredUnits);
- setMinCost(
- Math.min(
- ...newFilteredUnits.map((unit) => unit.unitPrice!).filter(Boolean)
- )
- );
- setMaxCost(
- Math.max(
- ...newFilteredUnits.map((unit) => unit.unitPrice!).filter(Boolean)
- )
- );
+ setMinCost(Math.min(...newFilteredUnits.map((unit) => unit.unitPrice!).filter(Boolean)));
+ setMaxCost(Math.max(...newFilteredUnits.map((unit) => unit.unitPrice!).filter(Boolean)));
setCost([
- Math.min(
- ...newFilteredUnits.map((unit) => unit.unitPrice!).filter(Boolean)
- ),
- Math.max(
- ...newFilteredUnits.map((unit) => unit.unitPrice!).filter(Boolean)
- ),
+ Math.min(...newFilteredUnits.map((unit) => unit.unitPrice!).filter(Boolean)),
+ Math.max(...newFilteredUnits.map((unit) => unit.unitPrice!).filter(Boolean)),
]);
// setMinTotalArea(
@@ -357,14 +323,7 @@ function SearchPage() {
// Math.min(...newFilteredUnits.map((unit) => unit.floor).filter(Boolean)),
// Math.max(...newFilteredUnits.map((unit) => unit.floor).filter(Boolean)),
// ]);
- }, [
- units,
- unitTypeFilters,
- unitViewFilters,
- totalArea,
- floor,
- isSortPriceAsc,
- ]);
+ }, [units, unitTypeFilters, unitViewFilters, totalArea, floor, isSortPriceAsc]);
// useEffect(() => {
// if (!units.length) return;
@@ -412,9 +371,7 @@ function SearchPage() {
}`}
>
unitTypeFilter === "Studio Squared"
- )}
+ checked={unitTypeFilters.some((unitTypeFilter) => unitTypeFilter === "Studio Squared")}
onChange={(isChecked, filterName) => {
if (isChecked) {
setUnitTypeFilters((prev) => [...prev, filterName]);
} else {
- setUnitTypeFilters(
- unitTypeFilters.filter(
- (unitTypeFilter) => unitTypeFilter !== filterName
- )
- );
+ setUnitTypeFilters(unitTypeFilters.filter((unitTypeFilter) => unitTypeFilter !== filterName));
}
}}
/>
@@ -486,10 +428,7 @@ function SearchPage() {
@@ -497,18 +436,12 @@ function SearchPage() {
unitTypeFilter === "1 BR Squared"
- )}
+ checked={unitTypeFilters.some((unitTypeFilter) => unitTypeFilter === "1 BR Squared")}
onChange={(isChecked, filterName) => {
if (isChecked) {
setUnitTypeFilters((prev) => [...prev, filterName]);
} else {
- setUnitTypeFilters(
- unitTypeFilters.filter(
- (unitTypeFilter) => unitTypeFilter !== filterName
- )
- );
+ setUnitTypeFilters(unitTypeFilters.filter((unitTypeFilter) => unitTypeFilter !== filterName));
}
}}
/>
@@ -516,10 +449,7 @@ function SearchPage() {
@@ -527,18 +457,12 @@ function SearchPage() {
{selectedPathName}
+{selectedPathName?.split(" ")[1]} floor
{wing} Wing
{/* */} diff --git a/client/src/pages/SearchPage.tsx b/client/src/pages/SearchPage.tsx index 1185dbe..b1adc63 100644 --- a/client/src/pages/SearchPage.tsx +++ b/client/src/pages/SearchPage.tsx @@ -29,10 +29,7 @@ function SearchPage() { const [cost, setCost] = useState
-
@@ -467,18 +415,12 @@ function SearchPage() {
- Filters -
+Filters
- { - units.filter((unit) => unit.unitType === "Studio Flex") - .length - } + {units.filter((unit) => unit.unitType === "Studio Flex").length}
- { - units.filter((unit) => unit.unitType === "Studio Squared") - .length - } + {units.filter((unit) => unit.unitType === "Studio Squared").length}
- { - units.filter((unit) => unit.unitType === "1 BR Squared") - .length - } + {units.filter((unit) => unit.unitType === "1 BR Squared").length}
- { - units.filter((unit) => unit.unitType === "2 BR Squared") - .length - } + {units.filter((unit) => unit.unitType === "2 BR Squared").length}
@@ -684,18 +601,12 @@ function SearchPage() {
unitViewFilter === "BK/DT"
- )}
+ checked={unitViewFilters.some((unitViewFilter) => unitViewFilter === "BK/DT")}
onChange={(isChecked, filterName) => {
if (isChecked) {
setUnitViewFilters((prev) => [...prev, filterName]);
} else {
- setUnitViewFilters(
- unitViewFilters.filter(
- (unitViewFilter) => unitViewFilter !== filterName
- )
- );
+ setUnitViewFilters(unitViewFilters.filter((unitViewFilter) => unitViewFilter !== filterName));
}
}}
/>
@@ -703,10 +614,7 @@ function SearchPage() {
@@ -714,18 +622,12 @@ function SearchPage() {
- { - units.filter((unit) => unit.unitView.includes("BK/DT")) - .length - } + {units.filter((unit) => unit.unitView.includes("BK/DT")).length}
- { - units.filter((unit) => unit.unitView === "Business Bay") - .length - } + {units.filter((unit) => unit.unitView === "Business Bay").length}
- { - units.filter((unit) => unit.unitView.includes("Amenities")) - .length - } + {units.filter((unit) => unit.unitView.includes("Amenities")).length}
- { - units.filter((unit) => unit.unitView.includes("Canal")) - .length - } + {units.filter((unit) => unit.unitView.includes("Canal")).length}
- { - units.filter((unit) => unit.unitView.includes("Park")) - .length - } + {units.filter((unit) => unit.unitView.includes("Park")).length}
{filteredUnits.length} apartments found
-