diff --git a/public/images/interiors/dubai-marina/1-bedroom-2-a.png b/public/images/interiors/dubai-marina/1-bedroom-a.png similarity index 100% rename from public/images/interiors/dubai-marina/1-bedroom-2-a.png rename to public/images/interiors/dubai-marina/1-bedroom-a.png diff --git a/public/images/interiors/dubai-marina/1-bedroom-2-b.png b/public/images/interiors/dubai-marina/1-bedroom-b.png similarity index 100% rename from public/images/interiors/dubai-marina/1-bedroom-2-b.png rename to public/images/interiors/dubai-marina/1-bedroom-b.png diff --git a/public/images/interiors/dubai-marina/1-bedroom-2-c.png b/public/images/interiors/dubai-marina/1-bedroom-c.png similarity index 100% rename from public/images/interiors/dubai-marina/1-bedroom-2-c.png rename to public/images/interiors/dubai-marina/1-bedroom-c.png diff --git a/public/images/interiors/dubai-marina/1-bedroom-2-d.png b/public/images/interiors/dubai-marina/1-bedroom-d.png similarity index 100% rename from public/images/interiors/dubai-marina/1-bedroom-2-d.png rename to public/images/interiors/dubai-marina/1-bedroom-d.png diff --git a/public/images/interiors/dubai-marina/1-bedroom-loft-ab.png b/public/images/interiors/dubai-marina/1-bedroom-loft-a.png similarity index 100% rename from public/images/interiors/dubai-marina/1-bedroom-loft-ab.png rename to public/images/interiors/dubai-marina/1-bedroom-loft-a.png diff --git a/public/images/interiors/dubai-marina/1-bedroom-loft-b.png b/public/images/interiors/dubai-marina/1-bedroom-loft-b.png new file mode 100644 index 0000000..d4f0f3d Binary files /dev/null and b/public/images/interiors/dubai-marina/1-bedroom-loft-b.png differ diff --git a/public/images/interiors/dubai-marina/2-bedroom-2-a.png b/public/images/interiors/dubai-marina/2-bedroom-a.png similarity index 100% rename from public/images/interiors/dubai-marina/2-bedroom-2-a.png rename to public/images/interiors/dubai-marina/2-bedroom-a.png diff --git a/public/images/unit-types/dubai-marina/1-bedroom-a-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-a-markers.jpg deleted file mode 100644 index 7962379..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-a-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-b-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-b-markers.jpg deleted file mode 100644 index 52b6ec4..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-b-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-c-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-c-markers.jpg deleted file mode 100644 index 5549639..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-c-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-d-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-d-markers.jpg deleted file mode 100644 index e339bc8..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-d-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-left.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-loft-a-left.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower-left.jpg diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower-markers.jpg deleted file mode 100644 index 8ce1803..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower-right.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-loft-a-right.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower-right.jpg diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower.jpg deleted file mode 100644 index 0ff5412..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper-left.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper-left.jpg new file mode 100644 index 0000000..83db530 Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper-left.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper-markers.jpg deleted file mode 100644 index 7443653..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper-right.jpg new file mode 100644 index 0000000..b13ed2c Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper.jpg deleted file mode 100644 index dc66351..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-a-upper.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-left.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-loft-b-left.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower-left.jpg diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower-markers.jpg deleted file mode 100644 index 69ceb47..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower-right.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-loft-b-right.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower-right.jpg diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower.jpg deleted file mode 100644 index 4efa16f..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper-left.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper-left.jpg new file mode 100644 index 0000000..57e2c4b Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper-left.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper-markers.jpg deleted file mode 100644 index 96a7be0..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper-right.jpg new file mode 100644 index 0000000..e6955a4 Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper.jpg deleted file mode 100644 index 90bc3a0..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-b-upper.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-left.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-left.jpg deleted file mode 100644 index 5713a87..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-left.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-left.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-left.jpg new file mode 100644 index 0000000..f8921a8 Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-left.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-markers.jpg deleted file mode 100644 index 50091f1..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-right.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-loft-c-right.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-right.jpg diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower.jpg deleted file mode 100644 index c6f5a63..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper-left.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper-left.jpg new file mode 100644 index 0000000..f315bdc Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper-left.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper-markers.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper-markers.jpg deleted file mode 100644 index 25af07e..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper-right.jpg new file mode 100644 index 0000000..1b8590a Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper.jpg deleted file mode 100644 index 8f7655f..0000000 Binary files a/public/images/unit-types/dubai-marina/1-bedroom-loft-c-upper.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/2-bedroom-a-markers.jpg b/public/images/unit-types/dubai-marina/2-bedroom-a-markers.jpg deleted file mode 100644 index 5c41afd..0000000 Binary files a/public/images/unit-types/dubai-marina/2-bedroom-a-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/2-bedroom-loft-left.jpg b/public/images/unit-types/dubai-marina/2-bedroom-loft-lower-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/2-bedroom-loft-left.jpg rename to public/images/unit-types/dubai-marina/2-bedroom-loft-lower-left.jpg diff --git a/public/images/unit-types/dubai-marina/2-bedroom-loft-lower-markers.jpg b/public/images/unit-types/dubai-marina/2-bedroom-loft-lower-markers.jpg deleted file mode 100644 index 0effb76..0000000 Binary files a/public/images/unit-types/dubai-marina/2-bedroom-loft-lower-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/2-bedroom-loft-right.jpg b/public/images/unit-types/dubai-marina/2-bedroom-loft-lower-right.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/2-bedroom-loft-right.jpg rename to public/images/unit-types/dubai-marina/2-bedroom-loft-lower-right.jpg diff --git a/public/images/unit-types/dubai-marina/2-bedroom-loft-lower.jpg b/public/images/unit-types/dubai-marina/2-bedroom-loft-lower.jpg deleted file mode 100644 index 247f6ee..0000000 Binary files a/public/images/unit-types/dubai-marina/2-bedroom-loft-lower.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/2-bedroom-loft-upper-left.jpg b/public/images/unit-types/dubai-marina/2-bedroom-loft-upper-left.jpg new file mode 100644 index 0000000..1f3cd62 Binary files /dev/null and b/public/images/unit-types/dubai-marina/2-bedroom-loft-upper-left.jpg differ diff --git a/public/images/unit-types/dubai-marina/2-bedroom-loft-upper-markers.jpg b/public/images/unit-types/dubai-marina/2-bedroom-loft-upper-markers.jpg deleted file mode 100644 index 4ad3874..0000000 Binary files a/public/images/unit-types/dubai-marina/2-bedroom-loft-upper-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/2-bedroom-loft-upper-right.jpg b/public/images/unit-types/dubai-marina/2-bedroom-loft-upper-right.jpg new file mode 100644 index 0000000..5450d18 Binary files /dev/null and b/public/images/unit-types/dubai-marina/2-bedroom-loft-upper-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/2-bedroom-loft-upper.jpg b/public/images/unit-types/dubai-marina/2-bedroom-loft-upper.jpg deleted file mode 100644 index 59a6408..0000000 Binary files a/public/images/unit-types/dubai-marina/2-bedroom-loft-upper.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/studio-2-a-markers.jpg b/public/images/unit-types/dubai-marina/studio-2-a-markers.jpg deleted file mode 100644 index fcf2945..0000000 Binary files a/public/images/unit-types/dubai-marina/studio-2-a-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/studio-2-b-markers.jpg b/public/images/unit-types/dubai-marina/studio-2-b-markers.jpg deleted file mode 100644 index ca03fb4..0000000 Binary files a/public/images/unit-types/dubai-marina/studio-2-b-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/dubai-marina/studio-2-c-markers.jpg b/public/images/unit-types/dubai-marina/studio-2-c-markers.jpg deleted file mode 100644 index d9d8f19..0000000 Binary files a/public/images/unit-types/dubai-marina/studio-2-c-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/1-bedroom-a-markers.jpg b/public/images/unit-types/marasi-drive/1-bedroom-a-markers.jpg deleted file mode 100644 index cee7583..0000000 Binary files a/public/images/unit-types/marasi-drive/1-bedroom-a-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/1-bedroom-a-right-markers.png b/public/images/unit-types/marasi-drive/1-bedroom-a-right-markers.png deleted file mode 100644 index 47ced88..0000000 Binary files a/public/images/unit-types/marasi-drive/1-bedroom-a-right-markers.png and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/1-bedroom-b-markers.jpg b/public/images/unit-types/marasi-drive/1-bedroom-b-markers.jpg deleted file mode 100644 index cd8f011..0000000 Binary files a/public/images/unit-types/marasi-drive/1-bedroom-b-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/1-bedroom-c-markers.jpg b/public/images/unit-types/marasi-drive/1-bedroom-c-markers.jpg deleted file mode 100644 index 3849c20..0000000 Binary files a/public/images/unit-types/marasi-drive/1-bedroom-c-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/1-bedroom-d-markers.jpg b/public/images/unit-types/marasi-drive/1-bedroom-d-markers.jpg deleted file mode 100644 index 7545291..0000000 Binary files a/public/images/unit-types/marasi-drive/1-bedroom-d-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/2-bedroom-a-markers.jpg b/public/images/unit-types/marasi-drive/2-bedroom-a-markers.jpg deleted file mode 100644 index 6aef580..0000000 Binary files a/public/images/unit-types/marasi-drive/2-bedroom-a-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/2-bedroom-b-markers.jpg b/public/images/unit-types/marasi-drive/2-bedroom-b-markers.jpg deleted file mode 100644 index 96cf839..0000000 Binary files a/public/images/unit-types/marasi-drive/2-bedroom-b-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/2-bedroom-b-left.jpg b/public/images/unit-types/marasi-drive/2-bedroom-b.jpg similarity index 100% rename from public/images/unit-types/marasi-drive/2-bedroom-b-left.jpg rename to public/images/unit-types/marasi-drive/2-bedroom-b.jpg diff --git a/public/images/unit-types/marasi-drive/studio-2-left-markers.jpg b/public/images/unit-types/marasi-drive/studio-2-left-markers.jpg deleted file mode 100644 index 6311172..0000000 Binary files a/public/images/unit-types/marasi-drive/studio-2-left-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/studio-2-right-markers.png b/public/images/unit-types/marasi-drive/studio-2-right-markers.png deleted file mode 100644 index bb676ae..0000000 Binary files a/public/images/unit-types/marasi-drive/studio-2-right-markers.png and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/studio-flex-left-markers.jpg b/public/images/unit-types/marasi-drive/studio-flex-left-markers.jpg deleted file mode 100644 index bfd1374..0000000 Binary files a/public/images/unit-types/marasi-drive/studio-flex-left-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/studio-flex-right-markers.png b/public/images/unit-types/marasi-drive/studio-flex-right-markers.png deleted file mode 100644 index 8fb1a2d..0000000 Binary files a/public/images/unit-types/marasi-drive/studio-flex-right-markers.png and /dev/null differ diff --git a/src/components/SliderWithTabs.tsx b/src/components/SliderWithTabs.tsx deleted file mode 100644 index d85201d..0000000 --- a/src/components/SliderWithTabs.tsx +++ /dev/null @@ -1,10 +0,0 @@ -interface SliderWithTabsProps { - tabs: string[]; - children: React.ReactNode; -} - -function SliderWithTabs({ tabs, children }: SliderWithTabsProps) { - return
; -} - -export default SliderWithTabs; diff --git a/src/components/UnitCard.tsx b/src/components/UnitCard.tsx index ed70106..aaf4343 100644 --- a/src/components/UnitCard.tsx +++ b/src/components/UnitCard.tsx @@ -11,7 +11,8 @@ import { Link } from "react-router"; import complexNameToSlug from "../utils/complexNameToSlug"; import { projects } from "../data/projects"; import { useEffect, useState } from "react"; -import getUnitTypeSlug from "../utils/getUnitTypeSlug"; +import { getUnitTypeVariantMarasiDrive } from "../utils/getUnitTypeVariantMarasiDrive"; +import { getUnitTypeVariantDubaiMarina } from "../utils/getUnitTypeVariantDubaiMarina"; function UnitCard({ unit }: { unit: Unit }) { const { favoriteUnits, setFavoriteUnits } = useFavoritesUnitsStore(); @@ -75,10 +76,11 @@ function UnitCard({ unit }: { unit: Unit }) {
diff --git a/src/components/UnitSlider.tsx b/src/components/UnitSlider.tsx new file mode 100644 index 0000000..f719fc6 --- /dev/null +++ b/src/components/UnitSlider.tsx @@ -0,0 +1,315 @@ +import { useEffect, useState } from "react"; +import { projects } from "../data/projects"; +import UnitTypeImageWithMarkers from "./UnitTypeImageWithMarkers"; +import Button from "./ui/Button"; +import { AnimatePresence, motion } from "framer-motion"; +import ChevronLeftIcon from "./icons/ChevronLeftIcon"; +import ChevronRightIcon from "./icons/ChevronRightIcon"; +import { useSwipeable } from "react-swipeable"; +import clsx from "clsx"; + +interface UnitSliderProps { + unitTypeVariant: string; + complexName: string; +} +// костыль: в Мараси 2 bedroom b ЕДИНСТВЕННАЯ НЕ ЗЕРКАЛЬНАЯ ХАТА среди всех +function UnitSlider({ unitTypeVariant, complexName }: UnitSliderProps) { + const [hasSide, setHasSide] = useState(false); + + const [selectedSide, setSelectedSide] = useState<"left" | "right">(); + + const [isLoft, setIsLoft] = useState(false); + + const [currentSlide, setCurrentSlide] = useState(0); + + useEffect( + () => + setSelectedSide( + hasSide || unitTypeVariant === "2-bedroom-b" ? undefined : "left" + ), + [hasSide, unitTypeVariant] + ); + + useEffect(() => { + setIsLoft(unitTypeVariant.includes("loft")); + setHasSide( + unitTypeVariant.endsWith("-left") || unitTypeVariant.endsWith("-right") + ); + }, [unitTypeVariant]); + + const handlers = useSwipeable({ + onSwipedLeft: () => + setCurrentSlide(Math.min(currentSlide + 1, isLoft ? 2 : 1)), + onSwipedRight: () => setCurrentSlide(Math.max(currentSlide - 1, 0)), + preventScrollOnSwipe: true, + touchEventOptions: { + passive: false, + }, + trackMouse: true, + }); + + return ( +
+ + {isLoft ? ( + <> + + + project.slug === complexName) + ?.types.find( + (type) => + type.slug === + (hasSide + ? unitTypeVariant + .split("-") + .slice(0, isLoft ? -2 : -1) + .join("-") + : unitTypeVariant) + )?.legend || [] + } + /> + + + + + project.slug === complexName) + ?.types.find( + (type) => + type.slug === + (hasSide + ? unitTypeVariant + .split("-") + .slice(0, isLoft ? -2 : -1) + .join("-") + : unitTypeVariant) + )?.legend || [] + } + /> + + + + ) : ( + + + project.slug === complexName) + ?.types.find( + (type) => + type.slug === + (hasSide + ? unitTypeVariant.split("-").slice(0, -1).join("-") + : unitTypeVariant) + )?.legend || [] + } + /> + + + )} +
+ +
+
+ + {!hasSide && + unitTypeVariant !== "2-bedroom-b" && + currentSlide !== (isLoft ? 2 : 1) && ( + +

Left

+
+ setSelectedSide(selectedSide === "left" ? "right" : "left") + } + > + +
+

Right

+
+ )} +
+
+ {isLoft ? ( + <> + + + + ) : ( + + )} + + {Array.from({ length: isLoft ? 3 : 2 }).map((_, index) => ( +
+ ))} +
+ + +
+ ); +} + +export default UnitSlider; diff --git a/src/components/UnitTypeCard.tsx b/src/components/UnitTypeCard.tsx index 038e479..8c2fe19 100644 --- a/src/components/UnitTypeCard.tsx +++ b/src/components/UnitTypeCard.tsx @@ -23,7 +23,9 @@ function UnitTypeCard({ project, type }: { project: Project; type: UnitType }) {
diff --git a/src/components/UnitTypeImageWithMarkers.tsx b/src/components/UnitTypeImageWithMarkers.tsx index fd60734..88386f9 100644 --- a/src/components/UnitTypeImageWithMarkers.tsx +++ b/src/components/UnitTypeImageWithMarkers.tsx @@ -1,13 +1,12 @@ -import { useEffect, useRef, useState } from "react"; -import { getUnitTypeVariantMarasiDrive } from "../utils/getUnitTypeVariantMarasiDrive"; -import { getUnitTypeVariantDubaiMarina } from "../utils/getUnitTypeVariantDubaiMarina"; +import { useRef, useState } from "react"; function UnitTypeImageWithMarkers({ complexName, legend, floor, - unitNumber, -}: { + unitTypeVariant, +}: // unitNumber, +{ complexName: string; legend: { name: string; @@ -16,7 +15,8 @@ function UnitTypeImageWithMarkers({ floor?: "lower" | "upper"; }[]; floor?: "lower" | "upper"; - unitNumber: string; + unitTypeVariant: string; + // unitNumber: string; }) { const refRect = useRef(null); const [hoveredIndex, setHoveredIndex] = useState(null); @@ -29,17 +29,15 @@ function UnitTypeImageWithMarkers({ return item.floor === floor; }); - console.log(legend, floor); + // const [unitTypeVariant, setUnitTypeVariant] = useState(); - const [unitTypeVariant, setUnitTypeVariant] = useState(); - - useEffect(() => { - setUnitTypeVariant( - complexName === "dubai-marina" - ? getUnitTypeVariantDubaiMarina(unitNumber) - : getUnitTypeVariantMarasiDrive(unitNumber) - ); - }, [complexName, unitNumber]); + // useEffect(() => { + // setUnitTypeVariant( + // complexName === "dubai-marina" + // ? getUnitTypeVariantDubaiMarina(unitNumber, floor) + // : getUnitTypeVariantMarasiDrive(unitNumber) + // ); + // }, [complexName, unitNumber, floor]); return ( (); - - useEffect(() => { - if (type.slug.includes("loft")) { - setSelectedFloor("lower"); - } - }, [type.slug]); - const { setModal } = useModalStore(); return (
-
- {/* {type.legend && ( -
- {type.legend.map((item, index) => ( -
-
-

- {index + 1} -

-
-

{item.name}

-
- ))} -
- )} */} - {/* - */} - - - - {type.slug.includes("loft") && ( -
- - -
- )} -
+
diff --git a/src/pages/UnitPage.tsx b/src/pages/UnitPage.tsx index daf2a78..8e494b8 100644 --- a/src/pages/UnitPage.tsx +++ b/src/pages/UnitPage.tsx @@ -10,12 +10,14 @@ import { useFavoritesUnitsStore } from "../stores/useFavoritesUnitsStore"; import HeartIcon from "../components/icons/HeartIcon"; import slugToComplexName from "../utils/slugToComplexName"; import getUnitTypeSlug from "../utils/getUnitTypeSlug"; -import { projects } from "../data/projects"; +// import { projects } from "../data/projects"; import { useEffect, useState } from "react"; -import UnitTypeImageWithMarkers from "../components/UnitTypeImageWithMarkers"; +// import UnitTypeImageWithMarkers from "../components/UnitTypeImageWithMarkers"; import { getUnitTypeVariantMarasiDrive } from "../utils/getUnitTypeVariantMarasiDrive"; import { formattedUnitTypes } from "../data/formattedUnitTypes"; +import UnitSlider from "../components/UnitSlider"; import { getUnitTypeVariantDubaiMarina } from "../utils/getUnitTypeVariantDubaiMarina"; +// import { getUnitTypeVariantDubaiMarina } from "../utils/getUnitTypeVariantDubaiMarina"; // import { useEffect } from "react"; // import PlayIcon from "../components/icons/PlayIcon"; // import { useRef } from "react"; @@ -69,8 +71,6 @@ function UnitPage() { else setFavoriteUnits([...favoriteUnits, unit]); } - // const videoButtonRef = useRef(null); - if (!unit) return null; function handleShare() { @@ -87,63 +87,22 @@ function UnitPage() {
-
- project.slug === params.complexName) - ?.types.find( - (type) => - type.slug === - (params.complexName === "marasi-drive" - ? getUnitTypeVariantMarasiDrive(unit.unitNo) - : getUnitTypeVariantDubaiMarina(unit.unitNo) - ) - .split("-") - .slice(0, -1) - .join("-") - )?.legend || [] - } - unitNumber={unit.unitNo} - /> - - {/* - */} - {getUnitTypeSlug(params.complexName!, unit.unitType).includes( - "loft" - ) && ( -
- - -
- )} -
+ +
diff --git a/src/pages/UnitTypeItemPage.tsx b/src/pages/UnitTypeItemPage.tsx index fab4445..72a1e82 100644 --- a/src/pages/UnitTypeItemPage.tsx +++ b/src/pages/UnitTypeItemPage.tsx @@ -19,6 +19,10 @@ function UnitTypeItemPage() { setUnitType(unitType); }, [unitTypeSlug]); + useEffect(() => { + console.log(unitType); + }, [unitType]); + if (unitType) { return (
diff --git a/src/utils/getUnitTypeVariantDubaiMarina.ts b/src/utils/getUnitTypeVariantDubaiMarina.ts index c6ef6af..327e3bb 100644 --- a/src/utils/getUnitTypeVariantDubaiMarina.ts +++ b/src/utils/getUnitTypeVariantDubaiMarina.ts @@ -1,9 +1,20 @@ export function getUnitTypeVariantDubaiMarina( - unitNumber: string + unitNumber: string, + loftFloor?: 'lower' | 'upper' ) { const isCombinable = unitNumber.endsWith('C') const formattedUnitNumber = isCombinable ? +unitNumber.slice(-4, -2) : +unitNumber.slice(-2); - const floor = +unitNumber.slice(0, isCombinable ? -4 : -2) + // const floor = +unitNumber.slice(0, isCombinable ? -4 : -2) + + if (loftFloor) { + if ([1, 7, 8, 14].includes(formattedUnitNumber)) return `1-bedroom-loft-c-${loftFloor}-${formattedUnitNumber % 7 === 0 ? 'left' : "right"}` + else if ([2, 9].includes(formattedUnitNumber)) return `1-bedroom-loft-b-${loftFloor}-right` + else if ([6, 13].includes(formattedUnitNumber)) return `1-bedroom-loft-b-${loftFloor}-left` + else if ([3, 5].includes(formattedUnitNumber)) return `2-bedroom-loft-${loftFloor}-right` + else if ([10, 12].includes(formattedUnitNumber)) return `2-bedroom-loft-${loftFloor}-left` + else if (formattedUnitNumber === 4) return `1-bedroom-loft-a-${loftFloor}-left` + return `1-bedroom-loft-a-${loftFloor}-right` + } if (isCombinable) { if ([2, 10, 13, 21].includes(formattedUnitNumber)) @@ -17,29 +28,19 @@ export function getUnitTypeVariantDubaiMarina( return '1-bedroom-b-left' } - if (floor >= 7 && floor <= 38) { - if ([4, 5, 7, 8].includes(formattedUnitNumber)) - return 'studio-2-a-right' - else if ([15, 16, 18, 19].includes(formattedUnitNumber)) - return 'studio-2-a-left' - else if ([3, 6, 9].includes(formattedUnitNumber)) - return '1-bedroom-a-right' - else if ([14, 17, 20].includes(formattedUnitNumber)) - return '1-bedroom-a-left' - else if ([2, 13].includes(formattedUnitNumber)) - return 'studio-2-b-left' - else if ([10, 21].includes(formattedUnitNumber)) - return 'studio-2-b-right' - else if ([11, 12].includes(formattedUnitNumber)) - return `studio-2-c-${formattedUnitNumber % 2 === 0 ? "left" : "right"}` - return '1-bedroom-b-left' - } - - if ([1, 7, 8, 14].includes(formattedUnitNumber)) return `1-bedroom-loft-c-${formattedUnitNumber % 7 === 0 ? 'left' : "right"}` - else if ([2, 9].includes(formattedUnitNumber)) return '1-bedroom-loft-b-right' - else if ([6, 13].includes(formattedUnitNumber)) return '1-bedroom-loft-b-left' - else if ([3, 5].includes(formattedUnitNumber)) return '2-bedroom-loft-right' - else if ([10, 12].includes(formattedUnitNumber)) return '2-bedroom-loft-left' - else if (formattedUnitNumber === 4) return '1-bedroom-loft-a-left' - return '1-bedroom-loft-a-right' + if ([4, 5, 7, 8].includes(formattedUnitNumber)) + return 'studio-2-a-right' + else if ([15, 16, 18, 19].includes(formattedUnitNumber)) + return 'studio-2-a-left' + else if ([3, 6, 9].includes(formattedUnitNumber)) + return '1-bedroom-a-right' + else if ([14, 17, 20].includes(formattedUnitNumber)) + return '1-bedroom-a-left' + else if ([2, 13].includes(formattedUnitNumber)) + return 'studio-2-b-left' + else if ([10, 21].includes(formattedUnitNumber)) + return 'studio-2-b-right' + else if ([11, 12].includes(formattedUnitNumber)) + return `studio-2-c-${formattedUnitNumber % 2 === 0 ? "left" : "right"}` + return '1-bedroom-b-left' } \ No newline at end of file diff --git a/src/utils/getUnitTypeVariantMarasiDrive.ts b/src/utils/getUnitTypeVariantMarasiDrive.ts index 08f1db0..9e13943 100644 --- a/src/utils/getUnitTypeVariantMarasiDrive.ts +++ b/src/utils/getUnitTypeVariantMarasiDrive.ts @@ -14,7 +14,7 @@ export const getUnitTypeVariantMarasiDrive = ( else if ([3, 6].includes(formattedUnitNumber)) return `1-bedroom-d-${formattedUnitNumber === 6 ? "left" : "right"}`; else if (formattedUnitNumber === 17) - return "2-bedroom-b-left"; + return "2-bedroom-b"; else if (formattedUnitNumber === 7) return '1-bedroom-a-right' else if (formattedUnitNumber === 8) return '1-bedroom-a-left' else if (formattedUnitNumber === 1) return '2-bedroom-a-left'