diff --git a/src/app/components/Markers.tsx b/src/app/components/Markers.tsx index a202528..f8268c1 100644 --- a/src/app/components/Markers.tsx +++ b/src/app/components/Markers.tsx @@ -4,6 +4,7 @@ import { School } from "@mui/icons-material"; import { Feature, TypedFeatures } from "../../../types/mapTypes"; import Features from "../../../public/features.json"; import { getFacilityEsData } from "@/app/institutions/elasticQuery.js"; +import { Tooltip } from "@mui/material"; type MarkersProps = { onMarkerClick: (feature: Feature) => void; @@ -31,9 +32,11 @@ const Markers: React.FC = ({ onMarkerClick }) => { if (!esInfo) { // Handle cases where there's no matching institution in the ElasticSearch data. return null; + } if(esInfo.gpuProvided > 0) { + console.log({esInfo}); } - const typedFeature: TypedFeatures = { + const filteredFeature: TypedFeatures = { type: feature.type, properties: { "Institution Name": institutionName, @@ -52,11 +55,15 @@ const Markers: React.FC = ({ onMarkerClick }) => { return ( - onMarkerClick(typedFeature)} /> + + onMarkerClick(filteredFeature)} /> + ); }); diff --git a/src/app/components/Sidebar.tsx b/src/app/components/Sidebar.tsx index 1f7d844..faf3247 100644 --- a/src/app/components/Sidebar.tsx +++ b/src/app/components/Sidebar.tsx @@ -1,8 +1,9 @@ import React from 'react'; -import { Box, IconButton, Typography, useMediaQuery } from '@mui/material'; +import { Box, IconButton, Typography, useMediaQuery, Slide } from '@mui/material'; import { Close as CloseIcon } from '@mui/icons-material'; import useTheme from '@mui/material/styles/useTheme'; import { sub } from 'date-fns'; +import { motion } from 'framer-motion'; type SidebarProps = { onClose: () => void; @@ -54,6 +55,7 @@ const Sidebar: React.FC = ({ onClose, header, facultyName, dataSta orgId: 1 } return ( + = ({ onClose, header, facultyName, dataSta - + = ({ onClose, header, facultyName, dataSta facultyName={facultyName} /> - + = ({ onClose, header, facultyName, dataSta facultyName={facultyName} /> - + { dataState ? = ({ onClose, header, facultyName, dataSta } + ); };