diff --git a/public/images/interiors/dubai-marina/1-bedroom-a.png b/public/images/interiors/dubai-marina/1-bedroom-a.png new file mode 100644 index 0000000..790f303 Binary files /dev/null and b/public/images/interiors/dubai-marina/1-bedroom-a.png differ diff --git a/public/images/interiors/dubai-marina/1-bedroom-b.png b/public/images/interiors/dubai-marina/1-bedroom-b.png new file mode 100644 index 0000000..f0469c9 Binary files /dev/null and b/public/images/interiors/dubai-marina/1-bedroom-b.png differ diff --git a/public/images/interiors/dubai-marina/1-bedroom-c.png b/public/images/interiors/dubai-marina/1-bedroom-c.png new file mode 100644 index 0000000..f514f06 Binary files /dev/null and b/public/images/interiors/dubai-marina/1-bedroom-c.png differ diff --git a/public/images/interiors/dubai-marina/1-bedroom-d.png b/public/images/interiors/dubai-marina/1-bedroom-d.png new file mode 100644 index 0000000..82cc045 Binary files /dev/null and b/public/images/interiors/dubai-marina/1-bedroom-d.png differ diff --git a/public/images/interiors/dubai-marina/1-bedroom-loft-a.png b/public/images/interiors/dubai-marina/1-bedroom-loft-a.png new file mode 100644 index 0000000..d4f0f3d Binary files /dev/null and b/public/images/interiors/dubai-marina/1-bedroom-loft-a.png differ 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/1-bedroom-loft-c.png b/public/images/interiors/dubai-marina/1-bedroom-loft-c.png new file mode 100644 index 0000000..c4b9eac Binary files /dev/null and b/public/images/interiors/dubai-marina/1-bedroom-loft-c.png differ diff --git a/public/images/interiors/dubai-marina/2-bedroom-a.png b/public/images/interiors/dubai-marina/2-bedroom-a.png new file mode 100644 index 0000000..d69dc2a Binary files /dev/null and b/public/images/interiors/dubai-marina/2-bedroom-a.png differ diff --git a/public/images/interiors/dubai-marina/2-bedroom-loft.png b/public/images/interiors/dubai-marina/2-bedroom-loft.png new file mode 100644 index 0000000..e623924 Binary files /dev/null and b/public/images/interiors/dubai-marina/2-bedroom-loft.png differ diff --git a/public/images/interiors/dubai-marina/studio-2-a.png b/public/images/interiors/dubai-marina/studio-2-a.png new file mode 100644 index 0000000..fcf0e9d Binary files /dev/null and b/public/images/interiors/dubai-marina/studio-2-a.png differ diff --git a/public/images/interiors/dubai-marina/studio-2-b.png b/public/images/interiors/dubai-marina/studio-2-b.png new file mode 100644 index 0000000..587b9d7 Binary files /dev/null and b/public/images/interiors/dubai-marina/studio-2-b.png differ diff --git a/public/images/interiors/dubai-marina/studio-2-c.png b/public/images/interiors/dubai-marina/studio-2-c.png new file mode 100644 index 0000000..eb528ed Binary files /dev/null and b/public/images/interiors/dubai-marina/studio-2-c.png differ diff --git a/public/images/interiors/marasi-drive/1-bedroom.png b/public/images/interiors/marasi-drive/1-bedroom.png new file mode 100644 index 0000000..8c7c91e Binary files /dev/null and b/public/images/interiors/marasi-drive/1-bedroom.png differ diff --git a/public/images/interiors/marasi-drive/2-bedroom.png b/public/images/interiors/marasi-drive/2-bedroom.png new file mode 100644 index 0000000..bf2dc40 Binary files /dev/null and b/public/images/interiors/marasi-drive/2-bedroom.png differ diff --git a/public/images/interiors/marasi-drive/studio-2.png b/public/images/interiors/marasi-drive/studio-2.png new file mode 100644 index 0000000..3cc4c67 Binary files /dev/null and b/public/images/interiors/marasi-drive/studio-2.png differ diff --git a/public/images/interiors/marasi-drive/studio-flex.png b/public/images/interiors/marasi-drive/studio-flex.png new file mode 100644 index 0000000..66ef638 Binary files /dev/null and b/public/images/interiors/marasi-drive/studio-flex.png differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-a.jpg b/public/images/unit-types/dubai-marina/1-bedroom-a-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-a.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-a-left.jpg 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-a-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-a-right.jpg new file mode 100644 index 0000000..8d26472 Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-a-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-b.jpg b/public/images/unit-types/dubai-marina/1-bedroom-b-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-b.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-b-left.jpg 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-b-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-b-right.jpg new file mode 100644 index 0000000..de2a995 Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-b-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-c.jpg b/public/images/unit-types/dubai-marina/1-bedroom-c-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-c.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-c-left.jpg 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-c-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-c-right.jpg new file mode 100644 index 0000000..b985d5e Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-c-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-d.jpg b/public/images/unit-types/dubai-marina/1-bedroom-d-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-d.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-d-left.jpg 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-d-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-d-right.jpg new file mode 100644 index 0000000..48376d0 Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-d-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/1-bedroom-loft-a.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.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-lower-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower-right.jpg new file mode 100644 index 0000000..c676273 Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-a-lower-right.jpg differ 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.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.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-lower-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower-right.jpg new file mode 100644 index 0000000..29a84da Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-b-lower-right.jpg differ 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.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/1-bedroom-loft-c.jpg rename to public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-left.jpg 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-lower-right.jpg b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-right.jpg new file mode 100644 index 0000000..b1fb53d Binary files /dev/null and b/public/images/unit-types/dubai-marina/1-bedroom-loft-c-lower-right.jpg differ 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.jpg b/public/images/unit-types/dubai-marina/2-bedroom-a-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/2-bedroom-a.jpg rename to public/images/unit-types/dubai-marina/2-bedroom-a-left.jpg 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-a-right.jpg b/public/images/unit-types/dubai-marina/2-bedroom-a-right.jpg new file mode 100644 index 0000000..eb9f714 Binary files /dev/null and b/public/images/unit-types/dubai-marina/2-bedroom-a-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/2-bedroom-loft.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.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-lower-right.jpg b/public/images/unit-types/dubai-marina/2-bedroom-loft-lower-right.jpg new file mode 100644 index 0000000..4ea4892 Binary files /dev/null and b/public/images/unit-types/dubai-marina/2-bedroom-loft-lower-right.jpg differ 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.jpg b/public/images/unit-types/dubai-marina/studio-2-a-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/studio-2-a.jpg rename to public/images/unit-types/dubai-marina/studio-2-a-left.jpg 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-a-right.jpg b/public/images/unit-types/dubai-marina/studio-2-a-right.jpg new file mode 100644 index 0000000..413b877 Binary files /dev/null and b/public/images/unit-types/dubai-marina/studio-2-a-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/studio-2-b.jpg b/public/images/unit-types/dubai-marina/studio-2-b-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/studio-2-b.jpg rename to public/images/unit-types/dubai-marina/studio-2-b-left.jpg 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-b-right.jpg b/public/images/unit-types/dubai-marina/studio-2-b-right.jpg new file mode 100644 index 0000000..295898d Binary files /dev/null and b/public/images/unit-types/dubai-marina/studio-2-b-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/studio-2-c.jpg b/public/images/unit-types/dubai-marina/studio-2-c-left.jpg similarity index 100% rename from public/images/unit-types/dubai-marina/studio-2-c.jpg rename to public/images/unit-types/dubai-marina/studio-2-c-left.jpg 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/dubai-marina/studio-2-c-right.jpg b/public/images/unit-types/dubai-marina/studio-2-c-right.jpg new file mode 100644 index 0000000..5f8394e Binary files /dev/null and b/public/images/unit-types/dubai-marina/studio-2-c-right.jpg differ diff --git a/public/images/unit-types/dubai-marina/studio-2-c.png b/public/images/unit-types/dubai-marina/studio-2-c.png deleted file mode 100644 index 1db11cc..0000000 Binary files a/public/images/unit-types/dubai-marina/studio-2-c.png and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/1-bedroom-a.jpg b/public/images/unit-types/marasi-drive/1-bedroom-a-left.jpg similarity index 100% rename from public/images/unit-types/marasi-drive/1-bedroom-a.jpg rename to public/images/unit-types/marasi-drive/1-bedroom-a-left.jpg 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.jpg b/public/images/unit-types/marasi-drive/1-bedroom-a-right.jpg new file mode 100644 index 0000000..d3f0f6f Binary files /dev/null and b/public/images/unit-types/marasi-drive/1-bedroom-a-right.jpg differ diff --git a/public/images/unit-types/marasi-drive/1-bedroom-b.jpg b/public/images/unit-types/marasi-drive/1-bedroom-b-left.jpg similarity index 100% rename from public/images/unit-types/marasi-drive/1-bedroom-b.jpg rename to public/images/unit-types/marasi-drive/1-bedroom-b-left.jpg 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-b-right.jpg b/public/images/unit-types/marasi-drive/1-bedroom-b-right.jpg new file mode 100644 index 0000000..304c842 Binary files /dev/null and b/public/images/unit-types/marasi-drive/1-bedroom-b-right.jpg differ diff --git a/public/images/unit-types/marasi-drive/1-bedroom-c.jpg b/public/images/unit-types/marasi-drive/1-bedroom-c-left.jpg similarity index 100% rename from public/images/unit-types/marasi-drive/1-bedroom-c.jpg rename to public/images/unit-types/marasi-drive/1-bedroom-c-left.jpg 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-c-right.jpg b/public/images/unit-types/marasi-drive/1-bedroom-c-right.jpg new file mode 100644 index 0000000..71ea9eb Binary files /dev/null and b/public/images/unit-types/marasi-drive/1-bedroom-c-right.jpg differ diff --git a/public/images/unit-types/marasi-drive/1-bedroom-d.jpg b/public/images/unit-types/marasi-drive/1-bedroom-d-left.jpg similarity index 100% rename from public/images/unit-types/marasi-drive/1-bedroom-d.jpg rename to public/images/unit-types/marasi-drive/1-bedroom-d-left.jpg 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/1-bedroom-d-right.jpg b/public/images/unit-types/marasi-drive/1-bedroom-d-right.jpg new file mode 100644 index 0000000..ad58fc5 Binary files /dev/null and b/public/images/unit-types/marasi-drive/1-bedroom-d-right.jpg differ diff --git a/public/images/unit-types/marasi-drive/2-bedroom-a.jpg b/public/images/unit-types/marasi-drive/2-bedroom-a-left.jpg similarity index 100% rename from public/images/unit-types/marasi-drive/2-bedroom-a.jpg rename to public/images/unit-types/marasi-drive/2-bedroom-a-left.jpg 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-a-right.jpg b/public/images/unit-types/marasi-drive/2-bedroom-a-right.jpg new file mode 100644 index 0000000..54b34ac Binary files /dev/null and b/public/images/unit-types/marasi-drive/2-bedroom-a-right.jpg 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/studio-2.jpg b/public/images/unit-types/marasi-drive/studio-2-left.jpg similarity index 100% rename from public/images/unit-types/marasi-drive/studio-2.jpg rename to public/images/unit-types/marasi-drive/studio-2-left.jpg diff --git a/public/images/unit-types/marasi-drive/studio-2-markers.jpg b/public/images/unit-types/marasi-drive/studio-2-markers.jpg deleted file mode 100644 index 6311172..0000000 Binary files a/public/images/unit-types/marasi-drive/studio-2-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/studio-2-right.jpg b/public/images/unit-types/marasi-drive/studio-2-right.jpg new file mode 100644 index 0000000..9ce793c Binary files /dev/null and b/public/images/unit-types/marasi-drive/studio-2-right.jpg differ diff --git a/public/images/unit-types/marasi-drive/studio-flex.jpg b/public/images/unit-types/marasi-drive/studio-flex-left.jpg similarity index 100% rename from public/images/unit-types/marasi-drive/studio-flex.jpg rename to public/images/unit-types/marasi-drive/studio-flex-left.jpg diff --git a/public/images/unit-types/marasi-drive/studio-flex-markers.jpg b/public/images/unit-types/marasi-drive/studio-flex-markers.jpg deleted file mode 100644 index bfd1374..0000000 Binary files a/public/images/unit-types/marasi-drive/studio-flex-markers.jpg and /dev/null differ diff --git a/public/images/unit-types/marasi-drive/studio-flex-right.jpg b/public/images/unit-types/marasi-drive/studio-flex-right.jpg new file mode 100644 index 0000000..6c7b9d3 Binary files /dev/null and b/public/images/unit-types/marasi-drive/studio-flex-right.jpg differ diff --git a/public/videos/studio_flex_bed.mp4 b/public/videos/studio_flex_bed.mp4 new file mode 100644 index 0000000..8df14b4 Binary files /dev/null and b/public/videos/studio_flex_bed.mp4 differ 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 c48c345..7eb2c32 100644 --- a/src/components/UnitTypeCard.tsx +++ b/src/components/UnitTypeCard.tsx @@ -23,7 +23,10 @@ function UnitTypeCard({ project, type }: { project: Project; type: UnitType }) {
diff --git a/src/components/UnitTypeImageWithMarkers.tsx b/src/components/UnitTypeImageWithMarkers.tsx index 2cc2209..88386f9 100644 --- a/src/components/UnitTypeImageWithMarkers.tsx +++ b/src/components/UnitTypeImageWithMarkers.tsx @@ -2,33 +2,43 @@ import { useRef, useState } from "react"; function UnitTypeImageWithMarkers({ complexName, - unitType, legend, floor, -}: { + unitTypeVariant, +}: // unitNumber, +{ complexName: string; - unitType: string; legend: { name: string; - x: number; - y: number; + x: [number, number]; + y: [number, number]; floor?: "lower" | "upper"; }[]; floor?: "lower" | "upper"; + unitTypeVariant: string; + // unitNumber: string; }) { - console.log(complexName, unitType, floor); - const refRect = useRef(null); const [hoveredIndex, setHoveredIndex] = useState(null); // Фильтруем legend по floor - const filteredLegend = legend.filter(item => { + const filteredLegend = legend.filter((item) => { // Если у элемента нет поля floor, показываем всегда if (!item.floor) return true; // Если у элемента есть поле floor, показываем только если оно совпадает с переданным floor return item.floor === floor; }); + // const [unitTypeVariant, setUnitTypeVariant] = useState(); + + // useEffect(() => { + // setUnitTypeVariant( + // complexName === "dubai-marina" + // ? getUnitTypeVariantDubaiMarina(unitNumber, floor) + // : getUnitTypeVariantMarasiDrive(unitNumber) + // ); + // }, [complexName, unitNumber, floor]); + return ( setHoveredIndex(index)} onMouseLeave={() => setHoveredIndex(null)} /> @@ -82,13 +91,17 @@ function UnitTypeImageWithMarkers({ {filteredLegend.map((item, index) => ( (); - - 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") && ( -
- - -
- )} -
+
@@ -117,6 +56,32 @@ function UnitTypeItem({ project, type }: UnitTypeItemProps) {

+ {![ + "1-bedroom-d", + "2-bedroom-a", + "1-bedroom-loft-a", + "1-bedroom-loft-b", + "1-bedroom-loft-c", + ].includes(type.slug) && ( + + )} {/* {type.video && (
diff --git a/src/components/VideoModal.tsx b/src/components/VideoModal.tsx index ad7f1a8..8580fb3 100644 --- a/src/components/VideoModal.tsx +++ b/src/components/VideoModal.tsx @@ -1,9 +1,9 @@ function VideoModal({ src }: { src: string }) { return ( -
+