Compare commits

...

2 Commits

Author SHA1 Message Date
zojgame 41b131153f not floor rmv 2024-07-10 18:26:31 +05:00
zojgame 8d9cdbb5e1 disclaimer + floors fix 2024-07-10 18:09:53 +05:00
8 changed files with 36 additions and 96 deletions
@@ -90,13 +90,13 @@ const ComplexTopPanel = () => {
<Button
icon={<InfoIcon />}
buttonType="primary"
text="About Complex"
text="About Projects"
onClick={handleOnAboutComplexClick}
/>
</div>
<div className="flex flex-col sm:col-start-6 col-start-8 sm:col-span-4 col-span-4 text-white text-center items-start ">
<div
className={`text-center duration-300 ease-in-out transition-opacity hidden lg:block ${
className={`text-center duration-300 ease-in-out transition-opacity hidden sm:block ${
isSidebar ? "opacity-0" : "opacity-100"
}`}
>
@@ -2,6 +2,7 @@ const FloorNumbers = () => {
return (
<>
<svg
className="sm:hidden block"
y={745.34}
x={691.44}
width="24"
@@ -17,6 +18,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={764.34}
x={691.44}
width="24"
@@ -32,6 +34,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={783.34}
x={691.44}
width="24"
@@ -47,6 +50,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={802.34}
x={691.44}
width="24"
@@ -62,6 +66,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
width="24"
height="14"
viewBox="0 0 24 14"
@@ -77,6 +82,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={840.34}
x={691.44}
width="24"
@@ -92,6 +98,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={859.34}
x={691.44}
width="24"
@@ -107,6 +114,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={878.34}
x={691.44}
width="24"
@@ -122,6 +130,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={921.34}
x={642.44}
width="73"
@@ -137,6 +146,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={969.34}
x={691.44}
width="25"
@@ -152,6 +162,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={990.34}
x={691.44}
width="25"
@@ -167,6 +178,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1009.34}
x={691.44}
width="25"
@@ -182,6 +194,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1028.34}
x={691.44}
width="25"
@@ -197,6 +210,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1047.34}
x={691.44}
width="25"
@@ -212,6 +226,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1066.34}
x={691.44}
width="25"
@@ -227,6 +242,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1085.34}
x={691.44}
width="25"
@@ -242,6 +258,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1104.34}
x={691.44}
width="25"
@@ -257,6 +274,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1123.34}
x={691.44}
width="25"
@@ -272,6 +290,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1142.34}
x={691.44}
width="25"
@@ -287,6 +306,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1161.34}
x={691.44}
width="25"
@@ -302,6 +322,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1180.34}
x={691.44}
width="25"
@@ -317,6 +338,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1199.34}
x={694.44}
width="19"
@@ -333,6 +355,7 @@ const FloorNumbers = () => {
</svg>
<svg
className="sm:hidden block"
y={1218.34}
x={694.44}
width="19"
@@ -348,6 +371,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1237.34}
x={694.44}
width="19"
@@ -363,6 +387,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1256.34}
x={694.44}
width="19"
@@ -378,6 +403,7 @@ const FloorNumbers = () => {
/>
</svg>
<svg
className="sm:hidden block"
y={1275.34}
x={694.44}
width="19"
@@ -35,7 +35,6 @@ const SequenceWing = () => {
const [width, setWidth] = useState<number>(0);
const [top, setTop] = useState<number>(0);
const [left, setLeft] = useState<number>(0);
// const leftWingRef = useRef(null);
const { isSidebar, setIsSidebar } = useWingSidebar();
const [mousePos, setMousePos] = useState<[number, number]>([0, 0]);
const [currentHoveredFloor, setHoverCurrentFloor] =
@@ -388,8 +387,8 @@ const SequenceWing = () => {
currentHoveredFloor?.floor !== skyGardenFloor &&
currentHoveredFloor &&
isWrapperHovered
? "opacity-100"
: "opacity-0"
? "flex"
: "hidden"
}`}
style={{
top: mousePos[1],
@@ -409,8 +408,8 @@ const SequenceWing = () => {
currentHoveredFloor?.floor === skyGardenFloor &&
currentHoveredFloor &&
isWrapperHovered
? "opacity-100"
: "opacity-0"
? "flex"
: "hidden"
}`}
style={{
top: mousePos[1],
@@ -9,7 +9,7 @@ const DisclaimerModal = () => {
return (
<div className="absolute z-[99999999] top-0 left-0 w-screen bg-[#0D192266] h-screen backdrop-blur-[6px] grid grid-cols-12 items-center">
<div className="bg-white rounded-lg col-span-4 col-start-5 py-[37px] px-8">
<div className="bg-white rounded-lg lg:col-span-4 col-span-8 col-start-3 lg:col-start-5 py-[37px] px-8">
<div className=" w-full h-1 flex justify-between">
<div className="h-[2px] bg-[#00BED7] w-1/3 rounded-full"></div>
<button onClick={handleOnCloseClick}>
@@ -3,7 +3,6 @@ import Button from "../Button";
import CrossIcon from "../icons/CrossIcon";
import ResetIcon from "../icons/ResetIcon";
import Checkbox from "../Checkbox";
import Switch from "../Switch";
import MultiRangeSlider from "../MultiRangeSlider";
import {
initialAparmentTypeCheckboxes,
@@ -22,7 +21,6 @@ const MasterplanFilters = () => {
setViewCheckboxes,
multirangeSliders,
setMultirangeSliders,
switchers,
setSwitchers,
} = useMasterplanFilters();
@@ -67,17 +65,6 @@ const MasterplanFilters = () => {
setMultirangeSliders(updatedSliders);
};
const handleOnSwitcherClick = (switcherId: string) => {
const updatedSwitchers = switchers.map((switcher) => {
if (switcherId !== switcher.id) return switcher;
const { isSwitched } = switcher;
return { ...switcher, isSwitched: !isSwitched };
});
setSwitchers(updatedSwitchers);
};
const handleOnResetClick = () => {
setApartmentTypeCheckboxes(initialAparmentTypeCheckboxes);
setViewCheckboxes(initialViewCheckboxes);
@@ -123,15 +110,6 @@ const MasterplanFilters = () => {
/>
</div>
))}
<div className="flex flex-col gap-2">
{switchers.map((switcher) => (
<div key={switcher.id} className="flex justify-between w-full">
<p className="text-s text-[#73787C]">{switcher.title}</p>
<Switch switcher={switcher} onClick={handleOnSwitcherClick} />
</div>
))}
</div>
</div>
<div className="flex flex-col pt-6 w-full">
<p className="text-[#0D1922] text-s pb-4">View</p>
@@ -5,13 +5,11 @@ import CrossIcon from "../../icons/CrossIcon";
import { MobileModalWrapperContext } from "./MobileModalWrapper";
import Checkbox from "../../Checkbox";
import MultiRangeSlider from "../../MultiRangeSlider";
import Switch from "../../Switch";
import ResetIcon from "../../icons/ResetIcon";
import { useSwipeable } from "react-swipeable";
import {
initialAparmentTypeCheckboxes,
initialSliders,
initialSwitchers,
initialViewCheckboxes,
} from "../../../consts/initialMasterplanFilters";
import { ICheckbox } from "../../../types/checkbox";
@@ -25,7 +23,6 @@ const MasterplanFiltersModal = () => {
const [viewCheckboxes, setViewCheckboxes] = useState<ICheckbox[]>(
initialViewCheckboxes
);
const [switchers, setSwitchers] = useState(initialSwitchers);
const [multirangeSliders, setMultirangeSliders] = useState(initialSliders);
const handlers = useSwipeable({
onSwipedDown: () => handleOnCrossClick(),
@@ -52,17 +49,6 @@ const MasterplanFiltersModal = () => {
setApartmentTypeCheckboxes(updatedCheckboxes);
};
const handleOnSwitcherClick = (switcherId: string) => {
const updatedSwitchers = switchers.map((switcher) => {
if (switcherId !== switcher.id) return switcher;
const { isSwitched } = switcher;
return { ...switcher, isSwitched: !isSwitched };
});
setSwitchers(updatedSwitchers);
};
const handleOnSliderValueChange = (
sliderId: string,
e: [a: number, b: number]
@@ -99,7 +85,6 @@ const MasterplanFiltersModal = () => {
const handleOnResetClick = () => {
setViewCheckboxes(initialViewCheckboxes);
setSwitchers(initialSwitchers);
setMultirangeSliders(initialSliders);
setApartmentTypeCheckboxes(initialAparmentTypeCheckboxes);
};
@@ -146,14 +131,6 @@ const MasterplanFiltersModal = () => {
/>
</div>
))}
<div className="flex flex-col gap-2 pt-6">
{switchers.map((switcher) => (
<div key={switcher.id} className="flex justify-between w-full">
<p className="text-s text-[#73787C]">{switcher.title}</p>
<Switch switcher={switcher} onClick={handleOnSwitcherClick} />
</div>
))}
</div>
</div>
<div className="flex flex-col w-full">
<p className="text-[#0D1922] text-s pb-4">Views</p>
@@ -6,13 +6,11 @@ import { MobileModalWrapperContext } from "./MobileModalWrapper";
import useSearchFilters from "../../../store/useSearchFilters";
import Checkbox from "../../Checkbox";
import MultiRangeSlider from "../../MultiRangeSlider";
import Switch from "../../Switch";
import ResetIcon from "../../icons/ResetIcon";
import { useSwipeable } from "react-swipeable";
import {
initialAparmentTypeCheckboxes,
initialSliders,
initialSwitchers,
initialViewCheckboxes,
initialRoveHomeCheckboxes,
} from "../../../consts/initialMasterplanFilters";
@@ -26,8 +24,6 @@ const SearchFiltersModal = () => {
const {
multirangeSliders,
setMultirangeSliders,
switchers,
setSwitchers,
apartmentTypeCheckboxes,
setApartmentTypeCheckboxes,
roveHomeTypeCheckboxes,
@@ -82,17 +78,6 @@ const SearchFiltersModal = () => {
setRoveHomeTypeCheckboxes(updatedCheckboxes);
};
const handleOnSwitcherClick = (switcherId: string) => {
const updatedSwitchers = switchers.map((switcher) => {
if (switcherId !== switcher.id) return switcher;
const { isSwitched } = switcher;
return { ...switcher, isSwitched: !isSwitched };
});
setSwitchers(updatedSwitchers);
};
const handleOnSliderValueChange = (
sliderId: string,
e: [a: number, b: number]
@@ -121,7 +106,7 @@ const SearchFiltersModal = () => {
setViewCheckboxes(initialViewCheckboxes);
setApartmentTypeCheckboxes(initialAparmentTypeCheckboxes);
setRoveHomeTypeCheckboxes(initialRoveHomeCheckboxes);
setSwitchers(initialSwitchers);
// setSwitchers(initialSwitchers);
};
return (
@@ -184,14 +169,14 @@ const SearchFiltersModal = () => {
/>
</div>
))}
<div className="flex flex-col gap-2 pt-6">
{/* <div className="flex flex-col gap-2 pt-6">
{switchers.map((switcher) => (
<div key={switcher.id} className="flex justify-between w-full">
<p className="text-s text-[#73787C]">{switcher.title}</p>
<Switch switcher={switcher} onClick={handleOnSwitcherClick} />
</div>
))}
</div>
</div> */}
</div>
<div className="grid grid-cols-2 gap-2">
{viewCheckboxes.map((checkbox) => (
@@ -1,14 +1,12 @@
import Button from "../Button";
import ResetIcon from "../icons/ResetIcon";
import Checkbox from "../Checkbox";
import Switch from "../Switch";
import MultiRangeSlider from "../MultiRangeSlider";
import useSearchFilters from "../../store/useSearchFilters";
import {
initialViewCheckboxes,
initialAparmentTypeCheckboxes,
initialSliders,
initialSwitchers,
initialRoveHomeCheckboxes,
pageInitial,
perPageInitial,
@@ -18,8 +16,6 @@ const SidebarFilters = () => {
const {
multirangeSliders,
setMultirangeSliders,
switchers,
setSwitchers,
apartmentTypeCheckboxes,
setApartmentTypeCheckboxes,
roveHomeTypeCheckboxes,
@@ -65,17 +61,6 @@ const SidebarFilters = () => {
setMultirangeSliders(updatedSliders);
};
const handleOnSwitcherClick = (switcherId: string) => {
const updatedSwitchers = switchers.map((switcher) => {
if (switcherId !== switcher.id) return switcher;
const { isSwitched } = switcher;
return { ...switcher, isSwitched: !isSwitched };
});
setSwitchers(updatedSwitchers);
};
const handleOnViewCheckboxClick = (checkboxId: string) => {
const updatedCheckboxes = viewCheckboxes.map((cbox) => {
if (checkboxId !== cbox.id) return cbox;
@@ -92,7 +77,6 @@ const SidebarFilters = () => {
setApartmentTypeCheckboxes(initialAparmentTypeCheckboxes);
setRoveHomeTypeCheckboxes(initialRoveHomeCheckboxes);
setMultirangeSliders(initialSliders);
setSwitchers(initialSwitchers);
setPage(pageInitial);
setPerPage(perPageInitial);
};
@@ -147,15 +131,6 @@ const SidebarFilters = () => {
/>
</div>
))}
<div className="flex flex-col gap-2">
{switchers.map((switcher) => (
<div key={switcher.id} className="flex justify-between w-full">
<p className="text-s text-[#73787C]">{switcher.title}</p>
<Switch switcher={switcher} onClick={handleOnSwitcherClick} />
</div>
))}
</div>
<div className="flex flex-col w-full">
<p className="text-[#0D1922] text-s pb-4">Views</p>
<div className="flex flex-col gap-2">