linter

applepie7864 · applepie7864 · commit dbc6971d5c79 · 2025-03-01T11:54:08.000-05:00
diff --git a/backend/services/implementation/miscImplementation.ts b/backend/services/implementation/miscImplementation.ts
@@ -7,10 +7,7 @@ class MiscService implements IMiscService {
       const today = new Date();
       const rooms = await prisma.participant.findMany({
         where: {
-          OR: [
-            { departure: "" },
-            { departure: { gte: today.toISOString() } },
-          ],
+          OR: [{ departure: "" }, { departure: { gte: today.toISOString() } }],
         },
         select: {
           roomNumber: true,
diff --git a/backend/services/implementation/participantImplementation.ts b/backend/services/implementation/participantImplementation.ts
@@ -6,7 +6,7 @@ class ParticipantService implements IParticipantService {
   async getAllParticipants(): Promise<Participant[]> {
     try {
       const participants = await prisma.participant.findMany({
-        orderBy: [{ departure: "asc" }, { arrival: "desc" }],
+        orderBy: [{ departure: "asc" }, { arrival: "asc" }],
       });
       return participants;
     } catch (err) {
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
@@ -65,7 +65,10 @@ const App = (): React.ReactElement => {
             {/* <Route path={ROUTES.HOME_PAGE} element={<HomePage />} /> */}
             {/* <Route path={ROUTES.SCHEDULE_PAGE} element={<SchedulePage />} /> */}
             {/* <Route path={ROUTES.ANNOUNCEMENTS_PAGE} element={<AnnouncementsPage />} /> */}
-            <Route path={ROUTES.PARTICIPANTS_PAGE} element={<ParticipantsPage />} />
+            <Route
+              path={ROUTES.PARTICIPANTS_PAGE}
+              element={<ParticipantsPage />}
+            />
             {/* <Route path={ROUTES.TASKS_PAGE} element={<TasksPage />} /> */}
             <Route path="*" element={<NotFoundPage />} />
           </Switch>
diff --git a/frontend/src/components/common/CommonTable.tsx b/frontend/src/components/common/CommonTable.tsx
@@ -203,41 +203,48 @@ const CommonTable = ({
                   />
                 </Th>
               ) : null}
-              {columnInfo.map((header, index) => header.display && (
-                <Th key={index}>
-                  <Flex alignItems="center">
-                    {header.header}
-                    <Flex
-                      alignItems="center"
-                      flexDirection="column"
-                      paddingLeft="2.5px"
-                    >
-                      <KeyboardArrowUpOutlinedIcon
-                        style={{
-                          height: "0.5em",
-                          cursor: "pointer",
-                          color:
-                            sortingColumn[header.key] === 1 ? "" : "#c4c8d8",
-                        }}
-                        onClick={() => {
-                          sortColumn(header.key);
-                        }}
-                      />
-                      <KeyboardArrowDownOutlinedIcon
-                        style={{
-                          height: "0.5em",
-                          cursor: "pointer",
-                          color:
-                            sortingColumn[header.key] === 2 ? "" : "#c4c8d8",
-                        }}
-                        onClick={() => {
-                          sortColumn(header.key);
-                        }}
-                      />
-                    </Flex>
-                  </Flex>
-                </Th>
-              ))}
+              {columnInfo.map(
+                (header, index) =>
+                  header.display && (
+                    <Th key={index}>
+                      <Flex alignItems="center">
+                        {header.header}
+                        <Flex
+                          alignItems="center"
+                          flexDirection="column"
+                          paddingLeft="2.5px"
+                        >
+                          <KeyboardArrowUpOutlinedIcon
+                            style={{
+                              height: "0.5em",
+                              cursor: "pointer",
+                              color:
+                                sortingColumn[header.key] === 1
+                                  ? ""
+                                  : "#c4c8d8",
+                            }}
+                            onClick={() => {
+                              sortColumn(header.key);
+                            }}
+                          />
+                          <KeyboardArrowDownOutlinedIcon
+                            style={{
+                              height: "0.5em",
+                              cursor: "pointer",
+                              color:
+                                sortingColumn[header.key] === 2
+                                  ? ""
+                                  : "#c4c8d8",
+                            }}
+                            onClick={() => {
+                              sortColumn(header.key);
+                            }}
+                          />
+                        </Flex>
+                      </Flex>
+                    </Th>
+                  ),
+              )}
               <Th />
             </Tr>
           </Thead>
@@ -262,16 +269,19 @@ const CommonTable = ({
                         />
                       </Td>
                     ) : null}
-                    {columnInfo.map((column, i) => column.display && (
-                      <Td
-                        onClick={() => {
-                          handleRowClick(row);
-                        }}
-                        key={i}
-                      >
-                        {String(row[column.key])}
-                      </Td>
-                    ))}
+                    {columnInfo.map(
+                      (column, i) =>
+                        column.display && (
+                          <Td
+                            onClick={() => {
+                              handleRowClick(row);
+                            }}
+                            key={i}
+                          >
+                            {String(row[column.key])}
+                          </Td>
+                        ),
+                    )}
                     <Td
                       onClick={(e) => {
                         e.stopPropagation();
diff --git a/frontend/src/components/common/FormInputField.tsx b/frontend/src/components/common/FormInputField.tsx
@@ -7,8 +7,7 @@ import {
   FormLabel,
   InputRightElement,
   InputGroup,
-  InputLeftElement,
-  FormErrorMessage,
+  InputLeftElement
 } from "@chakra-ui/react";
 
 import VisibilityIcon from "@mui/icons-material/Visibility";
diff --git a/frontend/src/components/common/FormSelectField.tsx b/frontend/src/components/common/FormSelectField.tsx
@@ -1,9 +1,7 @@
-import React, { useState } from "react";
+import React from "react";
 import {
-  Flex,
   FormControl,
   FormLabel,
-  FormErrorMessage,
   Select,
 } from "@chakra-ui/react";
 
diff --git a/frontend/src/components/common/ModalContainer.tsx b/frontend/src/components/common/ModalContainer.tsx
@@ -24,29 +24,18 @@ const ModalContainer = ({
   children,
 }: Props): React.ReactElement => {
   return (
-    <Modal
-      closeOnOverlayClick={false}
-      isOpen
-      onClose={() => {}}
-      isCentered
-    >
+    <Modal closeOnOverlayClick={false} isOpen onClose={() => {}} isCentered>
       <ModalOverlay />
       <ModalContent>
         <ModalHeader>
           {title}
-          { 
-            onDelete &&
-            <Button 
-              variant="del" 
-              gap="2px" 
-              onClick={onDelete}
-            >
+          {onDelete && (
+            <Button variant="del" gap="2px" onClick={onDelete}>
               <DeleteOutlinedIcon />
               Delete
             </Button>
-          }
-          {
-            close &&
+          )}
+          {close && (
             <Button
               bg="transparent"
               h="auto"
@@ -55,7 +44,7 @@ const ModalContainer = ({
             >
               <CloseIcon />
             </Button>
-          }
+          )}
         </ModalHeader>
         <ModalBody>{children}</ModalBody>
       </ModalContent>
diff --git a/frontend/src/components/common/SideBar.tsx b/frontend/src/components/common/SideBar.tsx
@@ -1,30 +1,18 @@
-import React, { useContext } from "react";
-import { gql, useMutation } from "@apollo/client";
+import React from "react";
 import {
   Tabs,
   TabList,
   Tab,
   Box,
   Button,
-  Avatar,
   Text,
-  Flex,
-  Heading,
-  useBreakpointValue,
+  Flex
 } from "@chakra-ui/react";
 import { useNavigate } from "react-router-dom";
 
 import * as Routes from "../../constants/routes";
 import { ReactComponent as Logo } from "../../assets/marillacPlaceLogo.svg";
 
-const mockAuthenticatedUser = {
-  id: "1",
-  type: "STAFF",
-  email: "janedoe@gmail.com",
-  firstName: "Jane",
-  lastName: "Doe",
-};
-
 const SideBarTab: React.FC<{ label: string; handleClick: () => void }> = ({
   label,
   handleClick,
diff --git a/frontend/src/components/pages/participants/AddParticipantCard.tsx b/frontend/src/components/pages/participants/AddParticipantCard.tsx
@@ -1,10 +1,5 @@
 import React, { useState } from "react";
-import {
-  Button,
-  Text,
-  Flex,
-  Spinner,
-} from "@chakra-ui/react";
+import { Button, Flex, Spinner } from "@chakra-ui/react";
 
 import { useMutation, useQuery, useLazyQuery } from "@apollo/client";
 import {
@@ -21,7 +16,9 @@ type AddParticipantCardProps = {
   close: () => void;
 };
 
-const AddParticipantCard = ({close}: AddParticipantCardProps): React.ReactElement => {
+const AddParticipantCard = ({
+  close,
+}: AddParticipantCardProps): React.ReactElement => {
   const [participantId, setParticipantId] = useState("");
   const [roomNumber, setRoomNumber] = useState("");
   const [arrivalDate, setArrivalDate] = useState("");
@@ -51,7 +48,9 @@ const AddParticipantCard = ({close}: AddParticipantCardProps): React.ReactElemen
       return false;
     }
     try {
-      const { data } = await getParticipantById({ variables: { participantId } });
+      const { data } = await getParticipantById({
+        variables: { participantId },
+      });
       if (data && data.getParticipantById) {
         setError("ID already exists.");
         return false;
@@ -83,7 +82,7 @@ const AddParticipantCard = ({close}: AddParticipantCardProps): React.ReactElemen
         window.location.reload();
       }
     } catch (err) {
-      setError("Unable to create participant.")
+      setError("Unable to create participant.");
       console.log(err);
     }
   };
diff --git a/frontend/src/components/pages/participants/EditParticipantCard.tsx b/frontend/src/components/pages/participants/EditParticipantCard.tsx
@@ -1,9 +1,5 @@
 import React, { useState } from "react";
-import {
-  Button,
-  Flex,
-  Spinner
-} from "@chakra-ui/react";
+import { Button, Flex, Spinner } from "@chakra-ui/react";
 
 import { useMutation, useQuery } from "@apollo/client";
 
@@ -20,7 +16,10 @@ type EditParticipantCardProps = {
   close: () => void;
 };
 
-const EditParticipantCard = ({selected, close}: EditParticipantCardProps): React.ReactElement => {
+const EditParticipantCard = ({
+  selected,
+  close,
+}: EditParticipantCardProps): React.ReactElement => {
   const [roomNumber, setRoomNumber] = useState(selected.roomNumber);
   const [arrivalDate, setArrivalDate] = useState(selected.arrival);
   const [departureDate, setDepartureDate] = useState(selected.departure);
@@ -38,7 +37,7 @@ const EditParticipantCard = ({selected, close}: EditParticipantCardProps): React
   const reset = () => {
     setRoomNumber(selected.roomNumber);
     setArrivalDate(selected.arrival);
-    setDepartureDate(selected.departure)
+    setDepartureDate(selected.departure);
     setPassword(selected.password);
     setError("");
   };
@@ -47,8 +46,13 @@ const EditParticipantCard = ({selected, close}: EditParticipantCardProps): React
     if (!roomNumber || !arrivalDate || !password) {
       setError("Missing fields.");
       return false;
-    } 
-    if (roomNumber === selected.roomNumber && arrivalDate === selected.arrival && departureDate === selected.departure && password === selected.password) {
+    }
+    if (
+      roomNumber === selected.roomNumber &&
+      arrivalDate === selected.arrival &&
+      departureDate === selected.departure &&
+      password === selected.password
+    ) {
       setError("No changes made.");
       return false;
     }
@@ -73,7 +77,7 @@ const EditParticipantCard = ({selected, close}: EditParticipantCardProps): React
         reset();
         close();
         window.location.reload();
-      } 
+      }
     } catch (err) {
       setError("Unable to update participant.");
       console.log(err);
@@ -86,7 +90,9 @@ const EditParticipantCard = ({selected, close}: EditParticipantCardProps): React
         {error && <Flex textColor="red.500">{error}</Flex>}
 
         <Flex flexDir="column">
-          <Flex mb="5px" color="gray.main" fontWeight="700">ID Number</Flex>
+          <Flex mb="5px" color="gray.main" fontWeight="700">
+            ID Number
+          </Flex>
           <Flex>{selected.participantId}</Flex>
         </Flex>
 
@@ -106,7 +112,9 @@ const EditParticipantCard = ({selected, close}: EditParticipantCardProps): React
                 display: `Room ${room}`,
               }),
             )}
-            onChange={(e) => setRoomNumber(e.target.value || selected.roomNumber)}
+            onChange={(e) =>
+              setRoomNumber(e.target.value || selected.roomNumber)
+            }
           />
         )}
 
@@ -155,4 +163,4 @@ const EditParticipantCard = ({selected, close}: EditParticipantCardProps): React
   );
 };
 
-export default EditParticipantCard;
+export default EditParticipantCard;
diff --git a/frontend/src/components/pages/participants/ParticipantsPage.tsx b/frontend/src/components/pages/participants/ParticipantsPage.tsx
