diff --git a/src/pages/TripsPage/components/FlightDetailsModal/FlightDetailsModal.module.css b/src/pages/TripsPage/components/FlightDetailsModal/FlightDetailsModal.module.css index 3b90c6a..218eba2 100644 --- a/src/pages/TripsPage/components/FlightDetailsModal/FlightDetailsModal.module.css +++ b/src/pages/TripsPage/components/FlightDetailsModal/FlightDetailsModal.module.css @@ -1,102 +1,33 @@ -.modalBackdrop { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - background-color: rgba(0, 0, 0, 0.5); - display: flex; - justify-content: center; - align-items: center; - z-index: 1000; -} - -.modal { - background-color: white; - padding: 20px; - border-radius: 10px; - box-shadow: 0 8px 16px rgba(0, 0, 0, 0.2); - display: flex; - flex-direction: column; - width: 500px; - max-width: 90%; - font-family: "Inter", sans-serif; - position: relative; -} - -.header { - font-size: 24px; - font-weight: 600; - border-bottom: 2px solid #eaeaea; - padding-bottom: 20px; - margin-bottom: 20px; -} - -.flightInfo { - display: flex; - flex-direction: column; - gap: 13px; -} - -.from, -.to, -.flightTime, -.flightNum { +.label { font-size: 16px; - color: #333; + margin-right: 10px; + color: var(--miracle-color-black); + font-weight: 600; } -.from, -.to { +.row { display: flex; + margin-bottom: 1rem; align-items: center; } -.airplaneIcon1 { - color: #7597ce; - margin-right: 8px; -} - -.airplaneIcon2 { - color: #d07171; - margin-right: 8px; -} - -.flightTime, -.flightNum, -.confirmationNum { - padding-left: 26px; -} - -.exitIcon { - width: 16px; - height: 16px; - position: absolute; - top: 20px; - right: 20px; +.icon { + width: 1.5rem; } -.exitIcon:hover { - cursor: pointer; - color: #d07171; +.colorRed { + color: var(--miracle-color-red); } -.modalContent { - overflow-y: auto; /*idek if this is even neccessary*/ - padding: 0 20px; +.colorBlue { + color: var(--miracle-color-blue); } .footer { - text-align: center; - padding-top: 20px; - color: #7597ce; + display: flex; + justify-content: center; + margin-top: 20px; + color: var(--miracle-color-blue); font-weight: 700; -} - -.fromMargin { - margin-right: 100px; -} - -.toMargin { - margin-right: 120px; + font-size: 18px; } diff --git a/src/pages/TripsPage/components/FlightDetailsModal/FlightDetailsModal.tsx b/src/pages/TripsPage/components/FlightDetailsModal/FlightDetailsModal.tsx index 2ad52ec..d31ad5a 100644 --- a/src/pages/TripsPage/components/FlightDetailsModal/FlightDetailsModal.tsx +++ b/src/pages/TripsPage/components/FlightDetailsModal/FlightDetailsModal.tsx @@ -1,7 +1,6 @@ import styles from "./FlightDetailsModal.module.css"; import Modal from "../../../../components/Modal/Modal"; -import { faPlaneUp } from "@fortawesome/free-solid-svg-icons"; -import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import Icon from "../../../../components/CustomIcon/Icon"; import type { FlightDetailsModalProps } from "./FlightDetailsModal.definitions"; const FlightDetailsModal = ({ onClose, flight }: FlightDetailsModalProps) => { @@ -25,6 +24,16 @@ const FlightDetailsModal = ({ onClose, flight }: FlightDetailsModalProps) => { } } } + function formatDateString(dateString: string | number | Date) { + const date = new Date(dateString); + const formattedDate = + date.getMonth() + 1 + "/" + date.getDate() + "/" + date.getFullYear(); + const formattedTime = + date.getHours().toString().padStart(2, "0") + + ":" + + date.getMinutes().toString().padStart(2, "0"); + return formattedDate + " " + formattedTime; + } return ( { header="Flight Information" body={ <> -
-
- -
From:
{" "} - {flight["Departure Airport"]} -
-
- -
To:
{" "} - {flight["Arrival Airport"]} -
-
- Departure Time: {flight["Departure Date/Time"]} +
+
+
-
- Passengers: {joinWithCommasAndAnd(flight["Passenger Names"])} +
From:
{" "} + {flight["Departure Airport"]} +
+
+
+
+
To:
{flight["Arrival Airport"]} +
+
+
+
Departure Time:
+ {formatDateString(flight["Departure Date/Time"])} +
+
+
+
Passengers:
+ {joinWithCommasAndAnd(flight["Passenger Names"])}