diff --git a/src/components/home/Meeting.tsx b/src/components/home/Meeting.tsx index 24bf854..f908a1e 100644 --- a/src/components/home/Meeting.tsx +++ b/src/components/home/Meeting.tsx @@ -1,9 +1,8 @@ import ListItemButton from "@mui/material/ListItemButton"; -import ListItemText from "@mui/material/ListItemText"; import DetailedMeeting from "../../api-bodies/DetailedMeeting"; -import Grid from "@mui/material/Grid"; import { useAppDispatch } from "../../redux/hooks"; import { open } from "../../redux/slices/meetingDetailsOpenSlice"; +import { Box, Typography } from "@mui/material"; interface Props { meeting: DetailedMeeting; @@ -17,15 +16,15 @@ function Meeting(props: Props) { const dispatch = useAppDispatch(); return ( - dispatch(open(props.meeting))} className={"row meeting " + props.meetingClass}> - - - - - - - - + dispatch(open(props.meeting))} + component="a" + className={"row meeting " + props.meetingClass}> + + {props.meetingName} + {props.meetingTime.toUpperCase()} + {props.meetingMembers} + ); } diff --git a/src/components/home/MeetingsPanel.tsx b/src/components/home/MeetingsPanel.tsx index d48a0ff..f93fc15 100644 --- a/src/components/home/MeetingsPanel.tsx +++ b/src/components/home/MeetingsPanel.tsx @@ -30,6 +30,7 @@ const MeetingsPanel: React.FC = () => { // ); // participants.push(userLite); // }); + const [currentDate, setCurrentDate] = useState(new Date()); useEffect(() => { @@ -41,12 +42,12 @@ const MeetingsPanel: React.FC = () => { return (
- - Meetings in Progress + + Meetings in progress
- + {meetings.map((meeting) => { const meetingMembers: UserLite[] = []; participants.forEach((userLite) => { @@ -61,8 +62,20 @@ const MeetingsPanel: React.FC = () => { const currentDatemil = currentDate.getTime(); + const meetingMembersString = () => { + if (meetingMembers.length > 3) { + return "Participants: " + + meetingMembers[0].name + ", " + + meetingMembers[1].name + ", " + + meetingMembers[2].name + ", and " + + (meetingMembers.length - 3).toString() + " more..."; + } else { + return "Participants: " + meetingMembers.map((userLite) => (" " + userLite.name)).toString(); + } + }; + if (currentDatemil >= startDatemil && currentDatemil <= endDatemil) { - let lastMeetingClass = meetings.length == i ? " lastMeeting" : ""; + const lastMeetingClass = meetings.length == i ? " lastMeeting" : ""; i += 1; return ( { meetingClass={"meeting-" + (i - 1) + lastMeetingClass} meetingName={meeting.topic} meetingTime={formatTimeFromDate(startDate) + " - " + formatTimeFromDate(endDate)} - meetingMembers={meetingMembers.map((userLite) => (" " + userLite.name + " ")).toString()} + meetingMembers={meetingMembersString()} /> ); } diff --git a/src/components/home/ShortCuts.tsx b/src/components/home/ShortCuts.tsx index ca02e22..8d11651 100644 --- a/src/components/home/ShortCuts.tsx +++ b/src/components/home/ShortCuts.tsx @@ -26,7 +26,7 @@ const ShortCuts: React.FC = () => { - + Schedule Meeting @@ -38,7 +38,7 @@ const ShortCuts: React.FC = () => { open={open} handleClose={handleClose} /> - + Call Group