From a1b896b37fa8c23edeb7c03562bc8954ec335fa9 Mon Sep 17 00:00:00 2001 From: C4rnivore Date: Mon, 28 Jul 2025 16:00:24 +0500 Subject: [PATCH] upd --- src/components/AboutDubaiMarina.tsx | 4 ++-- src/components/AboutMarasiDrive.tsx | 4 ++-- src/components/{ => google-map}/GoogleMap.tsx | 2 +- .../{ => google-map}/GoogleMapFilterButtons.tsx | 12 ++++++------ .../{ => google-map}/GoogleMapMarkers.tsx | 4 ++-- .../{ => google-map}/GoogleMapMobile.tsx | 8 ++++---- src/components/{ui => google-map}/MapMarker.tsx | 0 src/components/icons/map/PinIcon.tsx | 14 ++++++-------- src/data/googleMapData.tsx | 2 +- 9 files changed, 24 insertions(+), 26 deletions(-) rename src/components/{ => google-map}/GoogleMap.tsx (97%) rename src/components/{ => google-map}/GoogleMapFilterButtons.tsx (88%) rename src/components/{ => google-map}/GoogleMapMarkers.tsx (96%) rename src/components/{ => google-map}/GoogleMapMobile.tsx (94%) rename src/components/{ui => google-map}/MapMarker.tsx (100%) diff --git a/src/components/AboutDubaiMarina.tsx b/src/components/AboutDubaiMarina.tsx index 272f9ec..9c83a07 100644 --- a/src/components/AboutDubaiMarina.tsx +++ b/src/components/AboutDubaiMarina.tsx @@ -20,9 +20,9 @@ import clsx from "clsx"; import Slider from "./Slider"; import PlusIcon from "./icons/map/PlusIcon"; import EqualIcon from "./icons/EqualIcon"; -import GoogleMap from "./GoogleMap"; +import GoogleMap from "./google-map/GoogleMap"; import { GoogleMapData } from "../data/googleMapData"; -import GoogleMapMobile from "./GoogleMapMobile"; +import GoogleMapMobile from "./google-map/GoogleMapMobile"; // import FullScreenButton from "./FullScreenButton"; function AboutDubaiMarina() { diff --git a/src/components/AboutMarasiDrive.tsx b/src/components/AboutMarasiDrive.tsx index c86e7ad..1258409 100644 --- a/src/components/AboutMarasiDrive.tsx +++ b/src/components/AboutMarasiDrive.tsx @@ -7,12 +7,12 @@ import MarariDriveNeighboursSliderDesktop from "./MarasiDriveNeighboursSliderDes import MarasiDriveInteriorsSlider from "./MarasiDriveInteriorsSlider"; import MarasiDriveInteriorsSliderMobile from "./MarasiDriveInteriorsSliderMobile"; import MarasiDriveNeighboursSliderMobile from "./MarasiDriveNeighboursSliderMobile"; -import GoogleMapMobile from "./GoogleMapMobile"; +import GoogleMapMobile from "./google-map/GoogleMapMobile"; import TextBox from "./ui/TextBox"; import { useRef } from "react"; import { useScroll } from "motion/react"; // import MarasiDriveMapCard from "./MarasiDriveMapCard"; -import GoogleMap from "./GoogleMap"; +import GoogleMap from "./google-map/GoogleMap"; import MarasiDriveNeighboursSliderTablet from "./MarasiDriveNeighboursSliderTablet"; import CustomScrollBar from "./ui/ScrollBar"; import BrochureButton from "./ui/BrochureButton"; diff --git a/src/components/GoogleMap.tsx b/src/components/google-map/GoogleMap.tsx similarity index 97% rename from src/components/GoogleMap.tsx rename to src/components/google-map/GoogleMap.tsx index eaf3a45..bf7690d 100644 --- a/src/components/GoogleMap.tsx +++ b/src/components/google-map/GoogleMap.tsx @@ -1,4 +1,4 @@ -import IGMapPoi from "../types/IGMapPoi"; +import IGMapPoi from "../../types/IGMapPoi"; import GoogleMapMarkers from "./GoogleMapMarkers"; import { Map, useMap } from "@vis.gl/react-google-maps"; import { useEffect, useState } from "react"; diff --git a/src/components/GoogleMapFilterButtons.tsx b/src/components/google-map/GoogleMapFilterButtons.tsx similarity index 88% rename from src/components/GoogleMapFilterButtons.tsx rename to src/components/google-map/GoogleMapFilterButtons.tsx index 29ca769..50ad5bd 100644 --- a/src/components/GoogleMapFilterButtons.tsx +++ b/src/components/google-map/GoogleMapFilterButtons.tsx @@ -1,10 +1,10 @@ import { useState } from "react"; -import AllIcon from "./icons/map/AllIcon"; -import EntertainmentIcon from "./icons/map/EntertainmentIcon"; -import HotelIcon from "./icons/map/HotelIcon"; -import MallsIcon from "./icons/map/MallsIcon"; -import OtherIcon from "./icons/map/OtherIcon"; -import Button from "./ui/Button"; +import AllIcon from "../icons/map/AllIcon"; +import EntertainmentIcon from "../icons/map/EntertainmentIcon"; +import HotelIcon from "../icons/map/HotelIcon"; +import MallsIcon from "../icons/map/MallsIcon"; +import OtherIcon from "../icons/map/OtherIcon"; +import Button from "../ui/Button"; import { AnimatePresence, motion } from "motion/react"; import { MapFilter } from "./GoogleMap"; diff --git a/src/components/GoogleMapMarkers.tsx b/src/components/google-map/GoogleMapMarkers.tsx similarity index 96% rename from src/components/GoogleMapMarkers.tsx rename to src/components/google-map/GoogleMapMarkers.tsx index ffd14cb..dbb55cb 100644 --- a/src/components/GoogleMapMarkers.tsx +++ b/src/components/google-map/GoogleMapMarkers.tsx @@ -1,7 +1,7 @@ import { useMap } from "@vis.gl/react-google-maps"; import { useEffect, useRef, useState } from "react"; -import IGMapPoi from "../types/IGMapPoi"; -import MapMarker from "./ui/MapMarker"; +import IGMapPoi from "../../types/IGMapPoi"; +import MapMarker from "./MapMarker"; import { MarkerClusterer, DefaultRenderer, diff --git a/src/components/GoogleMapMobile.tsx b/src/components/google-map/GoogleMapMobile.tsx similarity index 94% rename from src/components/GoogleMapMobile.tsx rename to src/components/google-map/GoogleMapMobile.tsx index 188714a..8696388 100644 --- a/src/components/GoogleMapMobile.tsx +++ b/src/components/google-map/GoogleMapMobile.tsx @@ -3,10 +3,10 @@ import { useEffect, useState } from "react"; // import CustomScrollBar from "./ui/ScrollBar"; // import { GoogleMapData } from "../data/googleMapData"; import GoogleMap from "./GoogleMap"; -import Button from "./ui/Button"; -import FullScreenIcon from "./icons/FullScreenIcon"; -import useModalStore from "../stores/useModalStore"; -import IGMapPoi from "../types/IGMapPoi"; +import Button from "../ui/Button"; +import FullScreenIcon from "../icons/FullScreenIcon"; +import useModalStore from "../../stores/useModalStore"; +import IGMapPoi from "../../types/IGMapPoi"; function GoogleMapMobile({ markers, diff --git a/src/components/ui/MapMarker.tsx b/src/components/google-map/MapMarker.tsx similarity index 100% rename from src/components/ui/MapMarker.tsx rename to src/components/google-map/MapMarker.tsx diff --git a/src/components/icons/map/PinIcon.tsx b/src/components/icons/map/PinIcon.tsx index 5ecd246..f35c2b5 100644 --- a/src/components/icons/map/PinIcon.tsx +++ b/src/components/icons/map/PinIcon.tsx @@ -1,12 +1,10 @@ export default function PinIcon() { return ( -
- - - -
+ + + ); } diff --git a/src/data/googleMapData.tsx b/src/data/googleMapData.tsx index 1e79aaa..4b48ff4 100644 --- a/src/data/googleMapData.tsx +++ b/src/data/googleMapData.tsx @@ -21,7 +21,7 @@ function GetMarkerHTML(name: string, primary: boolean = false) { {/* ADD POINTER FOR PRIMARY POINTS */} {primary && ( -
+
)}