merge conflicts

calblueprint · Dec 6, 2024 · fe38f76 · fe38f76
1 parent feb8179
commit fe38f76
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/api/maps/AddMarkers.tsx b/api/maps/AddMarkers.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
 import ReactDOM from 'react-dom/client';
 import { Cluster, MarkerClusterer } from '@googlemaps/markerclusterer';
 import { useMap } from '@vis.gl/react-google-maps';

diff --git a/api/maps/style.ts b/api/maps/style.ts
@@ -0,0 +1,15 @@
+import { CSSProperties } from 'styled-components';
+
+export const InfoWindowStyle: CSSProperties = {
+  height: '0.3rem',
+  display: 'flex',
+  alignItems: 'center',
+  alignContent: 'center',
+  padding: '0.1rem 0',
+};
+
+/*= styled.div`
+  display: flex;
+  align-items: center;
+  height: 1rem;
+`;*/
diff --git a/components/Map/index.tsx b/components/Map/index.tsx
@@ -31,6 +31,7 @@ const mapId = '54eb1c7baba5a715'; // needed for AdvancedMarker
 export default function Map({
   projects,
   selectedProjectId,
+  filteredProjects,
   map,
   setMap,
   setSelectedProjectId,
@@ -57,7 +58,7 @@ export default function Map({
       >
         <AddMarkers
           projects={projects}
-        filteredProjects={filteredProjects}
+          filteredProjects={filteredProjects}
           map={map}
           setMap={setMap}
           selectedProjectId={selectedProjectId}