Merge pull request #55 from CPSC319-Winter-term-2/home

removed unused mockdata

src/components/home/CallFavouritesDialog.tsx

@@ -15,25 +15,16 @@ import { useAppSelector } from "../../redux/hooks";
 import { selectFavorites } from "../../redux/slices/favoritesSlice";
 import { selectTeam, selectUsers } from "../../redux/slices/usersSlice";
 import GroupSelect from "../sidebar/GroupSelect";
-import { SidebarUserObj } from "./Home";
 
 interface Props {
   open: boolean;
-  selectedValue: SidebarUserObj;
+  handleClose: () => void;
-  onClose: (value: SidebarUserObj) => void;
-  users: SidebarUserObj[];
 }
 
 const CallFavouritesDialog: React.FC<Props> = ({
   open,
-  selectedValue,
+  handleClose,
-  onClose,
-  users,
 }: Props) => {
-  const handleClose = () => {
-    onClose(selectedValue);
-  };
-  console.log(users);
 
   const [group, setGroup] = useState<string>("Favorites");
   const [inputText, setInputText] = useState<string>("");
@@ -60,6 +51,10 @@ const CallFavouritesDialog: React.FC<Props> = ({
     selectUsers(state, groupMembersUuids)
   );
 
+  const handleCall = () => {
+    handleClose();
+  };
+
   return (
     <Dialog onClose={handleClose} open={open} fullWidth maxWidth="sm">
       <DialogTitle>Select who to call:</DialogTitle>
@@ -107,7 +102,7 @@ const CallFavouritesDialog: React.FC<Props> = ({
       </DialogContent>
 
       <DialogActions>
-        <Button color="success" onClick={handleClose}>
+        <Button color="success" onClick={handleCall}>
           <Typography variant="button" color="black">
             Call
           </Typography>

src/components/home/Home.tsx

@@ -3,7 +3,6 @@ import ShortCuts from "./ShortCuts";
 import Container from "@mui/material/Container";
 import Grid from "@mui/material/Grid";
 import { MeetingStatus } from "../../utils";
-import { useState } from "react";
 
 export interface SidebarUserObj {
   id: number;
@@ -15,12 +14,12 @@ const Home: React.FC = () => {
   /* Temporary data - this is the same as what's in ProtectedRoute.tsx so it should not
   be duplicated like this in the future (Route components were being weird when I tried
   to pass it down from App.tsx) */
-  const [mockUsers] = useState<SidebarUserObj[]>([
+  // const [mockUsers] = useState<SidebarUserObj[]>([
-    { id: 0, name: "Jincheng L.", meetingStatus: MeetingStatus.NOT_IN_MEETING },
+  //   { id: 0, name: "Jincheng L.", meetingStatus: MeetingStatus.NOT_IN_MEETING },
-    { id: 1, name: "Matt B.", meetingStatus: MeetingStatus.IN_MEETING },
+  //   { id: 1, name: "Matt B.", meetingStatus: MeetingStatus.IN_MEETING },
-    { id: 2, name: "Taehee C.", meetingStatus: MeetingStatus.IN_MEETING },
+  //   { id: 2, name: "Taehee C.", meetingStatus: MeetingStatus.IN_MEETING },
-    { id: 3, name: "Bob A.", meetingStatus: MeetingStatus.NOT_IN_MEETING },
+  //   { id: 3, name: "Bob A.", meetingStatus: MeetingStatus.NOT_IN_MEETING },
-  ]);
+  // ]);
 
   return (
     <Container className="main-home">
@@ -29,7 +28,7 @@ const Home: React.FC = () => {
           <MeetingsPanel />
         </Grid>
         <Grid item sm={4}>
-          <ShortCuts users={mockUsers} />
+          <ShortCuts />
         </Grid>
       </Grid>
     </Container>

src/components/home/ShortCuts.tsx

@@ -1,27 +1,22 @@
 import PeopleIcon from "@mui/icons-material/People";
+// import AddIcon from "@mui/icons-material/Add";
 import PhoneEnabledIcon from "@mui/icons-material/PhoneEnabled";
+// import CircleIcon from "@mui/icons-material/Circle";
 import Button from "@mui/material/Button";
 import Grid from "@mui/material/Grid";
 import Typography from "@mui/material/Typography";
-import { SidebarUserObj } from "./Home";
 import CallFavouritesDialog from "./CallFavouritesDialog";
 import { useState } from "react";
 
-interface Props {
+const ShortCuts: React.FC = () => {
-  users: SidebarUserObj[];
-}
-
-const ShortCuts: React.FC<Props> = ({ users }: Props) => {
   const [open, setOpen] = useState(false);
-  const [selectedValue, setSelectedValue] = useState(users[0]);
 
   const handleClickOpen = () => {
     setOpen(true);
   };
 
-  const handleClose = (value: SidebarUserObj) => {
+  const handleClose = () => {
     setOpen(false);
-    setSelectedValue(value);
   };
 
   return (
@@ -40,10 +35,8 @@ const ShortCuts: React.FC<Props> = ({ users }: Props) => {
             <PhoneEnabledIcon className="icon" />
           </Button>
           <CallFavouritesDialog
-            selectedValue={selectedValue}
             open={open}
-            onClose={handleClose}
+            handleClose={handleClose}
-            users={users}
           />
           <Typography variant="h6" className="mylabel" sx={{ ml: 1 }}>
             Call Group

src/style/App.css.map

@@ -1,6 +1,6 @@
 {
     "version": 3,
-    "mappings": "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",
+    "mappings": "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",
     "sources": [
         "App.sass",
         "_variables.sass",

src/style/modules/_mainHome.sass

@@ -3,20 +3,20 @@
     // width: 100% !important
     max-width: 85% !important
     .meetings-panel
-        margin: auto
         margin-top: 15vh
+        padding-bottom: 10vh
         border-style: solid
-        border-color: $main-home-background-color
+        border-color: mistyrose
         border-width: 2px
         border-radius: 40px
-        width: 65%
+        width: 85%
         height: 65vh
         overflow: hidden
         .row
             width: 100%
         .panel-label
             text-align: center
-            background-color: grey
+            background-color: #AF000D
             padding-top: 2%
             padding-bottom: 2%
         // .current-time
@@ -29,8 +29,8 @@
         //     background-color: grey
         //     padding-bottom: 1%
         .meeting
-            background-color: $main-home-background-color
+            background-color: lightcoral
-            text-align: center
+            text-align: left
             margin-top: 15px
             line-height: 2
         .lastMeeting
@@ -43,16 +43,17 @@
             margin-top: 5vh
         .mylabel
             display: inline-block
-            margin: 0
+            margin-left: 25%
-            width: 100px
+            width: 125px
             text-align: center
         .tile
-            margin-right: 100%
+            margin-left: 25%
-            background-color: $main-home-background-color
+            margin-right: 50%
-            width: 100px
+            background-color: mistyrose
-            height: 100px
+            width: 125px
+            height: 125px
             border-radius: 16px
             .icon
                 color: black
-                width: 70%
+                width: 80%
-                height: 70%
+                height: 80%