Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Marker Popup Styling #757

Merged
merged 4 commits into from
Oct 26, 2023
Merged

Update Marker Popup Styling #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6ce0e4
Update Marker Popup Styling
KevinWu098 Oct 25, 2023
413f2ba
Update icon color
KevinWu098 Oct 25, 2023
a5d0dde
Update border and color
KevinWu098 Oct 25, 2023
0d0aa84
Adjust spacing
KevinWu098 Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion apps/antalmanac/src/components/Map/Map.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
}

/**
* Handle styling for the leaflet popup
*/
.leaflet-popup-content-wrapper {
border-radius: unset;
padding: 0;
width: 250px;
}
13 changes: 8 additions & 5 deletions apps/antalmanac/src/components/Map/Map.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,15 @@ export default function CourseMap() {
stackIndex={coursesSameBuildingPrior.length}
>
<Box>
<Typography variant="body2">
Class: {marker.title} {marker.sectionType}
<Typography variant="body1">
<span style={{ fontWeight: 'bold' }}>Class:</span> {marker.title}{' '}
{marker.sectionType}
</Typography>
<Typography variant="body2">
Room{allRoomsInBuilding.length > 1 && 's'}: {marker.locations[0].building}{' '}
{allRoomsInBuilding.join('/')}
<Typography variant="body1">
<span style={{ fontWeight: 'bold' }}>
Room{allRoomsInBuilding.length > 1 && 's'}:
</span>{' '}
{marker.locations[0].building} {allRoomsInBuilding.join('/')}
</Typography>
</Box>
</LocationMarker>
Expand Down
91 changes: 51 additions & 40 deletions apps/antalmanac/src/components/Map/Marker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { forwardRef, type Ref } from 'react';
import Leaflet from 'leaflet';
import { Marker, Popup } from 'react-leaflet';
import { Box, Button, Link, Typography } from '@mui/material';
import { DirectionsWalk as DirectionsWalkIcon } from '@mui/icons-material';
import { Box, Button, IconButton, Typography } from '@mui/material';
import { DirectionsWalk as DirectionsWalkIcon, Info } from '@mui/icons-material';

const GOOGLE_MAPS_URL = 'https://www.google.com/maps/dir/?api=1&travelmode=walking&destination=';
const IMAGE_CMS_URL = 'https://cms.concept3d.com/map/lib/image-cache/i.php?mapId=463&image=';
Expand Down Expand Up @@ -82,53 +82,64 @@ const LocationMarker = forwardRef(
<Popup>
<Box
sx={{
width: 200,
display: 'flex',
flexDirection: 'column',
gap: 0.5,
justifyContent: 'center',
m: 2,
width: 250,
}}
>
<Box>
{location ? (
<Link
href={`http://www.classrooms.uci.edu/classrooms/${acronym}`}
target="_blank"
rel="noopener noreferrer"
textAlign="center"
variant="h6"
>
{location}
</Link>
) : (
<Typography textAlign="center">{location}</Typography>
)}
</Box>

{image && (
<Box sx={{ mx: 'auto', my: 1, width: 150, height: 150 }}>
<Box
component="img"
src={`${IMAGE_CMS_URL}${image}`}
alt="Building Snapshot"
sx={{ width: 1, height: 1, objectFit: 'cover' }}
/>
</Box>
<Box
height={150}
borderRadius={'0.75rem 0.75rem 0 0'}
component="img"
src={`${IMAGE_CMS_URL}${image}`}
alt="Building Snapshot"
sx={{
objectFit: 'cover',
}}
/>
)}

{children}
<Box display="flex" flexDirection="column" mx={2} my={1.25} gap={1}>
<Box display="flex" flexDirection="column" gap={0.5}>
<Box display="flex" justifyContent="space-between" alignItems="flex-start">
<Typography fontSize={'1.25rem'} lineHeight={1.25} fontWeight={600}>
{location}
</Typography>
{location && (
<IconButton
href={`http://www.classrooms.uci.edu/classrooms/${acronym}`}
target="_blank"
size="medium"
sx={{ padding: 0 }}
>
<Info fontSize="large" color="primary" />
</IconButton>
)}
</Box>

<Button
variant="contained"
color="inherit"
startIcon={<DirectionsWalkIcon />}
href={`${GOOGLE_MAPS_URL}${lat},${lng}`}
target="_blank"
sx={{ alignSelf: 'center' }}
>
Directions
</Button>
{children}
</Box>

<Button
variant="contained"
color="primary"
startIcon={<DirectionsWalkIcon color="secondary" />}
href={`${GOOGLE_MAPS_URL}${lat},${lng}`}
target="_blank"
sx={{ alignSelf: 'center', width: '100%', borderRadius: '0.75rem' }}
>
<Typography
color="secondary"
fontSize={'1.25rem'}
letterSpacing={1.25}
fontWeight={500}
>
Directions
</Typography>
</Button>
</Box>
</Box>
</Popup>
</Marker>
Expand Down
Loading