Skip to content

replace html elements with MUI components in upcomingEvent.jsx #1842

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

Merged
merged 3 commits into from
Jan 27, 2025
Merged

replace html elements with MUI components in upcomingEvent.jsx #1842

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42e9f5e
replace html elements with MUI components in upcomingEvent.jsx
amachad4 Jan 22, 2025
4845474
Add 12pt left margin to event date and event location
amachad4 Jan 22, 2025
9bd86ce
Merge branch 'development' into update-html-to-mui-upcomingEvents
trillium Jan 27, 2025
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
33 changes: 17 additions & 16 deletions client/src/components/presentational/upcomingEvent.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,34 @@ import React from "react";
import { ReactComponent as ClockIcon } from "../../svg/Icon_Clock.svg";
import { ReactComponent as LocationIcon } from "../../svg/Icon_Location.svg";
import { Link } from "react-router-dom";
import { Box, Typography } from "@mui/material";

import moment from "moment";

const upcomingEvent = (props) => {
return props.nextEvent[0] ? (
<div className="warning-event">
<div className="warning-event-headers">
<p className="event-name">{props.nextEvent[0].name}</p>
<div className="event-info-wrapper">
<Box className="warning-event">
<Box className="warning-event-headers">
<Typography className="event-name">{props.nextEvent[0].name}</Typography>
<Box className="event-info-wrapper">
<ClockIcon />
<p className="event-info">
<Typography className="event-info" sx={{ margin: '0px 0px 0px 12px' }}>
{moment(props.nextEvent[0].date).format(
"ddd, MMM D @ h:mm a"
)}
</p>
</div>
</Typography>
</Box>
{props.nextEvent[0].location.city !== "" &&
<div className="event-info-wrapper">
<Box className="event-info-wrapper">
<LocationIcon />
<p className="event-info">
<Typography className="event-info" sx={{ margin: '0px 0px 0px 12px' }}>
{props.nextEvent[0].location.city},{" "}
{props.nextEvent[0].location.state}
</p>
</div>
</Typography>
</Box>
}
</div>
<div className="warning-event-toggle">
</Box>
<Box className="warning-event-toggle">
{props.nextEvent[0] && props.isCheckInReady === false ? (
<Link
to={`/events/${props.nextEvent[0]._id}`}
Expand All @@ -50,10 +51,10 @@ const upcomingEvent = (props) => {
CLOSE CHECK-IN
</Link>
)}
</div>
</div>
</Box>
</Box>
) : (
<div>No events coming up!</div>
<Box>No events coming up!</Box>
);
};
export default upcomingEvent;
Loading