From 99054f7e7256139b591d9344445a75dc99c7e240 Mon Sep 17 00:00:00 2001
From: Emir Icyer <emiricyer07@gmail.com>
Date: Sat, 28 Feb 2026 09:38:51 -0500
Subject: [PATCH 01/10] Request ride workflow UI

---
 frontend/package-lock.json                    |   40 +-
 frontend/src/components/Modal/Modal.tsx       |    4 +-
 .../src/components/Modal/modal.module.css     |   11 +-
 .../CreateOrEditRideModal.tsx                 |   42 +-
 .../RequestRideModal/CustomDatePicker.tsx     |  260 +++
 .../RequestRideModal/CustomTimePicker.tsx     |  181 +++
 .../RequestRideModal/RequestRideWizard.tsx    |  160 ++
 .../requestridemodal.module.css               | 1420 +++++++++++++++++
 .../RequestRideModal/steps/DateStep.tsx       |  363 +++++
 .../steps/DropoffLocationStep.tsx             |  470 ++++++
 .../steps/PickupLocationStep.tsx              |  451 ++++++
 .../steps/RequestSummaryStep.tsx              |  591 +++++++
 .../RequestRideModal/steps/SummaryStep.tsx    |  135 ++
 .../RiderComponents/RequestRideMap.tsx        |   65 +-
 frontend/src/pages/Rider/Schedule.tsx         |   95 +-
 frontend/src/util/index.tsx                   |   16 +
 16 files changed, 4162 insertions(+), 142 deletions(-)
 create mode 100644 frontend/src/components/RequestRideModal/CustomDatePicker.tsx
 create mode 100644 frontend/src/components/RequestRideModal/CustomTimePicker.tsx
 create mode 100644 frontend/src/components/RequestRideModal/RequestRideWizard.tsx
 create mode 100644 frontend/src/components/RequestRideModal/steps/DateStep.tsx
 create mode 100644 frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
 create mode 100644 frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
 create mode 100644 frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
 create mode 100644 frontend/src/components/RequestRideModal/steps/SummaryStep.tsx

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 2a1343513..607c82c03 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -102,7 +102,6 @@
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz",
       "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.27.1",
         "@babel/generator": "^7.28.3",
@@ -758,7 +757,6 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.27.1.tgz",
       "integrity": "sha512-p9OkPbZ5G7UT1MofwYFigGebnrzGJacoBSQM0/6bi/PUMVE+qlWDD/OalvQKbwgQzU6dl0xAv6r4X7Jme0RYxA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.27.1"
       },
@@ -1642,7 +1640,6 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz",
       "integrity": "sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.27.1",
         "@babel/helper-module-imports": "^7.27.1",
@@ -2471,7 +2468,6 @@
       "resolved": "https://registry.npmjs.org/@emotion/react/-/react-11.14.0.tgz",
       "integrity": "sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -2515,7 +2511,6 @@
       "resolved": "https://registry.npmjs.org/@emotion/styled/-/styled-11.14.1.tgz",
       "integrity": "sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.3",
         "@emotion/babel-plugin": "^11.13.5",
@@ -3876,7 +3871,6 @@
       "resolved": "https://registry.npmjs.org/@mui/material/-/material-6.5.0.tgz",
       "integrity": "sha512-yjvtXoFcrPLGtgKRxFaH6OQPtcLPhkloC0BML6rBG5UeldR0nPULR/2E2BfXdo5JNV7j7lOzrrLX2Qf/iSidow==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.26.0",
         "@mui/core-downloads-tracker": "^6.5.0",
@@ -4027,6 +4021,7 @@
       "resolved": "https://registry.npmjs.org/@mui/private-theming/-/private-theming-7.3.2.tgz",
       "integrity": "sha512-ha7mFoOyZGJr75xeiO9lugS3joRROjc8tG1u4P50dH0KR7bwhHznVMcYg7MouochUy0OxooJm/OOSpJ7gKcMvg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.3",
         "@mui/utils": "^7.3.2",
@@ -4054,6 +4049,7 @@
       "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.6.tgz",
       "integrity": "sha512-NVBbIw+4CDMMppNamVxyTccNv0WxtDb7motWDlMeSC8Oy95saj1TIZMGynPpFLePt3yOD8TskzumeqORCgRGWw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.3"
       },
@@ -4071,6 +4067,7 @@
       "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.3.2.tgz",
       "integrity": "sha512-4DMWQGenOdLnM3y/SdFQFwKsCLM+mqxzvoWp9+x2XdEzXapkznauHLiXtSohHs/mc0+5/9UACt1GdugCX2te5g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.3",
         "@mui/types": "^7.4.6",
@@ -4101,6 +4098,7 @@
       "resolved": "https://registry.npmjs.org/@mui/styled-engine/-/styled-engine-7.3.2.tgz",
       "integrity": "sha512-PkJzW+mTaek4e0nPYZ6qLnW5RGa0KN+eRTf5FA2nc7cFZTeM+qebmGibaTLrgQBy3UpcpemaqfzToBNkzuxqew==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.3",
         "@emotion/cache": "^11.14.0",
@@ -4135,6 +4133,7 @@
       "resolved": "https://registry.npmjs.org/@mui/system/-/system-7.3.2.tgz",
       "integrity": "sha512-9d8JEvZW+H6cVkaZ+FK56R53vkJe3HsTpcjMUtH8v1xK6Y1TjzHdZ7Jck02mGXJsE6MQGWVs3ogRHTQmS9Q/rA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.3",
         "@mui/private-theming": "^7.3.2",
@@ -4175,6 +4174,7 @@
       "resolved": "https://registry.npmjs.org/@mui/types/-/types-7.4.6.tgz",
       "integrity": "sha512-NVBbIw+4CDMMppNamVxyTccNv0WxtDb7motWDlMeSC8Oy95saj1TIZMGynPpFLePt3yOD8TskzumeqORCgRGWw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.3"
       },
@@ -4192,6 +4192,7 @@
       "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-7.3.2.tgz",
       "integrity": "sha512-4DMWQGenOdLnM3y/SdFQFwKsCLM+mqxzvoWp9+x2XdEzXapkznauHLiXtSohHs/mc0+5/9UACt1GdugCX2te5g==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.28.3",
         "@mui/types": "^7.4.6",
@@ -5239,7 +5240,6 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.24.tgz",
       "integrity": "sha512-0dLEBsA1kI3OezMBF8nSsb7Nk19ZnsyE1LLhB8r27KbgU5H4pvuqZLdtE+aUkJVoXgTVuA+iLIwmZ0TuK4tx6A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/prop-types": "*",
         "csstype": "^3.0.2"
@@ -5448,7 +5448,6 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
       "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.4.0",
         "@typescript-eslint/scope-manager": "5.62.0",
@@ -5502,7 +5501,6 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
       "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "5.62.0",
         "@typescript-eslint/types": "5.62.0",
@@ -5864,7 +5862,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -5969,7 +5966,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -6913,7 +6909,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.8.3",
         "caniuse-lite": "^1.0.30001741",
@@ -8054,7 +8049,6 @@
       "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz",
       "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.21.0"
       },
@@ -8070,8 +8064,7 @@
       "version": "1.11.18",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz",
       "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==",
-      "license": "MIT",
-      "peer": true
+      "license": "MIT"
     },
     "node_modules/debug": {
       "version": "4.4.3",
@@ -8824,7 +8817,6 @@
       "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -11625,7 +11617,6 @@
       "resolved": "https://registry.npmjs.org/jest/-/jest-27.5.1.tgz",
       "integrity": "sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@jest/core": "^27.5.1",
         "import-local": "^3.0.2",
@@ -14219,7 +14210,6 @@
       "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz",
       "integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       }
@@ -14469,7 +14459,6 @@
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
       "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": "*"
       }
@@ -15299,7 +15288,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -16493,7 +16481,6 @@
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
       "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -16709,7 +16696,6 @@
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -16882,7 +16868,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
       "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0"
       },
@@ -17024,7 +17009,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
       "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "loose-envify": "^1.1.0",
         "scheduler": "^0.23.2"
@@ -17092,7 +17076,6 @@
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz",
       "integrity": "sha512-F27qZr8uUqwhWZboondsPx8tnC3Ct3SxZA3V5WyEvujRyyNv0VYPhoBg1gZ8/MV5tubQp76Trw8lTv9hzRBa+A==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -17117,7 +17100,6 @@
       "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.1.tgz",
       "integrity": "sha512-llKsgOkZdbPU1Eg3zK8lCn+sjD9wMRZZPuzmdWWX5SUs8OFkN5HnFVC0u5KMeMaC9aoancFI/KoLuKPqN+hxHw==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@remix-run/router": "1.23.0",
         "react-router": "6.30.1"
@@ -17637,7 +17619,6 @@
       "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.2.tgz",
       "integrity": "sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ==",
       "license": "MIT",
-      "peer": true,
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -17883,7 +17864,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
@@ -19546,7 +19526,6 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
       "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "license": "(MIT OR CC0-1.0)",
-      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -20015,7 +19994,6 @@
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.101.3.tgz",
       "integrity": "sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.8",
@@ -20087,7 +20065,6 @@
       "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
       "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@types/bonjour": "^3.5.9",
         "@types/connect-history-api-fallback": "^1.3.5",
@@ -20478,7 +20455,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
       "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3",
         "fast-uri": "^3.0.1",
diff --git a/frontend/src/components/Modal/Modal.tsx b/frontend/src/components/Modal/Modal.tsx
index 04cd08fe4..6eb1fffad 100644
--- a/frontend/src/components/Modal/Modal.tsx
+++ b/frontend/src/components/Modal/Modal.tsx
@@ -37,6 +37,7 @@ type ModalProps = {
   isRider?: boolean;
   id?: string;
   arialabelledby?: string;
+  className?: string;
 };
 
 const Modal = ({
@@ -50,6 +51,7 @@ const Modal = ({
   isRider = true,
   arialabelledby,
   id = 'modal',
+  className,
 }: ModalProps) => {
   // Wrapping children in Array to match type for numPages
   const pages = paginate ? (children as React.ReactNodeArray) : [children];
@@ -74,7 +76,7 @@ const Modal = ({
                 clickOutsideDeactivates: true,
               }}
             >
-              <div className={styles.modal}>
+              <div className={`${styles.modal} ${className ?? ''}`.trim()}>
                 <div className={styles.topContainer}>
                   {isRider ? (
                     <h1 className={styles.title} id={id}>
diff --git a/frontend/src/components/Modal/modal.module.css b/frontend/src/components/Modal/modal.module.css
index bb46985ea..6a2530b7a 100644
--- a/frontend/src/components/Modal/modal.module.css
+++ b/frontend/src/components/Modal/modal.module.css
@@ -225,9 +225,16 @@
 
 @media screen and (max-height: 600px), screen and (max-width: 768px) {
   .modal {
-    max-width: 100%;
+    top: 0;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 100%;
+    max-width: 395px;
+    height: 100%;
     max-height: 100%;
-    overflow-y: scroll;
+    overflow-y: auto;
+    border-radius: 0;
+    padding: 0;
   }
 
   .page {
diff --git a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
index 9769f4a84..27ee9bd3d 100644
--- a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
+++ b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
@@ -1,12 +1,11 @@
-import React, { useContext } from 'react';
+import React, { useContext, useRef } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import moment from 'moment';
 import AuthContext from '../../context/auth';
 import Modal from '../Modal/Modal';
-import { Button } from '../FormElements/FormElements';
 import { ObjectType, Ride } from '../../types/index';
 import styles from './requestridemodal.module.css';
-import RequestRideInfo from './RequestRideInfo';
+import RequestRideWizard from './RequestRideWizard';
 import { RideModalType } from './types';
 import { format_date } from '../../util/index';
 import axios from '../../util/axios';
@@ -22,8 +21,8 @@ type CreateOrEditRideModalProps = {
 const CreateOrEditRideModal = ({
   isOpen,
   modalType,
-  onSubmit = () => {},
-  onClose = () => {},
+  onSubmit = () => { },
+  onClose = () => { },
   ride,
 }: CreateOrEditRideModalProps) => {
   const defaultStartDate = () => {
@@ -39,12 +38,13 @@ const CreateOrEditRideModal = ({
         return format_date(ride.startTime);
       }
     }
-    return format_date();
+    // For new rides, start with empty date so button is disabled
+    return '';
   };
 
   const defaultValues = {
     startDate: defaultStartDate(),
-    whenRepeat: ride?.isRecurring ? 'custom' : undefined,
+    whenRepeat: ride?.isRecurring ? 'custom' : 'no-repeat',
     pickupTime: ride ? moment(ride.startTime).format('HH:mm') : '',
     dropoffTime: ride ? moment(ride.endTime).format('HH:mm') : '',
     recurring: ride?.isRecurring ?? false,
@@ -52,12 +52,21 @@ const CreateOrEditRideModal = ({
 
   const methods = useForm({ defaultValues });
   const { id } = useContext(AuthContext);
+  const formRef = useRef<HTMLFormElement>(null);
 
   const closeModal = () => {
     methods.clearErrors();
     onClose();
   };
 
+  const handleFormSubmit = async () => {
+    // Trigger form submission
+    const isValid = await methods.trigger();
+    if (isValid) {
+      methods.handleSubmit(handleSubmit)();
+    }
+  };
+
   // Removes null fields from object
   const cleanData = (data: ObjectType) =>
     Object.fromEntries(Object.entries(data).filter(([_, v]) => v !== null));
@@ -95,14 +104,16 @@ const CreateOrEditRideModal = ({
         ? endLocation
         : `${customDropoff}, ${dropoffCity} NY, ${dropoffZip}`;
     let rideData: ObjectType;
-    if (recurring || whenRepeat) {
+    // Check if it's a recurring ride (not "no-repeat")
+    const isRecurringRide = recurring || (whenRepeat && whenRepeat !== 'no-repeat');
+    if (isRecurringRide) {
       // For now, block recurring rides as they're not fully implemented
       alert(
         'Recurring rides are not yet supported. Please create a single ride instead.'
       );
       return;
     } else {
-      // Single ride (non-recurring)
+      // Single ride (non-recurring) - "No repeat" or no repeat selection
       rideData = {
         startLocation: startLoc,
         endLocation: endLoc,
@@ -147,22 +158,23 @@ const CreateOrEditRideModal = ({
 
   return (
     <Modal
-      title={!ride ? 'Request a Ride' : 'Edit Ride'}
+      title=""
       isOpen={isOpen}
       onClose={closeModal}
+      displayClose={true}
+      className={styles.requestRideModal}
     >
       <FormProvider {...methods}>
-        <form onSubmit={methods.handleSubmit(handleSubmit)}>
+        <form ref={formRef} onSubmit={methods.handleSubmit(handleSubmit)} id="ride-form">
           <div className={styles.inputContainer}>
-            <RequestRideInfo
+            <RequestRideWizard
               ride={ride}
               showRepeatingCheckbox={!ride}
               showRepeatingInfo={modalType !== 'EDIT_SINGLE_RECURRING'}
               modalType={modalType}
+              onClose={closeModal}
+              onSubmit={handleFormSubmit}
             />
-            <Button className={styles.submit} type="submit">
-              {!ride ? 'Request a Ride' : 'Edit Ride'}
-            </Button>
           </div>
         </form>
       </FormProvider>
diff --git a/frontend/src/components/RequestRideModal/CustomDatePicker.tsx b/frontend/src/components/RequestRideModal/CustomDatePicker.tsx
new file mode 100644
index 000000000..6637acc3c
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/CustomDatePicker.tsx
@@ -0,0 +1,260 @@
+import React, { useState, useEffect, useRef } from 'react';
+import moment from 'moment';
+import styles from './requestridemodal.module.css';
+
+type CustomDatePickerProps = {
+    selectedDate: moment.Moment;
+    currentMonth: moment.Moment;
+    onMonthChange: (month: moment.Moment) => void;
+    onDateSelect: (date: moment.Moment) => void;
+    onCancel: () => void;
+    buttonRef: React.RefObject<HTMLButtonElement>;
+};
+
+const CustomDatePicker: React.FC<CustomDatePickerProps> = ({
+    selectedDate,
+    currentMonth,
+    onMonthChange,
+    onDateSelect,
+    onCancel,
+    buttonRef,
+}) => {
+    const pickerRef = useRef<HTMLDivElement>(null);
+
+    // Close picker when clicking outside
+    useEffect(() => {
+        const handleClickOutside = (event: MouseEvent) => {
+            if (
+                pickerRef.current &&
+                !pickerRef.current.contains(event.target as Node) &&
+                buttonRef.current &&
+                !buttonRef.current.contains(event.target as Node)
+            ) {
+                // onCancel will be called by parent
+            }
+        };
+
+        document.addEventListener('mousedown', handleClickOutside);
+        return () => {
+            document.removeEventListener('mousedown', handleClickOutside);
+        };
+    }, []);
+
+    const monthNames = moment.months();
+    const currentYear = currentMonth.year();
+    const years = Array.from({ length: 10 }, (_, i) => currentYear - 5 + i);
+
+    const handlePreviousMonth = () => {
+        onMonthChange(currentMonth.clone().subtract(1, 'month'));
+    };
+
+    const handleNextMonth = () => {
+        onMonthChange(currentMonth.clone().add(1, 'month'));
+    };
+
+    const handlePreviousYear = () => {
+        onMonthChange(currentMonth.clone().subtract(1, 'year'));
+    };
+
+    const handleNextYear = () => {
+        onMonthChange(currentMonth.clone().add(1, 'year'));
+    };
+
+    const handleMonthChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
+        const monthIndex = parseInt(e.target.value);
+        onMonthChange(currentMonth.clone().month(monthIndex));
+    };
+
+    const handleYearChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
+        const year = parseInt(e.target.value);
+        onMonthChange(currentMonth.clone().year(year));
+    };
+
+    // Get calendar days for the current month
+    const startOfMonth = currentMonth.clone().startOf('month');
+    const endOfMonth = currentMonth.clone().endOf('month');
+    const startDate = startOfMonth.clone().startOf('week');
+    const endDate = endOfMonth.clone().endOf('week');
+    const days: moment.Moment[] = [];
+    let current = startDate.clone();
+    while (current.isSameOrBefore(endDate, 'day')) {
+        days.push(current.clone());
+        current.add(1, 'day');
+    }
+
+    return (
+        <div
+            ref={pickerRef}
+            className={styles.customDatePicker}
+            onClick={(e) => e.stopPropagation()}
+        >
+            {/* Top frame with month and year selectors */}
+            <div className={styles.datePickerTopFrame}>
+                {/* Month selector on left */}
+                <div className={styles.monthYearSelector}>
+                    <button
+                        type="button"
+                        className={styles.datePickerArrow}
+                        onClick={handlePreviousMonth}
+                    >
+                        <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="24"
+                            height="24"
+                            viewBox="0 0 24 24"
+                            fill="none"
+                        >
+                            <path
+                                d="M15.41 7.41L14 6L8 12L14 18L15.41 16.59L10.83 12L15.41 7.41Z"
+                                fill="#49454F"
+                            />
+                        </svg>
+                    </button>
+                    <select
+                        className={styles.monthYearSelect}
+                        value={currentMonth.month()}
+                        onChange={handleMonthChange}
+                    >
+                        {monthNames.map((month, index) => (
+                            <option key={index} value={index}>
+                                {month}
+                            </option>
+                        ))}
+                    </select>
+                    <button
+                        type="button"
+                        className={styles.datePickerArrow}
+                        onClick={handleNextMonth}
+                    >
+                        <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="24"
+                            height="24"
+                            viewBox="0 0 24 24"
+                            fill="none"
+                        >
+                            <path
+                                d="M8.59 16.59L10 18L16 12L10 6L8.59 7.41L13.17 12L8.59 16.59Z"
+                                fill="#49454F"
+                            />
+                        </svg>
+                    </button>
+                </div>
+
+                {/* Year selector on right */}
+                <div className={styles.monthYearSelector}>
+                    <button
+                        type="button"
+                        className={styles.datePickerArrow}
+                        onClick={handlePreviousYear}
+                    >
+                        <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="24"
+                            height="24"
+                            viewBox="0 0 24 24"
+                            fill="none"
+                        >
+                            <path
+                                d="M15.41 7.41L14 6L8 12L14 18L15.41 16.59L10.83 12L15.41 7.41Z"
+                                fill="#49454F"
+                            />
+                        </svg>
+                    </button>
+                    <select
+                        className={styles.monthYearSelect}
+                        value={currentYear}
+                        onChange={handleYearChange}
+                    >
+                        {years.map((year) => (
+                            <option key={year} value={year}>
+                                {year}
+                            </option>
+                        ))}
+                    </select>
+                    <button
+                        type="button"
+                        className={styles.datePickerArrow}
+                        onClick={handleNextYear}
+                    >
+                        <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="24"
+                            height="24"
+                            viewBox="0 0 24 24"
+                            fill="none"
+                        >
+                            <path
+                                d="M8.59 16.59L10 18L16 12L10 6L8.59 7.41L13.17 12L8.59 16.59Z"
+                                fill="#49454F"
+                            />
+                        </svg>
+                    </button>
+                </div>
+            </div>
+
+            {/* Calendar grid */}
+            <div className={styles.datePickerCalendar}>
+                {/* Day headers */}
+                <div className={styles.datePickerWeekdays}>
+                    {['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'].map((day) => (
+                        <div key={day} className={styles.datePickerWeekday}>
+                            {day}
+                        </div>
+                    ))}
+                </div>
+
+                {/* Calendar days */}
+                <div className={styles.datePickerDays}>
+                    {days.map((day, index) => {
+                        const isCurrentMonth = day.month() === currentMonth.month();
+                        const isSelected = day.isSame(selectedDate, 'day');
+                        const isToday = day.isSame(moment(), 'day');
+
+                        return (
+                            <button
+                                key={index}
+                                type="button"
+                                className={`${styles.datePickerDay} ${
+                                    !isCurrentMonth ? styles.datePickerDayOtherMonth : ''
+                                } ${isSelected ? styles.datePickerDaySelected : ''} ${
+                                    isToday ? styles.datePickerDayToday : ''
+                                }`}
+                                onClick={() => {
+                                    if (isCurrentMonth) {
+                                        onDateSelect(day);
+                                    }
+                                }}
+                                disabled={!isCurrentMonth}
+                            >
+                                {day.date()}
+                            </button>
+                        );
+                    })}
+                </div>
+            </div>
+
+            {/* Bottom frame with Cancel and OK buttons */}
+            <div className={styles.datePickerBottomFrame}>
+                <button
+                    type="button"
+                    className={styles.datePickerCancelButton}
+                    onClick={onCancel}
+                >
+                    Cancel
+                </button>
+                <button
+                    type="button"
+                    className={styles.datePickerOkButton}
+                    onClick={() => {
+                        onDateSelect(selectedDate);
+                    }}
+                >
+                    OK
+                </button>
+            </div>
+        </div>
+    );
+};
+
+export default CustomDatePicker;
diff --git a/frontend/src/components/RequestRideModal/CustomTimePicker.tsx b/frontend/src/components/RequestRideModal/CustomTimePicker.tsx
new file mode 100644
index 000000000..57a833b31
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/CustomTimePicker.tsx
@@ -0,0 +1,181 @@
+import React, { useState, useRef, useEffect } from 'react';
+import moment from 'moment';
+import styles from './requestridemodal.module.css';
+
+type CustomTimePickerProps = {
+    selectedTime: string; // Format: "HH:mm"
+    onTimeSelect: (time: string) => void;
+    onCancel: () => void;
+    buttonRef: React.RefObject<HTMLButtonElement>;
+};
+
+const CustomTimePicker: React.FC<CustomTimePickerProps> = ({
+    selectedTime,
+    onTimeSelect,
+    onCancel,
+    buttonRef,
+}) => {
+    const pickerRef = useRef<HTMLDivElement>(null);
+    const [selectedHour, setSelectedHour] = useState<number>(() => {
+        if (selectedTime) {
+            return parseInt(selectedTime.split(':')[0]) || 12;
+        }
+        return 12;
+    });
+    const [selectedMinute, setSelectedMinute] = useState<number>(() => {
+        if (selectedTime) {
+            return parseInt(selectedTime.split(':')[1]) || 0;
+        }
+        return 0;
+    });
+    const [isAM, setIsAM] = useState<boolean>(() => {
+        if (selectedTime) {
+            const hour = parseInt(selectedTime.split(':')[0]) || 12;
+            return hour < 12;
+        }
+        return true;
+    });
+
+    // Close picker when clicking outside
+    useEffect(() => {
+        const handleClickOutside = (event: MouseEvent) => {
+            if (
+                pickerRef.current &&
+                !pickerRef.current.contains(event.target as Node) &&
+                buttonRef.current &&
+                !buttonRef.current.contains(event.target as Node)
+            ) {
+                // onCancel will be called by parent
+            }
+        };
+
+        document.addEventListener('mousedown', handleClickOutside);
+        return () => {
+            document.removeEventListener('mousedown', handleClickOutside);
+        };
+    }, []);
+
+    const hours = Array.from({ length: 12 }, (_, i) => i + 1);
+    const minutes = Array.from({ length: 60 }, (_, i) => i);
+
+    const handleHourSelect = (hour: number) => {
+        setSelectedHour(hour);
+    };
+
+    const handleMinuteSelect = (minute: number) => {
+        setSelectedMinute(minute);
+    };
+
+    const handleAMPMToggle = (am: boolean) => {
+        setIsAM(am);
+    };
+
+    const handleOK = () => {
+        let hour24 = selectedHour;
+        if (!isAM && selectedHour !== 12) {
+            hour24 = selectedHour + 12;
+        } else if (isAM && selectedHour === 12) {
+            hour24 = 0;
+        }
+        const timeString = `${hour24.toString().padStart(2, '0')}:${selectedMinute.toString().padStart(2, '0')}`;
+        onTimeSelect(timeString);
+    };
+
+    return (
+        <div
+            ref={pickerRef}
+            className={styles.customTimePicker}
+            onClick={(e) => e.stopPropagation()}
+        >
+            {/* Time selection grid */}
+            <div className={styles.timePickerContent}>
+                {/* Hours */}
+                <div className={styles.timePickerColumn}>
+                    <div className={styles.timePickerLabel}>Hour</div>
+                    <div className={styles.timePickerValues}>
+                        {hours.map((hour) => (
+                            <button
+                                key={hour}
+                                type="button"
+                                className={`${styles.timePickerValue} ${
+                                    selectedHour === hour
+                                        ? styles.timePickerValueSelected
+                                        : ''
+                                }`}
+                                onClick={() => handleHourSelect(hour)}
+                            >
+                                {hour}
+                            </button>
+                        ))}
+                    </div>
+                </div>
+
+                {/* Minutes */}
+                <div className={styles.timePickerColumn}>
+                    <div className={styles.timePickerLabel}>Minute</div>
+                    <div className={styles.timePickerValues}>
+                        {minutes.map((minute) => (
+                            <button
+                                key={minute}
+                                type="button"
+                                className={`${styles.timePickerValue} ${
+                                    selectedMinute === minute
+                                        ? styles.timePickerValueSelected
+                                        : ''
+                                }`}
+                                onClick={() => handleMinuteSelect(minute)}
+                            >
+                                {minute.toString().padStart(2, '0')}
+                            </button>
+                        ))}
+                    </div>
+                </div>
+
+                {/* AM/PM */}
+                <div className={styles.timePickerColumn}>
+                    <div className={styles.timePickerLabel}>Period</div>
+                    <div className={styles.timePickerValues}>
+                        <button
+                            type="button"
+                            className={`${styles.timePickerValue} ${
+                                isAM ? styles.timePickerValueSelected : ''
+                            }`}
+                            onClick={() => handleAMPMToggle(true)}
+                        >
+                            AM
+                        </button>
+                        <button
+                            type="button"
+                            className={`${styles.timePickerValue} ${
+                                !isAM ? styles.timePickerValueSelected : ''
+                            }`}
+                            onClick={() => handleAMPMToggle(false)}
+                        >
+                            PM
+                        </button>
+                    </div>
+                </div>
+            </div>
+
+            {/* Bottom frame with Cancel and OK buttons */}
+            <div className={styles.datePickerBottomFrame}>
+                <button
+                    type="button"
+                    className={styles.datePickerCancelButton}
+                    onClick={onCancel}
+                >
+                    Cancel
+                </button>
+                <button
+                    type="button"
+                    className={styles.datePickerOkButton}
+                    onClick={handleOK}
+                >
+                    OK
+                </button>
+            </div>
+        </div>
+    );
+};
+
+export default CustomTimePicker;
diff --git a/frontend/src/components/RequestRideModal/RequestRideWizard.tsx b/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
new file mode 100644
index 000000000..f03f3ae7a
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
@@ -0,0 +1,160 @@
+import React, { useState } from 'react';
+import { useFormContext } from 'react-hook-form';
+import { Ride } from '../../types';
+import { RideModalType } from './types';
+import { Button } from '../FormElements/FormElements';
+import DateStep from './steps/DateStep';
+import PickupLocationStep from './steps/PickupLocationStep';
+import DropoffLocationStep from './steps/DropoffLocationStep';
+import RequestSummaryStep from './steps/RequestSummaryStep';
+import styles from './requestridemodal.module.css';
+
+export type WizardStep = 'date' | 'pickup' | 'dropoff' | 'summary';
+
+type RequestRideWizardProps = {
+    ride?: Ride;
+    showRepeatingCheckbox: boolean;
+    showRepeatingInfo: boolean;
+    modalType: RideModalType;
+    onSubmit?: () => void;
+    onClose?: () => void;
+};
+
+const RequestRideWizard: React.FC<RequestRideWizardProps> = ({
+    ride,
+    showRepeatingCheckbox,
+    showRepeatingInfo,
+    modalType,
+    onSubmit,
+    onClose,
+}) => {
+    const [currentStep, setCurrentStep] = useState<WizardStep>('date');
+    const {
+        trigger,
+        formState: { errors },
+        watch,
+    } = useFormContext();
+
+    // Define step order - 4 steps including summary
+    const stepOrder: WizardStep[] = ['date', 'pickup', 'dropoff', 'summary'];
+
+    const currentStepIndex = stepOrder.indexOf(currentStep);
+    const isFirstStep = currentStepIndex === 0;
+    const isLastStep = currentStepIndex === stepOrder.length - 1;
+
+    // Get fields to validate for each step
+    const getStepFields = (step: WizardStep): string[] => {
+        switch (step) {
+            case 'date':
+                // Include repeat fields if repeating is enabled
+                const watchRepeating = watch('recurring', false);
+                const baseFields = ['startDate'];
+                if (watchRepeating) {
+                    return [...baseFields, 'whenRepeat', 'endDate'];
+                }
+                return baseFields;
+            case 'pickup':
+                return ['startLocation', 'pickupTime'];
+            case 'dropoff':
+                return ['endLocation', 'dropoffTime'];
+            case 'summary':
+                return [];
+            default:
+                return [];
+        }
+    };
+
+    const handleNext = async () => {
+        const fieldsToValidate = getStepFields(currentStep);
+        const isValid = await trigger(fieldsToValidate as any);
+
+        if (isValid) {
+            const nextIndex = currentStepIndex + 1;
+            if (nextIndex < stepOrder.length) {
+                setCurrentStep(stepOrder[nextIndex]);
+            }
+        } else {
+            // If validation fails, check if basic fields are filled
+            // This allows navigation even if strict validation fails (will be caught on final submit)
+            const basicFieldsFilled = fieldsToValidate.every(field => {
+                const value = watch(field as any);
+                return value && value !== '' && value !== undefined;
+            });
+            
+            if (basicFieldsFilled) {
+                const nextIndex = currentStepIndex + 1;
+                if (nextIndex < stepOrder.length) {
+                    setCurrentStep(stepOrder[nextIndex]);
+                }
+            }
+        }
+    };
+
+    const handleBack = () => {
+        const prevIndex = currentStepIndex - 1;
+        if (prevIndex >= 0) {
+            setCurrentStep(stepOrder[prevIndex]);
+        }
+    };
+
+
+    const renderStep = () => {
+        switch (currentStep) {
+            case 'date':
+                return (
+                    <DateStep
+                        ride={ride}
+                        modalType={modalType}
+                        showRepeatingCheckbox={showRepeatingCheckbox}
+                        showRepeatingInfo={showRepeatingInfo}
+                        onClose={onClose}
+                        onNext={handleNext}
+                        currentStep={currentStep}
+                    />
+                );
+            case 'pickup':
+                return (
+                    <PickupLocationStep
+                        ride={ride}
+                        modalType={modalType}
+                        currentStep={currentStep}
+                        onClose={onClose}
+                        onNext={handleNext}
+                        onBack={handleBack}
+                    />
+                );
+            case 'dropoff':
+                return (
+                    <DropoffLocationStep
+                        ride={ride}
+                        modalType={modalType}
+                        currentStep={currentStep}
+                        onClose={onClose}
+                        onNext={handleNext}
+                        onBack={handleBack}
+                    />
+                );
+            case 'summary':
+                return (
+                    <RequestSummaryStep
+                        onClose={onClose}
+                        onNext={onSubmit}
+                        onBack={handleBack}
+                    />
+                );
+            default:
+                return null;
+        }
+    };
+
+    return (
+        <div className={styles.wizardContainer}>
+            {/* Step content */}
+            <div className={styles.stepContent}>{renderStep()}</div>
+
+            {/* Navigation buttons - removed Continue button, each step handles its own navigation */}
+        </div>
+    );
+};
+
+export default RequestRideWizard;
diff --git a/frontend/src/components/RequestRideModal/requestridemodal.module.css b/frontend/src/components/RequestRideModal/requestridemodal.module.css
index c4a285c81..5dd03b5c5 100644
--- a/frontend/src/components/RequestRideModal/requestridemodal.module.css
+++ b/frontend/src/components/RequestRideModal/requestridemodal.module.css
@@ -1,6 +1,7 @@
 .inputContainer {
   max-width: 45rem;
 }
+
 .input[type='time']::-webkit-datetime-edit-hour-field:focus,
 .input[type='time']::-webkit-datetime-edit-minute-field:focus,
 .input[type='time']::-webkit-datetime-edit-ampm-field:focus {
@@ -18,11 +19,13 @@
 .input[type='time']::-moz-datetime-edit-ampm-field:focus {
   background-color: #3783f6;
 }
+
 .input[type='time']::-ms-datetime-edit-hour-field,
 .input[type='time']::-ms-datetime-edit-minute-field:focus,
 .input[type='time']::-ms-datetime-edit-ampm-field:focus {
   background-color: #3783f6;
 }
+
 .input {
   display: inline-block;
   border-radius: 0.5rem;
@@ -32,42 +35,52 @@
   margin: 0.5rem;
   min-width: 0;
 }
+
 .largeLabel {
   font-size: 1.25rem;
   font-weight: bold;
   display: block;
 }
+
 .label {
   font-size: 0.875rem;
   margin: 0 0.5rem;
 }
+
 .radioLabel {
   font-size: 0.875rem;
   margin: 0 0.5rem;
 }
+
 .boldLabel {
   font-weight: bold;
   font-size: 0.875rem;
 }
+
 .box {
   display: flex;
 }
+
 .btn {
   margin-right: 10px;
 }
+
 .dayBox {
   display: flex;
 }
+
 .errorBox {
   display: flex;
   flex-direction: column;
   flex-wrap: nowrap;
   align-items: stretch;
 }
+
 .formHeading {
   margin: 0;
   padding: 0;
 }
+
 .day {
   border-radius: 40%;
   height: 1rem;
@@ -91,18 +104,22 @@
 .daySelected:focus {
   background-color: black;
 }
+
 .submit {
   float: right;
   margin-top: 0.25rem;
 }
+
 .error {
   color: #eb0023;
   font-size: 0.66rem;
   margin: 0.5rem;
 }
+
 .flexGrow {
   flex-grow: 2;
 }
+
 .flexShrink {
   flex-shrink: 2;
 }
@@ -110,6 +127,7 @@
 .whenRepeat:focus {
   outline: 3px solid black;
 }
+
 .recurring:focus {
   outline: 3px solid black;
 }
@@ -126,20 +144,1422 @@
   overflow: hidden;
 }
 
+/* Mobile-first outer frame for each step */
+.stepPage {
+  display: flex;
+  width: 395px;
+  height: 752px;
+  flex-direction: column;
+  justify-content: space-between;
+  align-items: center;
+  border-top: 1px solid #dadada;
+  background: #fff;
+  margin: 0 auto;
+}
+
+/* Top content container - grows to fill space and scrolls so bottom buttons stay visible */
+.topContent {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  flex: 1;
+  min-height: 0;
+  overflow-y: auto;
+}
+
+/* Bottom section container - pinned to bottom, never shrinks */
+.bottomSection {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  flex-shrink: 0;
+  margin-top: auto;
+  padding-bottom: 8px;
+}
+
+/* Page indicators - positioned right above bottom button frame */
+.pageIndicators {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  justify-content: center;
+  padding: 8px 16px 4px 16px;
+}
+
+.pageIndicator {
+  width: 12px;
+  height: 12px;
+  border-radius: 2px;
+  background: #d9d9d9;
+}
+
+.pageIndicatorActive {
+  width: 24px;
+  height: 12px;
+  border-radius: 2px;
+  background: #393939;
+}
+
+/* Request Summary step */
+.summaryStepPage {
+  display: flex;
+  flex-direction: column;
+  width: 395px;
+  height: 752px;
+  align-items: center;
+  border-top: 1px solid #dadada;
+  background: #fff;
+  margin: 0 auto;
+  overflow: hidden;
+}
+
+.summaryTitle {
+  align-self: stretch;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 20px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: normal;
+  margin: 0;
+  padding: 16px 16px 0;
+  flex-shrink: 0;
+}
+
+.summaryScrollContainer {
+  flex: 1;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  padding: 16px;
+  min-height: 0;
+}
+
+.summarySection {
+  min-height: 250px;
+  width: 100%;
+  max-width: 363px;
+  margin: 0 auto;
+}
+
+.summaryDivider {
+  width: 363px;
+  max-width: 100%;
+  height: 1px;
+  background: #dadada;
+  margin: 0 auto;
+}
+
+/* Summary: Date and time section (40px below Request Summary title) */
+.summaryDateTimeBlock {
+  margin-top: 40px;
+  margin-bottom: 40px;
+  width: 100%;
+  max-width: 363px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+/* Summary: section block (e.g. Pickup) - 40px below divider */
+.summarySectionBlock {
+  margin-top: 40px;
+  width: 100%;
+  max-width: 363px;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.summarySectionLabel {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  margin: 0 0 10px 0;
+}
+
+.summarySectionLabelAfterValue {
+  margin-top: 16px;
+  margin-bottom: 10px;
+}
+
+/* Divider 40px below a section (e.g. below Edit button) */
+.summaryDividerAfterSection {
+  margin-top: 40px;
+}
+
+.summaryDateTimeTitle {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  margin: 0 0 10px 0;
+}
+
+.summaryValueBox {
+  display: flex;
+  height: 40px;
+  padding: 10px;
+  justify-content: space-between;
+  align-items: center;
+  align-self: stretch;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.summaryValueBox + .summaryValueBox {
+  margin-top: 10px;
+}
+
+.summaryRepeatBlock {
+  margin-top: 10px;
+}
+
+.summaryCustomDaysInSummary {
+  margin-top: 10px;
+}
+
+.summaryCustomDaysInSummary .summaryDayBlockReadOnly {
+  display: flex;
+  width: 40px;
+  height: 40px;
+  padding: 10px;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  flex-shrink: 0;
+  border-radius: 8px;
+  border: 1px solid #dadada;
+  background: var(--bg-main, #fff);
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  pointer-events: none;
+  cursor: default;
+}
+
+.summaryCustomDaysInSummary .summaryDayBlockReadOnly.summaryDayBlockReadOnlySelected {
+  background: #000;
+  color: #fff;
+  border: 1px solid #000;
+}
+
+.summaryEditContainer {
+  display: flex;
+  padding: 10px;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  align-self: stretch;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  margin-top: 40px;
+  background: #fff;
+  cursor: pointer;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.summaryEditContainer:hover {
+  background: #f5f5f5;
+}
+
+.summaryEditText {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+/* Inline edit area on summary (date/repeat, pickup, dropoff) */
+.summaryInlineEdit {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  width: 100%;
+  margin-top: 8px;
+}
+
+.summaryDoneButton {
+  align-self: flex-start;
+  margin-top: 8px;
+  padding: 8px 16px;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: #fff;
+  cursor: pointer;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.summaryDoneButton:hover {
+  background: #f5f5f5;
+}
+
+/* Drag handle at the top of the sheet (sits above inner frame) */
+.dragHandle {
+  width: 72px;
+  height: 4px;
+  background: #dadada;
+  border-radius: 999px;
+  align-self: center;
+  margin-bottom: 8px;
+  cursor: pointer;
+}
+
+.mobileHeaderFrame {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  gap: 16px;
+  align-self: stretch;
+  padding: 16px;
+  position: relative;
+}
+
+.pickupLocationFrame {
+  display: flex;
+  padding: 16px;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+  align-self: stretch;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.pickupLocationTitle {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  align-self: flex-start;
+}
+
+.locationSelectButton {
+  display: flex;
+  width: 100%;
+  height: 40px;
+  padding: 10px;
+  justify-content: space-between;
+  align-items: center;
+  pointer-events: auto;
+  position: relative;
+  z-index: 201;
+  align-self: stretch;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: #fff;
+  cursor: pointer;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-weight: 400;
+  line-height: normal;
+  box-sizing: border-box;
+}
+
+.locationButtonPlaceholder {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  opacity: 0.3;
+}
+
+.pickupMapContainer {
+  width: 363px;
+  max-width: 100%;
+  height: 209.928px;
+  aspect-ratio: 83/48;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: lightgray;
+  background-size: cover;
+  background-position: 50%;
+  background-repeat: no-repeat;
+  overflow: hidden;
+  flex-shrink: 0;
+  position: relative;
+  z-index: 0;
+}
+
+.pickupMapContainer>* {
+  width: 100% !important;
+  height: 100% !important;
+  max-width: 100% !important;
+  max-height: 100% !important;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.pickupTimeText {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  align-self: flex-start;
+}
+
+.pickupTimeSelector {
+  display: flex;
+  height: 40px;
+  padding: 10px;
+  justify-content: space-between;
+  align-items: center;
+  align-self: stretch;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: #fff;
+  cursor: pointer;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.pickupTimePlaceholder {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  opacity: 0.3;
+}
+
+/* Time input - single row, Figma-style */
+.timeInputContainer {
+  display: flex;
+  height: 48px;
+  padding: 0 16px;
+  align-items: center;
+  align-self: stretch;
+  border-radius: 8px;
+  border: 1px solid #e0e0e0;
+  background: #fff;
+  gap: 6px;
+  transition: border-color 0.2s ease, box-shadow 0.2s ease;
+}
+
+.timeInputContainer:focus-within {
+  border-color: #000;
+  box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.08);
+}
+
+.timeInputHour,
+.timeInputMinute {
+  width: 32px;
+  height: 32px;
+  border: none;
+  outline: none;
+  background: transparent;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 16px;
+  font-weight: 500;
+  line-height: 1.25;
+  text-align: center;
+  padding: 0;
+  flex-shrink: 0;
+}
+
+.timeInputHour::placeholder,
+.timeInputMinute::placeholder {
+  color: #9e9e9e;
+  font-weight: 400;
+}
+
+.timeSeparator {
+  color: #616161;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 16px;
+  font-weight: 500;
+  line-height: 1;
+  margin: 0 2px;
+  flex-shrink: 0;
+}
+
+.timePeriodContainer {
+  display: flex;
+  gap: 4px;
+  margin-left: auto;
+}
+
+.timePeriodButton {
+  padding: 6px 12px;
+  border: 1px solid #e0e0e0;
+  border-radius: 6px;
+  background: #fff;
+  color: #616161;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1.25;
+  cursor: pointer;
+  transition: background 0.2s ease, color 0.2s ease, border-color 0.2s ease;
+  white-space: nowrap;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.timePeriodButton:hover {
+  background: #f5f5f5;
+  color: #212121;
+  border-color: #bdbdbd;
+}
+
+.timePeriodButtonActive {
+  background: #000;
+  color: #fff;
+  border-color: #000;
+}
+
+.timePeriodButtonActive:hover {
+  background: #333;
+  border-color: #333;
+  color: #fff;
+}
+
+.timeIcon {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  margin-left: 8px;
+  flex-shrink: 0;
+  color: #757575;
+}
+
+/* Time slot chips (pickup/dropoff) */
+.timeSlotsContainer {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+  width: 100%;
+  align-self: stretch;
+}
+
+.timeSlotChip {
+  padding: 10px 16px;
+  border-radius: 8px;
+  border: 1px solid #dadada;
+  background: #fff;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 1.25;
+  cursor: pointer;
+  transition: background 0.2s ease, border-color 0.2s ease, color 0.2s ease;
+  white-space: nowrap;
+}
+
+.timeSlotChip:hover {
+  background: #f5f5f5;
+  border-color: #bbb;
+}
+
+.timeSlotChipActive {
+  background: #000;
+  color: #fff;
+  border-color: #000;
+}
+
+.timeSlotChipActive:hover {
+  background: #333;
+  border-color: #333;
+}
+
+/* Custom Time Picker */
+.customTimePicker {
+  display: flex;
+  flex-direction: column;
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  width: calc(100% - 32px);
+  max-width: 363px;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: #fff;
+  z-index: 1001;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+}
+
+.timePickerContent {
+  display: flex;
+  justify-content: center;
+  align-items: flex-start;
+  gap: 16px;
+  padding: 24px;
+  min-height: 300px;
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.timePickerColumn {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 8px;
+  flex: 1;
+}
+
+.timePickerLabel {
+  color: var(--M3-sys-light-on-surface-variant, var(--Schemes-On-Surface-Variant, #49454F));
+  text-align: center;
+  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: var(--Static-Label-Large-Size, 14px);
+  font-style: normal;
+  font-weight: 500;
+  line-height: var(--Static-Label-Large-Line-Height, 20px);
+  letter-spacing: var(--Static-Label-Large-Tracking, 0.1px);
+  margin-bottom: 8px;
+}
+
+.timePickerValues {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  width: 100%;
+  max-height: 250px;
+  overflow-y: auto;
+}
+
+.timePickerValue {
+  min-width: 48px;
+  width: 48px;
+  min-height: 48px;
+  height: 48px;
+  border: none;
+  background: transparent;
+  border-radius: 50%;
+  color: var(--M3-sys-light-on-surface-variant, var(--Schemes-On-Surface-Variant, #49454F));
+  text-align: center;
+  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: var(--Static-Label-Large-Size, 14px);
+  font-style: normal;
+  font-weight: 500;
+  line-height: 1;
+  letter-spacing: var(--Static-Label-Large-Tracking, 0.1px);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+  flex-shrink: 0;
+  box-sizing: border-box;
+}
+
+.timePickerValue:hover {
+  background-color: #f5f5f5;
+}
+
+.timePickerValueSelected {
+  background: #000;
+  color: #fff;
+  border-radius: 50%;
+}
+
+.timePickerValueSelected:hover {
+  background: #333;
+}
+
+.mobileTitle {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.mobileTitleLeft {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  text-align: left;
+  align-self: flex-start;
+}
+
+/* Apply font styles to all buttons and text */
+.optionButton {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.dateButtonPlaceholder {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  opacity: 0.3;
+}
+
+.repeatOption {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.cancelButton {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.saveContinueButton {
+  color: #fff;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.optionButton {
+  display: flex;
+  height: 40px;
+  padding: 10px;
+  justify-content: space-between;
+  align-items: center;
+  align-self: stretch;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background-color: #ffffff;
+  cursor: pointer;
+}
+
+.optionButton:hover {
+  background-color: #f5f5f5;
+}
+
+.optionIcon {
+  display: inline-flex;
+  width: 24px;
+  height: 24px;
+}
+
+/* Repeat options container */
+.repeatOptionsContainer {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  width: 100%;
+  margin-top: 0;
+}
+
+.repeatOption {
+  display: flex;
+  padding: 8px 16px;
+  align-items: center;
+  gap: 10px;
+  align-self: stretch;
+  border-radius: 4px;
+  background: var(--bg-main, #fff);
+  border: 1px solid #dadada;
+  cursor: pointer;
+  transition: all 0.2s ease;
+}
+
+.repeatOption:hover {
+  background-color: #f5f5f5;
+}
+
+.repeatOptionSelected {
+  background: #000;
+  color: #fff;
+  border: 1px solid #000;
+}
+
+.repeatOptionSelected:hover {
+  background: #333;
+}
+
+/* Custom repeat section */
+.customRepeatSection {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  width: 100%;
+  margin-top: 0;
+}
+
+.selectDaysLabel {
+  width: 170.375px;
+  color: var(--fg-dimmer, #656565);
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 12px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: normal;
+}
+
+.daysContainer {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+}
+
+.dayBlock {
+  display: flex;
+  width: 40px;
+  height: 40px;
+  padding: 10px;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  flex-shrink: 0;
+  border-radius: 8px;
+  border: 1px solid #dadada;
+  background: var(--bg-main, #fff);
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  cursor: pointer;
+  transition: all 0.2s ease;
+}
+
+.dayBlock:hover {
+  background-color: #f5f5f5;
+}
+
+.dayBlockSelected {
+  background: #000;
+  color: #fff;
+  border: 1px solid #000;
+}
+
+.dayBlockSelected:hover {
+  background: #333;
+}
+
+/* Wrapper for date button + calendar so calendar can position below button */
+.datePickerAnchor {
+  position: relative;
+  width: 100%;
+  align-self: stretch;
+}
+
+.datePickerAnchor .optionButton {
+  width: 100%;
+  box-sizing: border-box;
+}
+
+/* Custom Date Picker */
+.customDatePicker {
+  display: flex;
+  width: calc(100% - 32px);
+  flex-direction: column;
+  align-items: flex-start;
+  position: absolute;
+  bottom: -418px;
+  left: 16px;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: var(--bg-main, #fff);
+  z-index: 1000;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1D1B20));
+  text-align: center;
+  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: var(--Static-Body-Large-Size, 16px);
+  font-style: normal;
+  font-weight: 400;
+  line-height: var(--Static-Body-Large-Line-Height, 24px);
+  letter-spacing: var(--Static-Body-Large-Tracking, 0.5px);
+}
+
+.datePickerTopFrame {
+  display: flex;
+  height: 64px;
+  justify-content: space-between;
+  align-items: center;
+  align-self: stretch;
+  padding: 0 16px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.monthYearSelector {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 8px;
+}
+
+.datePickerArrow {
+  width: 24px;
+  height: 24px;
+  border: none;
+  background: none;
+  cursor: pointer;
+  padding: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.datePickerArrow:hover {
+  opacity: 0.7;
+}
+
+.monthYearSelect {
+  border: 1px solid #dadada;
+  border-radius: 4px;
+  padding: 4px 8px;
+  padding-right: 24px;
+  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1D1B20));
+  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: var(--Static-Body-Large-Size, 16px);
+  font-style: normal;
+  font-weight: 400;
+  line-height: var(--Static-Body-Large-Line-Height, 24px);
+  letter-spacing: var(--Static-Body-Large-Tracking, 0.5px);
+  background: #fff;
+  cursor: pointer;
+  appearance: none;
+  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12' fill='none'%3E%3Cpath d='M2 4L6 8L10 4' stroke='%2349454F' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
+  background-repeat: no-repeat;
+  background-position: right 8px center;
+}
+
+.datePickerCalendar {
+  padding: 16px;
+}
+
+.datePickerWeekdays {
+  display: grid;
+  grid-template-columns: repeat(7, 1fr);
+  gap: 4px;
+  margin-bottom: 8px;
+}
+
+.datePickerWeekday {
+  text-align: center;
+  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1D1B20));
+  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: var(--Static-Body-Large-Size, 16px);
+  font-style: normal;
+  font-weight: 400;
+  line-height: var(--Static-Body-Large-Line-Height, 24px);
+  letter-spacing: var(--Static-Body-Large-Tracking, 0.5px);
+  padding: 8px 0;
+}
+
+.datePickerDays {
+  display: grid;
+  grid-template-columns: repeat(7, 1fr);
+  gap: 4px;
+}
+
+.datePickerDay {
+  width: 40px;
+  height: 40px;
+  border: none;
+  background: none;
+  border-radius: 4px;
+  text-align: center;
+  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1D1B20));
+  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: var(--Static-Body-Large-Size, 16px);
+  font-style: normal;
+  font-weight: 400;
+  line-height: var(--Static-Body-Large-Line-Height, 24px);
+  letter-spacing: var(--Static-Body-Large-Tracking, 0.5px);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.datePickerDay:hover {
+  background-color: #f5f5f5;
+}
+
+.datePickerDayOtherMonth {
+  color: #ccc;
+  cursor: not-allowed;
+}
+
+.datePickerDayOtherMonth:hover {
+  background-color: transparent;
+}
+
+.datePickerDaySelected {
+  background: #000;
+  color: #fff;
+  border-radius: 50%;
+}
+
+.datePickerDaySelected:hover {
+  background: #333;
+}
+
+.datePickerDayToday {
+  border: 1px solid #000;
+}
+
+.datePickerBottomFrame {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+  gap: 16px;
+  flex: 1 0 0;
+  padding: 16px;
+  border-top: 1px solid #f0f0f0;
+  background: #fff;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.datePickerCancelButton,
+.datePickerOkButton {
+  display: flex;
+  height: 48px;
+  justify-content: center;
+  align-items: center;
+  padding: 0;
+  border: none;
+  background: transparent;
+  text-align: right;
+  color: var(--M3-sys-light-on-surface-variant, var(--Schemes-On-Surface-Variant, #49454F));
+  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: var(--Static-Label-Large-Size, 14px);
+  font-style: normal;
+  font-weight: 500;
+  line-height: var(--Static-Label-Large-Line-Height, 20px);
+  letter-spacing: var(--Static-Label-Large-Tracking, 0.1px);
+  cursor: pointer;
+  transition: opacity 0.2s ease;
+}
+
+.datePickerCancelButton {
+  margin-left: auto;
+}
+
+.datePickerOkButton {
+  color: var(--M3-sys-light-on-surface-variant, var(--Schemes-On-Surface-Variant, #49454F));
+}
+
+.datePickerCancelButton:hover,
+.datePickerOkButton:hover {
+  opacity: 0.7;
+}
+
+/* Search Input with Icon - z-index so location button/dropdown stay above map and are always clickable */
+.searchInputWrapper {
+  position: relative;
+  width: 100%;
+  align-self: stretch;
+  z-index: 200;
+  pointer-events: auto;
+}
+
+.searchInput {
+  width: 100%;
+  padding: 0.75rem 1rem 0.75rem 2.75rem;
+  border: 1px solid #e0e0e0;
+  border-radius: 0.5rem;
+  font-size: 1rem;
+  transition: all 0.2s ease;
+  background-color: white;
+}
+
+.searchInput:focus {
+  outline: none;
+  border-color: #3783f6;
+  box-shadow: 0 0 0 3px rgba(55, 131, 246, 0.1);
+}
+
+.searchInput:disabled {
+  background-color: #f5f5f5;
+  cursor: not-allowed;
+  opacity: 0.6;
+}
+
+.inputIcon {
+  position: absolute;
+  left: 0.75rem;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 1.25rem;
+  height: 1.25rem;
+  pointer-events: none;
+  opacity: 0.6;
+}
+
+/* Location Dropdown - above map so it's clickable when changing selection */
+.locationDropdown {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  right: 0;
+  background-color: white;
+  border: 1px solid #e0e0e0;
+  border-radius: 0.5rem;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);
+  max-height: 200px;
+  overflow-y: auto;
+  z-index: 202;
+  margin-top: 0.25rem;
+  pointer-events: auto;
+}
+
+.locationOption {
+  padding: 0.75rem 1rem;
+  cursor: pointer;
+  transition: background-color 0.2s ease;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.locationOption:last-child {
+  border-bottom: none;
+}
+
+.locationOption:hover {
+  background-color: #f5f5f5;
+}
+
+/* Time Input with Icon */
+.timeInputWrapper {
+  position: relative;
+  width: 100%;
+}
+
+.timeInput {
+  width: 100%;
+  padding: 0.75rem 1rem 0.75rem 2.75rem;
+  border: 1px solid #e0e0e0;
+  border-radius: 0.5rem;
+  font-size: 1rem;
+  transition: all 0.2s ease;
+  background-color: white;
+}
+
+.timeInput:focus {
+  outline: none;
+  border-color: #3783f6;
+  box-shadow: 0 0 0 3px rgba(55, 131, 246, 0.1);
+}
+
+/* Notes Textarea */
+.notesTextarea {
+  width: 100%;
+  padding: 0.75rem 1rem;
+  border: 1px solid #e0e0e0;
+  border-radius: 0.5rem;
+  font-size: 1rem;
+  font-family: inherit;
+  resize: vertical;
+  transition: all 0.2s ease;
+  background-color: white;
+}
+
+.notesTextarea:focus {
+  outline: none;
+  border-color: #3783f6;
+  box-shadow: 0 0 0 3px rgba(55, 131, 246, 0.1);
+}
+
+.notesTextarea::placeholder {
+  color: #999;
+}
+
+/* Bottom button frame */
+.bottomButtonFrame {
+  display: flex;
+  padding: 8px 16px 12px;
+  justify-content: center;
+  align-items: center;
+  gap: 4px;
+  align-self: stretch;
+  border-top: 1px solid #dadada;
+}
+
+.cancelButton {
+  display: flex;
+  padding: 10px;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  flex: 1 0 0;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background-color: #fff;
+  cursor: pointer;
+  transition: background-color 0.2s ease;
+}
+
+.cancelButton:hover {
+  background-color: #f5f5f5;
+}
+
+.saveContinueButton {
+  display: flex;
+  padding: 10px;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  flex: 1 0 0;
+  border-radius: 4px;
+  border: 1px solid #000;
+  background: #000;
+  cursor: pointer;
+  transition: opacity 0.2s ease;
+}
+
+.saveContinueButton:disabled {
+  border: 1px solid #000;
+  background: #000;
+  opacity: 0.3;
+  cursor: not-allowed;
+}
+
+.saveContinueButton:not(:disabled):hover {
+  opacity: 0.9;
+}
+
+/* Hidden inputs for form validation */
+.hiddenInput {
+  position: absolute;
+  opacity: 0;
+  pointer-events: none;
+  width: 0;
+  height: 0;
+  overflow: hidden;
+}
+
 @media screen and (max-width: 768px) {
   .box {
     display: block;
   }
+
   .label {
     display: inline-block;
   }
+
   .radioBox {
     display: block;
   }
+
   .whenRepeat {
     display: inline-block;
   }
+
   .mapContainer {
     height: 300px;
   }
+
+  .locationDropdown {
+    max-height: 150px;
+  }
 }
+
+/* Desktop: request ride modal in fixed 767×493 container (245px top, 373px left) */
+@media screen and (min-width: 769px) {
+  .requestRideModal {
+    position: fixed;
+    top: 245px;
+    left: 373px;
+    width: 767px;
+    height: 493px;
+    transform: none;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 24px;
+    border-radius: 1rem;
+    box-sizing: border-box;
+  }
+
+  /* Content area: flex column so height flows to step and bottom buttons stay visible */
+  .requestRideModal > div:nth-child(2) {
+    flex: 1;
+    min-height: 0;
+    overflow: hidden;
+    width: 100%;
+    align-self: stretch;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .requestRideModal > div:nth-child(2) form {
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+
+  .requestRideModal > div:nth-child(2) .inputContainer {
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+
+  .requestRideModal .wizardContainer,
+  .requestRideModal .stepContent {
+    flex: 1;
+    min-height: 0;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+  }
+
+  /* Date, pickup, dropoff: fill space, unscrollable */
+  .requestRideModal .stepPage {
+    height: auto;
+    min-height: 0;
+    flex: 1;
+    overflow: hidden;
+    max-height: 100%;
+    width: 100%;
+    max-width: 100%;
+  }
+
+  /* Summary step only: full width of modal, scrollable */
+  .requestRideModal .summaryStepPage {
+    height: auto;
+    min-height: 0;
+    flex: 1;
+    overflow-y: auto;
+    max-height: 100%;
+    width: 100%;
+    max-width: 100%;
+    align-self: stretch;
+    margin: 0;
+  }
+
+  .requestRideModal .summaryScrollContainer {
+    width: 100%;
+    max-width: 100%;
+    box-sizing: border-box;
+  }
+
+  .requestRideModal .summarySection,
+  .requestRideModal .summarySectionBlock,
+  .requestRideModal .summaryDateTimeBlock,
+  .requestRideModal .summaryDivider {
+    max-width: 100%;
+    width: 100%;
+  }
+
+  /* Pickup/dropoff: map and location/time containers 719px */
+  .requestRideModal .pickupMapContainer {
+    width: 719px;
+    max-width: 100%;
+    height: 209.928px;
+    aspect-ratio: 137/40;
+  }
+
+  .requestRideModal .searchInputWrapper {
+    width: 719px;
+    max-width: 100%;
+  }
+
+  .requestRideModal .timeInputContainer {
+    width: 719px;
+    max-width: 100%;
+    align-self: stretch;
+  }
+
+  /* Date picker: top-left of calendar at bottom-left of date button, fixed size */
+  .requestRideModal .datePickerAnchor .customDatePicker {
+    top: 100%;
+    left: 0;
+    bottom: auto;
+    margin-top: 4px;
+    width: 320px;
+    max-width: calc(100vw - 24px);
+  }
+
+  .requestRideModal .datePickerAnchor .datePickerTopFrame {
+    height: 48px;
+    padding: 0 12px;
+  }
+
+  .requestRideModal .datePickerAnchor .datePickerCalendar {
+    padding: 12px;
+  }
+
+  .requestRideModal .datePickerAnchor .datePickerDay {
+    width: 32px;
+    height: 32px;
+    font-size: 14px;
+  }
+
+  .requestRideModal .datePickerAnchor .datePickerBottomFrame {
+    padding: 12px;
+  }
+}
\ No newline at end of file
diff --git a/frontend/src/components/RequestRideModal/steps/DateStep.tsx b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
new file mode 100644
index 000000000..c6b56f0af
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
@@ -0,0 +1,363 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { useFormContext } from 'react-hook-form';
+import moment from 'moment';
+import { Ride } from '../../../types';
+import { RideModalType } from '../types';
+import { Label, Input } from '../../FormElements/FormElements';
+import { isTimeValid } from '../../../util/index';
+import CustomRepeatingRides from '../CustomRepeatingRides';
+import CustomDatePicker from '../CustomDatePicker';
+import styles from '../requestridemodal.module.css';
+
+type DateStepProps = {
+    ride?: Ride;
+    modalType: RideModalType;
+    showRepeatingCheckbox: boolean;
+    showRepeatingInfo: boolean;
+    onClose?: () => void;
+    onNext?: () => void;
+    currentStep?: 'date' | 'pickup' | 'dropoff';
+};
+
+const DateStep: React.FC<DateStepProps> = ({
+    ride,
+    modalType,
+    showRepeatingCheckbox,
+    showRepeatingInfo,
+    onClose,
+    onNext,
+    currentStep = 'date',
+}) => {
+    const {
+        register,
+        formState: { errors },
+        getValues,
+        watch,
+        trigger,
+        reset,
+        setValue,
+    } = useFormContext();
+
+    const [custom, setCustom] = useState(false);
+    const [dragStartY, setDragStartY] = useState<number | null>(null);
+    const [showRepeatOptions, setShowRepeatOptions] = useState(false);
+    const [selectedDays, setSelectedDays] = useState<Set<string>>(new Set());
+    const [showDatePicker, setShowDatePicker] = useState(false);
+    const [datePickerMonth, setDatePickerMonth] = useState(moment());
+    const dateButtonRef = useRef<HTMLButtonElement>(null);
+    const watchRepeating = watch('recurring', false);
+    const watchStartDate = watch('startDate');
+    const watchWhenRepeat = watch('whenRepeat', 'no-repeat');
+    const watchEndDate = watch('endDate');
+    const shouldDisableStartDate = ride && ride.schedulingState !== 'unscheduled';
+
+    // Check if form is valid for enabling "Save and Continue" button
+    // Date is always required - must be a valid date string (not empty, not just whitespace)
+    // If Custom is selected, at least one day must be selected
+    const hasValidDate = Boolean(
+        watchStartDate && 
+        typeof watchStartDate === 'string' &&
+        watchStartDate.trim() !== '' &&
+        watchStartDate !== 'Invalid date'
+    );
+    
+    const isCustom = watchWhenRepeat === 'custom';
+    const hasValidRepeats = !isCustom || selectedDays.size > 0;
+    
+    const isFormValid = hasValidDate && hasValidRepeats;
+
+    const handleTouchStart = (e: React.TouchEvent<HTMLDivElement>) => {
+        setDragStartY(e.touches[0].clientY);
+    };
+
+    const handleTouchMove = (e: React.TouchEvent<HTMLDivElement>) => {
+        if (dragStartY === null) return;
+        const currentY = e.touches[0].clientY;
+        const deltaY = currentY - dragStartY;
+
+        // If user drags down more than 60px, close the modal
+        if (deltaY > 60) {
+            onClose?.();
+            setDragStartY(null);
+        }
+    };
+
+    const handleTouchEnd = () => {
+        setDragStartY(null);
+    };
+
+    return (
+        <div className={styles.stepPage}>
+            <div className={styles.topContent}>
+                {/* Drag handle at the top (click to close on desktop, drag down on mobile) */}
+                <div
+                    className={styles.dragHandle}
+                    onClick={onClose}
+                    onTouchStart={handleTouchStart}
+                    onTouchMove={handleTouchMove}
+                    onTouchEnd={handleTouchEnd}
+                />
+
+                <div className={styles.mobileHeaderFrame}>
+                <div className={styles.mobileTitleLeft}>Request a Ride</div>
+                <div className={styles.datePickerAnchor}>
+                    <button
+                        ref={dateButtonRef}
+                        type="button"
+                        className={styles.optionButton}
+                        onClick={() => {
+                            setShowDatePicker(!showDatePicker);
+                        }}
+                    >
+                        <span
+                            className={
+                                !watchStartDate || watchStartDate === ''
+                                    ? styles.dateButtonPlaceholder
+                                    : ''
+                            }
+                        >
+                            {watchStartDate && watchStartDate !== ''
+                                ? moment(watchStartDate).format('MM/DD/YYYY')
+                                : 'Date'}
+                        </span>
+                        <span
+                            aria-hidden="true"
+                            className={styles.optionIcon}
+                        >
+                            {/* Calendar icon */}
+                            <svg
+                                xmlns="http://www.w3.org/2000/svg"
+                                width="24"
+                                height="24"
+                                viewBox="0 0 24 24"
+                                fill="none"
+                            >
+                                <path
+                                    d="M19 19H5V8H19M16 1V3H8V1H6V3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3H18V1"
+                                    fill="black"
+                                />
+                            </svg>
+                        </span>
+                    </button>
+                    {showDatePicker && dateButtonRef.current && (
+                        <CustomDatePicker
+                            selectedDate={
+                                watchStartDate && watchStartDate !== ''
+                                    ? moment(watchStartDate)
+                                    : moment()
+                            }
+                            currentMonth={datePickerMonth}
+                            onMonthChange={setDatePickerMonth}
+                            onDateSelect={(date) => {
+                                const formattedDate = date.format('YYYY-MM-DD');
+                                setValue('startDate', formattedDate);
+                                setShowDatePicker(false);
+                            }}
+                            onCancel={() => setShowDatePicker(false)}
+                            buttonRef={dateButtonRef}
+                        />
+                    )}
+                </div>
+                <button
+                    type="button"
+                    className={styles.optionButton}
+                    onClick={() => {
+                        setShowRepeatOptions(!showRepeatOptions);
+                    }}
+                >
+                    <span>
+                        {watchWhenRepeat === 'no-repeat' ? 'No Repeat' :
+                         watchWhenRepeat === 'daily' ? 'Daily' :
+                         watchWhenRepeat === 'weekly' ? 'Weekly' :
+                         watchWhenRepeat === 'biweekly' ? 'Biweekly' :
+                         watchWhenRepeat === 'custom' ? 'Custom' :
+                         'No Repeat'}
+                    </span>
+                    <span
+                        aria-hidden="true"
+                        className={styles.optionIcon}
+                    >
+                        {/* Chevron-right icon */}
+                        <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="24"
+                            height="24"
+                            viewBox="0 0 24 24"
+                            fill="none"
+                        >
+                            <path
+                                d="M8.29496 7.11508L12.875 11.7051L8.29496 16.2951L9.70496 17.7051L15.705 11.7051L9.70496 5.70508L8.29496 7.11508Z"
+                                fill="black"
+                            />
+                        </svg>
+                    </span>
+                </button>
+
+                {/* Repeat options selection form */}
+                {showRepeatOptions && (
+                    <div className={styles.repeatOptionsContainer}>
+                        {[
+                            { value: 'no-repeat', label: 'No Repeat' },
+                            { value: 'daily', label: 'Daily' },
+                            { value: 'weekly', label: 'Weekly' },
+                            { value: 'biweekly', label: 'Biweekly' },
+                            { value: 'custom', label: 'Custom' },
+                        ].map((option) => {
+                            const isSelected = watchWhenRepeat === option.value;
+                            return (
+                                <button
+                                    key={option.value}
+                                    type="button"
+                                    className={`${styles.repeatOption} ${isSelected ? styles.repeatOptionSelected : ''}`}
+                                    onClick={() => {
+                                        if (option.value === 'no-repeat') {
+                                            setValue('whenRepeat', 'no-repeat');
+                                            setValue('recurring', false);
+                                            setCustom(false);
+                                        } else if (option.value === 'custom') {
+                                            setValue('whenRepeat', 'custom');
+                                            setValue('recurring', true);
+                                            setCustom(true);
+                                        } else {
+                                            // Daily, Weekly, Biweekly - set recurring to true but don't show custom options
+                                            setValue('whenRepeat', option.value);
+                                            setValue('recurring', true);
+                                            setCustom(false);
+                                        }
+                                        setShowRepeatOptions(false);
+                                    }}
+                                >
+                                    {option.label}
+                                </button>
+                            );
+                        })}
+                    </div>
+                )}
+
+                {/* Custom repeat day selection - appears when Custom is selected */}
+                {showRepeatingInfo && watchWhenRepeat === 'custom' && (
+                    <div className={styles.customRepeatSection}>
+                        <div className={styles.selectDaysLabel}>Select day of the week</div>
+                        <div className={styles.daysContainer}>
+                            {[
+                                { value: 'Mon', label: 'M' },
+                                { value: 'Tue', label: 'T' },
+                                { value: 'Wed', label: 'W' },
+                                { value: 'Thu', label: 'T' },
+                                { value: 'Fri', label: 'F' },
+                            ].map((day) => {
+                                const isSelected = selectedDays.has(day.value);
+                                return (
+                                    <button
+                                        key={day.value}
+                                        type="button"
+                                        className={`${styles.dayBlock} ${isSelected ? styles.dayBlockSelected : ''}`}
+                                        onClick={() => {
+                                            const newSelectedDays = new Set(selectedDays);
+                                            if (isSelected) {
+                                                newSelectedDays.delete(day.value);
+                                            } else {
+                                                newSelectedDays.add(day.value);
+                                            }
+                                            setSelectedDays(newSelectedDays);
+                                            // Update form values
+                                            setValue(day.value, !isSelected);
+                                        }}
+                                    >
+                                        {day.label}
+                                    </button>
+                                );
+                            })}
+                        </div>
+                    </div>
+                )}
+                </div>
+            </div>
+
+            {/* Hidden form fields for validation - Date button will trigger date picker */}
+            <div style={{ position: 'absolute', opacity: 0, pointerEvents: 'none', width: 0, height: 0, overflow: 'hidden' }}>
+                <input
+                    id="startDate"
+                    type="date"
+                    disabled={shouldDisableStartDate}
+                    aria-hidden="true"
+                    {...register('startDate', {
+                        required: 'Please select a date',
+                        validate: (startDate) => {
+                            const pickupTime = getValues('pickupTime');
+                            const notWeekend =
+                                moment(startDate).day() !== 0 &&
+                                moment(startDate).day() !== 6;
+                            if (pickupTime && notWeekend) {
+                                return (
+                                    isTimeValid(startDate, pickupTime) ||
+                                    "Can't schedule rides for less than 2 days from today"
+                                );
+                            } else {
+                                return (
+                                    notWeekend ||
+                                    'Please enter a valid date. (Note: CULifts does not operate during weekends or university-wide breaks.)'
+                                );
+                            }
+                        },
+                    })}
+                />
+                {/* Hidden checkbox for repeating - Repeats button will toggle this */}
+                <input
+                    type="checkbox"
+                    id="recurring"
+                    aria-hidden="true"
+                    {...register('recurring')}
+                />
+                {/* Hidden input for whenRepeat */}
+                <input
+                    type="hidden"
+                    {...register('whenRepeat')}
+                />
+            </div>
+            {errors.startDate && (
+                <p className={styles.error}>{errors.startDate.message as string}</p>
+            )}
+
+            {/* Bottom section with page indicators and buttons */}
+            <div className={styles.bottomSection}>
+                {/* Page indicators - positioned right above bottom button frame */}
+                <div className={styles.pageIndicators}>
+                    <div className={`${styles.pageIndicator} ${currentStep === 'date' ? styles.pageIndicatorActive : ''}`} />
+                    <div className={`${styles.pageIndicator} ${currentStep === 'pickup' ? styles.pageIndicatorActive : ''}`} />
+                    <div className={`${styles.pageIndicator} ${currentStep === 'dropoff' ? styles.pageIndicatorActive : ''}`} />
+                </div>
+
+                {/* Bottom frame with Cancel and Save & Continue buttons */}
+                <div className={styles.bottomButtonFrame}>
+                <button
+                    type="button"
+                    className={styles.cancelButton}
+                    onClick={() => {
+                        reset();
+                        onClose?.();
+                    }}
+                >
+                    Cancel
+                </button>
+                <button
+                    type="button"
+                    className={styles.saveContinueButton}
+                    disabled={!isFormValid}
+                    onClick={async () => {
+                        const fieldsToValidate = ['startDate'];
+                        const isValid = await trigger(fieldsToValidate as any);
+                        if (isValid && isFormValid && onNext) {
+                            onNext();
+                        }
+                    }}
+                >
+                    Save and Continue
+                </button>
+                </div>
+            </div>
+        </div>
+    );
+};
+
+export default DateStep;
diff --git a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
new file mode 100644
index 000000000..9425d4e22
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
@@ -0,0 +1,470 @@
+import React, { useState, useEffect, useRef, useMemo } from 'react';
+import { useFormContext } from 'react-hook-form';
+import addresser from 'addresser';
+import moment from 'moment';
+import { Ride } from '../../../types';
+import { RideModalType } from '../types';
+import { Label, Input } from '../../FormElements/FormElements';
+import { checkBounds, isTimeValid } from '../../../util/index';
+import { useLocations } from '../../../context/LocationsContext';
+import RequestRideMap from '../../RiderComponents/RequestRideMap';
+import { Location } from '../../../types';
+import styles from '../requestridemodal.module.css';
+
+type DropoffLocationStepProps = {
+  ride?: Ride;
+  modalType: RideModalType;
+  currentStep?: 'date' | 'pickup' | 'dropoff';
+  onClose?: () => void;
+  onNext?: () => void;
+  onBack?: () => void;
+};
+
+const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
+  ride,
+  modalType,
+  currentStep = 'dropoff',
+  onClose,
+  onNext,
+  onBack,
+}) => {
+  const {
+    register,
+    formState: { errors },
+    getValues,
+    watch,
+    setValue,
+    reset,
+    trigger,
+  } = useFormContext();
+
+  const [locations, setLocations] = useState<Location[]>([]);
+  const [dropoffLocation, setDropoffLocation] = useState<Location | null>(null);
+  const [searchQuery, setSearchQuery] = useState('');
+  const [filteredLocations, setFilteredLocations] = useState<Location[]>([]);
+  const [showLocationDropdown, setShowLocationDropdown] = useState(false);
+  const [showLocationButton, setShowLocationButton] = useState(false);
+  const [dragStartY, setDragStartY] = useState<number | null>(null);
+  const [timeHour, setTimeHour] = useState<string>('');
+  const [timeMinute, setTimeMinute] = useState<string>('');
+  const [timePeriod, setTimePeriod] = useState<'AM' | 'PM'>('AM');
+  const searchInputRef = useRef<HTMLDivElement>(null);
+  const locationButtonRef = useRef<HTMLButtonElement>(null);
+  const watchDropoffCustom = watch('endLocation');
+  const watchCustomCheckbox = watch('customDropoffLocation', false);
+  const watchEndLocation = watch('endLocation');
+  const watchDropoffTime = watch('dropoffTime');
+  const loc = useLocations().locations;
+
+  // Initialize time fields from watchDropoffTime
+  useEffect(() => {
+    if (watchDropoffTime && watchDropoffTime !== '') {
+      const time = moment(watchDropoffTime, 'HH:mm');
+      setTimeHour(time.format('h'));
+      setTimeMinute(time.format('mm'));
+      setTimePeriod(time.format('A') as 'AM' | 'PM');
+    }
+  }, [watchDropoffTime]);
+
+  // Update form value when time fields change
+  useEffect(() => {
+    if (timeHour && timeMinute) {
+      const hour24 = timePeriod === 'AM'
+        ? (timeHour === '12' ? 0 : parseInt(timeHour, 10))
+        : (timeHour === '12' ? 12 : parseInt(timeHour, 10) + 12);
+      const timeString = `${hour24.toString().padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
+      setValue('dropoffTime', timeString);
+    }
+  }, [timeHour, timeMinute, timePeriod, setValue]);
+
+  // Close dropdown when clicking outside
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        searchInputRef.current &&
+        !searchInputRef.current.contains(event.target as Node) &&
+        locationButtonRef.current &&
+        !locationButtonRef.current.contains(event.target as Node)
+      ) {
+        setShowLocationDropdown(false);
+        setShowLocationButton(false);
+      }
+    };
+
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, []);
+
+  useEffect(() => {
+    // Use all locations from context for the selector,
+    // and let the map handle filtering by coordinates internally
+    setLocations(loc);
+    setFilteredLocations(loc);
+  }, [loc]);
+
+  useEffect(() => {
+    if (searchQuery.trim() === '') {
+      setFilteredLocations(locations);
+    } else {
+      const filtered = locations.filter((location) =>
+        location.name.toLowerCase().includes(searchQuery.toLowerCase())
+      );
+      setFilteredLocations(filtered);
+    }
+  }, [searchQuery, locations]);
+
+  useEffect(() => {
+    if (ride) {
+      const defaultEnd =
+        ride.endLocation.tag === 'custom'
+          ? 'Other'
+          : ride.endLocation.id ?? '';
+      setValue('endLocation', defaultEnd);
+    }
+  }, [locations, ride, setValue]);
+
+  useEffect(() => {
+    if (ride && watchDropoffCustom === 'Other') {
+      const dropoff = addresser.parseAddress(ride.endLocation.address);
+      setValue('customDropoff', dropoff.addressLine1);
+      setValue('dropoffCity', dropoff.placeName);
+      setValue('dropoffZip', dropoff.zipCode);
+    }
+  }, [watchDropoffCustom, ride, setValue]);
+
+  useEffect(() => {
+    if (watchCustomCheckbox) {
+      setValue('endLocation', 'Other');
+      setSearchQuery('Other (Custom Address)');
+    }
+  }, [watchCustomCheckbox, setValue]);
+
+  const handleDropoffSelect = (location: Location | null) => {
+    setDropoffLocation(location);
+    if (location) {
+      const foundLocation = locations.find((loc) => loc.id === location.id);
+      if (foundLocation) {
+        setValue('endLocation', foundLocation.id);
+        setSearchQuery(foundLocation.name);
+        setShowLocationDropdown(false);
+        setShowLocationButton(false);
+      } else {
+        setValue('endLocation', 'Other');
+        const parsed = addresser.parseAddress(location.address);
+        setValue('customDropoff', parsed.addressLine1);
+        setValue('dropoffCity', parsed.placeName);
+        setValue('dropoffZip', parsed.zipCode);
+      }
+    }
+  };
+
+  const handleLocationInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const value = e.target.value;
+    setSearchQuery(value);
+    setShowLocationDropdown(true);
+    if (value === '') {
+      setValue('endLocation', '');
+    }
+  };
+
+  const handleLocationSelect = (location: Location) => {
+    setValue('endLocation', location.id);
+    setSearchQuery(location.name);
+    setShowLocationDropdown(false);
+    setShowLocationButton(false);
+    setDropoffLocation(location);
+  };
+
+  // Check if form is valid for enabling "Save and Continue" button
+  const isFormValid = useMemo(() => {
+    const hasLocation = watchEndLocation && watchEndLocation !== '' && watchEndLocation !== undefined;
+    const hasTime = watchDropoffTime && watchDropoffTime !== '' && watchDropoffTime !== undefined;
+
+    // Basic validation - just check if both fields are filled
+    // Let form validation handle more complex checks on submit
+    return hasLocation && hasTime;
+  }, [watchEndLocation, watchDropoffTime]);
+
+  const handleBack = () => {
+    if (onBack) {
+      onBack();
+    }
+  };
+
+  const handleSaveAndContinue = async () => {
+    if (onNext) {
+      await onNext();
+    }
+  };
+
+  const handleTouchStart = (e: React.TouchEvent) => {
+    setDragStartY(e.touches[0].clientY);
+  };
+
+  const handleTouchMove = (e: React.TouchEvent) => {
+    if (dragStartY !== null) {
+      const currentY = e.touches[0].clientY;
+      const diff = currentY - dragStartY;
+      if (diff > 100 && onClose) {
+        onClose();
+        setDragStartY(null);
+      }
+    }
+  };
+
+  const handleTouchEnd = () => {
+    setDragStartY(null);
+  };
+
+  // Get selected location name for display
+  const getSelectedLocationName = () => {
+    if (watchEndLocation && watchEndLocation !== '') {
+      if (watchEndLocation === 'Other') {
+        return 'Other (Custom Address)';
+      }
+      const location = locations.find((loc) => loc.id === watchEndLocation);
+      return location ? location.name : 'Select dropoff location';
+    }
+    return 'Select dropoff location';
+  };
+
+  return (
+    <div className={styles.stepPage}>
+      <div className={styles.topContent}>
+        {/* Drag handle at the top */}
+        <div
+          className={styles.dragHandle}
+          onClick={onClose}
+          onTouchStart={handleTouchStart}
+          onTouchMove={handleTouchMove}
+          onTouchEnd={handleTouchEnd}
+        />
+
+        {/* Top frame with dropoff location selection */}
+        <div className={styles.pickupLocationFrame}>
+          <div className={styles.pickupLocationTitle}>Select dropoff location:</div>
+
+          {/* Location selection button */}
+          <div className={styles.searchInputWrapper} ref={searchInputRef}>
+            <button
+              ref={locationButtonRef}
+              type="button"
+              className={styles.locationSelectButton}
+              onClick={() => {
+                setSearchQuery('');
+                setShowLocationButton(true);
+                setShowLocationDropdown(true);
+              }}
+            >
+              <span
+                className={
+                  !watchEndLocation || watchEndLocation === ''
+                    ? styles.locationButtonPlaceholder
+                    : ''
+                }
+              >
+                {getSelectedLocationName()}
+              </span>
+              <span className={styles.optionIcon}>
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="24"
+                  height="24"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  style={{ transform: 'rotate(90deg)' }}
+                >
+                  <path
+                    d="M9.20508 3C10.929 3 12.5823 3.68482 13.8013 4.90381C15.0203 6.12279 15.7051 7.77609 15.7051 9.5C15.7051 11.11 15.1151 12.59 14.1451 13.73L14.4151 14H15.2051L20.2051 19L18.7051 20.5L13.7051 15.5V14.71L13.4351 14.44C12.2951 15.41 10.8151 16 9.20508 16C7.48117 16 5.82787 15.3152 4.60888 14.0962C3.3899 12.8772 2.70508 11.2239 2.70508 9.5C2.70508 7.77609 3.3899 6.12279 4.60888 4.90381C5.82787 3.68482 7.48117 3 9.20508 3ZM9.20508 5C6.70508 5 4.70508 7 4.70508 9.5C4.70508 12 6.70508 14 9.20508 14C11.7051 14 13.7051 12 13.7051 9.5C13.7051 7 11.7051 5 9.20508 5Z"
+                    fill="black"
+                  />
+                </svg>
+              </span>
+            </button>
+
+            {/* Location dropdown */}
+            {showLocationDropdown && (
+              <div className={styles.locationDropdown}>
+                {filteredLocations.map((location) => (
+                  <div
+                    key={location.id}
+                    className={styles.locationOption}
+                    onClick={() => handleLocationSelect(location)}
+                  >
+                    {location.name}
+                  </div>
+                ))}
+                <div
+                  className={styles.locationOption}
+                  onClick={() => {
+                    setValue('endLocation', 'Other');
+                    setSearchQuery('Other (Custom Address)');
+                    setShowLocationDropdown(false);
+                    setShowLocationButton(false);
+                  }}
+                >
+                  Other (Custom Address)
+                </div>
+              </div>
+            )}
+          </div>
+
+          {/* Map */}
+          <div className={styles.pickupMapContainer}>
+            <RequestRideMap
+              pickupLocation={null}
+              dropoffLocation={dropoffLocation}
+              availableLocations={locations}
+              enableDropoffMapClick
+              onPickupSelect={() => { }}
+              onDropoffSelect={handleDropoffSelect}
+            />
+          </div>
+
+          {/* Dropoff time text */}
+          <div className={styles.pickupTimeText}>
+            Drop me off by ...
+          </div>
+
+          {/* Time input - Figma-style */}
+          <div className={styles.timeInputContainer}>
+            <input
+              type="text"
+              className={styles.timeInputHour}
+              placeholder="12"
+              value={timeHour}
+              onChange={(e) => {
+                const value = e.target.value.replace(/\D/g, '');
+                if (value === '' || (parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12)) {
+                  setTimeHour(value);
+                }
+              }}
+              maxLength={2}
+              aria-label="Hour"
+            />
+            <span className={styles.timeSeparator}>:</span>
+            <input
+              type="text"
+              className={styles.timeInputMinute}
+              placeholder="00"
+              value={timeMinute}
+              onChange={(e) => {
+                const value = e.target.value.replace(/\D/g, '');
+                if (value === '' || (parseInt(value, 10) >= 0 && parseInt(value, 10) <= 59)) {
+                  setTimeMinute(value.slice(0, 2));
+                }
+              }}
+              onBlur={() => {
+                if (timeMinute && timeMinute.length === 1) {
+                  setTimeMinute(timeMinute.padStart(2, '0'));
+                }
+              }}
+              maxLength={2}
+              aria-label="Minute"
+            />
+            <div className={styles.timePeriodContainer}>
+              <button
+                type="button"
+                className={`${styles.timePeriodButton} ${timePeriod === 'AM' ? styles.timePeriodButtonActive : ''}`}
+                onClick={() => setTimePeriod('AM')}
+              >
+                AM
+              </button>
+              <button
+                type="button"
+                className={`${styles.timePeriodButton} ${timePeriod === 'PM' ? styles.timePeriodButtonActive : ''}`}
+                onClick={() => setTimePeriod('PM')}
+              >
+                PM
+              </button>
+            </div>
+            <span className={styles.timeIcon} aria-hidden="true">
+              <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                <circle cx="12" cy="12" r="10" />
+                <polyline points="12 6 12 12 16 14" />
+              </svg>
+            </span>
+          </div>
+        </div>
+      </div>
+
+      {/* Hidden form fields for validation */}
+      <div style={{ position: 'absolute', opacity: 0, pointerEvents: 'none', width: 0, height: 0, overflow: 'hidden' }}>
+        <input
+          type="text"
+          {...register('endLocation', {
+            required: !watchCustomCheckbox && 'Please select a dropoff location',
+            validate: (dropOffLocation: string) => {
+              if (watchCustomCheckbox) return true;
+              const pickUpLocation = getValues('startLocation');
+              return (
+                dropOffLocation !== pickUpLocation ||
+                'Pickup and dropoff locations cannot be the same'
+              );
+            },
+          })}
+        />
+        <Input
+          id="dropoffTime"
+          type="time"
+          {...register('dropoffTime', {
+            required: 'Please select a dropoff time',
+            validate: (dropoffTime: string) => {
+              const startDate = getValues('startDate');
+              const pickupTime = getValues('pickupTime');
+              const dropoff = moment(`${startDate} ${dropoffTime}`);
+              if (startDate && pickupTime) {
+                const pickup = moment(`${startDate} ${pickupTime}`);
+                if (dropoff.isBefore(pickup)) {
+                  return 'Dropoff time must be after pickup time';
+                }
+              }
+              if (startDate) {
+                if (!isTimeValid(startDate, dropoffTime)) {
+                  return 'Please enter a valid date. (Note: CULifts does not operate during weekends or university-wide breaks.)';
+                }
+              }
+              return (
+                checkBounds(startDate, dropoff) ||
+                'Please select a valid dropoff time between 7:45 AM and 10:00 PM.'
+              );
+            },
+          })}
+        />
+      </div>
+
+      {/* Bottom section with page indicators and buttons */}
+      <div className={styles.bottomSection}>
+        {/* Page indicators */}
+        <div className={styles.pageIndicators}>
+          <div className={`${styles.pageIndicator} ${currentStep === 'date' ? styles.pageIndicatorActive : ''}`} />
+          <div className={`${styles.pageIndicator} ${currentStep === 'pickup' ? styles.pageIndicatorActive : ''}`} />
+          <div className={`${styles.pageIndicator} ${currentStep === 'dropoff' ? styles.pageIndicatorActive : ''}`} />
+        </div>
+
+        {/* Bottom button frame */}
+        <div className={styles.bottomButtonFrame}>
+          <button
+            type="button"
+            className={styles.cancelButton}
+            onClick={handleBack}
+          >
+            Back
+          </button>
+          <button
+            type="button"
+            className={styles.saveContinueButton}
+            disabled={!isFormValid}
+            onClick={handleSaveAndContinue}
+          >
+            Save and Continue
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default DropoffLocationStep;
diff --git a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
new file mode 100644
index 000000000..db9103166
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
@@ -0,0 +1,451 @@
+import React, { useState, useEffect, useRef, useMemo } from 'react';
+import { useFormContext } from 'react-hook-form';
+import addresser from 'addresser';
+import moment from 'moment';
+import { Ride } from '../../../types';
+import { RideModalType } from '../types';
+import { Input } from '../../FormElements/FormElements';
+import { checkBounds, isTimeValid } from '../../../util/index';
+import { useLocations } from '../../../context/LocationsContext';
+import RequestRideMap from '../../RiderComponents/RequestRideMap';
+import { Location } from '../../../types';
+import styles from '../requestridemodal.module.css';
+
+type PickupLocationStepProps = {
+  ride?: Ride;
+  modalType: RideModalType;
+  currentStep?: 'date' | 'pickup' | 'dropoff';
+  onClose?: () => void;
+  onNext?: () => void;
+  onBack?: () => void;
+};
+
+const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
+  ride,
+  modalType,
+  currentStep = 'pickup',
+  onClose,
+  onNext,
+  onBack,
+}) => {
+  const {
+    register,
+    getValues,
+    watch,
+    setValue,
+  } = useFormContext();
+
+  const [locations, setLocations] = useState<Location[]>([]);
+  const [pickupLocation, setPickupLocation] = useState<Location | null>(null);
+  const [searchQuery, setSearchQuery] = useState('');
+  const [filteredLocations, setFilteredLocations] = useState<Location[]>([]);
+  const [showLocationDropdown, setShowLocationDropdown] = useState(false);
+  const [showLocationButton, setShowLocationButton] = useState(false);
+  const [dragStartY, setDragStartY] = useState<number | null>(null);
+  const [timeHour, setTimeHour] = useState<string>('');
+  const [timeMinute, setTimeMinute] = useState<string>('');
+  const [timePeriod, setTimePeriod] = useState<'AM' | 'PM'>('AM');
+  const searchInputRef = useRef<HTMLDivElement>(null);
+  const locationButtonRef = useRef<HTMLButtonElement>(null);
+  const watchPickupCustom = watch('startLocation');
+  const watchCustomCheckbox = watch('customPickupLocation', false);
+  const watchStartLocation = watch('startLocation');
+  const watchPickupTime = watch('pickupTime');
+  const loc = useLocations().locations;
+
+  // Initialize time fields from watchPickupTime
+  useEffect(() => {
+    if (watchPickupTime && watchPickupTime !== '') {
+      const time = moment(watchPickupTime, 'HH:mm');
+      setTimeHour(time.format('h'));
+      setTimeMinute(time.format('mm'));
+      setTimePeriod(time.format('A') as 'AM' | 'PM');
+    }
+  }, [watchPickupTime]);
+
+  // Update form value when time fields change
+  useEffect(() => {
+    if (timeHour && timeMinute) {
+      const hour24 = timePeriod === 'AM'
+        ? (timeHour === '12' ? 0 : parseInt(timeHour, 10))
+        : (timeHour === '12' ? 12 : parseInt(timeHour, 10) + 12);
+      const timeString = `${hour24.toString().padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
+      setValue('pickupTime', timeString);
+    }
+  }, [timeHour, timeMinute, timePeriod, setValue]);
+
+  // Close dropdown when clicking outside
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        searchInputRef.current &&
+        !searchInputRef.current.contains(event.target as Node) &&
+        locationButtonRef.current &&
+        !locationButtonRef.current.contains(event.target as Node)
+      ) {
+        setShowLocationDropdown(false);
+        setShowLocationButton(false);
+      }
+    };
+
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
+    };
+  }, []);
+
+  useEffect(() => {
+    // Use all locations from context for the selector,
+    // and let the map handle filtering by coordinates internally
+    setLocations(loc);
+    setFilteredLocations(loc);
+  }, [loc]);
+
+  useEffect(() => {
+    if (searchQuery.trim() === '') {
+      setFilteredLocations(locations);
+    } else {
+      const filtered = locations.filter((location) =>
+        location.name.toLowerCase().includes(searchQuery.toLowerCase())
+      );
+      setFilteredLocations(filtered);
+    }
+  }, [searchQuery, locations]);
+
+  useEffect(() => {
+    if (ride) {
+      const defaultStart =
+        ride.startLocation.tag === 'custom'
+          ? 'Other'
+          : ride.startLocation.id ?? '';
+      setValue('startLocation', defaultStart);
+    }
+  }, [locations, ride, setValue]);
+
+  useEffect(() => {
+    if (ride && watchPickupCustom === 'Other') {
+      const pickup = addresser.parseAddress(ride.startLocation.address);
+      setValue('customPickup', pickup.addressLine1);
+      setValue('pickupCity', pickup.placeName);
+      setValue('pickupZip', pickup.zipCode);
+    }
+  }, [watchPickupCustom, ride, setValue]);
+
+  useEffect(() => {
+    if (watchCustomCheckbox) {
+      setValue('startLocation', 'Other');
+      setSearchQuery('Other (Custom Address)');
+    }
+  }, [watchCustomCheckbox, setValue]);
+
+  const handlePickupSelect = (location: Location | null) => {
+    setPickupLocation(location);
+    if (location) {
+      const foundLocation = locations.find((loc) => loc.id === location.id);
+      if (foundLocation) {
+        setValue('startLocation', foundLocation.id);
+        setSearchQuery(foundLocation.name);
+        setShowLocationDropdown(false);
+        setShowLocationButton(false);
+      } else {
+        setValue('startLocation', 'Other');
+        const parsed = addresser.parseAddress(location.address);
+        setValue('customPickup', parsed.addressLine1);
+        setValue('pickupCity', parsed.placeName);
+        setValue('pickupZip', parsed.zipCode);
+      }
+    }
+  };
+
+  const handleLocationSelect = (location: Location) => {
+    setValue('startLocation', location.id);
+    setSearchQuery(location.name);
+    setShowLocationDropdown(false);
+    setShowLocationButton(false);
+    setPickupLocation(location);
+  };
+
+  // Check if form is valid for enabling "Save and Continue" button
+  const isFormValid = useMemo(() => {
+    const hasLocation = watchStartLocation && watchStartLocation !== '' && watchStartLocation !== undefined;
+    const hasTime = watchPickupTime && watchPickupTime !== '' && watchPickupTime !== undefined;
+
+    // Basic validation - just check if both fields are filled
+    // Let form validation handle more complex checks on submit
+    return hasLocation && hasTime;
+  }, [watchStartLocation, watchPickupTime]);
+
+  const handleBack = () => {
+    if (onBack) {
+      onBack();
+    }
+  };
+
+  const handleSaveAndContinue = async () => {
+    if (onNext) {
+      await onNext();
+    }
+  };
+
+  const handleTouchStart = (e: React.TouchEvent) => {
+    setDragStartY(e.touches[0].clientY);
+  };
+
+  const handleTouchMove = (e: React.TouchEvent) => {
+    if (dragStartY !== null) {
+      const currentY = e.touches[0].clientY;
+      const diff = currentY - dragStartY;
+      if (diff > 100 && onClose) {
+        onClose();
+        setDragStartY(null);
+      }
+    }
+  };
+
+  const handleTouchEnd = () => {
+    setDragStartY(null);
+  };
+
+  // Get selected location name for display
+  const getSelectedLocationName = () => {
+    if (watchStartLocation && watchStartLocation !== '') {
+      if (watchStartLocation === 'Other') {
+        return 'Other (Custom Address)';
+      }
+      const location = locations.find((loc) => loc.id === watchStartLocation);
+      return location ? location.name : 'Select pickup location';
+    }
+    return 'Select pickup location';
+  };
+
+  return (
+    <div className={styles.stepPage}>
+      <div className={styles.topContent}>
+        {/* Drag handle at the top */}
+        <div
+          className={styles.dragHandle}
+          onClick={onClose}
+          onTouchStart={handleTouchStart}
+          onTouchMove={handleTouchMove}
+          onTouchEnd={handleTouchEnd}
+        />
+
+        {/* Top frame with pickup location selection */}
+        <div className={styles.pickupLocationFrame}>
+          <div className={styles.pickupLocationTitle}>Select pickup location:</div>
+
+          {/* Location selection button */}
+          <div className={styles.searchInputWrapper} ref={searchInputRef}>
+            <button
+              ref={locationButtonRef}
+              type="button"
+              className={styles.locationSelectButton}
+              onClick={() => {
+                setSearchQuery('');
+                setShowLocationButton(true);
+                setShowLocationDropdown(true);
+              }}
+            >
+              <span
+                className={
+                  !watchStartLocation || watchStartLocation === ''
+                    ? styles.locationButtonPlaceholder
+                    : ''
+                }
+              >
+                {getSelectedLocationName()}
+              </span>
+              <span className={styles.optionIcon}>
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="24"
+                  height="24"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  style={{ transform: 'rotate(90deg)' }}
+                >
+                  <path
+                    d="M9.20508 3C10.929 3 12.5823 3.68482 13.8013 4.90381C15.0203 6.12279 15.7051 7.77609 15.7051 9.5C15.7051 11.11 15.1151 12.59 14.1451 13.73L14.4151 14H15.2051L20.2051 19L18.7051 20.5L13.7051 15.5V14.71L13.4351 14.44C12.2951 15.41 10.8151 16 9.20508 16C7.48117 16 5.82787 15.3152 4.60888 14.0962C3.3899 12.8772 2.70508 11.2239 2.70508 9.5C2.70508 7.77609 3.3899 6.12279 4.60888 4.90381C5.82787 3.68482 7.48117 3 9.20508 3ZM9.20508 5C6.70508 5 4.70508 7 4.70508 9.5C4.70508 12 6.70508 14 9.20508 14C11.7051 14 13.7051 12 13.7051 9.5C13.7051 7 11.7051 5 9.20508 5Z"
+                    fill="black"
+                  />
+                </svg>
+              </span>
+            </button>
+
+            {/* Location dropdown */}
+            {showLocationDropdown && (
+              <div className={styles.locationDropdown}>
+                {filteredLocations.map((location) => (
+                  <div
+                    key={location.id}
+                    className={styles.locationOption}
+                    onClick={() => handleLocationSelect(location)}
+                  >
+                    {location.name}
+                  </div>
+                ))}
+                <div
+                  className={styles.locationOption}
+                  onClick={() => {
+                    setValue('startLocation', 'Other');
+                    setSearchQuery('Other (Custom Address)');
+                    setShowLocationDropdown(false);
+                    setShowLocationButton(false);
+                  }}
+                >
+                  Other (Custom Address)
+                </div>
+              </div>
+            )}
+          </div>
+
+          {/* Map */}
+          <div className={styles.pickupMapContainer}>
+            <RequestRideMap
+              pickupLocation={pickupLocation}
+              dropoffLocation={null}
+              availableLocations={locations}
+              enablePickupMapClick
+              onPickupSelect={handlePickupSelect}
+              onDropoffSelect={() => { }}
+            />
+          </div>
+
+          {/* Pickup time text */}
+          <div className={styles.pickupTimeText}>
+            Pick me up by ...
+          </div>
+
+          {/* Time input - Figma-style */}
+          <div className={styles.timeInputContainer}>
+            <input
+              type="text"
+              className={styles.timeInputHour}
+              placeholder="12"
+              value={timeHour}
+              onChange={(e) => {
+                const value = e.target.value.replace(/\D/g, '');
+                if (value === '' || (parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12)) {
+                  setTimeHour(value);
+                }
+              }}
+              maxLength={2}
+              aria-label="Hour"
+            />
+            <span className={styles.timeSeparator}>:</span>
+            <input
+              type="text"
+              className={styles.timeInputMinute}
+              placeholder="00"
+              value={timeMinute}
+              onChange={(e) => {
+                const value = e.target.value.replace(/\D/g, '');
+                if (value === '' || (parseInt(value, 10) >= 0 && parseInt(value, 10) <= 59)) {
+                  setTimeMinute(value.slice(0, 2));
+                }
+              }}
+              onBlur={() => {
+                if (timeMinute && timeMinute.length === 1) {
+                  setTimeMinute(timeMinute.padStart(2, '0'));
+                }
+              }}
+              maxLength={2}
+              aria-label="Minute"
+            />
+            <div className={styles.timePeriodContainer}>
+              <button
+                type="button"
+                className={`${styles.timePeriodButton} ${timePeriod === 'AM' ? styles.timePeriodButtonActive : ''}`}
+                onClick={() => setTimePeriod('AM')}
+              >
+                AM
+              </button>
+              <button
+                type="button"
+                className={`${styles.timePeriodButton} ${timePeriod === 'PM' ? styles.timePeriodButtonActive : ''}`}
+                onClick={() => setTimePeriod('PM')}
+              >
+                PM
+              </button>
+            </div>
+            <span className={styles.timeIcon} aria-hidden="true">
+              <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                <circle cx="12" cy="12" r="10" />
+                <polyline points="12 6 12 12 16 14" />
+              </svg>
+            </span>
+          </div>
+        </div>
+      </div>
+
+      {/* Hidden form fields for validation */}
+      <div style={{ position: 'absolute', opacity: 0, pointerEvents: 'none', width: 0, height: 0, overflow: 'hidden' }}>
+        <input
+          type="text"
+          {...register('startLocation', {
+            required: !watchCustomCheckbox && 'Please select a pickup location',
+            validate: (pickUpLocation: string) => {
+              if (watchCustomCheckbox) return true;
+              const dropOffLocation = getValues('endLocation');
+              return (
+                dropOffLocation !== pickUpLocation ||
+                'Pickup and dropoff locations cannot be the same'
+              );
+            },
+          })}
+        />
+        <Input
+          id="pickupTime"
+          type="time"
+          {...register('pickupTime', {
+            required: 'Please select a pickup time',
+            validate: (pickupTime: string) => {
+              const startDate = getValues('startDate');
+              const pickup = moment(`${startDate} ${pickupTime}`);
+              if (startDate) {
+                if (!isTimeValid(startDate, pickupTime)) {
+                  return 'Please enter a valid date. (Note: CULifts does not operate during weekends or university-wide breaks.)';
+                }
+              }
+              return (
+                checkBounds(startDate, pickup) ||
+                'Please select a valid pickup time between 7:45 AM and 10:00 PM.'
+              );
+            },
+          })}
+        />
+      </div>
+
+      {/* Bottom section with page indicators and buttons */}
+      <div className={styles.bottomSection}>
+        {/* Page indicators */}
+        <div className={styles.pageIndicators}>
+          <div className={`${styles.pageIndicator} ${currentStep === 'date' ? styles.pageIndicatorActive : ''}`} />
+          <div className={`${styles.pageIndicator} ${currentStep === 'pickup' ? styles.pageIndicatorActive : ''}`} />
+          <div className={`${styles.pageIndicator} ${currentStep === 'dropoff' ? styles.pageIndicatorActive : ''}`} />
+        </div>
+
+        {/* Bottom button frame */}
+        <div className={styles.bottomButtonFrame}>
+          <button
+            type="button"
+            className={styles.cancelButton}
+            onClick={handleBack}
+          >
+            Back
+          </button>
+          <button
+            type="button"
+            className={styles.saveContinueButton}
+            disabled={!isFormValid}
+            onClick={handleSaveAndContinue}
+          >
+            Save and Continue
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default PickupLocationStep;
diff --git a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
new file mode 100644
index 000000000..5ac3270b3
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
@@ -0,0 +1,591 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { useFormContext } from 'react-hook-form';
+import moment from 'moment';
+import { useLocations } from '../../../context/LocationsContext';
+import CustomDatePicker from '../CustomDatePicker';
+import { Location } from '../../../types';
+import styles from '../requestridemodal.module.css';
+
+type RequestSummaryStepProps = {
+  onClose?: () => void;
+  onNext?: () => void;
+  onBack?: () => void;
+};
+
+const REPEAT_LABELS: Record<string, string> = {
+  'no-repeat': 'No Repeat',
+  'daily': 'Daily',
+  'weekly': 'Weekly',
+  'biweekly': 'Biweekly',
+  'custom': 'Custom',
+};
+
+const REPEAT_OPTIONS = [
+  { value: 'no-repeat', label: 'No Repeat' },
+  { value: 'daily', label: 'Daily' },
+  { value: 'weekly', label: 'Weekly' },
+  { value: 'biweekly', label: 'Biweekly' },
+  { value: 'custom', label: 'Custom' },
+];
+
+type CustomDayValue = 'Mon' | 'Tue' | 'Wed' | 'Thu' | 'Fri';
+
+const CUSTOM_DAYS: { value: CustomDayValue; label: string }[] = [
+  { value: 'Mon', label: 'M' },
+  { value: 'Tue', label: 'T' },
+  { value: 'Wed', label: 'W' },
+  { value: 'Thu', label: 'T' },
+  { value: 'Fri', label: 'F' },
+];
+
+type EditingSection = 'date' | 'pickup' | 'dropoff' | null;
+
+const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
+  onClose,
+  onNext,
+  onBack,
+}) => {
+  const [dragStartY, setDragStartY] = useState<number | null>(null);
+  const [editingSection, setEditingSection] = useState<EditingSection>(null);
+  const [showDatePicker, setShowDatePicker] = useState(false);
+  const [datePickerMonth, setDatePickerMonth] = useState(moment());
+  const [showPickupDropdown, setShowPickupDropdown] = useState(false);
+  const [showDropoffDropdown, setShowDropoffDropdown] = useState(false);
+  const [pickupTimeHour, setPickupTimeHour] = useState<string>('');
+  const [pickupTimeMinute, setPickupTimeMinute] = useState<string>('');
+  const [pickupTimePeriod, setPickupTimePeriod] = useState<'AM' | 'PM'>('AM');
+  const [dropoffTimeHour, setDropoffTimeHour] = useState<string>('');
+  const [dropoffTimeMinute, setDropoffTimeMinute] = useState<string>('');
+  const [dropoffTimePeriod, setDropoffTimePeriod] = useState<'AM' | 'PM'>('AM');
+
+  const dateButtonRef = useRef<HTMLButtonElement>(null);
+  const pickupDropdownRef = useRef<HTMLDivElement>(null);
+  const dropoffDropdownRef = useRef<HTMLDivElement>(null);
+
+  const { watch, setValue } = useFormContext();
+  const { locations } = useLocations();
+
+  const startDate = watch('startDate');
+  const whenRepeat = watch('whenRepeat') || 'no-repeat';
+  const mon = watch('Mon');
+  const tue = watch('Tue');
+  const wed = watch('Wed');
+  const thu = watch('Thu');
+  const fri = watch('Fri');
+  const startLocation = watch('startLocation');
+  const pickupTime = watch('pickupTime');
+  const endLocation = watch('endLocation');
+  const dropoffTime = watch('dropoffTime');
+
+  const customDaysSelected: Record<string, boolean> = {
+    Mon: !!mon,
+    Tue: !!tue,
+    Wed: !!wed,
+    Thu: !!thu,
+    Fri: !!fri,
+  };
+  const selectedDaysSet = new Set(
+    (['Mon', 'Tue', 'Wed', 'Thu', 'Fri'] as const).filter((d) => customDaysSelected[d])
+  );
+
+  // Sync pickup time state when entering pickup edit mode
+  useEffect(() => {
+    if (editingSection === 'pickup' && pickupTime) {
+      const t = moment(pickupTime, 'HH:mm');
+      setPickupTimeHour(t.format('h'));
+      setPickupTimeMinute(t.format('mm'));
+      setPickupTimePeriod(t.format('A') as 'AM' | 'PM');
+    }
+  }, [editingSection, pickupTime]);
+
+  // Sync dropoff time state when entering dropoff edit mode
+  useEffect(() => {
+    if (editingSection === 'dropoff' && dropoffTime) {
+      const t = moment(dropoffTime, 'HH:mm');
+      setDropoffTimeHour(t.format('h'));
+      setDropoffTimeMinute(t.format('mm'));
+      setDropoffTimePeriod(t.format('A') as 'AM' | 'PM');
+    }
+  }, [editingSection, dropoffTime]);
+
+  // Write pickup time back to form
+  useEffect(() => {
+    if (editingSection === 'pickup' && pickupTimeHour && pickupTimeMinute) {
+      const hour24 =
+        pickupTimePeriod === 'AM'
+          ? pickupTimeHour === '12'
+            ? 0
+            : parseInt(pickupTimeHour, 10)
+          : pickupTimeHour === '12'
+            ? 12
+            : parseInt(pickupTimeHour, 10) + 12;
+      const timeString = `${hour24.toString().padStart(2, '0')}:${pickupTimeMinute.padStart(2, '0')}`;
+      setValue('pickupTime', timeString);
+    }
+  }, [editingSection, pickupTimeHour, pickupTimeMinute, pickupTimePeriod, setValue]);
+
+  // Write dropoff time back to form
+  useEffect(() => {
+    if (editingSection === 'dropoff' && dropoffTimeHour && dropoffTimeMinute) {
+      const hour24 =
+        dropoffTimePeriod === 'AM'
+          ? dropoffTimeHour === '12'
+            ? 0
+            : parseInt(dropoffTimeHour, 10)
+          : dropoffTimeHour === '12'
+            ? 12
+            : parseInt(dropoffTimeHour, 10) + 12;
+      const timeString = `${hour24.toString().padStart(2, '0')}:${dropoffTimeMinute.padStart(2, '0')}`;
+      setValue('dropoffTime', timeString);
+    }
+  }, [editingSection, dropoffTimeHour, dropoffTimeMinute, dropoffTimePeriod, setValue]);
+
+  const getPickupLocationDisplay = () => {
+    if (!startLocation || startLocation === '') return '';
+    if (startLocation === 'Other') return 'Other (Custom Address)';
+    const loc = locations.find((l) => l.id === startLocation);
+    return loc ? loc.name : startLocation;
+  };
+
+  const formatTime = (time: string) => {
+    if (!time) return '';
+    return moment(time, 'HH:mm').format('h:mm A');
+  };
+
+  const getDropoffLocationDisplay = () => {
+    if (!endLocation || endLocation === '') return '';
+    if (endLocation === 'Other') return 'Other (Custom Address)';
+    const loc = locations.find((l) => l.id === endLocation);
+    return loc ? loc.name : endLocation;
+  };
+
+  const handleTouchStart = (e: React.TouchEvent) => {
+    setDragStartY(e.touches[0].clientY);
+  };
+
+  const handleTouchMove = (e: React.TouchEvent) => {
+    if (dragStartY !== null) {
+      const currentY = e.touches[0].clientY;
+      const diff = currentY - dragStartY;
+      if (diff > 100 && onClose) {
+        onClose();
+        setDragStartY(null);
+      }
+    }
+  };
+
+  const handleTouchEnd = () => {
+    setDragStartY(null);
+  };
+
+  const toggleCustomDay = (day: CustomDayValue) => {
+    const current = watch(day);
+    setValue(day, !current);
+  };
+
+  const dateDisplay =
+    startDate && moment(startDate).isValid()
+      ? moment(startDate).format('MM/DD/YYYY')
+      : '';
+
+  const repeatDisplay =
+    REPEAT_LABELS[whenRepeat] ??
+    (whenRepeat ? whenRepeat.charAt(0).toUpperCase() + whenRepeat.slice(1) : 'No Repeat');
+
+  return (
+    <div className={styles.summaryStepPage}>
+      <div
+        className={styles.dragHandle}
+        onClick={onClose}
+        onTouchStart={handleTouchStart}
+        onTouchMove={handleTouchMove}
+        onTouchEnd={handleTouchEnd}
+      />
+
+      <h2 className={styles.summaryTitle}>Request Summary</h2>
+
+      <div className={styles.summaryScrollContainer}>
+        {/* Date and time section */}
+        <div className={styles.summaryDateTimeBlock}>
+          <h3 className={styles.summaryDateTimeTitle}>Date and time</h3>
+
+          {editingSection === 'date' ? (
+            <div className={styles.summaryInlineEdit}>
+              <div className={styles.datePickerAnchor}>
+                <button
+                  ref={dateButtonRef}
+                  type="button"
+                  className={styles.optionButton}
+                  onClick={() => setShowDatePicker(!showDatePicker)}
+                >
+                  <span>
+                    {startDate && moment(startDate).isValid()
+                      ? moment(startDate).format('MM/DD/YYYY')
+                      : 'Select date'}
+                  </span>
+                  <span className={styles.optionIcon} aria-hidden="true">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                      <path d="M19 19H5V8H19M16 1V3H8V1H6V3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3H18V1" fill="black" />
+                    </svg>
+                  </span>
+                </button>
+                {showDatePicker && dateButtonRef.current && (
+                  <CustomDatePicker
+                    selectedDate={
+                      startDate && moment(startDate).isValid() ? moment(startDate) : moment()
+                    }
+                    currentMonth={datePickerMonth}
+                    onMonthChange={setDatePickerMonth}
+                    onDateSelect={(date) => {
+                      setValue('startDate', date.format('YYYY-MM-DD'));
+                      setShowDatePicker(false);
+                    }}
+                    onCancel={() => setShowDatePicker(false)}
+                    buttonRef={dateButtonRef}
+                  />
+                )}
+              </div>
+              <div className={styles.summaryRepeatBlock}>
+                <div className={styles.repeatOptionsContainer}>
+                  {REPEAT_OPTIONS.map((option) => {
+                    const isSelected = whenRepeat === option.value;
+                    return (
+                      <button
+                        key={option.value}
+                        type="button"
+                        className={`${styles.repeatOption} ${isSelected ? styles.repeatOptionSelected : ''}`}
+                        onClick={() => {
+                          if (option.value === 'no-repeat') {
+                            setValue('whenRepeat', 'no-repeat');
+                            setValue('recurring', false);
+                          } else if (option.value === 'custom') {
+                            setValue('whenRepeat', 'custom');
+                            setValue('recurring', true);
+                          } else {
+                            setValue('whenRepeat', option.value);
+                            setValue('recurring', true);
+                          }
+                        }}
+                      >
+                        {option.label}
+                      </button>
+                    );
+                  })}
+                </div>
+                {whenRepeat === 'custom' && (
+                  <div className={styles.customRepeatSection}>
+                    <div className={styles.selectDaysLabel}>Select day of the week</div>
+                    <div className={styles.daysContainer}>
+                      {CUSTOM_DAYS.map((day) => (
+                        <button
+                          key={day.value}
+                          type="button"
+                          className={`${styles.dayBlock} ${selectedDaysSet.has(day.value) ? styles.dayBlockSelected : ''}`}
+                          onClick={() => toggleCustomDay(day.value)}
+                        >
+                          {day.label}
+                        </button>
+                      ))}
+                    </div>
+                  </div>
+                )}
+              </div>
+              <button
+                type="button"
+                className={styles.summaryDoneButton}
+                onClick={() => setEditingSection(null)}
+              >
+                Done
+              </button>
+            </div>
+          ) : (
+            <>
+              <div className={styles.summaryValueBox}>
+                <span>{dateDisplay}</span>
+              </div>
+              <div className={styles.summaryRepeatBlock}>
+                <div className={styles.summaryValueBox}>
+                  <span>{repeatDisplay}</span>
+                </div>
+                {whenRepeat === 'custom' && (
+                  <div className={`${styles.daysContainer} ${styles.summaryCustomDaysInSummary}`}>
+                    {CUSTOM_DAYS.map((day) => (
+                      <div
+                        key={day.value}
+                        className={`${styles.summaryDayBlockReadOnly} ${customDaysSelected[day.value] ? styles.summaryDayBlockReadOnlySelected : ''}`}
+                      >
+                        {day.label}
+                      </div>
+                    ))}
+                  </div>
+                )}
+              </div>
+              <button
+                type="button"
+                className={styles.summaryEditContainer}
+                onClick={() => setEditingSection('date')}
+              >
+                <span className={styles.summaryEditText}>Edit</span>
+              </button>
+            </>
+          )}
+        </div>
+
+        <div className={styles.summaryDivider} />
+
+        {/* Pickup section */}
+        <div className={styles.summarySectionBlock}>
+          <h3 className={styles.summarySectionLabel}>Pickup Location</h3>
+          {editingSection === 'pickup' ? (
+            <div className={styles.summaryInlineEdit}>
+              <div className={styles.searchInputWrapper} ref={pickupDropdownRef}>
+                <button
+                  type="button"
+                  className={styles.locationSelectButton}
+                  onClick={() => setShowPickupDropdown(!showPickupDropdown)}
+                >
+                  <span className={!startLocation ? styles.locationButtonPlaceholder : ''}>
+                    {getPickupLocationDisplay() || 'Select pickup location'}
+                  </span>
+                  <span className={styles.optionIcon}>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" style={{ transform: 'rotate(90deg)' }}>
+                      <path d="M9.20508 3C10.929 3 12.5823 3.68482 13.8013 4.90381C15.0203 6.12279 15.7051 7.77609 15.7051 9.5C15.7051 11.11 15.1151 12.59 14.1451 13.73L14.4151 14H15.2051L20.2051 19L18.7051 20.5L13.7051 15.5V14.71L13.4351 14.44C12.2951 15.41 10.8151 16 9.20508 16C7.48117 16 5.82787 15.3152 4.60888 14.0962C3.3899 12.8772 2.70508 11.2239 2.70508 9.5C2.70508 7.77609 3.3899 6.12279 4.60888 4.90381C5.82787 3.68482 7.48117 3 9.20508 3ZM9.20508 5C6.70508 5 4.70508 7 4.70508 9.5C4.70508 12 6.70508 14 9.20508 14C11.7051 14 13.7051 12 13.7051 9.5C13.7051 7 11.7051 5 9.20508 5Z" fill="black" />
+                    </svg>
+                  </span>
+                </button>
+                {showPickupDropdown && (
+                  <div className={styles.locationDropdown}>
+                    {locations.map((location: Location) => (
+                      <div
+                        key={location.id}
+                        className={styles.locationOption}
+                        onClick={() => {
+                          setValue('startLocation', location.id);
+                          setShowPickupDropdown(false);
+                        }}
+                      >
+                        {location.name}
+                      </div>
+                    ))}
+                    <div
+                      className={styles.locationOption}
+                      onClick={() => {
+                        setValue('startLocation', 'Other');
+                        setShowPickupDropdown(false);
+                      }}
+                    >
+                      Other (Custom Address)
+                    </div>
+                  </div>
+                )}
+              </div>
+              <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Pickup Time</h3>
+              <div className={styles.timeInputContainer}>
+                <input
+                  type="text"
+                  className={styles.timeInputHour}
+                  placeholder="12"
+                  value={pickupTimeHour}
+                  onChange={(e) => {
+                    const v = e.target.value.replace(/\D/g, '');
+                    if (v === '' || (parseInt(v, 10) >= 1 && parseInt(v, 10) <= 12)) setPickupTimeHour(v);
+                  }}
+                  maxLength={2}
+                />
+                <span className={styles.timeSeparator}>:</span>
+                <input
+                  type="text"
+                  className={styles.timeInputMinute}
+                  placeholder="00"
+                  value={pickupTimeMinute}
+                  onChange={(e) => {
+                    const v = e.target.value.replace(/\D/g, '');
+                    if (v === '' || (parseInt(v, 10) >= 0 && parseInt(v, 10) <= 59)) setPickupTimeMinute(v.slice(0, 2));
+                  }}
+                  onBlur={() => {
+                    if (pickupTimeMinute && pickupTimeMinute.length === 1) setPickupTimeMinute(pickupTimeMinute.padStart(2, '0'));
+                  }}
+                  maxLength={2}
+                />
+                <div className={styles.timePeriodContainer}>
+                  <button
+                    type="button"
+                    className={`${styles.timePeriodButton} ${pickupTimePeriod === 'AM' ? styles.timePeriodButtonActive : ''}`}
+                    onClick={() => setPickupTimePeriod('AM')}
+                  >
+                    AM
+                  </button>
+                  <button
+                    type="button"
+                    className={`${styles.timePeriodButton} ${pickupTimePeriod === 'PM' ? styles.timePeriodButtonActive : ''}`}
+                    onClick={() => setPickupTimePeriod('PM')}
+                  >
+                    PM
+                  </button>
+                </div>
+              </div>
+              <button
+                type="button"
+                className={styles.summaryDoneButton}
+                onClick={() => setEditingSection(null)}
+              >
+                Done
+              </button>
+            </div>
+          ) : (
+            <>
+              <div className={styles.summaryValueBox}>
+                <span>{getPickupLocationDisplay()}</span>
+              </div>
+              <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Pickup Time</h3>
+              <div className={styles.summaryValueBox}>
+                <span>{formatTime(pickupTime)}</span>
+              </div>
+              <button
+                type="button"
+                className={styles.summaryEditContainer}
+                onClick={() => setEditingSection('pickup')}
+              >
+                <span className={styles.summaryEditText}>Edit</span>
+              </button>
+            </>
+          )}
+        </div>
+
+        <div className={`${styles.summaryDivider} ${styles.summaryDividerAfterSection}`} />
+
+        {/* Dropoff section */}
+        <div className={styles.summarySectionBlock}>
+          <h3 className={styles.summarySectionLabel}>Dropoff Location</h3>
+          {editingSection === 'dropoff' ? (
+            <div className={styles.summaryInlineEdit}>
+              <div className={styles.searchInputWrapper} ref={dropoffDropdownRef}>
+                <button
+                  type="button"
+                  className={styles.locationSelectButton}
+                  onClick={() => setShowDropoffDropdown(!showDropoffDropdown)}
+                >
+                  <span className={!endLocation ? styles.locationButtonPlaceholder : ''}>
+                    {getDropoffLocationDisplay() || 'Select dropoff location'}
+                  </span>
+                  <span className={styles.optionIcon}>
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" style={{ transform: 'rotate(90deg)' }}>
+                      <path d="M9.20508 3C10.929 3 12.5823 3.68482 13.8013 4.90381C15.0203 6.12279 15.7051 7.77609 15.7051 9.5C15.7051 11.11 15.1151 12.59 14.1451 13.73L14.4151 14H15.2051L20.2051 19L18.7051 20.5L13.7051 15.5V14.71L13.4351 14.44C12.2951 15.41 10.8151 16 9.20508 16C7.48117 16 5.82787 15.3152 4.60888 14.0962C3.3899 12.8772 2.70508 11.2239 2.70508 9.5C2.70508 7.77609 3.3899 6.12279 4.60888 4.90381C5.82787 3.68482 7.48117 3 9.20508 3ZM9.20508 5C6.70508 5 4.70508 7 4.70508 9.5C4.70508 12 6.70508 14 9.20508 14C11.7051 14 13.7051 12 13.7051 9.5C13.7051 7 11.7051 5 9.20508 5Z" fill="black" />
+                    </svg>
+                  </span>
+                </button>
+                {showDropoffDropdown && (
+                  <div className={styles.locationDropdown}>
+                    {locations.map((location: Location) => (
+                      <div
+                        key={location.id}
+                        className={styles.locationOption}
+                        onClick={() => {
+                          setValue('endLocation', location.id);
+                          setShowDropoffDropdown(false);
+                        }}
+                      >
+                        {location.name}
+                      </div>
+                    ))}
+                    <div
+                      className={styles.locationOption}
+                      onClick={() => {
+                        setValue('endLocation', 'Other');
+                        setShowDropoffDropdown(false);
+                      }}
+                    >
+                      Other (Custom Address)
+                    </div>
+                  </div>
+                )}
+              </div>
+              <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Dropoff Time</h3>
+              <div className={styles.timeInputContainer}>
+                <input
+                  type="text"
+                  className={styles.timeInputHour}
+                  placeholder="12"
+                  value={dropoffTimeHour}
+                  onChange={(e) => {
+                    const v = e.target.value.replace(/\D/g, '');
+                    if (v === '' || (parseInt(v, 10) >= 1 && parseInt(v, 10) <= 12)) setDropoffTimeHour(v);
+                  }}
+                  maxLength={2}
+                />
+                <span className={styles.timeSeparator}>:</span>
+                <input
+                  type="text"
+                  className={styles.timeInputMinute}
+                  placeholder="00"
+                  value={dropoffTimeMinute}
+                  onChange={(e) => {
+                    const v = e.target.value.replace(/\D/g, '');
+                    if (v === '' || (parseInt(v, 10) >= 0 && parseInt(v, 10) <= 59)) setDropoffTimeMinute(v.slice(0, 2));
+                  }}
+                  onBlur={() => {
+                    if (dropoffTimeMinute && dropoffTimeMinute.length === 1) setDropoffTimeMinute(dropoffTimeMinute.padStart(2, '0'));
+                  }}
+                  maxLength={2}
+                />
+                <div className={styles.timePeriodContainer}>
+                  <button
+                    type="button"
+                    className={`${styles.timePeriodButton} ${dropoffTimePeriod === 'AM' ? styles.timePeriodButtonActive : ''}`}
+                    onClick={() => setDropoffTimePeriod('AM')}
+                  >
+                    AM
+                  </button>
+                  <button
+                    type="button"
+                    className={`${styles.timePeriodButton} ${dropoffTimePeriod === 'PM' ? styles.timePeriodButtonActive : ''}`}
+                    onClick={() => setDropoffTimePeriod('PM')}
+                  >
+                    PM
+                  </button>
+                </div>
+              </div>
+              <button
+                type="button"
+                className={styles.summaryDoneButton}
+                onClick={() => setEditingSection(null)}
+              >
+                Done
+              </button>
+            </div>
+          ) : (
+            <>
+              <div className={styles.summaryValueBox}>
+                <span>{getDropoffLocationDisplay()}</span>
+              </div>
+              <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Dropoff Time</h3>
+              <div className={styles.summaryValueBox}>
+                <span>{formatTime(dropoffTime)}</span>
+              </div>
+              <button
+                type="button"
+                className={styles.summaryEditContainer}
+                onClick={() => setEditingSection('dropoff')}
+              >
+                <span className={styles.summaryEditText}>Edit</span>
+              </button>
+            </>
+          )}
+        </div>
+      </div>
+
+      <div className={styles.bottomSection}>
+        <div className={styles.bottomButtonFrame}>
+          <button type="button" className={styles.cancelButton} onClick={onBack}>
+            Back
+          </button>
+          <button type="button" className={styles.saveContinueButton} onClick={onNext}>
+            Save and Continue
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default RequestSummaryStep;
diff --git a/frontend/src/components/RequestRideModal/steps/SummaryStep.tsx b/frontend/src/components/RequestRideModal/steps/SummaryStep.tsx
new file mode 100644
index 000000000..987d56e65
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/steps/SummaryStep.tsx
@@ -0,0 +1,135 @@
+import React from 'react';
+import { useFormContext } from 'react-hook-form';
+import moment from 'moment';
+import { Ride } from '../../../types';
+import { RideModalType } from '../types';
+import { useLocations } from '../../../context/LocationsContext';
+import styles from '../requestridemodal.module.css';
+
+type SummaryStepProps = {
+  ride?: Ride;
+  modalType: RideModalType;
+};
+
+const SummaryStep: React.FC<SummaryStepProps> = ({ ride, modalType }) => {
+  const { watch } = useFormContext();
+  const { locations } = useLocations();
+
+  const formData = watch();
+  const {
+    startDate,
+    startLocation,
+    endLocation,
+    pickupTime,
+    dropoffTime,
+    recurring,
+    whenRepeat,
+    endDate,
+    customPickup,
+    pickupCity,
+    pickupZip,
+    customDropoff,
+    dropoffCity,
+    dropoffZip,
+  } = formData;
+
+  const getLocationName = (locationId: string) => {
+    if (locationId === 'Other') {
+      return 'Custom Address';
+    }
+    const location = locations.find((loc) => loc.id === locationId);
+    return location ? location.name : locationId;
+  };
+
+  const getPickupAddress = () => {
+    if (startLocation === 'Other') {
+      return `${customPickup || ''}, ${pickupCity || 'Ithaca'} NY, ${
+        pickupZip || '14853'
+      }`;
+    }
+    return getLocationName(startLocation);
+  };
+
+  const getDropoffAddress = () => {
+    if (endLocation === 'Other') {
+      return `${customDropoff || ''}, ${dropoffCity || 'Ithaca'} NY, ${
+        dropoffZip || '14850'
+      }`;
+    }
+    return getLocationName(endLocation);
+  };
+
+  const formatTime = (time: string) => {
+    if (!time) return 'Not set';
+    return moment(time, 'HH:mm').format('h:mm A');
+  };
+
+  return (
+    <div className={styles.stepPage}>
+      <h2 className={styles.stepTitle}>Review Your Request</h2>
+      <p className={styles.stepDescription}>
+        Please review your ride details before submitting
+      </p>
+
+      <div className={styles.summaryContainer}>
+        <div className={styles.summarySection}>
+          <h3 className={styles.summarySectionTitle}>Date & Time</h3>
+          <div className={styles.summaryItem}>
+            <span className={styles.summaryLabel}>Date:</span>
+            <span className={styles.summaryValue}>
+              {startDate
+                ? moment(startDate).format('MMMM D, YYYY')
+                : 'Not set'}
+            </span>
+          </div>
+          <div className={styles.summaryItem}>
+            <span className={styles.summaryLabel}>Pickup Time:</span>
+            <span className={styles.summaryValue}>{formatTime(pickupTime)}</span>
+          </div>
+          <div className={styles.summaryItem}>
+            <span className={styles.summaryLabel}>Dropoff Time:</span>
+            <span className={styles.summaryValue}>
+              {formatTime(dropoffTime)}
+            </span>
+          </div>
+        </div>
+
+        <div className={styles.summarySection}>
+          <h3 className={styles.summarySectionTitle}>Locations</h3>
+          <div className={styles.summaryItem}>
+            <span className={styles.summaryLabel}>Pickup:</span>
+            <span className={styles.summaryValue}>{getPickupAddress()}</span>
+          </div>
+          <div className={styles.summaryItem}>
+            <span className={styles.summaryLabel}>Dropoff:</span>
+            <span className={styles.summaryValue}>{getDropoffAddress()}</span>
+          </div>
+        </div>
+
+        {recurring && (
+          <div className={styles.summarySection}>
+            <h3 className={styles.summarySectionTitle}>Repeat Schedule</h3>
+            <div className={styles.summaryItem}>
+              <span className={styles.summaryLabel}>Frequency:</span>
+              <span className={styles.summaryValue}>
+                {whenRepeat
+                  ? whenRepeat.charAt(0).toUpperCase() + whenRepeat.slice(1)
+                  : 'Not set'}
+              </span>
+            </div>
+            {endDate && (
+              <div className={styles.summaryItem}>
+                <span className={styles.summaryLabel}>Ends:</span>
+                <span className={styles.summaryValue}>
+                  {moment(endDate).format('MMMM D, YYYY')}
+                </span>
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default SummaryStep;
diff --git a/frontend/src/components/RiderComponents/RequestRideMap.tsx b/frontend/src/components/RiderComponents/RequestRideMap.tsx
index c29225665..027c2a8eb 100644
--- a/frontend/src/components/RiderComponents/RequestRideMap.tsx
+++ b/frontend/src/components/RiderComponents/RequestRideMap.tsx
@@ -6,7 +6,7 @@ import {
   Pin,
   InfoWindow,
   useMap,
-  MapMouseEvent,
+  type MapMouseEvent,
 } from '@vis.gl/react-google-maps';
 import { MarkerClusterer } from '@googlemaps/markerclusterer';
 import type { Marker } from '@googlemaps/markerclusterer';
@@ -25,6 +25,10 @@ interface RequestRideMapProps {
     address: string;
   }>;
   availableLocations?: Location[];
+  /** When true, clicking the map sets the pickup location (e.g. when there are no DB locations). */
+  enablePickupMapClick?: boolean;
+  /** When true, clicking the map sets the dropoff location. */
+  enableDropoffMapClick?: boolean;
   onPickupSelect: (location: Location | null) => void;
   onDropoffSelect: (location: Location | null) => void;
 }
@@ -34,6 +38,8 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
   dropoffLocation,
   dropoffOptions,
   availableLocations = [],
+  enablePickupMapClick = false,
+  enableDropoffMapClick = false,
   onPickupSelect,
   onDropoffSelect,
 }) => {
@@ -151,9 +157,61 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
     }
   };
 
-  // Remove custom map click handling since we only use predefined locations now
+  const handleMapClick = useCallback(
+    (event: MapMouseEvent) => {
+      const e = event as unknown as google.maps.MapMouseEvent;
+      if (!e.latLng) return;
+      const lat = typeof e.latLng.lat === 'function' ? e.latLng.lat() : (e.latLng as any).lat;
+      const lng = typeof e.latLng.lng === 'function' ? e.latLng.lng() : (e.latLng as any).lng;
+      if (typeof lat !== 'number' || typeof lng !== 'number' || !Number.isFinite(lat) || !Number.isFinite(lng)) return;
 
-  // Remove these functions since confirmation is now handled in the parent component
+      const locationFromClick: Location = {
+        id: 'custom',
+        name: 'Selected location',
+        address: `${lat.toFixed(6)}, ${lng.toFixed(6)}`,
+        shortName: 'Selected',
+        tag: 'custom' as any,
+        info: '',
+        lat,
+        lng,
+      };
+
+      const applyGeocoded = (loc: Location, results: google.maps.GeocoderResult[] | null) => {
+        if (results?.[0]?.formatted_address) {
+          return {
+            ...loc,
+            address: results[0].formatted_address,
+            name: results[0].formatted_address,
+            shortName: results[0].address_components?.[0]?.short_name ?? 'Selected',
+          };
+        }
+        return loc;
+      };
+
+      if (enablePickupMapClick) {
+        if (window.google?.maps?.Geocoder) {
+          const geocoder = new window.google.maps.Geocoder();
+          geocoder.geocode({ location: { lat, lng } }, (results, status) => {
+            const loc = status === 'OK' ? applyGeocoded(locationFromClick, results) : locationFromClick;
+            onPickupSelect(loc);
+          });
+        } else {
+          onPickupSelect(locationFromClick);
+        }
+      } else if (enableDropoffMapClick) {
+        if (window.google?.maps?.Geocoder) {
+          const geocoder = new window.google.maps.Geocoder();
+          geocoder.geocode({ location: { lat, lng } }, (results, status) => {
+            const loc = status === 'OK' ? applyGeocoded(locationFromClick, results) : locationFromClick;
+            onDropoffSelect(loc);
+          });
+        } else {
+          onDropoffSelect(locationFromClick);
+        }
+      }
+    },
+    [enablePickupMapClick, enableDropoffMapClick, onPickupSelect, onDropoffSelect]
+  );
 
   return (
     <>
@@ -164,6 +222,7 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
         gestureHandling={'greedy'}
         disableDefaultUI={false}
         className={styles.mapContainer}
+        onClick={handleMapClick}
       >
         {/* Pickup Location Marker */}
         {pickupLocation && (
diff --git a/frontend/src/pages/Rider/Schedule.tsx b/frontend/src/pages/Rider/Schedule.tsx
index b6dc69345..ed5239103 100644
--- a/frontend/src/pages/Rider/Schedule.tsx
+++ b/frontend/src/pages/Rider/Schedule.tsx
@@ -9,8 +9,7 @@ import { Button } from '@mui/material';
 import { Ride } from '../../types';
 import AuthContext from '../../context/auth';
 import styles from './page.module.css';
-import { FormData } from 'components/RiderComponents/RequestRideDialog';
-import RequestRideDialog from 'components/RiderComponents/RequestRideDialog';
+import RequestRideModal from 'components/RequestRideModal/RequestRideModal';
 import { APIProvider } from '@vis.gl/react-google-maps';
 import { useLocations } from '../../context/LocationsContext';
 import { useRides } from '../../context/RidesContext';
@@ -71,7 +70,6 @@ const Schedule: React.FC = () => {
   const { user, id } = useContext(AuthContext);
   const { locations } = useLocations();
   const { refreshRides, refreshRidesByUser } = useRides();
-  const [isDialogOpen, setIsDialogOpen] = useState(false);
   const [allRiderRides, setAllRiderRides] = useState<Ride[]>([]);
   const [loadingRides, setLoadingRides] = useState(false);
 
@@ -144,60 +142,10 @@ const Schedule: React.FC = () => {
     document.title = 'Schedule - Carriage';
   }, [id]);
 
-  const handleDialogOpen = () => {
-    setIsDialogOpen(true);
-  };
-
-  const handleDialogClose = () => {
-    setIsDialogOpen(false);
-  };
-
-  const handleRideSubmit = async (formData: FormData) => {
-    if (!formData.pickupLocation || !formData.dropoffLocation) return;
-
-    // For now, block any recurring rides
-    if (formData.repeatType !== 'none') {
-      alert(
-        'Recurring rides are not yet supported. Please create a single ride.'
-      );
-      return;
-    }
-
-    try {
-      // Build ISO datetimes
-      if (!formData.date || !formData.time) {
-        alert('Please select both date and time.');
-        return;
-      }
-
-      const dateStr = formData.date.toISOString().split('T')[0];
-      const timeStr = formData.time.toTimeString().split(' ')[0];
-      const startISO = new Date(`${dateStr}T${timeStr}`).toISOString();
-
-      const endISO = new Date(
-        new Date(startISO).getTime() + 30 * 60 * 1000
-      ).toISOString();
-
-      await axios.post('/api/rides', {
-        // Send location IDs (matching Admin flow)
-        startLocation: formData.pickupLocation.id,
-        endLocation: formData.dropoffLocation.id,
-        startTime: startISO,
-        endTime: endISO,
-        rider: id,
-        type: 'upcoming',
-        status: 'not_started',
-        schedulingState: 'unscheduled',
-      });
-
-      // Refresh rides after successful creation
-      await refreshRides();
-      console.log('Ride created successfully');
-      fetchRiderRides();
-    } catch (error) {
-      console.error('Failed to create ride:', error);
-      alert('Failed to create ride. Please try again.');
-    }
+  const handleRideSubmit = async () => {
+    // Refresh rides after successful creation
+    await refreshRides();
+    fetchRiderRides();
   };
 
   // Use the fetched rider rides instead of filtering from context
@@ -223,19 +171,7 @@ const Schedule: React.FC = () => {
             <h1 className={styles.header}>{user.firstName}'s Schedule</h1>
           )}
           <div className={styles.rightSection}>
-            <Button
-              variant="contained"
-              color="secondary"
-              onClick={handleDialogOpen}
-              sx={{
-                backgroundColor: 'black',
-                '&:hover': {
-                  backgroundColor: 'black',
-                },
-              }}
-            >
-              Request Ride
-            </Button>
+            <RequestRideModal onSubmit={handleRideSubmit} />
           </div>
         </div>
 
@@ -395,25 +331,6 @@ const Schedule: React.FC = () => {
           )}
         </div>
 
-        <RequestRideDialog
-          open={isDialogOpen}
-          onClose={handleDialogClose}
-          onSubmit={handleRideSubmit}
-          supportedLocations={locations
-            .map((l) => ({
-              id: String(l.id),
-              name: l.name,
-              address: l.address,
-              shortName: l.shortName,
-              info: l.info ?? '',
-              tag: (l.tag as any) ?? '',
-              lat: Number(l.lat),
-              lng: Number(l.lng),
-              photoLink: l.photoLink,
-              images: l.images,
-            }))
-            .filter((l) => Number.isFinite(l.lat) && Number.isFinite(l.lng))}
-        />
         {editingRide && (
           <RideDetailsComponent
             ride={editingRide}
diff --git a/frontend/src/util/index.tsx b/frontend/src/util/index.tsx
index 3af4e8fbb..5c5d08ee7 100644
--- a/frontend/src/util/index.tsx
+++ b/frontend/src/util/index.tsx
@@ -25,5 +25,21 @@ export const isTimeValid = (startDate: string, pickupTime: string) => {
   return selectedTime.isSameOrAfter(now.add(bufferDays, 'day'), 'day');
 };
 
+/** Time slots for pickup/dropoff: 7:45 AM–10:00 PM, 15-min steps. value = HH:mm, label = "7:45 AM" etc. */
+export const getTimeSlots = (): { value: string; label: string }[] => {
+  const slots: { value: string; label: string }[] = [];
+  const start = moment().hour(7).minute(45).second(0).millisecond(0);
+  const end = moment().hour(22).minute(0).second(0).millisecond(0);
+  let current = start.clone();
+  while (current.isSameOrBefore(end)) {
+    slots.push({
+      value: current.format('HH:mm'),
+      label: current.format('h:mm A'),
+    });
+    current.add(15, 'minutes');
+  }
+  return slots;
+};
+
 // Re-export user utilities
 export { extractNetIdFromEmail, getUserNetId } from './userUtils';

From d97198086c608954d68ba8ac70db76f36da6fab1 Mon Sep 17 00:00:00 2001
From: Emir Icyer <emiricyer07@gmail.com>
Date: Sat, 28 Feb 2026 10:30:16 -0500
Subject: [PATCH 02/10] Fixed minute form bug

---
 .../requestridemodal.module.css               | 28 +++++++++++++
 .../steps/DropoffLocationStep.tsx             | 27 ++++++++----
 .../steps/PickupLocationStep.tsx              | 27 ++++++++----
 .../steps/RequestSummaryStep.tsx              | 41 ++++++++++++++-----
 server/package.json                           |  1 +
 5 files changed, 96 insertions(+), 28 deletions(-)

diff --git a/frontend/src/components/RequestRideModal/requestridemodal.module.css b/frontend/src/components/RequestRideModal/requestridemodal.module.css
index 5dd03b5c5..b1418dbce 100644
--- a/frontend/src/components/RequestRideModal/requestridemodal.module.css
+++ b/frontend/src/components/RequestRideModal/requestridemodal.module.css
@@ -666,6 +666,34 @@
   color: #757575;
 }
 
+.timeInputWrapper {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  width: 100%;
+  align-self: stretch;
+}
+
+.timeInputContainerError {
+  border-color: #c62828;
+  box-shadow: 0 0 0 2px rgba(198, 40, 40, 0.12);
+}
+
+.timeInputContainerError:focus-within {
+  border-color: #c62828;
+  box-shadow: 0 0 0 2px rgba(198, 40, 40, 0.2);
+}
+
+.timeInputError {
+  margin: 0;
+  padding: 0;
+  color: #c62828;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-size: 13px;
+  font-weight: 400;
+  line-height: 1.35;
+}
+
 /* Time slot chips (pickup/dropoff) */
 .timeSlotsContainer {
   display: flex;
diff --git a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
index 9425d4e22..c5af6612a 100644
--- a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
@@ -66,16 +66,18 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
     }
   }, [watchDropoffTime]);
 
-  // Update form value when time fields change
+  // Update form value only when minute is complete and valid (2 digits, 00–59)
+  const timeMinuteNum = timeMinute.length === 2 ? parseInt(timeMinute, 10) : null;
+  const timeMinuteInvalid = timeMinuteNum !== null && (Number.isNaN(timeMinuteNum) || timeMinuteNum > 59);
   useEffect(() => {
-    if (timeHour && timeMinute) {
+    if (timeHour && timeMinute.length === 2 && !timeMinuteInvalid) {
       const hour24 = timePeriod === 'AM'
         ? (timeHour === '12' ? 0 : parseInt(timeHour, 10))
         : (timeHour === '12' ? 12 : parseInt(timeHour, 10) + 12);
       const timeString = `${hour24.toString().padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
       setValue('dropoffTime', timeString);
     }
-  }, [timeHour, timeMinute, timePeriod, setValue]);
+  }, [timeHour, timeMinute, timePeriod, setValue, timeMinuteInvalid]);
 
   // Close dropdown when clicking outside
   useEffect(() => {
@@ -329,7 +331,8 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
           </div>
 
           {/* Time input - Figma-style */}
-          <div className={styles.timeInputContainer}>
+          <div className={styles.timeInputWrapper}>
+            <div className={`${styles.timeInputContainer} ${timeMinuteInvalid ? styles.timeInputContainerError : ''}`}>
             <input
               type="text"
               className={styles.timeInputHour}
@@ -351,15 +354,15 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
               placeholder="00"
               value={timeMinute}
               onChange={(e) => {
-                const value = e.target.value.replace(/\D/g, '');
-                if (value === '' || (parseInt(value, 10) >= 0 && parseInt(value, 10) <= 59)) {
-                  setTimeMinute(value.slice(0, 2));
-                }
+                const value = e.target.value.replace(/\D/g, '').slice(0, 2);
+                setTimeMinute(value);
               }}
               onBlur={() => {
-                if (timeMinute && timeMinute.length === 1) {
+                if (timeMinute === '') return;
+                if (timeMinute.length === 1) {
                   setTimeMinute(timeMinute.padStart(2, '0'));
                 }
+                /* When minutes > 59 we leave the value so the user can correct it; error is shown below */
               }}
               maxLength={2}
               aria-label="Minute"
@@ -386,6 +389,12 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
                 <polyline points="12 6 12 12 16 14" />
               </svg>
             </span>
+            </div>
+            {timeMinuteInvalid && (
+              <p className={styles.timeInputError} role="alert">
+                Please enter minutes between 00 and 59. You can correct it above.
+              </p>
+            )}
           </div>
         </div>
       </div>
diff --git a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
index db9103166..05b74d044 100644
--- a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
@@ -63,16 +63,18 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
     }
   }, [watchPickupTime]);
 
-  // Update form value when time fields change
+  // Update form value only when minute is complete and valid (2 digits, 00–59)
+  const timeMinuteNum = timeMinute.length === 2 ? parseInt(timeMinute, 10) : null;
+  const timeMinuteInvalid = timeMinuteNum !== null && (Number.isNaN(timeMinuteNum) || timeMinuteNum > 59);
   useEffect(() => {
-    if (timeHour && timeMinute) {
+    if (timeHour && timeMinute.length === 2 && !timeMinuteInvalid) {
       const hour24 = timePeriod === 'AM'
         ? (timeHour === '12' ? 0 : parseInt(timeHour, 10))
         : (timeHour === '12' ? 12 : parseInt(timeHour, 10) + 12);
       const timeString = `${hour24.toString().padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
       setValue('pickupTime', timeString);
     }
-  }, [timeHour, timeMinute, timePeriod, setValue]);
+  }, [timeHour, timeMinute, timePeriod, setValue, timeMinuteInvalid]);
 
   // Close dropdown when clicking outside
   useEffect(() => {
@@ -317,7 +319,8 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
           </div>
 
           {/* Time input - Figma-style */}
-          <div className={styles.timeInputContainer}>
+          <div className={styles.timeInputWrapper}>
+            <div className={`${styles.timeInputContainer} ${timeMinuteInvalid ? styles.timeInputContainerError : ''}`}>
             <input
               type="text"
               className={styles.timeInputHour}
@@ -339,15 +342,15 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
               placeholder="00"
               value={timeMinute}
               onChange={(e) => {
-                const value = e.target.value.replace(/\D/g, '');
-                if (value === '' || (parseInt(value, 10) >= 0 && parseInt(value, 10) <= 59)) {
-                  setTimeMinute(value.slice(0, 2));
-                }
+                const value = e.target.value.replace(/\D/g, '').slice(0, 2);
+                setTimeMinute(value);
               }}
               onBlur={() => {
-                if (timeMinute && timeMinute.length === 1) {
+                if (timeMinute === '') return;
+                if (timeMinute.length === 1) {
                   setTimeMinute(timeMinute.padStart(2, '0'));
                 }
+                /* When minutes > 59 we leave the value so the user can correct it; error is shown below */
               }}
               maxLength={2}
               aria-label="Minute"
@@ -374,6 +377,12 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
                 <polyline points="12 6 12 12 16 14" />
               </svg>
             </span>
+            </div>
+            {timeMinuteInvalid && (
+              <p className={styles.timeInputError} role="alert">
+                Please enter minutes between 00 and 59. You can correct it above.
+              </p>
+            )}
           </div>
         </div>
       </div>
diff --git a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
index 5ac3270b3..4ac491993 100644
--- a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
@@ -109,8 +109,13 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
   }, [editingSection, dropoffTime]);
 
   // Write pickup time back to form
+  const pickupMinuteNum = pickupTimeMinute.length === 2 ? parseInt(pickupTimeMinute, 10) : null;
+  const pickupMinuteInvalid = pickupMinuteNum !== null && (Number.isNaN(pickupMinuteNum) || pickupMinuteNum > 59);
+  const dropoffMinuteNum = dropoffTimeMinute.length === 2 ? parseInt(dropoffTimeMinute, 10) : null;
+  const dropoffMinuteInvalid = dropoffMinuteNum !== null && (Number.isNaN(dropoffMinuteNum) || dropoffMinuteNum > 59);
+
   useEffect(() => {
-    if (editingSection === 'pickup' && pickupTimeHour && pickupTimeMinute) {
+    if (editingSection === 'pickup' && pickupTimeHour && pickupTimeMinute.length === 2 && !pickupMinuteInvalid) {
       const hour24 =
         pickupTimePeriod === 'AM'
           ? pickupTimeHour === '12'
@@ -126,7 +131,7 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
 
   // Write dropoff time back to form
   useEffect(() => {
-    if (editingSection === 'dropoff' && dropoffTimeHour && dropoffTimeMinute) {
+    if (editingSection === 'dropoff' && dropoffTimeHour && dropoffTimeMinute.length === 2 && !dropoffMinuteInvalid) {
       const hour24 =
         dropoffTimePeriod === 'AM'
           ? dropoffTimeHour === '12'
@@ -380,7 +385,8 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                 )}
               </div>
               <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Pickup Time</h3>
-              <div className={styles.timeInputContainer}>
+              <div className={styles.timeInputWrapper}>
+                <div className={`${styles.timeInputContainer} ${pickupMinuteInvalid ? styles.timeInputContainerError : ''}`}>
                 <input
                   type="text"
                   className={styles.timeInputHour}
@@ -399,11 +405,12 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                   placeholder="00"
                   value={pickupTimeMinute}
                   onChange={(e) => {
-                    const v = e.target.value.replace(/\D/g, '');
-                    if (v === '' || (parseInt(v, 10) >= 0 && parseInt(v, 10) <= 59)) setPickupTimeMinute(v.slice(0, 2));
+                    const v = e.target.value.replace(/\D/g, '').slice(0, 2);
+                    setPickupTimeMinute(v);
                   }}
                   onBlur={() => {
-                    if (pickupTimeMinute && pickupTimeMinute.length === 1) setPickupTimeMinute(pickupTimeMinute.padStart(2, '0'));
+                    if (pickupTimeMinute === '') return;
+                    if (pickupTimeMinute.length === 1) setPickupTimeMinute(pickupTimeMinute.padStart(2, '0'));
                   }}
                   maxLength={2}
                 />
@@ -424,6 +431,12 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                   </button>
                 </div>
               </div>
+              {pickupMinuteInvalid && (
+                <p className={styles.timeInputError} role="alert">
+                  Please enter minutes between 00 and 59. You can correct it above.
+                </p>
+              )}
+              </div>
               <button
                 type="button"
                 className={styles.summaryDoneButton}
@@ -501,7 +514,8 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                 )}
               </div>
               <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Dropoff Time</h3>
-              <div className={styles.timeInputContainer}>
+              <div className={styles.timeInputWrapper}>
+                <div className={`${styles.timeInputContainer} ${dropoffMinuteInvalid ? styles.timeInputContainerError : ''}`}>
                 <input
                   type="text"
                   className={styles.timeInputHour}
@@ -520,11 +534,12 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                   placeholder="00"
                   value={dropoffTimeMinute}
                   onChange={(e) => {
-                    const v = e.target.value.replace(/\D/g, '');
-                    if (v === '' || (parseInt(v, 10) >= 0 && parseInt(v, 10) <= 59)) setDropoffTimeMinute(v.slice(0, 2));
+                    const v = e.target.value.replace(/\D/g, '').slice(0, 2);
+                    setDropoffTimeMinute(v);
                   }}
                   onBlur={() => {
-                    if (dropoffTimeMinute && dropoffTimeMinute.length === 1) setDropoffTimeMinute(dropoffTimeMinute.padStart(2, '0'));
+                    if (dropoffTimeMinute === '') return;
+                    if (dropoffTimeMinute.length === 1) setDropoffTimeMinute(dropoffTimeMinute.padStart(2, '0'));
                   }}
                   maxLength={2}
                 />
@@ -545,6 +560,12 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                   </button>
                 </div>
               </div>
+              {dropoffMinuteInvalid && (
+                <p className={styles.timeInputError} role="alert">
+                  Please enter minutes between 00 and 59. You can correct it above.
+                </p>
+              )}
+              </div>
               <button
                 type="button"
                 className={styles.summaryDoneButton}
diff --git a/server/package.json b/server/package.json
index 8e68e95ed..df7fe41a0 100644
--- a/server/package.json
+++ b/server/package.json
@@ -42,6 +42,7 @@
     "lint": "eslint . --ext .js --ext .jsx --ext .ts --ext .tsx --fix",
     "type-check": "tsc --pretty --noEmit",
     "test": "cross-env NODE_ENV=test mocha -r ts-node/register \"tests/**/*.ts\" --exit --timeout 30000",
+    "seed": "ts-node src/scripts/seed-locations.ts",
     "test:watch": "cross-env NODE_ENV=test nodemon --watch . --exec 'mocha -r ts-node/register \"tests/**/*.ts\" --timeout 10000' --ext ts"
   },
   "repository": {

From 2244577d2b8a595c2480020232a1dd19a965819b Mon Sep 17 00:00:00 2001
From: Matthew Kim <mk2672@cornell.edu>
Date: Sun, 22 Mar 2026 14:08:30 -0400
Subject: [PATCH 03/10] Merged from main

---
 README.md                                     |    7 +
 frontend/package.json                         |    3 +-
 .../CreateOrEditRideModal.tsx                 |   13 +-
 .../RequestRideModal/CustomDatePicker.tsx     |  462 +-
 .../RequestRideModal/CustomTimePicker.tsx     |  316 +-
 .../RequestRideModal/RequestRideWizard.tsx    |  253 +-
 .../requestridemodal.module.css               |   92 +-
 .../RequestRideModal/steps/DateStep.tsx       |  674 +-
 .../steps/DropoffLocationStep.tsx             |  220 +-
 .../steps/PickupLocationStep.tsx              |  216 +-
 .../steps/RequestSummaryStep.tsx              |  441 +-
 .../RequestRideModal/steps/SummaryStep.tsx    |    8 +-
 .../RiderComponents/RequestRideMap.tsx        |   43 +-
 package.json                                  |    1 +
 pnpm-lock.yaml                                | 5825 +++++------------
 15 files changed, 3074 insertions(+), 5500 deletions(-)

diff --git a/README.md b/README.md
index d8d3b9dfc..c4860172f 100644
--- a/README.md
+++ b/README.md
@@ -26,12 +26,15 @@ If you have a disability that prevents you from walking around campus, getting a
 ### Current Contributors
 
 #### Technical Project Manager
+
 - Matthew Kim
 
 ### Designer
+
 - Ryan Qiu
 
 #### Software Developers
+
 - Anika Chandra
 - Emir Icyer
 
@@ -40,6 +43,7 @@ If you have a disability that prevents you from walking around campus, getting a
 ### Past Contributors
 
 #### Product Managers
+
 - Andrew Choi
 - Bryan Graeser
 - Kathy Lim
@@ -49,6 +53,7 @@ If you have a disability that prevents you from walking around campus, getting a
 - Stephy Chen
 
 #### Technical Project Managers
+
 - Christopher Hansen
 - Desmond Atikpui
 - Daniel Wei
@@ -59,6 +64,7 @@ If you have a disability that prevents you from walking around campus, getting a
 - Selena Liu
 
 #### Software Developers
+
 - Aaron Kang
 - Aiden Kim
 - Andrew Choi
@@ -90,6 +96,7 @@ If you have a disability that prevents you from walking around campus, getting a
 - Zack Ashen
 
 #### Designers
+
 - Aiden Kim
 - Chelsea Wang
 - Joanne Lee
diff --git a/frontend/package.json b/frontend/package.json
index 3264767e6..70014b622 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -4,7 +4,8 @@
   "description": "",
   "main": "index.js",
   "dependencies": {
-    "@carriage-web/shared": "workspace:*"
+    "@carriage-web/shared": "workspace:*",
+    "node-releases": "^2.0.36"
   },
   "scripts": {
     "dev": "vite",
diff --git a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
index 7a6a0fa28..a295fccd0 100644
--- a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
+++ b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
@@ -23,8 +23,8 @@ type CreateOrEditRideModalProps = {
 const CreateOrEditRideModal = ({
   isOpen,
   modalType,
-  onSubmit = () => { },
-  onClose = () => { },
+  onSubmit = () => {},
+  onClose = () => {},
   ride,
 }: CreateOrEditRideModalProps) => {
   const defaultStartDate = () => {
@@ -107,7 +107,8 @@ const CreateOrEditRideModal = ({
         : `${customDropoff}, ${dropoffCity} NY, ${dropoffZip}`;
     let rideData: ObjectType;
     // Check if it's a recurring ride (not "no-repeat")
-    const isRecurringRide = recurring || (whenRepeat && whenRepeat !== 'no-repeat');
+    const isRecurringRide =
+      recurring || (whenRepeat && whenRepeat !== 'no-repeat');
     if (isRecurringRide) {
       // For now, block recurring rides as they're not fully implemented
       alert(
@@ -167,7 +168,11 @@ const CreateOrEditRideModal = ({
       className={styles.requestRideModal}
     >
       <FormProvider {...methods}>
-        <form ref={formRef} onSubmit={methods.handleSubmit(handleSubmit)} id="ride-form">
+        <form
+          ref={formRef}
+          onSubmit={methods.handleSubmit(handleSubmit)}
+          id="ride-form"
+        >
           <div className={styles.inputContainer}>
             <RequestRideWizard
               ride={ride}
diff --git a/frontend/src/components/RequestRideModal/CustomDatePicker.tsx b/frontend/src/components/RequestRideModal/CustomDatePicker.tsx
index 6637acc3c..827765d36 100644
--- a/frontend/src/components/RequestRideModal/CustomDatePicker.tsx
+++ b/frontend/src/components/RequestRideModal/CustomDatePicker.tsx
@@ -3,258 +3,258 @@ import moment from 'moment';
 import styles from './requestridemodal.module.css';
 
 type CustomDatePickerProps = {
-    selectedDate: moment.Moment;
-    currentMonth: moment.Moment;
-    onMonthChange: (month: moment.Moment) => void;
-    onDateSelect: (date: moment.Moment) => void;
-    onCancel: () => void;
-    buttonRef: React.RefObject<HTMLButtonElement>;
+  selectedDate: moment.Moment;
+  currentMonth: moment.Moment;
+  onMonthChange: (month: moment.Moment) => void;
+  onDateSelect: (date: moment.Moment) => void;
+  onCancel: () => void;
+  buttonRef: React.RefObject<HTMLButtonElement>;
 };
 
 const CustomDatePicker: React.FC<CustomDatePickerProps> = ({
-    selectedDate,
-    currentMonth,
-    onMonthChange,
-    onDateSelect,
-    onCancel,
-    buttonRef,
+  selectedDate,
+  currentMonth,
+  onMonthChange,
+  onDateSelect,
+  onCancel,
+  buttonRef,
 }) => {
-    const pickerRef = useRef<HTMLDivElement>(null);
+  const pickerRef = useRef<HTMLDivElement>(null);
 
-    // Close picker when clicking outside
-    useEffect(() => {
-        const handleClickOutside = (event: MouseEvent) => {
-            if (
-                pickerRef.current &&
-                !pickerRef.current.contains(event.target as Node) &&
-                buttonRef.current &&
-                !buttonRef.current.contains(event.target as Node)
-            ) {
-                // onCancel will be called by parent
-            }
-        };
-
-        document.addEventListener('mousedown', handleClickOutside);
-        return () => {
-            document.removeEventListener('mousedown', handleClickOutside);
-        };
-    }, []);
-
-    const monthNames = moment.months();
-    const currentYear = currentMonth.year();
-    const years = Array.from({ length: 10 }, (_, i) => currentYear - 5 + i);
-
-    const handlePreviousMonth = () => {
-        onMonthChange(currentMonth.clone().subtract(1, 'month'));
+  // Close picker when clicking outside
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        pickerRef.current &&
+        !pickerRef.current.contains(event.target as Node) &&
+        buttonRef.current &&
+        !buttonRef.current.contains(event.target as Node)
+      ) {
+        // onCancel will be called by parent
+      }
     };
 
-    const handleNextMonth = () => {
-        onMonthChange(currentMonth.clone().add(1, 'month'));
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
     };
+  }, []);
 
-    const handlePreviousYear = () => {
-        onMonthChange(currentMonth.clone().subtract(1, 'year'));
-    };
+  const monthNames = moment.months();
+  const currentYear = currentMonth.year();
+  const years = Array.from({ length: 10 }, (_, i) => currentYear - 5 + i);
 
-    const handleNextYear = () => {
-        onMonthChange(currentMonth.clone().add(1, 'year'));
-    };
+  const handlePreviousMonth = () => {
+    onMonthChange(currentMonth.clone().subtract(1, 'month'));
+  };
 
-    const handleMonthChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
-        const monthIndex = parseInt(e.target.value);
-        onMonthChange(currentMonth.clone().month(monthIndex));
-    };
+  const handleNextMonth = () => {
+    onMonthChange(currentMonth.clone().add(1, 'month'));
+  };
 
-    const handleYearChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
-        const year = parseInt(e.target.value);
-        onMonthChange(currentMonth.clone().year(year));
-    };
+  const handlePreviousYear = () => {
+    onMonthChange(currentMonth.clone().subtract(1, 'year'));
+  };
 
-    // Get calendar days for the current month
-    const startOfMonth = currentMonth.clone().startOf('month');
-    const endOfMonth = currentMonth.clone().endOf('month');
-    const startDate = startOfMonth.clone().startOf('week');
-    const endDate = endOfMonth.clone().endOf('week');
-    const days: moment.Moment[] = [];
-    let current = startDate.clone();
-    while (current.isSameOrBefore(endDate, 'day')) {
-        days.push(current.clone());
-        current.add(1, 'day');
-    }
+  const handleNextYear = () => {
+    onMonthChange(currentMonth.clone().add(1, 'year'));
+  };
 
-    return (
-        <div
-            ref={pickerRef}
-            className={styles.customDatePicker}
-            onClick={(e) => e.stopPropagation()}
-        >
-            {/* Top frame with month and year selectors */}
-            <div className={styles.datePickerTopFrame}>
-                {/* Month selector on left */}
-                <div className={styles.monthYearSelector}>
-                    <button
-                        type="button"
-                        className={styles.datePickerArrow}
-                        onClick={handlePreviousMonth}
-                    >
-                        <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            width="24"
-                            height="24"
-                            viewBox="0 0 24 24"
-                            fill="none"
-                        >
-                            <path
-                                d="M15.41 7.41L14 6L8 12L14 18L15.41 16.59L10.83 12L15.41 7.41Z"
-                                fill="#49454F"
-                            />
-                        </svg>
-                    </button>
-                    <select
-                        className={styles.monthYearSelect}
-                        value={currentMonth.month()}
-                        onChange={handleMonthChange}
-                    >
-                        {monthNames.map((month, index) => (
-                            <option key={index} value={index}>
-                                {month}
-                            </option>
-                        ))}
-                    </select>
-                    <button
-                        type="button"
-                        className={styles.datePickerArrow}
-                        onClick={handleNextMonth}
-                    >
-                        <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            width="24"
-                            height="24"
-                            viewBox="0 0 24 24"
-                            fill="none"
-                        >
-                            <path
-                                d="M8.59 16.59L10 18L16 12L10 6L8.59 7.41L13.17 12L8.59 16.59Z"
-                                fill="#49454F"
-                            />
-                        </svg>
-                    </button>
-                </div>
+  const handleMonthChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
+    const monthIndex = parseInt(e.target.value);
+    onMonthChange(currentMonth.clone().month(monthIndex));
+  };
 
-                {/* Year selector on right */}
-                <div className={styles.monthYearSelector}>
-                    <button
-                        type="button"
-                        className={styles.datePickerArrow}
-                        onClick={handlePreviousYear}
-                    >
-                        <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            width="24"
-                            height="24"
-                            viewBox="0 0 24 24"
-                            fill="none"
-                        >
-                            <path
-                                d="M15.41 7.41L14 6L8 12L14 18L15.41 16.59L10.83 12L15.41 7.41Z"
-                                fill="#49454F"
-                            />
-                        </svg>
-                    </button>
-                    <select
-                        className={styles.monthYearSelect}
-                        value={currentYear}
-                        onChange={handleYearChange}
-                    >
-                        {years.map((year) => (
-                            <option key={year} value={year}>
-                                {year}
-                            </option>
-                        ))}
-                    </select>
-                    <button
-                        type="button"
-                        className={styles.datePickerArrow}
-                        onClick={handleNextYear}
-                    >
-                        <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            width="24"
-                            height="24"
-                            viewBox="0 0 24 24"
-                            fill="none"
-                        >
-                            <path
-                                d="M8.59 16.59L10 18L16 12L10 6L8.59 7.41L13.17 12L8.59 16.59Z"
-                                fill="#49454F"
-                            />
-                        </svg>
-                    </button>
-                </div>
-            </div>
+  const handleYearChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
+    const year = parseInt(e.target.value);
+    onMonthChange(currentMonth.clone().year(year));
+  };
 
-            {/* Calendar grid */}
-            <div className={styles.datePickerCalendar}>
-                {/* Day headers */}
-                <div className={styles.datePickerWeekdays}>
-                    {['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'].map((day) => (
-                        <div key={day} className={styles.datePickerWeekday}>
-                            {day}
-                        </div>
-                    ))}
-                </div>
+  // Get calendar days for the current month
+  const startOfMonth = currentMonth.clone().startOf('month');
+  const endOfMonth = currentMonth.clone().endOf('month');
+  const startDate = startOfMonth.clone().startOf('week');
+  const endDate = endOfMonth.clone().endOf('week');
+  const days: moment.Moment[] = [];
+  let current = startDate.clone();
+  while (current.isSameOrBefore(endDate, 'day')) {
+    days.push(current.clone());
+    current.add(1, 'day');
+  }
 
-                {/* Calendar days */}
-                <div className={styles.datePickerDays}>
-                    {days.map((day, index) => {
-                        const isCurrentMonth = day.month() === currentMonth.month();
-                        const isSelected = day.isSame(selectedDate, 'day');
-                        const isToday = day.isSame(moment(), 'day');
+  return (
+    <div
+      ref={pickerRef}
+      className={styles.customDatePicker}
+      onClick={(e) => e.stopPropagation()}
+    >
+      {/* Top frame with month and year selectors */}
+      <div className={styles.datePickerTopFrame}>
+        {/* Month selector on left */}
+        <div className={styles.monthYearSelector}>
+          <button
+            type="button"
+            className={styles.datePickerArrow}
+            onClick={handlePreviousMonth}
+          >
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="24"
+              height="24"
+              viewBox="0 0 24 24"
+              fill="none"
+            >
+              <path
+                d="M15.41 7.41L14 6L8 12L14 18L15.41 16.59L10.83 12L15.41 7.41Z"
+                fill="#49454F"
+              />
+            </svg>
+          </button>
+          <select
+            className={styles.monthYearSelect}
+            value={currentMonth.month()}
+            onChange={handleMonthChange}
+          >
+            {monthNames.map((month, index) => (
+              <option key={index} value={index}>
+                {month}
+              </option>
+            ))}
+          </select>
+          <button
+            type="button"
+            className={styles.datePickerArrow}
+            onClick={handleNextMonth}
+          >
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="24"
+              height="24"
+              viewBox="0 0 24 24"
+              fill="none"
+            >
+              <path
+                d="M8.59 16.59L10 18L16 12L10 6L8.59 7.41L13.17 12L8.59 16.59Z"
+                fill="#49454F"
+              />
+            </svg>
+          </button>
+        </div>
 
-                        return (
-                            <button
-                                key={index}
-                                type="button"
-                                className={`${styles.datePickerDay} ${
-                                    !isCurrentMonth ? styles.datePickerDayOtherMonth : ''
-                                } ${isSelected ? styles.datePickerDaySelected : ''} ${
-                                    isToday ? styles.datePickerDayToday : ''
-                                }`}
-                                onClick={() => {
-                                    if (isCurrentMonth) {
-                                        onDateSelect(day);
-                                    }
-                                }}
-                                disabled={!isCurrentMonth}
-                            >
-                                {day.date()}
-                            </button>
-                        );
-                    })}
-                </div>
-            </div>
+        {/* Year selector on right */}
+        <div className={styles.monthYearSelector}>
+          <button
+            type="button"
+            className={styles.datePickerArrow}
+            onClick={handlePreviousYear}
+          >
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="24"
+              height="24"
+              viewBox="0 0 24 24"
+              fill="none"
+            >
+              <path
+                d="M15.41 7.41L14 6L8 12L14 18L15.41 16.59L10.83 12L15.41 7.41Z"
+                fill="#49454F"
+              />
+            </svg>
+          </button>
+          <select
+            className={styles.monthYearSelect}
+            value={currentYear}
+            onChange={handleYearChange}
+          >
+            {years.map((year) => (
+              <option key={year} value={year}>
+                {year}
+              </option>
+            ))}
+          </select>
+          <button
+            type="button"
+            className={styles.datePickerArrow}
+            onClick={handleNextYear}
+          >
+            <svg
+              xmlns="http://www.w3.org/2000/svg"
+              width="24"
+              height="24"
+              viewBox="0 0 24 24"
+              fill="none"
+            >
+              <path
+                d="M8.59 16.59L10 18L16 12L10 6L8.59 7.41L13.17 12L8.59 16.59Z"
+                fill="#49454F"
+              />
+            </svg>
+          </button>
+        </div>
+      </div>
 
-            {/* Bottom frame with Cancel and OK buttons */}
-            <div className={styles.datePickerBottomFrame}>
-                <button
-                    type="button"
-                    className={styles.datePickerCancelButton}
-                    onClick={onCancel}
-                >
-                    Cancel
-                </button>
-                <button
-                    type="button"
-                    className={styles.datePickerOkButton}
-                    onClick={() => {
-                        onDateSelect(selectedDate);
-                    }}
-                >
-                    OK
-                </button>
+      {/* Calendar grid */}
+      <div className={styles.datePickerCalendar}>
+        {/* Day headers */}
+        <div className={styles.datePickerWeekdays}>
+          {['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'].map((day) => (
+            <div key={day} className={styles.datePickerWeekday}>
+              {day}
             </div>
+          ))}
         </div>
-    );
+
+        {/* Calendar days */}
+        <div className={styles.datePickerDays}>
+          {days.map((day, index) => {
+            const isCurrentMonth = day.month() === currentMonth.month();
+            const isSelected = day.isSame(selectedDate, 'day');
+            const isToday = day.isSame(moment(), 'day');
+
+            return (
+              <button
+                key={index}
+                type="button"
+                className={`${styles.datePickerDay} ${
+                  !isCurrentMonth ? styles.datePickerDayOtherMonth : ''
+                } ${isSelected ? styles.datePickerDaySelected : ''} ${
+                  isToday ? styles.datePickerDayToday : ''
+                }`}
+                onClick={() => {
+                  if (isCurrentMonth) {
+                    onDateSelect(day);
+                  }
+                }}
+                disabled={!isCurrentMonth}
+              >
+                {day.date()}
+              </button>
+            );
+          })}
+        </div>
+      </div>
+
+      {/* Bottom frame with Cancel and OK buttons */}
+      <div className={styles.datePickerBottomFrame}>
+        <button
+          type="button"
+          className={styles.datePickerCancelButton}
+          onClick={onCancel}
+        >
+          Cancel
+        </button>
+        <button
+          type="button"
+          className={styles.datePickerOkButton}
+          onClick={() => {
+            onDateSelect(selectedDate);
+          }}
+        >
+          OK
+        </button>
+      </div>
+    </div>
+  );
 };
 
 export default CustomDatePicker;
diff --git a/frontend/src/components/RequestRideModal/CustomTimePicker.tsx b/frontend/src/components/RequestRideModal/CustomTimePicker.tsx
index 57a833b31..509ed21d4 100644
--- a/frontend/src/components/RequestRideModal/CustomTimePicker.tsx
+++ b/frontend/src/components/RequestRideModal/CustomTimePicker.tsx
@@ -3,179 +3,179 @@ import moment from 'moment';
 import styles from './requestridemodal.module.css';
 
 type CustomTimePickerProps = {
-    selectedTime: string; // Format: "HH:mm"
-    onTimeSelect: (time: string) => void;
-    onCancel: () => void;
-    buttonRef: React.RefObject<HTMLButtonElement>;
+  selectedTime: string; // Format: "HH:mm"
+  onTimeSelect: (time: string) => void;
+  onCancel: () => void;
+  buttonRef: React.RefObject<HTMLButtonElement>;
 };
 
 const CustomTimePicker: React.FC<CustomTimePickerProps> = ({
-    selectedTime,
-    onTimeSelect,
-    onCancel,
-    buttonRef,
+  selectedTime,
+  onTimeSelect,
+  onCancel,
+  buttonRef,
 }) => {
-    const pickerRef = useRef<HTMLDivElement>(null);
-    const [selectedHour, setSelectedHour] = useState<number>(() => {
-        if (selectedTime) {
-            return parseInt(selectedTime.split(':')[0]) || 12;
-        }
-        return 12;
-    });
-    const [selectedMinute, setSelectedMinute] = useState<number>(() => {
-        if (selectedTime) {
-            return parseInt(selectedTime.split(':')[1]) || 0;
-        }
-        return 0;
-    });
-    const [isAM, setIsAM] = useState<boolean>(() => {
-        if (selectedTime) {
-            const hour = parseInt(selectedTime.split(':')[0]) || 12;
-            return hour < 12;
-        }
-        return true;
-    });
+  const pickerRef = useRef<HTMLDivElement>(null);
+  const [selectedHour, setSelectedHour] = useState<number>(() => {
+    if (selectedTime) {
+      return parseInt(selectedTime.split(':')[0]) || 12;
+    }
+    return 12;
+  });
+  const [selectedMinute, setSelectedMinute] = useState<number>(() => {
+    if (selectedTime) {
+      return parseInt(selectedTime.split(':')[1]) || 0;
+    }
+    return 0;
+  });
+  const [isAM, setIsAM] = useState<boolean>(() => {
+    if (selectedTime) {
+      const hour = parseInt(selectedTime.split(':')[0]) || 12;
+      return hour < 12;
+    }
+    return true;
+  });
 
-    // Close picker when clicking outside
-    useEffect(() => {
-        const handleClickOutside = (event: MouseEvent) => {
-            if (
-                pickerRef.current &&
-                !pickerRef.current.contains(event.target as Node) &&
-                buttonRef.current &&
-                !buttonRef.current.contains(event.target as Node)
-            ) {
-                // onCancel will be called by parent
-            }
-        };
-
-        document.addEventListener('mousedown', handleClickOutside);
-        return () => {
-            document.removeEventListener('mousedown', handleClickOutside);
-        };
-    }, []);
-
-    const hours = Array.from({ length: 12 }, (_, i) => i + 1);
-    const minutes = Array.from({ length: 60 }, (_, i) => i);
-
-    const handleHourSelect = (hour: number) => {
-        setSelectedHour(hour);
+  // Close picker when clicking outside
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (
+        pickerRef.current &&
+        !pickerRef.current.contains(event.target as Node) &&
+        buttonRef.current &&
+        !buttonRef.current.contains(event.target as Node)
+      ) {
+        // onCancel will be called by parent
+      }
     };
 
-    const handleMinuteSelect = (minute: number) => {
-        setSelectedMinute(minute);
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => {
+      document.removeEventListener('mousedown', handleClickOutside);
     };
+  }, []);
 
-    const handleAMPMToggle = (am: boolean) => {
-        setIsAM(am);
-    };
+  const hours = Array.from({ length: 12 }, (_, i) => i + 1);
+  const minutes = Array.from({ length: 60 }, (_, i) => i);
 
-    const handleOK = () => {
-        let hour24 = selectedHour;
-        if (!isAM && selectedHour !== 12) {
-            hour24 = selectedHour + 12;
-        } else if (isAM && selectedHour === 12) {
-            hour24 = 0;
-        }
-        const timeString = `${hour24.toString().padStart(2, '0')}:${selectedMinute.toString().padStart(2, '0')}`;
-        onTimeSelect(timeString);
-    };
+  const handleHourSelect = (hour: number) => {
+    setSelectedHour(hour);
+  };
 
-    return (
-        <div
-            ref={pickerRef}
-            className={styles.customTimePicker}
-            onClick={(e) => e.stopPropagation()}
-        >
-            {/* Time selection grid */}
-            <div className={styles.timePickerContent}>
-                {/* Hours */}
-                <div className={styles.timePickerColumn}>
-                    <div className={styles.timePickerLabel}>Hour</div>
-                    <div className={styles.timePickerValues}>
-                        {hours.map((hour) => (
-                            <button
-                                key={hour}
-                                type="button"
-                                className={`${styles.timePickerValue} ${
-                                    selectedHour === hour
-                                        ? styles.timePickerValueSelected
-                                        : ''
-                                }`}
-                                onClick={() => handleHourSelect(hour)}
-                            >
-                                {hour}
-                            </button>
-                        ))}
-                    </div>
-                </div>
+  const handleMinuteSelect = (minute: number) => {
+    setSelectedMinute(minute);
+  };
 
-                {/* Minutes */}
-                <div className={styles.timePickerColumn}>
-                    <div className={styles.timePickerLabel}>Minute</div>
-                    <div className={styles.timePickerValues}>
-                        {minutes.map((minute) => (
-                            <button
-                                key={minute}
-                                type="button"
-                                className={`${styles.timePickerValue} ${
-                                    selectedMinute === minute
-                                        ? styles.timePickerValueSelected
-                                        : ''
-                                }`}
-                                onClick={() => handleMinuteSelect(minute)}
-                            >
-                                {minute.toString().padStart(2, '0')}
-                            </button>
-                        ))}
-                    </div>
-                </div>
+  const handleAMPMToggle = (am: boolean) => {
+    setIsAM(am);
+  };
 
-                {/* AM/PM */}
-                <div className={styles.timePickerColumn}>
-                    <div className={styles.timePickerLabel}>Period</div>
-                    <div className={styles.timePickerValues}>
-                        <button
-                            type="button"
-                            className={`${styles.timePickerValue} ${
-                                isAM ? styles.timePickerValueSelected : ''
-                            }`}
-                            onClick={() => handleAMPMToggle(true)}
-                        >
-                            AM
-                        </button>
-                        <button
-                            type="button"
-                            className={`${styles.timePickerValue} ${
-                                !isAM ? styles.timePickerValueSelected : ''
-                            }`}
-                            onClick={() => handleAMPMToggle(false)}
-                        >
-                            PM
-                        </button>
-                    </div>
-                </div>
-            </div>
+  const handleOK = () => {
+    let hour24 = selectedHour;
+    if (!isAM && selectedHour !== 12) {
+      hour24 = selectedHour + 12;
+    } else if (isAM && selectedHour === 12) {
+      hour24 = 0;
+    }
+    const timeString = `${hour24.toString().padStart(2, '0')}:${selectedMinute
+      .toString()
+      .padStart(2, '0')}`;
+    onTimeSelect(timeString);
+  };
 
-            {/* Bottom frame with Cancel and OK buttons */}
-            <div className={styles.datePickerBottomFrame}>
-                <button
-                    type="button"
-                    className={styles.datePickerCancelButton}
-                    onClick={onCancel}
-                >
-                    Cancel
-                </button>
-                <button
-                    type="button"
-                    className={styles.datePickerOkButton}
-                    onClick={handleOK}
-                >
-                    OK
-                </button>
-            </div>
+  return (
+    <div
+      ref={pickerRef}
+      className={styles.customTimePicker}
+      onClick={(e) => e.stopPropagation()}
+    >
+      {/* Time selection grid */}
+      <div className={styles.timePickerContent}>
+        {/* Hours */}
+        <div className={styles.timePickerColumn}>
+          <div className={styles.timePickerLabel}>Hour</div>
+          <div className={styles.timePickerValues}>
+            {hours.map((hour) => (
+              <button
+                key={hour}
+                type="button"
+                className={`${styles.timePickerValue} ${
+                  selectedHour === hour ? styles.timePickerValueSelected : ''
+                }`}
+                onClick={() => handleHourSelect(hour)}
+              >
+                {hour}
+              </button>
+            ))}
+          </div>
         </div>
-    );
+
+        {/* Minutes */}
+        <div className={styles.timePickerColumn}>
+          <div className={styles.timePickerLabel}>Minute</div>
+          <div className={styles.timePickerValues}>
+            {minutes.map((minute) => (
+              <button
+                key={minute}
+                type="button"
+                className={`${styles.timePickerValue} ${
+                  selectedMinute === minute
+                    ? styles.timePickerValueSelected
+                    : ''
+                }`}
+                onClick={() => handleMinuteSelect(minute)}
+              >
+                {minute.toString().padStart(2, '0')}
+              </button>
+            ))}
+          </div>
+        </div>
+
+        {/* AM/PM */}
+        <div className={styles.timePickerColumn}>
+          <div className={styles.timePickerLabel}>Period</div>
+          <div className={styles.timePickerValues}>
+            <button
+              type="button"
+              className={`${styles.timePickerValue} ${
+                isAM ? styles.timePickerValueSelected : ''
+              }`}
+              onClick={() => handleAMPMToggle(true)}
+            >
+              AM
+            </button>
+            <button
+              type="button"
+              className={`${styles.timePickerValue} ${
+                !isAM ? styles.timePickerValueSelected : ''
+              }`}
+              onClick={() => handleAMPMToggle(false)}
+            >
+              PM
+            </button>
+          </div>
+        </div>
+      </div>
+
+      {/* Bottom frame with Cancel and OK buttons */}
+      <div className={styles.datePickerBottomFrame}>
+        <button
+          type="button"
+          className={styles.datePickerCancelButton}
+          onClick={onCancel}
+        >
+          Cancel
+        </button>
+        <button
+          type="button"
+          className={styles.datePickerOkButton}
+          onClick={handleOK}
+        >
+          OK
+        </button>
+      </div>
+    </div>
+  );
 };
 
 export default CustomTimePicker;
diff --git a/frontend/src/components/RequestRideModal/RequestRideWizard.tsx b/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
index f03f3ae7a..2d555f541 100644
--- a/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
+++ b/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
@@ -12,149 +12,148 @@ import styles from './requestridemodal.module.css';
 export type WizardStep = 'date' | 'pickup' | 'dropoff' | 'summary';
 
 type RequestRideWizardProps = {
-    ride?: Ride;
-    showRepeatingCheckbox: boolean;
-    showRepeatingInfo: boolean;
-    modalType: RideModalType;
-    onSubmit?: () => void;
-    onClose?: () => void;
+  ride?: Ride;
+  showRepeatingCheckbox: boolean;
+  showRepeatingInfo: boolean;
+  modalType: RideModalType;
+  onSubmit?: () => void;
+  onClose?: () => void;
 };
 
 const RequestRideWizard: React.FC<RequestRideWizardProps> = ({
-    ride,
-    showRepeatingCheckbox,
-    showRepeatingInfo,
-    modalType,
-    onSubmit,
-    onClose,
+  ride,
+  showRepeatingCheckbox,
+  showRepeatingInfo,
+  modalType,
+  onSubmit,
+  onClose,
 }) => {
-    const [currentStep, setCurrentStep] = useState<WizardStep>('date');
-    const {
-        trigger,
-        formState: { errors },
-        watch,
-    } = useFormContext();
+  const [currentStep, setCurrentStep] = useState<WizardStep>('date');
+  const {
+    trigger,
+    formState: { errors },
+    watch,
+  } = useFormContext();
 
-    // Define step order - 4 steps including summary
-    const stepOrder: WizardStep[] = ['date', 'pickup', 'dropoff', 'summary'];
+  // Define step order - 4 steps including summary
+  const stepOrder: WizardStep[] = ['date', 'pickup', 'dropoff', 'summary'];
 
-    const currentStepIndex = stepOrder.indexOf(currentStep);
-    const isFirstStep = currentStepIndex === 0;
-    const isLastStep = currentStepIndex === stepOrder.length - 1;
+  const currentStepIndex = stepOrder.indexOf(currentStep);
+  const isFirstStep = currentStepIndex === 0;
+  const isLastStep = currentStepIndex === stepOrder.length - 1;
 
-    // Get fields to validate for each step
-    const getStepFields = (step: WizardStep): string[] => {
-        switch (step) {
-            case 'date':
-                // Include repeat fields if repeating is enabled
-                const watchRepeating = watch('recurring', false);
-                const baseFields = ['startDate'];
-                if (watchRepeating) {
-                    return [...baseFields, 'whenRepeat', 'endDate'];
-                }
-                return baseFields;
-            case 'pickup':
-                return ['startLocation', 'pickupTime'];
-            case 'dropoff':
-                return ['endLocation', 'dropoffTime'];
-            case 'summary':
-                return [];
-            default:
-                return [];
+  // Get fields to validate for each step
+  const getStepFields = (step: WizardStep): string[] => {
+    switch (step) {
+      case 'date':
+        // Include repeat fields if repeating is enabled
+        const watchRepeating = watch('recurring', false);
+        const baseFields = ['startDate'];
+        if (watchRepeating) {
+          return [...baseFields, 'whenRepeat', 'endDate'];
         }
-    };
+        return baseFields;
+      case 'pickup':
+        return ['startLocation', 'pickupTime'];
+      case 'dropoff':
+        return ['endLocation', 'dropoffTime'];
+      case 'summary':
+        return [];
+      default:
+        return [];
+    }
+  };
 
-    const handleNext = async () => {
-        const fieldsToValidate = getStepFields(currentStep);
-        const isValid = await trigger(fieldsToValidate as any);
+  const handleNext = async () => {
+    const fieldsToValidate = getStepFields(currentStep);
+    const isValid = await trigger(fieldsToValidate as any);
 
-        if (isValid) {
-            const nextIndex = currentStepIndex + 1;
-            if (nextIndex < stepOrder.length) {
-                setCurrentStep(stepOrder[nextIndex]);
-            }
-        } else {
-            // If validation fails, check if basic fields are filled
-            // This allows navigation even if strict validation fails (will be caught on final submit)
-            const basicFieldsFilled = fieldsToValidate.every(field => {
-                const value = watch(field as any);
-                return value && value !== '' && value !== undefined;
-            });
-            
-            if (basicFieldsFilled) {
-                const nextIndex = currentStepIndex + 1;
-                if (nextIndex < stepOrder.length) {
-                    setCurrentStep(stepOrder[nextIndex]);
-                }
-            }
-        }
-    };
+    if (isValid) {
+      const nextIndex = currentStepIndex + 1;
+      if (nextIndex < stepOrder.length) {
+        setCurrentStep(stepOrder[nextIndex]);
+      }
+    } else {
+      // If validation fails, check if basic fields are filled
+      // This allows navigation even if strict validation fails (will be caught on final submit)
+      const basicFieldsFilled = fieldsToValidate.every((field) => {
+        const value = watch(field as any);
+        return value && value !== '' && value !== undefined;
+      });
 
-    const handleBack = () => {
-        const prevIndex = currentStepIndex - 1;
-        if (prevIndex >= 0) {
-            setCurrentStep(stepOrder[prevIndex]);
+      if (basicFieldsFilled) {
+        const nextIndex = currentStepIndex + 1;
+        if (nextIndex < stepOrder.length) {
+          setCurrentStep(stepOrder[nextIndex]);
         }
-    };
+      }
+    }
+  };
 
+  const handleBack = () => {
+    const prevIndex = currentStepIndex - 1;
+    if (prevIndex >= 0) {
+      setCurrentStep(stepOrder[prevIndex]);
+    }
+  };
 
-    const renderStep = () => {
-        switch (currentStep) {
-            case 'date':
-                return (
-                    <DateStep
-                        ride={ride}
-                        modalType={modalType}
-                        showRepeatingCheckbox={showRepeatingCheckbox}
-                        showRepeatingInfo={showRepeatingInfo}
-                        onClose={onClose}
-                        onNext={handleNext}
-                        currentStep={currentStep}
-                    />
-                );
-            case 'pickup':
-                return (
-                    <PickupLocationStep
-                        ride={ride}
-                        modalType={modalType}
-                        currentStep={currentStep}
-                        onClose={onClose}
-                        onNext={handleNext}
-                        onBack={handleBack}
-                    />
-                );
-            case 'dropoff':
-                return (
-                    <DropoffLocationStep
-                        ride={ride}
-                        modalType={modalType}
-                        currentStep={currentStep}
-                        onClose={onClose}
-                        onNext={handleNext}
-                        onBack={handleBack}
-                    />
-                );
-            case 'summary':
-                return (
-                    <RequestSummaryStep
-                        onClose={onClose}
-                        onNext={onSubmit}
-                        onBack={handleBack}
-                    />
-                );
-            default:
-                return null;
-        }
-    };
+  const renderStep = () => {
+    switch (currentStep) {
+      case 'date':
+        return (
+          <DateStep
+            ride={ride}
+            modalType={modalType}
+            showRepeatingCheckbox={showRepeatingCheckbox}
+            showRepeatingInfo={showRepeatingInfo}
+            onClose={onClose}
+            onNext={handleNext}
+            currentStep={currentStep}
+          />
+        );
+      case 'pickup':
+        return (
+          <PickupLocationStep
+            ride={ride}
+            modalType={modalType}
+            currentStep={currentStep}
+            onClose={onClose}
+            onNext={handleNext}
+            onBack={handleBack}
+          />
+        );
+      case 'dropoff':
+        return (
+          <DropoffLocationStep
+            ride={ride}
+            modalType={modalType}
+            currentStep={currentStep}
+            onClose={onClose}
+            onNext={handleNext}
+            onBack={handleBack}
+          />
+        );
+      case 'summary':
+        return (
+          <RequestSummaryStep
+            onClose={onClose}
+            onNext={onSubmit}
+            onBack={handleBack}
+          />
+        );
+      default:
+        return null;
+    }
+  };
 
-    return (
-        <div className={styles.wizardContainer}>
-            {/* Step content */}
-            <div className={styles.stepContent}>{renderStep()}</div>
+  return (
+    <div className={styles.wizardContainer}>
+      {/* Step content */}
+      <div className={styles.stepContent}>{renderStep()}</div>
 
-            {/* Navigation buttons - removed Continue button, each step handles its own navigation */}
-        </div>
-    );
+      {/* Navigation buttons - removed Continue button, each step handles its own navigation */}
+    </div>
+  );
 };
 
 export default RequestRideWizard;
diff --git a/frontend/src/components/RequestRideModal/requestridemodal.module.css b/frontend/src/components/RequestRideModal/requestridemodal.module.css
index b1418dbce..03a98c9d9 100644
--- a/frontend/src/components/RequestRideModal/requestridemodal.module.css
+++ b/frontend/src/components/RequestRideModal/requestridemodal.module.css
@@ -217,7 +217,8 @@
 .summaryTitle {
   align-self: stretch;
   color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 20px;
   font-style: normal;
   font-weight: 500;
@@ -272,7 +273,8 @@
 
 .summarySectionLabel {
   color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 16px;
   font-style: normal;
   font-weight: 400;
@@ -292,7 +294,8 @@
 
 .summaryDateTimeTitle {
   color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 16px;
   font-style: normal;
   font-weight: 400;
@@ -310,7 +313,8 @@
   border-radius: 4px;
   border: 1px solid #dadada;
   color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 16px;
   font-style: normal;
   font-weight: 400;
@@ -343,7 +347,8 @@
   border: 1px solid #dadada;
   background: var(--bg-main, #fff);
   color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 16px;
   font-style: normal;
   font-weight: 400;
@@ -352,7 +357,8 @@
   cursor: default;
 }
 
-.summaryCustomDaysInSummary .summaryDayBlockReadOnly.summaryDayBlockReadOnlySelected {
+.summaryCustomDaysInSummary
+  .summaryDayBlockReadOnly.summaryDayBlockReadOnlySelected {
   background: #000;
   color: #fff;
   border: 1px solid #000;
@@ -380,7 +386,8 @@
 
 .summaryEditText {
   color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 16px;
   font-style: normal;
   font-weight: 400;
@@ -404,7 +411,8 @@
   border: 1px solid #dadada;
   background: #fff;
   cursor: pointer;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 14px;
   font-weight: 500;
 }
@@ -508,7 +516,7 @@
   z-index: 0;
 }
 
-.pickupMapContainer>* {
+.pickupMapContainer > * {
   width: 100% !important;
   height: 100% !important;
   max-width: 100% !important;
@@ -587,7 +595,8 @@
   outline: none;
   background: transparent;
   color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 16px;
   font-weight: 500;
   line-height: 1.25;
@@ -604,7 +613,8 @@
 
 .timeSeparator {
   color: #616161;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 16px;
   font-weight: 500;
   line-height: 1;
@@ -624,7 +634,8 @@
   border-radius: 6px;
   background: #fff;
   color: #616161;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 13px;
   font-weight: 500;
   line-height: 1.25;
@@ -688,7 +699,8 @@
   margin: 0;
   padding: 0;
   color: #c62828;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 13px;
   font-weight: 400;
   line-height: 1.35;
@@ -709,7 +721,8 @@
   border: 1px solid #dadada;
   background: #fff;
   color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
   font-size: 14px;
   font-weight: 400;
   line-height: 1.25;
@@ -771,9 +784,13 @@
 }
 
 .timePickerLabel {
-  color: var(--M3-sys-light-on-surface-variant, var(--Schemes-On-Surface-Variant, #49454F));
+  color: var(
+    --M3-sys-light-on-surface-variant,
+    var(--Schemes-On-Surface-Variant, #49454f)
+  );
   text-align: center;
-  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system,
+    BlinkMacSystemFont, 'Segoe UI', sans-serif;
   font-size: var(--Static-Label-Large-Size, 14px);
   font-style: normal;
   font-weight: 500;
@@ -800,9 +817,13 @@
   border: none;
   background: transparent;
   border-radius: 50%;
-  color: var(--M3-sys-light-on-surface-variant, var(--Schemes-On-Surface-Variant, #49454F));
+  color: var(
+    --M3-sys-light-on-surface-variant,
+    var(--Schemes-On-Surface-Variant, #49454f)
+  );
   text-align: center;
-  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system,
+    BlinkMacSystemFont, 'Segoe UI', sans-serif;
   font-size: var(--Static-Label-Large-Size, 14px);
   font-style: normal;
   font-weight: 500;
@@ -1055,9 +1076,10 @@
   background: var(--bg-main, #fff);
   z-index: 1000;
   box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1D1B20));
+  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1d1b20));
   text-align: center;
-  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system,
+    BlinkMacSystemFont, 'Segoe UI', sans-serif;
   font-size: var(--Static-Body-Large-Size, 16px);
   font-style: normal;
   font-weight: 400;
@@ -1103,8 +1125,9 @@
   border-radius: 4px;
   padding: 4px 8px;
   padding-right: 24px;
-  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1D1B20));
-  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1d1b20));
+  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system,
+    BlinkMacSystemFont, 'Segoe UI', sans-serif;
   font-size: var(--Static-Body-Large-Size, 16px);
   font-style: normal;
   font-weight: 400;
@@ -1131,8 +1154,9 @@
 
 .datePickerWeekday {
   text-align: center;
-  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1D1B20));
-  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1d1b20));
+  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system,
+    BlinkMacSystemFont, 'Segoe UI', sans-serif;
   font-size: var(--Static-Body-Large-Size, 16px);
   font-style: normal;
   font-weight: 400;
@@ -1154,8 +1178,9 @@
   background: none;
   border-radius: 4px;
   text-align: center;
-  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1D1B20));
-  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1d1b20));
+  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system,
+    BlinkMacSystemFont, 'Segoe UI', sans-serif;
   font-size: var(--Static-Body-Large-Size, 16px);
   font-style: normal;
   font-weight: 400;
@@ -1218,8 +1243,12 @@
   border: none;
   background: transparent;
   text-align: right;
-  color: var(--M3-sys-light-on-surface-variant, var(--Schemes-On-Surface-Variant, #49454F));
-  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
+  color: var(
+    --M3-sys-light-on-surface-variant,
+    var(--Schemes-On-Surface-Variant, #49454f)
+  );
+  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system,
+    BlinkMacSystemFont, 'Segoe UI', sans-serif;
   font-size: var(--Static-Label-Large-Size, 14px);
   font-style: normal;
   font-weight: 500;
@@ -1234,7 +1263,10 @@
 }
 
 .datePickerOkButton {
-  color: var(--M3-sys-light-on-surface-variant, var(--Schemes-On-Surface-Variant, #49454F));
+  color: var(
+    --M3-sys-light-on-surface-variant,
+    var(--Schemes-On-Surface-Variant, #49454f)
+  );
 }
 
 .datePickerCancelButton:hover,
@@ -1590,4 +1622,4 @@
   .requestRideModal .datePickerAnchor .datePickerBottomFrame {
     padding: 12px;
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/src/components/RequestRideModal/steps/DateStep.tsx b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
index c6b56f0af..d953cf436 100644
--- a/frontend/src/components/RequestRideModal/steps/DateStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
@@ -10,354 +10,376 @@ import CustomDatePicker from '../CustomDatePicker';
 import styles from '../requestridemodal.module.css';
 
 type DateStepProps = {
-    ride?: Ride;
-    modalType: RideModalType;
-    showRepeatingCheckbox: boolean;
-    showRepeatingInfo: boolean;
-    onClose?: () => void;
-    onNext?: () => void;
-    currentStep?: 'date' | 'pickup' | 'dropoff';
+  ride?: Ride;
+  modalType: RideModalType;
+  showRepeatingCheckbox: boolean;
+  showRepeatingInfo: boolean;
+  onClose?: () => void;
+  onNext?: () => void;
+  currentStep?: 'date' | 'pickup' | 'dropoff';
 };
 
 const DateStep: React.FC<DateStepProps> = ({
-    ride,
-    modalType,
-    showRepeatingCheckbox,
-    showRepeatingInfo,
-    onClose,
-    onNext,
-    currentStep = 'date',
+  ride,
+  modalType,
+  showRepeatingCheckbox,
+  showRepeatingInfo,
+  onClose,
+  onNext,
+  currentStep = 'date',
 }) => {
-    const {
-        register,
-        formState: { errors },
-        getValues,
-        watch,
-        trigger,
-        reset,
-        setValue,
-    } = useFormContext();
+  const {
+    register,
+    formState: { errors },
+    getValues,
+    watch,
+    trigger,
+    reset,
+    setValue,
+  } = useFormContext();
 
-    const [custom, setCustom] = useState(false);
-    const [dragStartY, setDragStartY] = useState<number | null>(null);
-    const [showRepeatOptions, setShowRepeatOptions] = useState(false);
-    const [selectedDays, setSelectedDays] = useState<Set<string>>(new Set());
-    const [showDatePicker, setShowDatePicker] = useState(false);
-    const [datePickerMonth, setDatePickerMonth] = useState(moment());
-    const dateButtonRef = useRef<HTMLButtonElement>(null);
-    const watchRepeating = watch('recurring', false);
-    const watchStartDate = watch('startDate');
-    const watchWhenRepeat = watch('whenRepeat', 'no-repeat');
-    const watchEndDate = watch('endDate');
-    const shouldDisableStartDate = ride && ride.schedulingState !== 'unscheduled';
+  const [custom, setCustom] = useState(false);
+  const [dragStartY, setDragStartY] = useState<number | null>(null);
+  const [showRepeatOptions, setShowRepeatOptions] = useState(false);
+  const [selectedDays, setSelectedDays] = useState<Set<string>>(new Set());
+  const [showDatePicker, setShowDatePicker] = useState(false);
+  const [datePickerMonth, setDatePickerMonth] = useState(moment());
+  const dateButtonRef = useRef<HTMLButtonElement>(null);
+  const watchRepeating = watch('recurring', false);
+  const watchStartDate = watch('startDate');
+  const watchWhenRepeat = watch('whenRepeat', 'no-repeat');
+  const watchEndDate = watch('endDate');
+  const shouldDisableStartDate = ride && ride.schedulingState !== 'unscheduled';
 
-    // Check if form is valid for enabling "Save and Continue" button
-    // Date is always required - must be a valid date string (not empty, not just whitespace)
-    // If Custom is selected, at least one day must be selected
-    const hasValidDate = Boolean(
-        watchStartDate && 
-        typeof watchStartDate === 'string' &&
-        watchStartDate.trim() !== '' &&
-        watchStartDate !== 'Invalid date'
-    );
-    
-    const isCustom = watchWhenRepeat === 'custom';
-    const hasValidRepeats = !isCustom || selectedDays.size > 0;
-    
-    const isFormValid = hasValidDate && hasValidRepeats;
+  // Check if form is valid for enabling "Save and Continue" button
+  // Date is always required - must be a valid date string (not empty, not just whitespace)
+  // If Custom is selected, at least one day must be selected
+  const hasValidDate = Boolean(
+    watchStartDate &&
+      typeof watchStartDate === 'string' &&
+      watchStartDate.trim() !== '' &&
+      watchStartDate !== 'Invalid date'
+  );
 
-    const handleTouchStart = (e: React.TouchEvent<HTMLDivElement>) => {
-        setDragStartY(e.touches[0].clientY);
-    };
+  const isCustom = watchWhenRepeat === 'custom';
+  const hasValidRepeats = !isCustom || selectedDays.size > 0;
 
-    const handleTouchMove = (e: React.TouchEvent<HTMLDivElement>) => {
-        if (dragStartY === null) return;
-        const currentY = e.touches[0].clientY;
-        const deltaY = currentY - dragStartY;
+  const isFormValid = hasValidDate && hasValidRepeats;
 
-        // If user drags down more than 60px, close the modal
-        if (deltaY > 60) {
-            onClose?.();
-            setDragStartY(null);
-        }
-    };
+  const handleTouchStart = (e: React.TouchEvent<HTMLDivElement>) => {
+    setDragStartY(e.touches[0].clientY);
+  };
 
-    const handleTouchEnd = () => {
-        setDragStartY(null);
-    };
+  const handleTouchMove = (e: React.TouchEvent<HTMLDivElement>) => {
+    if (dragStartY === null) return;
+    const currentY = e.touches[0].clientY;
+    const deltaY = currentY - dragStartY;
 
-    return (
-        <div className={styles.stepPage}>
-            <div className={styles.topContent}>
-                {/* Drag handle at the top (click to close on desktop, drag down on mobile) */}
-                <div
-                    className={styles.dragHandle}
-                    onClick={onClose}
-                    onTouchStart={handleTouchStart}
-                    onTouchMove={handleTouchMove}
-                    onTouchEnd={handleTouchEnd}
-                />
-
-                <div className={styles.mobileHeaderFrame}>
-                <div className={styles.mobileTitleLeft}>Request a Ride</div>
-                <div className={styles.datePickerAnchor}>
-                    <button
-                        ref={dateButtonRef}
-                        type="button"
-                        className={styles.optionButton}
-                        onClick={() => {
-                            setShowDatePicker(!showDatePicker);
-                        }}
-                    >
-                        <span
-                            className={
-                                !watchStartDate || watchStartDate === ''
-                                    ? styles.dateButtonPlaceholder
-                                    : ''
-                            }
-                        >
-                            {watchStartDate && watchStartDate !== ''
-                                ? moment(watchStartDate).format('MM/DD/YYYY')
-                                : 'Date'}
-                        </span>
-                        <span
-                            aria-hidden="true"
-                            className={styles.optionIcon}
-                        >
-                            {/* Calendar icon */}
-                            <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                width="24"
-                                height="24"
-                                viewBox="0 0 24 24"
-                                fill="none"
-                            >
-                                <path
-                                    d="M19 19H5V8H19M16 1V3H8V1H6V3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3H18V1"
-                                    fill="black"
-                                />
-                            </svg>
-                        </span>
-                    </button>
-                    {showDatePicker && dateButtonRef.current && (
-                        <CustomDatePicker
-                            selectedDate={
-                                watchStartDate && watchStartDate !== ''
-                                    ? moment(watchStartDate)
-                                    : moment()
-                            }
-                            currentMonth={datePickerMonth}
-                            onMonthChange={setDatePickerMonth}
-                            onDateSelect={(date) => {
-                                const formattedDate = date.format('YYYY-MM-DD');
-                                setValue('startDate', formattedDate);
-                                setShowDatePicker(false);
-                            }}
-                            onCancel={() => setShowDatePicker(false)}
-                            buttonRef={dateButtonRef}
-                        />
-                    )}
-                </div>
-                <button
-                    type="button"
-                    className={styles.optionButton}
-                    onClick={() => {
-                        setShowRepeatOptions(!showRepeatOptions);
-                    }}
-                >
-                    <span>
-                        {watchWhenRepeat === 'no-repeat' ? 'No Repeat' :
-                         watchWhenRepeat === 'daily' ? 'Daily' :
-                         watchWhenRepeat === 'weekly' ? 'Weekly' :
-                         watchWhenRepeat === 'biweekly' ? 'Biweekly' :
-                         watchWhenRepeat === 'custom' ? 'Custom' :
-                         'No Repeat'}
-                    </span>
-                    <span
-                        aria-hidden="true"
-                        className={styles.optionIcon}
-                    >
-                        {/* Chevron-right icon */}
-                        <svg
-                            xmlns="http://www.w3.org/2000/svg"
-                            width="24"
-                            height="24"
-                            viewBox="0 0 24 24"
-                            fill="none"
-                        >
-                            <path
-                                d="M8.29496 7.11508L12.875 11.7051L8.29496 16.2951L9.70496 17.7051L15.705 11.7051L9.70496 5.70508L8.29496 7.11508Z"
-                                fill="black"
-                            />
-                        </svg>
-                    </span>
-                </button>
+    // If user drags down more than 60px, close the modal
+    if (deltaY > 60) {
+      onClose?.();
+      setDragStartY(null);
+    }
+  };
 
-                {/* Repeat options selection form */}
-                {showRepeatOptions && (
-                    <div className={styles.repeatOptionsContainer}>
-                        {[
-                            { value: 'no-repeat', label: 'No Repeat' },
-                            { value: 'daily', label: 'Daily' },
-                            { value: 'weekly', label: 'Weekly' },
-                            { value: 'biweekly', label: 'Biweekly' },
-                            { value: 'custom', label: 'Custom' },
-                        ].map((option) => {
-                            const isSelected = watchWhenRepeat === option.value;
-                            return (
-                                <button
-                                    key={option.value}
-                                    type="button"
-                                    className={`${styles.repeatOption} ${isSelected ? styles.repeatOptionSelected : ''}`}
-                                    onClick={() => {
-                                        if (option.value === 'no-repeat') {
-                                            setValue('whenRepeat', 'no-repeat');
-                                            setValue('recurring', false);
-                                            setCustom(false);
-                                        } else if (option.value === 'custom') {
-                                            setValue('whenRepeat', 'custom');
-                                            setValue('recurring', true);
-                                            setCustom(true);
-                                        } else {
-                                            // Daily, Weekly, Biweekly - set recurring to true but don't show custom options
-                                            setValue('whenRepeat', option.value);
-                                            setValue('recurring', true);
-                                            setCustom(false);
-                                        }
-                                        setShowRepeatOptions(false);
-                                    }}
-                                >
-                                    {option.label}
-                                </button>
-                            );
-                        })}
-                    </div>
-                )}
+  const handleTouchEnd = () => {
+    setDragStartY(null);
+  };
 
-                {/* Custom repeat day selection - appears when Custom is selected */}
-                {showRepeatingInfo && watchWhenRepeat === 'custom' && (
-                    <div className={styles.customRepeatSection}>
-                        <div className={styles.selectDaysLabel}>Select day of the week</div>
-                        <div className={styles.daysContainer}>
-                            {[
-                                { value: 'Mon', label: 'M' },
-                                { value: 'Tue', label: 'T' },
-                                { value: 'Wed', label: 'W' },
-                                { value: 'Thu', label: 'T' },
-                                { value: 'Fri', label: 'F' },
-                            ].map((day) => {
-                                const isSelected = selectedDays.has(day.value);
-                                return (
-                                    <button
-                                        key={day.value}
-                                        type="button"
-                                        className={`${styles.dayBlock} ${isSelected ? styles.dayBlockSelected : ''}`}
-                                        onClick={() => {
-                                            const newSelectedDays = new Set(selectedDays);
-                                            if (isSelected) {
-                                                newSelectedDays.delete(day.value);
-                                            } else {
-                                                newSelectedDays.add(day.value);
-                                            }
-                                            setSelectedDays(newSelectedDays);
-                                            // Update form values
-                                            setValue(day.value, !isSelected);
-                                        }}
-                                    >
-                                        {day.label}
-                                    </button>
-                                );
-                            })}
-                        </div>
-                    </div>
-                )}
-                </div>
-            </div>
+  return (
+    <div className={styles.stepPage}>
+      <div className={styles.topContent}>
+        {/* Drag handle at the top (click to close on desktop, drag down on mobile) */}
+        <div
+          className={styles.dragHandle}
+          onClick={onClose}
+          onTouchStart={handleTouchStart}
+          onTouchMove={handleTouchMove}
+          onTouchEnd={handleTouchEnd}
+        />
 
-            {/* Hidden form fields for validation - Date button will trigger date picker */}
-            <div style={{ position: 'absolute', opacity: 0, pointerEvents: 'none', width: 0, height: 0, overflow: 'hidden' }}>
-                <input
-                    id="startDate"
-                    type="date"
-                    disabled={shouldDisableStartDate}
-                    aria-hidden="true"
-                    {...register('startDate', {
-                        required: 'Please select a date',
-                        validate: (startDate) => {
-                            const pickupTime = getValues('pickupTime');
-                            const notWeekend =
-                                moment(startDate).day() !== 0 &&
-                                moment(startDate).day() !== 6;
-                            if (pickupTime && notWeekend) {
-                                return (
-                                    isTimeValid(startDate, pickupTime) ||
-                                    "Can't schedule rides for less than 2 days from today"
-                                );
-                            } else {
-                                return (
-                                    notWeekend ||
-                                    'Please enter a valid date. (Note: CULifts does not operate during weekends or university-wide breaks.)'
-                                );
-                            }
-                        },
-                    })}
-                />
-                {/* Hidden checkbox for repeating - Repeats button will toggle this */}
-                <input
-                    type="checkbox"
-                    id="recurring"
-                    aria-hidden="true"
-                    {...register('recurring')}
-                />
-                {/* Hidden input for whenRepeat */}
-                <input
-                    type="hidden"
-                    {...register('whenRepeat')}
-                />
-            </div>
-            {errors.startDate && (
-                <p className={styles.error}>{errors.startDate.message as string}</p>
+        <div className={styles.mobileHeaderFrame}>
+          <div className={styles.mobileTitleLeft}>Request a Ride</div>
+          <div className={styles.datePickerAnchor}>
+            <button
+              ref={dateButtonRef}
+              type="button"
+              className={styles.optionButton}
+              onClick={() => {
+                setShowDatePicker(!showDatePicker);
+              }}
+            >
+              <span
+                className={
+                  !watchStartDate || watchStartDate === ''
+                    ? styles.dateButtonPlaceholder
+                    : ''
+                }
+              >
+                {watchStartDate && watchStartDate !== ''
+                  ? moment(watchStartDate).format('MM/DD/YYYY')
+                  : 'Date'}
+              </span>
+              <span aria-hidden="true" className={styles.optionIcon}>
+                {/* Calendar icon */}
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="24"
+                  height="24"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                >
+                  <path
+                    d="M19 19H5V8H19M16 1V3H8V1H6V3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3H18V1"
+                    fill="black"
+                  />
+                </svg>
+              </span>
+            </button>
+            {showDatePicker && dateButtonRef.current && (
+              <CustomDatePicker
+                selectedDate={
+                  watchStartDate && watchStartDate !== ''
+                    ? moment(watchStartDate)
+                    : moment()
+                }
+                currentMonth={datePickerMonth}
+                onMonthChange={setDatePickerMonth}
+                onDateSelect={(date) => {
+                  const formattedDate = date.format('YYYY-MM-DD');
+                  setValue('startDate', formattedDate);
+                  setShowDatePicker(false);
+                }}
+                onCancel={() => setShowDatePicker(false)}
+                buttonRef={dateButtonRef}
+              />
             )}
+          </div>
+          <button
+            type="button"
+            className={styles.optionButton}
+            onClick={() => {
+              setShowRepeatOptions(!showRepeatOptions);
+            }}
+          >
+            <span>
+              {watchWhenRepeat === 'no-repeat'
+                ? 'No Repeat'
+                : watchWhenRepeat === 'daily'
+                ? 'Daily'
+                : watchWhenRepeat === 'weekly'
+                ? 'Weekly'
+                : watchWhenRepeat === 'biweekly'
+                ? 'Biweekly'
+                : watchWhenRepeat === 'custom'
+                ? 'Custom'
+                : 'No Repeat'}
+            </span>
+            <span aria-hidden="true" className={styles.optionIcon}>
+              {/* Chevron-right icon */}
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="24"
+                height="24"
+                viewBox="0 0 24 24"
+                fill="none"
+              >
+                <path
+                  d="M8.29496 7.11508L12.875 11.7051L8.29496 16.2951L9.70496 17.7051L15.705 11.7051L9.70496 5.70508L8.29496 7.11508Z"
+                  fill="black"
+                />
+              </svg>
+            </span>
+          </button>
 
-            {/* Bottom section with page indicators and buttons */}
-            <div className={styles.bottomSection}>
-                {/* Page indicators - positioned right above bottom button frame */}
-                <div className={styles.pageIndicators}>
-                    <div className={`${styles.pageIndicator} ${currentStep === 'date' ? styles.pageIndicatorActive : ''}`} />
-                    <div className={`${styles.pageIndicator} ${currentStep === 'pickup' ? styles.pageIndicatorActive : ''}`} />
-                    <div className={`${styles.pageIndicator} ${currentStep === 'dropoff' ? styles.pageIndicatorActive : ''}`} />
-                </div>
-
-                {/* Bottom frame with Cancel and Save & Continue buttons */}
-                <div className={styles.bottomButtonFrame}>
-                <button
+          {/* Repeat options selection form */}
+          {showRepeatOptions && (
+            <div className={styles.repeatOptionsContainer}>
+              {[
+                { value: 'no-repeat', label: 'No Repeat' },
+                { value: 'daily', label: 'Daily' },
+                { value: 'weekly', label: 'Weekly' },
+                { value: 'biweekly', label: 'Biweekly' },
+                { value: 'custom', label: 'Custom' },
+              ].map((option) => {
+                const isSelected = watchWhenRepeat === option.value;
+                return (
+                  <button
+                    key={option.value}
                     type="button"
-                    className={styles.cancelButton}
+                    className={`${styles.repeatOption} ${
+                      isSelected ? styles.repeatOptionSelected : ''
+                    }`}
                     onClick={() => {
-                        reset();
-                        onClose?.();
+                      if (option.value === 'no-repeat') {
+                        setValue('whenRepeat', 'no-repeat');
+                        setValue('recurring', false);
+                        setCustom(false);
+                      } else if (option.value === 'custom') {
+                        setValue('whenRepeat', 'custom');
+                        setValue('recurring', true);
+                        setCustom(true);
+                      } else {
+                        // Daily, Weekly, Biweekly - set recurring to true but don't show custom options
+                        setValue('whenRepeat', option.value);
+                        setValue('recurring', true);
+                        setCustom(false);
+                      }
+                      setShowRepeatOptions(false);
                     }}
-                >
-                    Cancel
-                </button>
-                <button
-                    type="button"
-                    className={styles.saveContinueButton}
-                    disabled={!isFormValid}
-                    onClick={async () => {
-                        const fieldsToValidate = ['startDate'];
-                        const isValid = await trigger(fieldsToValidate as any);
-                        if (isValid && isFormValid && onNext) {
-                            onNext();
+                  >
+                    {option.label}
+                  </button>
+                );
+              })}
+            </div>
+          )}
+
+          {/* Custom repeat day selection - appears when Custom is selected */}
+          {showRepeatingInfo && watchWhenRepeat === 'custom' && (
+            <div className={styles.customRepeatSection}>
+              <div className={styles.selectDaysLabel}>
+                Select day of the week
+              </div>
+              <div className={styles.daysContainer}>
+                {[
+                  { value: 'Mon', label: 'M' },
+                  { value: 'Tue', label: 'T' },
+                  { value: 'Wed', label: 'W' },
+                  { value: 'Thu', label: 'T' },
+                  { value: 'Fri', label: 'F' },
+                ].map((day) => {
+                  const isSelected = selectedDays.has(day.value);
+                  return (
+                    <button
+                      key={day.value}
+                      type="button"
+                      className={`${styles.dayBlock} ${
+                        isSelected ? styles.dayBlockSelected : ''
+                      }`}
+                      onClick={() => {
+                        const newSelectedDays = new Set(selectedDays);
+                        if (isSelected) {
+                          newSelectedDays.delete(day.value);
+                        } else {
+                          newSelectedDays.add(day.value);
                         }
-                    }}
-                >
-                    Save and Continue
-                </button>
-                </div>
+                        setSelectedDays(newSelectedDays);
+                        // Update form values
+                        setValue(day.value, !isSelected);
+                      }}
+                    >
+                      {day.label}
+                    </button>
+                  );
+                })}
+              </div>
             </div>
+          )}
+        </div>
+      </div>
+
+      {/* Hidden form fields for validation - Date button will trigger date picker */}
+      <div
+        style={{
+          position: 'absolute',
+          opacity: 0,
+          pointerEvents: 'none',
+          width: 0,
+          height: 0,
+          overflow: 'hidden',
+        }}
+      >
+        <input
+          id="startDate"
+          type="date"
+          disabled={shouldDisableStartDate}
+          aria-hidden="true"
+          {...register('startDate', {
+            required: 'Please select a date',
+            validate: (startDate) => {
+              const pickupTime = getValues('pickupTime');
+              const notWeekend =
+                moment(startDate).day() !== 0 && moment(startDate).day() !== 6;
+              if (pickupTime && notWeekend) {
+                return (
+                  isTimeValid(startDate, pickupTime) ||
+                  "Can't schedule rides for less than 2 days from today"
+                );
+              } else {
+                return (
+                  notWeekend ||
+                  'Please enter a valid date. (Note: CULifts does not operate during weekends or university-wide breaks.)'
+                );
+              }
+            },
+          })}
+        />
+        {/* Hidden checkbox for repeating - Repeats button will toggle this */}
+        <input
+          type="checkbox"
+          id="recurring"
+          aria-hidden="true"
+          {...register('recurring')}
+        />
+        {/* Hidden input for whenRepeat */}
+        <input type="hidden" {...register('whenRepeat')} />
+      </div>
+      {errors.startDate && (
+        <p className={styles.error}>{errors.startDate.message as string}</p>
+      )}
+
+      {/* Bottom section with page indicators and buttons */}
+      <div className={styles.bottomSection}>
+        {/* Page indicators - positioned right above bottom button frame */}
+        <div className={styles.pageIndicators}>
+          <div
+            className={`${styles.pageIndicator} ${
+              currentStep === 'date' ? styles.pageIndicatorActive : ''
+            }`}
+          />
+          <div
+            className={`${styles.pageIndicator} ${
+              currentStep === 'pickup' ? styles.pageIndicatorActive : ''
+            }`}
+          />
+          <div
+            className={`${styles.pageIndicator} ${
+              currentStep === 'dropoff' ? styles.pageIndicatorActive : ''
+            }`}
+          />
+        </div>
+
+        {/* Bottom frame with Cancel and Save & Continue buttons */}
+        <div className={styles.bottomButtonFrame}>
+          <button
+            type="button"
+            className={styles.cancelButton}
+            onClick={() => {
+              reset();
+              onClose?.();
+            }}
+          >
+            Cancel
+          </button>
+          <button
+            type="button"
+            className={styles.saveContinueButton}
+            disabled={!isFormValid}
+            onClick={async () => {
+              const fieldsToValidate = ['startDate'];
+              const isValid = await trigger(fieldsToValidate as any);
+              if (isValid && isFormValid && onNext) {
+                onNext();
+              }
+            }}
+          >
+            Save and Continue
+          </button>
         </div>
-    );
+      </div>
+    </div>
+  );
 };
 
 export default DateStep;
diff --git a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
index c5af6612a..c0e5d19b2 100644
--- a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
@@ -67,14 +67,24 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   }, [watchDropoffTime]);
 
   // Update form value only when minute is complete and valid (2 digits, 00–59)
-  const timeMinuteNum = timeMinute.length === 2 ? parseInt(timeMinute, 10) : null;
-  const timeMinuteInvalid = timeMinuteNum !== null && (Number.isNaN(timeMinuteNum) || timeMinuteNum > 59);
+  const timeMinuteNum =
+    timeMinute.length === 2 ? parseInt(timeMinute, 10) : null;
+  const timeMinuteInvalid =
+    timeMinuteNum !== null &&
+    (Number.isNaN(timeMinuteNum) || timeMinuteNum > 59);
   useEffect(() => {
     if (timeHour && timeMinute.length === 2 && !timeMinuteInvalid) {
-      const hour24 = timePeriod === 'AM'
-        ? (timeHour === '12' ? 0 : parseInt(timeHour, 10))
-        : (timeHour === '12' ? 12 : parseInt(timeHour, 10) + 12);
-      const timeString = `${hour24.toString().padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
+      const hour24 =
+        timePeriod === 'AM'
+          ? timeHour === '12'
+            ? 0
+            : parseInt(timeHour, 10)
+          : timeHour === '12'
+          ? 12
+          : parseInt(timeHour, 10) + 12;
+      const timeString = `${hour24
+        .toString()
+        .padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
       setValue('dropoffTime', timeString);
     }
   }, [timeHour, timeMinute, timePeriod, setValue, timeMinuteInvalid]);
@@ -120,9 +130,7 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   useEffect(() => {
     if (ride) {
       const defaultEnd =
-        ride.endLocation.tag === 'custom'
-          ? 'Other'
-          : ride.endLocation.id ?? '';
+        ride.endLocation.tag === 'custom' ? 'Other' : ride.endLocation.id ?? '';
       setValue('endLocation', defaultEnd);
     }
   }, [locations, ride, setValue]);
@@ -162,7 +170,9 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
     }
   };
 
-  const handleLocationInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+  const handleLocationInputChange = (
+    e: React.ChangeEvent<HTMLInputElement>
+  ) => {
     const value = e.target.value;
     setSearchQuery(value);
     setShowLocationDropdown(true);
@@ -181,8 +191,14 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
 
   // Check if form is valid for enabling "Save and Continue" button
   const isFormValid = useMemo(() => {
-    const hasLocation = watchEndLocation && watchEndLocation !== '' && watchEndLocation !== undefined;
-    const hasTime = watchDropoffTime && watchDropoffTime !== '' && watchDropoffTime !== undefined;
+    const hasLocation =
+      watchEndLocation &&
+      watchEndLocation !== '' &&
+      watchEndLocation !== undefined;
+    const hasTime =
+      watchDropoffTime &&
+      watchDropoffTime !== '' &&
+      watchDropoffTime !== undefined;
 
     // Basic validation - just check if both fields are filled
     // Let form validation handle more complex checks on submit
@@ -246,7 +262,9 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
 
         {/* Top frame with dropoff location selection */}
         <div className={styles.pickupLocationFrame}>
-          <div className={styles.pickupLocationTitle}>Select dropoff location:</div>
+          <div className={styles.pickupLocationTitle}>
+            Select dropoff location:
+          </div>
 
           {/* Location selection button */}
           <div className={styles.searchInputWrapper} ref={searchInputRef}>
@@ -320,79 +338,99 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
               dropoffLocation={dropoffLocation}
               availableLocations={locations}
               enableDropoffMapClick
-              onPickupSelect={() => { }}
+              onPickupSelect={() => {}}
               onDropoffSelect={handleDropoffSelect}
             />
           </div>
 
           {/* Dropoff time text */}
-          <div className={styles.pickupTimeText}>
-            Drop me off by ...
-          </div>
+          <div className={styles.pickupTimeText}>Drop me off by ...</div>
 
           {/* Time input - Figma-style */}
           <div className={styles.timeInputWrapper}>
-            <div className={`${styles.timeInputContainer} ${timeMinuteInvalid ? styles.timeInputContainerError : ''}`}>
-            <input
-              type="text"
-              className={styles.timeInputHour}
-              placeholder="12"
-              value={timeHour}
-              onChange={(e) => {
-                const value = e.target.value.replace(/\D/g, '');
-                if (value === '' || (parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12)) {
-                  setTimeHour(value);
-                }
-              }}
-              maxLength={2}
-              aria-label="Hour"
-            />
-            <span className={styles.timeSeparator}>:</span>
-            <input
-              type="text"
-              className={styles.timeInputMinute}
-              placeholder="00"
-              value={timeMinute}
-              onChange={(e) => {
-                const value = e.target.value.replace(/\D/g, '').slice(0, 2);
-                setTimeMinute(value);
-              }}
-              onBlur={() => {
-                if (timeMinute === '') return;
-                if (timeMinute.length === 1) {
-                  setTimeMinute(timeMinute.padStart(2, '0'));
-                }
-                /* When minutes > 59 we leave the value so the user can correct it; error is shown below */
-              }}
-              maxLength={2}
-              aria-label="Minute"
-            />
-            <div className={styles.timePeriodContainer}>
-              <button
-                type="button"
-                className={`${styles.timePeriodButton} ${timePeriod === 'AM' ? styles.timePeriodButtonActive : ''}`}
-                onClick={() => setTimePeriod('AM')}
-              >
-                AM
-              </button>
-              <button
-                type="button"
-                className={`${styles.timePeriodButton} ${timePeriod === 'PM' ? styles.timePeriodButtonActive : ''}`}
-                onClick={() => setTimePeriod('PM')}
-              >
-                PM
-              </button>
-            </div>
-            <span className={styles.timeIcon} aria-hidden="true">
-              <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
-                <circle cx="12" cy="12" r="10" />
-                <polyline points="12 6 12 12 16 14" />
-              </svg>
-            </span>
+            <div
+              className={`${styles.timeInputContainer} ${
+                timeMinuteInvalid ? styles.timeInputContainerError : ''
+              }`}
+            >
+              <input
+                type="text"
+                className={styles.timeInputHour}
+                placeholder="12"
+                value={timeHour}
+                onChange={(e) => {
+                  const value = e.target.value.replace(/\D/g, '');
+                  if (
+                    value === '' ||
+                    (parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12)
+                  ) {
+                    setTimeHour(value);
+                  }
+                }}
+                maxLength={2}
+                aria-label="Hour"
+              />
+              <span className={styles.timeSeparator}>:</span>
+              <input
+                type="text"
+                className={styles.timeInputMinute}
+                placeholder="00"
+                value={timeMinute}
+                onChange={(e) => {
+                  const value = e.target.value.replace(/\D/g, '').slice(0, 2);
+                  setTimeMinute(value);
+                }}
+                onBlur={() => {
+                  if (timeMinute === '') return;
+                  if (timeMinute.length === 1) {
+                    setTimeMinute(timeMinute.padStart(2, '0'));
+                  }
+                  /* When minutes > 59 we leave the value so the user can correct it; error is shown below */
+                }}
+                maxLength={2}
+                aria-label="Minute"
+              />
+              <div className={styles.timePeriodContainer}>
+                <button
+                  type="button"
+                  className={`${styles.timePeriodButton} ${
+                    timePeriod === 'AM' ? styles.timePeriodButtonActive : ''
+                  }`}
+                  onClick={() => setTimePeriod('AM')}
+                >
+                  AM
+                </button>
+                <button
+                  type="button"
+                  className={`${styles.timePeriodButton} ${
+                    timePeriod === 'PM' ? styles.timePeriodButtonActive : ''
+                  }`}
+                  onClick={() => setTimePeriod('PM')}
+                >
+                  PM
+                </button>
+              </div>
+              <span className={styles.timeIcon} aria-hidden="true">
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="20"
+                  height="20"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="2"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                >
+                  <circle cx="12" cy="12" r="10" />
+                  <polyline points="12 6 12 12 16 14" />
+                </svg>
+              </span>
             </div>
             {timeMinuteInvalid && (
               <p className={styles.timeInputError} role="alert">
-                Please enter minutes between 00 and 59. You can correct it above.
+                Please enter minutes between 00 and 59. You can correct it
+                above.
               </p>
             )}
           </div>
@@ -400,11 +438,21 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
       </div>
 
       {/* Hidden form fields for validation */}
-      <div style={{ position: 'absolute', opacity: 0, pointerEvents: 'none', width: 0, height: 0, overflow: 'hidden' }}>
+      <div
+        style={{
+          position: 'absolute',
+          opacity: 0,
+          pointerEvents: 'none',
+          width: 0,
+          height: 0,
+          overflow: 'hidden',
+        }}
+      >
         <input
           type="text"
           {...register('endLocation', {
-            required: !watchCustomCheckbox && 'Please select a dropoff location',
+            required:
+              !watchCustomCheckbox && 'Please select a dropoff location',
             validate: (dropOffLocation: string) => {
               if (watchCustomCheckbox) return true;
               const pickUpLocation = getValues('startLocation');
@@ -448,9 +496,21 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
       <div className={styles.bottomSection}>
         {/* Page indicators */}
         <div className={styles.pageIndicators}>
-          <div className={`${styles.pageIndicator} ${currentStep === 'date' ? styles.pageIndicatorActive : ''}`} />
-          <div className={`${styles.pageIndicator} ${currentStep === 'pickup' ? styles.pageIndicatorActive : ''}`} />
-          <div className={`${styles.pageIndicator} ${currentStep === 'dropoff' ? styles.pageIndicatorActive : ''}`} />
+          <div
+            className={`${styles.pageIndicator} ${
+              currentStep === 'date' ? styles.pageIndicatorActive : ''
+            }`}
+          />
+          <div
+            className={`${styles.pageIndicator} ${
+              currentStep === 'pickup' ? styles.pageIndicatorActive : ''
+            }`}
+          />
+          <div
+            className={`${styles.pageIndicator} ${
+              currentStep === 'dropoff' ? styles.pageIndicatorActive : ''
+            }`}
+          />
         </div>
 
         {/* Bottom button frame */}
diff --git a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
index 05b74d044..1002c2e8d 100644
--- a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
@@ -28,12 +28,7 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   onNext,
   onBack,
 }) => {
-  const {
-    register,
-    getValues,
-    watch,
-    setValue,
-  } = useFormContext();
+  const { register, getValues, watch, setValue } = useFormContext();
 
   const [locations, setLocations] = useState<Location[]>([]);
   const [pickupLocation, setPickupLocation] = useState<Location | null>(null);
@@ -64,14 +59,24 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   }, [watchPickupTime]);
 
   // Update form value only when minute is complete and valid (2 digits, 00–59)
-  const timeMinuteNum = timeMinute.length === 2 ? parseInt(timeMinute, 10) : null;
-  const timeMinuteInvalid = timeMinuteNum !== null && (Number.isNaN(timeMinuteNum) || timeMinuteNum > 59);
+  const timeMinuteNum =
+    timeMinute.length === 2 ? parseInt(timeMinute, 10) : null;
+  const timeMinuteInvalid =
+    timeMinuteNum !== null &&
+    (Number.isNaN(timeMinuteNum) || timeMinuteNum > 59);
   useEffect(() => {
     if (timeHour && timeMinute.length === 2 && !timeMinuteInvalid) {
-      const hour24 = timePeriod === 'AM'
-        ? (timeHour === '12' ? 0 : parseInt(timeHour, 10))
-        : (timeHour === '12' ? 12 : parseInt(timeHour, 10) + 12);
-      const timeString = `${hour24.toString().padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
+      const hour24 =
+        timePeriod === 'AM'
+          ? timeHour === '12'
+            ? 0
+            : parseInt(timeHour, 10)
+          : timeHour === '12'
+          ? 12
+          : parseInt(timeHour, 10) + 12;
+      const timeString = `${hour24
+        .toString()
+        .padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
       setValue('pickupTime', timeString);
     }
   }, [timeHour, timeMinute, timePeriod, setValue, timeMinuteInvalid]);
@@ -169,8 +174,14 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
 
   // Check if form is valid for enabling "Save and Continue" button
   const isFormValid = useMemo(() => {
-    const hasLocation = watchStartLocation && watchStartLocation !== '' && watchStartLocation !== undefined;
-    const hasTime = watchPickupTime && watchPickupTime !== '' && watchPickupTime !== undefined;
+    const hasLocation =
+      watchStartLocation &&
+      watchStartLocation !== '' &&
+      watchStartLocation !== undefined;
+    const hasTime =
+      watchPickupTime &&
+      watchPickupTime !== '' &&
+      watchPickupTime !== undefined;
 
     // Basic validation - just check if both fields are filled
     // Let form validation handle more complex checks on submit
@@ -234,7 +245,9 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
 
         {/* Top frame with pickup location selection */}
         <div className={styles.pickupLocationFrame}>
-          <div className={styles.pickupLocationTitle}>Select pickup location:</div>
+          <div className={styles.pickupLocationTitle}>
+            Select pickup location:
+          </div>
 
           {/* Location selection button */}
           <div className={styles.searchInputWrapper} ref={searchInputRef}>
@@ -309,78 +322,98 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
               availableLocations={locations}
               enablePickupMapClick
               onPickupSelect={handlePickupSelect}
-              onDropoffSelect={() => { }}
+              onDropoffSelect={() => {}}
             />
           </div>
 
           {/* Pickup time text */}
-          <div className={styles.pickupTimeText}>
-            Pick me up by ...
-          </div>
+          <div className={styles.pickupTimeText}>Pick me up by ...</div>
 
           {/* Time input - Figma-style */}
           <div className={styles.timeInputWrapper}>
-            <div className={`${styles.timeInputContainer} ${timeMinuteInvalid ? styles.timeInputContainerError : ''}`}>
-            <input
-              type="text"
-              className={styles.timeInputHour}
-              placeholder="12"
-              value={timeHour}
-              onChange={(e) => {
-                const value = e.target.value.replace(/\D/g, '');
-                if (value === '' || (parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12)) {
-                  setTimeHour(value);
-                }
-              }}
-              maxLength={2}
-              aria-label="Hour"
-            />
-            <span className={styles.timeSeparator}>:</span>
-            <input
-              type="text"
-              className={styles.timeInputMinute}
-              placeholder="00"
-              value={timeMinute}
-              onChange={(e) => {
-                const value = e.target.value.replace(/\D/g, '').slice(0, 2);
-                setTimeMinute(value);
-              }}
-              onBlur={() => {
-                if (timeMinute === '') return;
-                if (timeMinute.length === 1) {
-                  setTimeMinute(timeMinute.padStart(2, '0'));
-                }
-                /* When minutes > 59 we leave the value so the user can correct it; error is shown below */
-              }}
-              maxLength={2}
-              aria-label="Minute"
-            />
-            <div className={styles.timePeriodContainer}>
-              <button
-                type="button"
-                className={`${styles.timePeriodButton} ${timePeriod === 'AM' ? styles.timePeriodButtonActive : ''}`}
-                onClick={() => setTimePeriod('AM')}
-              >
-                AM
-              </button>
-              <button
-                type="button"
-                className={`${styles.timePeriodButton} ${timePeriod === 'PM' ? styles.timePeriodButtonActive : ''}`}
-                onClick={() => setTimePeriod('PM')}
-              >
-                PM
-              </button>
-            </div>
-            <span className={styles.timeIcon} aria-hidden="true">
-              <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
-                <circle cx="12" cy="12" r="10" />
-                <polyline points="12 6 12 12 16 14" />
-              </svg>
-            </span>
+            <div
+              className={`${styles.timeInputContainer} ${
+                timeMinuteInvalid ? styles.timeInputContainerError : ''
+              }`}
+            >
+              <input
+                type="text"
+                className={styles.timeInputHour}
+                placeholder="12"
+                value={timeHour}
+                onChange={(e) => {
+                  const value = e.target.value.replace(/\D/g, '');
+                  if (
+                    value === '' ||
+                    (parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12)
+                  ) {
+                    setTimeHour(value);
+                  }
+                }}
+                maxLength={2}
+                aria-label="Hour"
+              />
+              <span className={styles.timeSeparator}>:</span>
+              <input
+                type="text"
+                className={styles.timeInputMinute}
+                placeholder="00"
+                value={timeMinute}
+                onChange={(e) => {
+                  const value = e.target.value.replace(/\D/g, '').slice(0, 2);
+                  setTimeMinute(value);
+                }}
+                onBlur={() => {
+                  if (timeMinute === '') return;
+                  if (timeMinute.length === 1) {
+                    setTimeMinute(timeMinute.padStart(2, '0'));
+                  }
+                  /* When minutes > 59 we leave the value so the user can correct it; error is shown below */
+                }}
+                maxLength={2}
+                aria-label="Minute"
+              />
+              <div className={styles.timePeriodContainer}>
+                <button
+                  type="button"
+                  className={`${styles.timePeriodButton} ${
+                    timePeriod === 'AM' ? styles.timePeriodButtonActive : ''
+                  }`}
+                  onClick={() => setTimePeriod('AM')}
+                >
+                  AM
+                </button>
+                <button
+                  type="button"
+                  className={`${styles.timePeriodButton} ${
+                    timePeriod === 'PM' ? styles.timePeriodButtonActive : ''
+                  }`}
+                  onClick={() => setTimePeriod('PM')}
+                >
+                  PM
+                </button>
+              </div>
+              <span className={styles.timeIcon} aria-hidden="true">
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  width="20"
+                  height="20"
+                  viewBox="0 0 24 24"
+                  fill="none"
+                  stroke="currentColor"
+                  strokeWidth="2"
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                >
+                  <circle cx="12" cy="12" r="10" />
+                  <polyline points="12 6 12 12 16 14" />
+                </svg>
+              </span>
             </div>
             {timeMinuteInvalid && (
               <p className={styles.timeInputError} role="alert">
-                Please enter minutes between 00 and 59. You can correct it above.
+                Please enter minutes between 00 and 59. You can correct it
+                above.
               </p>
             )}
           </div>
@@ -388,7 +421,16 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
       </div>
 
       {/* Hidden form fields for validation */}
-      <div style={{ position: 'absolute', opacity: 0, pointerEvents: 'none', width: 0, height: 0, overflow: 'hidden' }}>
+      <div
+        style={{
+          position: 'absolute',
+          opacity: 0,
+          pointerEvents: 'none',
+          width: 0,
+          height: 0,
+          overflow: 'hidden',
+        }}
+      >
         <input
           type="text"
           {...register('startLocation', {
@@ -429,9 +471,21 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
       <div className={styles.bottomSection}>
         {/* Page indicators */}
         <div className={styles.pageIndicators}>
-          <div className={`${styles.pageIndicator} ${currentStep === 'date' ? styles.pageIndicatorActive : ''}`} />
-          <div className={`${styles.pageIndicator} ${currentStep === 'pickup' ? styles.pageIndicatorActive : ''}`} />
-          <div className={`${styles.pageIndicator} ${currentStep === 'dropoff' ? styles.pageIndicatorActive : ''}`} />
+          <div
+            className={`${styles.pageIndicator} ${
+              currentStep === 'date' ? styles.pageIndicatorActive : ''
+            }`}
+          />
+          <div
+            className={`${styles.pageIndicator} ${
+              currentStep === 'pickup' ? styles.pageIndicatorActive : ''
+            }`}
+          />
+          <div
+            className={`${styles.pageIndicator} ${
+              currentStep === 'dropoff' ? styles.pageIndicatorActive : ''
+            }`}
+          />
         </div>
 
         {/* Bottom button frame */}
diff --git a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
index 4ac491993..eb4142e3c 100644
--- a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
@@ -14,10 +14,10 @@ type RequestSummaryStepProps = {
 
 const REPEAT_LABELS: Record<string, string> = {
   'no-repeat': 'No Repeat',
-  'daily': 'Daily',
-  'weekly': 'Weekly',
-  'biweekly': 'Biweekly',
-  'custom': 'Custom',
+  daily: 'Daily',
+  weekly: 'Weekly',
+  biweekly: 'Biweekly',
+  custom: 'Custom',
 };
 
 const REPEAT_OPTIONS = [
@@ -85,7 +85,9 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
     Fri: !!fri,
   };
   const selectedDaysSet = new Set(
-    (['Mon', 'Tue', 'Wed', 'Thu', 'Fri'] as const).filter((d) => customDaysSelected[d])
+    (['Mon', 'Tue', 'Wed', 'Thu', 'Fri'] as const).filter(
+      (d) => customDaysSelected[d]
+    )
   );
 
   // Sync pickup time state when entering pickup edit mode
@@ -109,41 +111,73 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
   }, [editingSection, dropoffTime]);
 
   // Write pickup time back to form
-  const pickupMinuteNum = pickupTimeMinute.length === 2 ? parseInt(pickupTimeMinute, 10) : null;
-  const pickupMinuteInvalid = pickupMinuteNum !== null && (Number.isNaN(pickupMinuteNum) || pickupMinuteNum > 59);
-  const dropoffMinuteNum = dropoffTimeMinute.length === 2 ? parseInt(dropoffTimeMinute, 10) : null;
-  const dropoffMinuteInvalid = dropoffMinuteNum !== null && (Number.isNaN(dropoffMinuteNum) || dropoffMinuteNum > 59);
+  const pickupMinuteNum =
+    pickupTimeMinute.length === 2 ? parseInt(pickupTimeMinute, 10) : null;
+  const pickupMinuteInvalid =
+    pickupMinuteNum !== null &&
+    (Number.isNaN(pickupMinuteNum) || pickupMinuteNum > 59);
+  const dropoffMinuteNum =
+    dropoffTimeMinute.length === 2 ? parseInt(dropoffTimeMinute, 10) : null;
+  const dropoffMinuteInvalid =
+    dropoffMinuteNum !== null &&
+    (Number.isNaN(dropoffMinuteNum) || dropoffMinuteNum > 59);
 
   useEffect(() => {
-    if (editingSection === 'pickup' && pickupTimeHour && pickupTimeMinute.length === 2 && !pickupMinuteInvalid) {
+    if (
+      editingSection === 'pickup' &&
+      pickupTimeHour &&
+      pickupTimeMinute.length === 2 &&
+      !pickupMinuteInvalid
+    ) {
       const hour24 =
         pickupTimePeriod === 'AM'
           ? pickupTimeHour === '12'
             ? 0
             : parseInt(pickupTimeHour, 10)
           : pickupTimeHour === '12'
-            ? 12
-            : parseInt(pickupTimeHour, 10) + 12;
-      const timeString = `${hour24.toString().padStart(2, '0')}:${pickupTimeMinute.padStart(2, '0')}`;
+          ? 12
+          : parseInt(pickupTimeHour, 10) + 12;
+      const timeString = `${hour24
+        .toString()
+        .padStart(2, '0')}:${pickupTimeMinute.padStart(2, '0')}`;
       setValue('pickupTime', timeString);
     }
-  }, [editingSection, pickupTimeHour, pickupTimeMinute, pickupTimePeriod, setValue]);
+  }, [
+    editingSection,
+    pickupTimeHour,
+    pickupTimeMinute,
+    pickupTimePeriod,
+    setValue,
+  ]);
 
   // Write dropoff time back to form
   useEffect(() => {
-    if (editingSection === 'dropoff' && dropoffTimeHour && dropoffTimeMinute.length === 2 && !dropoffMinuteInvalid) {
+    if (
+      editingSection === 'dropoff' &&
+      dropoffTimeHour &&
+      dropoffTimeMinute.length === 2 &&
+      !dropoffMinuteInvalid
+    ) {
       const hour24 =
         dropoffTimePeriod === 'AM'
           ? dropoffTimeHour === '12'
             ? 0
             : parseInt(dropoffTimeHour, 10)
           : dropoffTimeHour === '12'
-            ? 12
-            : parseInt(dropoffTimeHour, 10) + 12;
-      const timeString = `${hour24.toString().padStart(2, '0')}:${dropoffTimeMinute.padStart(2, '0')}`;
+          ? 12
+          : parseInt(dropoffTimeHour, 10) + 12;
+      const timeString = `${hour24
+        .toString()
+        .padStart(2, '0')}:${dropoffTimeMinute.padStart(2, '0')}`;
       setValue('dropoffTime', timeString);
     }
-  }, [editingSection, dropoffTimeHour, dropoffTimeMinute, dropoffTimePeriod, setValue]);
+  }, [
+    editingSection,
+    dropoffTimeHour,
+    dropoffTimeMinute,
+    dropoffTimePeriod,
+    setValue,
+  ]);
 
   const getPickupLocationDisplay = () => {
     if (!startLocation || startLocation === '') return '';
@@ -195,7 +229,9 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
 
   const repeatDisplay =
     REPEAT_LABELS[whenRepeat] ??
-    (whenRepeat ? whenRepeat.charAt(0).toUpperCase() + whenRepeat.slice(1) : 'No Repeat');
+    (whenRepeat
+      ? whenRepeat.charAt(0).toUpperCase() + whenRepeat.slice(1)
+      : 'No Repeat');
 
   return (
     <div className={styles.summaryStepPage}>
@@ -229,15 +265,26 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                       : 'Select date'}
                   </span>
                   <span className={styles.optionIcon} aria-hidden="true">
-                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-                      <path d="M19 19H5V8H19M16 1V3H8V1H6V3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3H18V1" fill="black" />
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      width="24"
+                      height="24"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                    >
+                      <path
+                        d="M19 19H5V8H19M16 1V3H8V1H6V3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3H18V1"
+                        fill="black"
+                      />
                     </svg>
                   </span>
                 </button>
                 {showDatePicker && dateButtonRef.current && (
                   <CustomDatePicker
                     selectedDate={
-                      startDate && moment(startDate).isValid() ? moment(startDate) : moment()
+                      startDate && moment(startDate).isValid()
+                        ? moment(startDate)
+                        : moment()
                     }
                     currentMonth={datePickerMonth}
                     onMonthChange={setDatePickerMonth}
@@ -258,7 +305,9 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                       <button
                         key={option.value}
                         type="button"
-                        className={`${styles.repeatOption} ${isSelected ? styles.repeatOptionSelected : ''}`}
+                        className={`${styles.repeatOption} ${
+                          isSelected ? styles.repeatOptionSelected : ''
+                        }`}
                         onClick={() => {
                           if (option.value === 'no-repeat') {
                             setValue('whenRepeat', 'no-repeat');
@@ -279,13 +328,19 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                 </div>
                 {whenRepeat === 'custom' && (
                   <div className={styles.customRepeatSection}>
-                    <div className={styles.selectDaysLabel}>Select day of the week</div>
+                    <div className={styles.selectDaysLabel}>
+                      Select day of the week
+                    </div>
                     <div className={styles.daysContainer}>
                       {CUSTOM_DAYS.map((day) => (
                         <button
                           key={day.value}
                           type="button"
-                          className={`${styles.dayBlock} ${selectedDaysSet.has(day.value) ? styles.dayBlockSelected : ''}`}
+                          className={`${styles.dayBlock} ${
+                            selectedDaysSet.has(day.value)
+                              ? styles.dayBlockSelected
+                              : ''
+                          }`}
                           onClick={() => toggleCustomDay(day.value)}
                         >
                           {day.label}
@@ -313,11 +368,17 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                   <span>{repeatDisplay}</span>
                 </div>
                 {whenRepeat === 'custom' && (
-                  <div className={`${styles.daysContainer} ${styles.summaryCustomDaysInSummary}`}>
+                  <div
+                    className={`${styles.daysContainer} ${styles.summaryCustomDaysInSummary}`}
+                  >
                     {CUSTOM_DAYS.map((day) => (
                       <div
                         key={day.value}
-                        className={`${styles.summaryDayBlockReadOnly} ${customDaysSelected[day.value] ? styles.summaryDayBlockReadOnlySelected : ''}`}
+                        className={`${styles.summaryDayBlockReadOnly} ${
+                          customDaysSelected[day.value]
+                            ? styles.summaryDayBlockReadOnlySelected
+                            : ''
+                        }`}
                       >
                         {day.label}
                       </div>
@@ -343,18 +404,35 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
           <h3 className={styles.summarySectionLabel}>Pickup Location</h3>
           {editingSection === 'pickup' ? (
             <div className={styles.summaryInlineEdit}>
-              <div className={styles.searchInputWrapper} ref={pickupDropdownRef}>
+              <div
+                className={styles.searchInputWrapper}
+                ref={pickupDropdownRef}
+              >
                 <button
                   type="button"
                   className={styles.locationSelectButton}
                   onClick={() => setShowPickupDropdown(!showPickupDropdown)}
                 >
-                  <span className={!startLocation ? styles.locationButtonPlaceholder : ''}>
+                  <span
+                    className={
+                      !startLocation ? styles.locationButtonPlaceholder : ''
+                    }
+                  >
                     {getPickupLocationDisplay() || 'Select pickup location'}
                   </span>
                   <span className={styles.optionIcon}>
-                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" style={{ transform: 'rotate(90deg)' }}>
-                      <path d="M9.20508 3C10.929 3 12.5823 3.68482 13.8013 4.90381C15.0203 6.12279 15.7051 7.77609 15.7051 9.5C15.7051 11.11 15.1151 12.59 14.1451 13.73L14.4151 14H15.2051L20.2051 19L18.7051 20.5L13.7051 15.5V14.71L13.4351 14.44C12.2951 15.41 10.8151 16 9.20508 16C7.48117 16 5.82787 15.3152 4.60888 14.0962C3.3899 12.8772 2.70508 11.2239 2.70508 9.5C2.70508 7.77609 3.3899 6.12279 4.60888 4.90381C5.82787 3.68482 7.48117 3 9.20508 3ZM9.20508 5C6.70508 5 4.70508 7 4.70508 9.5C4.70508 12 6.70508 14 9.20508 14C11.7051 14 13.7051 12 13.7051 9.5C13.7051 7 11.7051 5 9.20508 5Z" fill="black" />
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      width="24"
+                      height="24"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                      style={{ transform: 'rotate(90deg)' }}
+                    >
+                      <path
+                        d="M9.20508 3C10.929 3 12.5823 3.68482 13.8013 4.90381C15.0203 6.12279 15.7051 7.77609 15.7051 9.5C15.7051 11.11 15.1151 12.59 14.1451 13.73L14.4151 14H15.2051L20.2051 19L18.7051 20.5L13.7051 15.5V14.71L13.4351 14.44C12.2951 15.41 10.8151 16 9.20508 16C7.48117 16 5.82787 15.3152 4.60888 14.0962C3.3899 12.8772 2.70508 11.2239 2.70508 9.5C2.70508 7.77609 3.3899 6.12279 4.60888 4.90381C5.82787 3.68482 7.48117 3 9.20508 3ZM9.20508 5C6.70508 5 4.70508 7 4.70508 9.5C4.70508 12 6.70508 14 9.20508 14C11.7051 14 13.7051 12 13.7051 9.5C13.7051 7 11.7051 5 9.20508 5Z"
+                        fill="black"
+                      />
                     </svg>
                   </span>
                 </button>
@@ -384,58 +462,80 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                   </div>
                 )}
               </div>
-              <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Pickup Time</h3>
+              <h3
+                className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}
+              >
+                Pickup Time
+              </h3>
               <div className={styles.timeInputWrapper}>
-                <div className={`${styles.timeInputContainer} ${pickupMinuteInvalid ? styles.timeInputContainerError : ''}`}>
-                <input
-                  type="text"
-                  className={styles.timeInputHour}
-                  placeholder="12"
-                  value={pickupTimeHour}
-                  onChange={(e) => {
-                    const v = e.target.value.replace(/\D/g, '');
-                    if (v === '' || (parseInt(v, 10) >= 1 && parseInt(v, 10) <= 12)) setPickupTimeHour(v);
-                  }}
-                  maxLength={2}
-                />
-                <span className={styles.timeSeparator}>:</span>
-                <input
-                  type="text"
-                  className={styles.timeInputMinute}
-                  placeholder="00"
-                  value={pickupTimeMinute}
-                  onChange={(e) => {
-                    const v = e.target.value.replace(/\D/g, '').slice(0, 2);
-                    setPickupTimeMinute(v);
-                  }}
-                  onBlur={() => {
-                    if (pickupTimeMinute === '') return;
-                    if (pickupTimeMinute.length === 1) setPickupTimeMinute(pickupTimeMinute.padStart(2, '0'));
-                  }}
-                  maxLength={2}
-                />
-                <div className={styles.timePeriodContainer}>
-                  <button
-                    type="button"
-                    className={`${styles.timePeriodButton} ${pickupTimePeriod === 'AM' ? styles.timePeriodButtonActive : ''}`}
-                    onClick={() => setPickupTimePeriod('AM')}
-                  >
-                    AM
-                  </button>
-                  <button
-                    type="button"
-                    className={`${styles.timePeriodButton} ${pickupTimePeriod === 'PM' ? styles.timePeriodButtonActive : ''}`}
-                    onClick={() => setPickupTimePeriod('PM')}
-                  >
-                    PM
-                  </button>
+                <div
+                  className={`${styles.timeInputContainer} ${
+                    pickupMinuteInvalid ? styles.timeInputContainerError : ''
+                  }`}
+                >
+                  <input
+                    type="text"
+                    className={styles.timeInputHour}
+                    placeholder="12"
+                    value={pickupTimeHour}
+                    onChange={(e) => {
+                      const v = e.target.value.replace(/\D/g, '');
+                      if (
+                        v === '' ||
+                        (parseInt(v, 10) >= 1 && parseInt(v, 10) <= 12)
+                      )
+                        setPickupTimeHour(v);
+                    }}
+                    maxLength={2}
+                  />
+                  <span className={styles.timeSeparator}>:</span>
+                  <input
+                    type="text"
+                    className={styles.timeInputMinute}
+                    placeholder="00"
+                    value={pickupTimeMinute}
+                    onChange={(e) => {
+                      const v = e.target.value.replace(/\D/g, '').slice(0, 2);
+                      setPickupTimeMinute(v);
+                    }}
+                    onBlur={() => {
+                      if (pickupTimeMinute === '') return;
+                      if (pickupTimeMinute.length === 1)
+                        setPickupTimeMinute(pickupTimeMinute.padStart(2, '0'));
+                    }}
+                    maxLength={2}
+                  />
+                  <div className={styles.timePeriodContainer}>
+                    <button
+                      type="button"
+                      className={`${styles.timePeriodButton} ${
+                        pickupTimePeriod === 'AM'
+                          ? styles.timePeriodButtonActive
+                          : ''
+                      }`}
+                      onClick={() => setPickupTimePeriod('AM')}
+                    >
+                      AM
+                    </button>
+                    <button
+                      type="button"
+                      className={`${styles.timePeriodButton} ${
+                        pickupTimePeriod === 'PM'
+                          ? styles.timePeriodButtonActive
+                          : ''
+                      }`}
+                      onClick={() => setPickupTimePeriod('PM')}
+                    >
+                      PM
+                    </button>
+                  </div>
                 </div>
-              </div>
-              {pickupMinuteInvalid && (
-                <p className={styles.timeInputError} role="alert">
-                  Please enter minutes between 00 and 59. You can correct it above.
-                </p>
-              )}
+                {pickupMinuteInvalid && (
+                  <p className={styles.timeInputError} role="alert">
+                    Please enter minutes between 00 and 59. You can correct it
+                    above.
+                  </p>
+                )}
               </div>
               <button
                 type="button"
@@ -450,7 +550,11 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
               <div className={styles.summaryValueBox}>
                 <span>{getPickupLocationDisplay()}</span>
               </div>
-              <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Pickup Time</h3>
+              <h3
+                className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}
+              >
+                Pickup Time
+              </h3>
               <div className={styles.summaryValueBox}>
                 <span>{formatTime(pickupTime)}</span>
               </div>
@@ -465,25 +569,44 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
           )}
         </div>
 
-        <div className={`${styles.summaryDivider} ${styles.summaryDividerAfterSection}`} />
+        <div
+          className={`${styles.summaryDivider} ${styles.summaryDividerAfterSection}`}
+        />
 
         {/* Dropoff section */}
         <div className={styles.summarySectionBlock}>
           <h3 className={styles.summarySectionLabel}>Dropoff Location</h3>
           {editingSection === 'dropoff' ? (
             <div className={styles.summaryInlineEdit}>
-              <div className={styles.searchInputWrapper} ref={dropoffDropdownRef}>
+              <div
+                className={styles.searchInputWrapper}
+                ref={dropoffDropdownRef}
+              >
                 <button
                   type="button"
                   className={styles.locationSelectButton}
                   onClick={() => setShowDropoffDropdown(!showDropoffDropdown)}
                 >
-                  <span className={!endLocation ? styles.locationButtonPlaceholder : ''}>
+                  <span
+                    className={
+                      !endLocation ? styles.locationButtonPlaceholder : ''
+                    }
+                  >
                     {getDropoffLocationDisplay() || 'Select dropoff location'}
                   </span>
                   <span className={styles.optionIcon}>
-                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" style={{ transform: 'rotate(90deg)' }}>
-                      <path d="M9.20508 3C10.929 3 12.5823 3.68482 13.8013 4.90381C15.0203 6.12279 15.7051 7.77609 15.7051 9.5C15.7051 11.11 15.1151 12.59 14.1451 13.73L14.4151 14H15.2051L20.2051 19L18.7051 20.5L13.7051 15.5V14.71L13.4351 14.44C12.2951 15.41 10.8151 16 9.20508 16C7.48117 16 5.82787 15.3152 4.60888 14.0962C3.3899 12.8772 2.70508 11.2239 2.70508 9.5C2.70508 7.77609 3.3899 6.12279 4.60888 4.90381C5.82787 3.68482 7.48117 3 9.20508 3ZM9.20508 5C6.70508 5 4.70508 7 4.70508 9.5C4.70508 12 6.70508 14 9.20508 14C11.7051 14 13.7051 12 13.7051 9.5C13.7051 7 11.7051 5 9.20508 5Z" fill="black" />
+                    <svg
+                      xmlns="http://www.w3.org/2000/svg"
+                      width="24"
+                      height="24"
+                      viewBox="0 0 24 24"
+                      fill="none"
+                      style={{ transform: 'rotate(90deg)' }}
+                    >
+                      <path
+                        d="M9.20508 3C10.929 3 12.5823 3.68482 13.8013 4.90381C15.0203 6.12279 15.7051 7.77609 15.7051 9.5C15.7051 11.11 15.1151 12.59 14.1451 13.73L14.4151 14H15.2051L20.2051 19L18.7051 20.5L13.7051 15.5V14.71L13.4351 14.44C12.2951 15.41 10.8151 16 9.20508 16C7.48117 16 5.82787 15.3152 4.60888 14.0962C3.3899 12.8772 2.70508 11.2239 2.70508 9.5C2.70508 7.77609 3.3899 6.12279 4.60888 4.90381C5.82787 3.68482 7.48117 3 9.20508 3ZM9.20508 5C6.70508 5 4.70508 7 4.70508 9.5C4.70508 12 6.70508 14 9.20508 14C11.7051 14 13.7051 12 13.7051 9.5C13.7051 7 11.7051 5 9.20508 5Z"
+                        fill="black"
+                      />
                     </svg>
                   </span>
                 </button>
@@ -513,58 +636,82 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
                   </div>
                 )}
               </div>
-              <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Dropoff Time</h3>
+              <h3
+                className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}
+              >
+                Dropoff Time
+              </h3>
               <div className={styles.timeInputWrapper}>
-                <div className={`${styles.timeInputContainer} ${dropoffMinuteInvalid ? styles.timeInputContainerError : ''}`}>
-                <input
-                  type="text"
-                  className={styles.timeInputHour}
-                  placeholder="12"
-                  value={dropoffTimeHour}
-                  onChange={(e) => {
-                    const v = e.target.value.replace(/\D/g, '');
-                    if (v === '' || (parseInt(v, 10) >= 1 && parseInt(v, 10) <= 12)) setDropoffTimeHour(v);
-                  }}
-                  maxLength={2}
-                />
-                <span className={styles.timeSeparator}>:</span>
-                <input
-                  type="text"
-                  className={styles.timeInputMinute}
-                  placeholder="00"
-                  value={dropoffTimeMinute}
-                  onChange={(e) => {
-                    const v = e.target.value.replace(/\D/g, '').slice(0, 2);
-                    setDropoffTimeMinute(v);
-                  }}
-                  onBlur={() => {
-                    if (dropoffTimeMinute === '') return;
-                    if (dropoffTimeMinute.length === 1) setDropoffTimeMinute(dropoffTimeMinute.padStart(2, '0'));
-                  }}
-                  maxLength={2}
-                />
-                <div className={styles.timePeriodContainer}>
-                  <button
-                    type="button"
-                    className={`${styles.timePeriodButton} ${dropoffTimePeriod === 'AM' ? styles.timePeriodButtonActive : ''}`}
-                    onClick={() => setDropoffTimePeriod('AM')}
-                  >
-                    AM
-                  </button>
-                  <button
-                    type="button"
-                    className={`${styles.timePeriodButton} ${dropoffTimePeriod === 'PM' ? styles.timePeriodButtonActive : ''}`}
-                    onClick={() => setDropoffTimePeriod('PM')}
-                  >
-                    PM
-                  </button>
+                <div
+                  className={`${styles.timeInputContainer} ${
+                    dropoffMinuteInvalid ? styles.timeInputContainerError : ''
+                  }`}
+                >
+                  <input
+                    type="text"
+                    className={styles.timeInputHour}
+                    placeholder="12"
+                    value={dropoffTimeHour}
+                    onChange={(e) => {
+                      const v = e.target.value.replace(/\D/g, '');
+                      if (
+                        v === '' ||
+                        (parseInt(v, 10) >= 1 && parseInt(v, 10) <= 12)
+                      )
+                        setDropoffTimeHour(v);
+                    }}
+                    maxLength={2}
+                  />
+                  <span className={styles.timeSeparator}>:</span>
+                  <input
+                    type="text"
+                    className={styles.timeInputMinute}
+                    placeholder="00"
+                    value={dropoffTimeMinute}
+                    onChange={(e) => {
+                      const v = e.target.value.replace(/\D/g, '').slice(0, 2);
+                      setDropoffTimeMinute(v);
+                    }}
+                    onBlur={() => {
+                      if (dropoffTimeMinute === '') return;
+                      if (dropoffTimeMinute.length === 1)
+                        setDropoffTimeMinute(
+                          dropoffTimeMinute.padStart(2, '0')
+                        );
+                    }}
+                    maxLength={2}
+                  />
+                  <div className={styles.timePeriodContainer}>
+                    <button
+                      type="button"
+                      className={`${styles.timePeriodButton} ${
+                        dropoffTimePeriod === 'AM'
+                          ? styles.timePeriodButtonActive
+                          : ''
+                      }`}
+                      onClick={() => setDropoffTimePeriod('AM')}
+                    >
+                      AM
+                    </button>
+                    <button
+                      type="button"
+                      className={`${styles.timePeriodButton} ${
+                        dropoffTimePeriod === 'PM'
+                          ? styles.timePeriodButtonActive
+                          : ''
+                      }`}
+                      onClick={() => setDropoffTimePeriod('PM')}
+                    >
+                      PM
+                    </button>
+                  </div>
                 </div>
-              </div>
-              {dropoffMinuteInvalid && (
-                <p className={styles.timeInputError} role="alert">
-                  Please enter minutes between 00 and 59. You can correct it above.
-                </p>
-              )}
+                {dropoffMinuteInvalid && (
+                  <p className={styles.timeInputError} role="alert">
+                    Please enter minutes between 00 and 59. You can correct it
+                    above.
+                  </p>
+                )}
               </div>
               <button
                 type="button"
@@ -579,7 +726,11 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
               <div className={styles.summaryValueBox}>
                 <span>{getDropoffLocationDisplay()}</span>
               </div>
-              <h3 className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}>Dropoff Time</h3>
+              <h3
+                className={`${styles.summarySectionLabel} ${styles.summarySectionLabelAfterValue}`}
+              >
+                Dropoff Time
+              </h3>
               <div className={styles.summaryValueBox}>
                 <span>{formatTime(dropoffTime)}</span>
               </div>
@@ -597,10 +748,18 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
 
       <div className={styles.bottomSection}>
         <div className={styles.bottomButtonFrame}>
-          <button type="button" className={styles.cancelButton} onClick={onBack}>
+          <button
+            type="button"
+            className={styles.cancelButton}
+            onClick={onBack}
+          >
             Back
           </button>
-          <button type="button" className={styles.saveContinueButton} onClick={onNext}>
+          <button
+            type="button"
+            className={styles.saveContinueButton}
+            onClick={onNext}
+          >
             Save and Continue
           </button>
         </div>
diff --git a/frontend/src/components/RequestRideModal/steps/SummaryStep.tsx b/frontend/src/components/RequestRideModal/steps/SummaryStep.tsx
index 987d56e65..ebf5adfeb 100644
--- a/frontend/src/components/RequestRideModal/steps/SummaryStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/SummaryStep.tsx
@@ -77,14 +77,14 @@ const SummaryStep: React.FC<SummaryStepProps> = ({ ride, modalType }) => {
           <div className={styles.summaryItem}>
             <span className={styles.summaryLabel}>Date:</span>
             <span className={styles.summaryValue}>
-              {startDate
-                ? moment(startDate).format('MMMM D, YYYY')
-                : 'Not set'}
+              {startDate ? moment(startDate).format('MMMM D, YYYY') : 'Not set'}
             </span>
           </div>
           <div className={styles.summaryItem}>
             <span className={styles.summaryLabel}>Pickup Time:</span>
-            <span className={styles.summaryValue}>{formatTime(pickupTime)}</span>
+            <span className={styles.summaryValue}>
+              {formatTime(pickupTime)}
+            </span>
           </div>
           <div className={styles.summaryItem}>
             <span className={styles.summaryLabel}>Dropoff Time:</span>
diff --git a/frontend/src/components/RiderComponents/RequestRideMap.tsx b/frontend/src/components/RiderComponents/RequestRideMap.tsx
index c72f0d281..f78f2d561 100644
--- a/frontend/src/components/RiderComponents/RequestRideMap.tsx
+++ b/frontend/src/components/RiderComponents/RequestRideMap.tsx
@@ -163,9 +163,21 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
     (event: MapMouseEvent) => {
       const e = event as unknown as google.maps.MapMouseEvent;
       if (!e.latLng) return;
-      const lat = typeof e.latLng.lat === 'function' ? e.latLng.lat() : (e.latLng as any).lat;
-      const lng = typeof e.latLng.lng === 'function' ? e.latLng.lng() : (e.latLng as any).lng;
-      if (typeof lat !== 'number' || typeof lng !== 'number' || !Number.isFinite(lat) || !Number.isFinite(lng)) return;
+      const lat =
+        typeof e.latLng.lat === 'function'
+          ? e.latLng.lat()
+          : (e.latLng as any).lat;
+      const lng =
+        typeof e.latLng.lng === 'function'
+          ? e.latLng.lng()
+          : (e.latLng as any).lng;
+      if (
+        typeof lat !== 'number' ||
+        typeof lng !== 'number' ||
+        !Number.isFinite(lat) ||
+        !Number.isFinite(lng)
+      )
+        return;
 
       const locationFromClick: Location = {
         id: 'custom',
@@ -178,13 +190,17 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
         lng,
       };
 
-      const applyGeocoded = (loc: Location, results: google.maps.GeocoderResult[] | null) => {
+      const applyGeocoded = (
+        loc: Location,
+        results: google.maps.GeocoderResult[] | null
+      ) => {
         if (results?.[0]?.formatted_address) {
           return {
             ...loc,
             address: results[0].formatted_address,
             name: results[0].formatted_address,
-            shortName: results[0].address_components?.[0]?.short_name ?? 'Selected',
+            shortName:
+              results[0].address_components?.[0]?.short_name ?? 'Selected',
           };
         }
         return loc;
@@ -194,7 +210,10 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
         if (window.google?.maps?.Geocoder) {
           const geocoder = new window.google.maps.Geocoder();
           geocoder.geocode({ location: { lat, lng } }, (results, status) => {
-            const loc = status === 'OK' ? applyGeocoded(locationFromClick, results) : locationFromClick;
+            const loc =
+              status === 'OK'
+                ? applyGeocoded(locationFromClick, results)
+                : locationFromClick;
             onPickupSelect(loc);
           });
         } else {
@@ -204,7 +223,10 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
         if (window.google?.maps?.Geocoder) {
           const geocoder = new window.google.maps.Geocoder();
           geocoder.geocode({ location: { lat, lng } }, (results, status) => {
-            const loc = status === 'OK' ? applyGeocoded(locationFromClick, results) : locationFromClick;
+            const loc =
+              status === 'OK'
+                ? applyGeocoded(locationFromClick, results)
+                : locationFromClick;
             onDropoffSelect(loc);
           });
         } else {
@@ -212,7 +234,12 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
         }
       }
     },
-    [enablePickupMapClick, enableDropoffMapClick, onPickupSelect, onDropoffSelect]
+    [
+      enablePickupMapClick,
+      enableDropoffMapClick,
+      onPickupSelect,
+      onDropoffSelect,
+    ]
   );
 
   return (
diff --git a/package.json b/package.json
index d595e7019..38489bb1b 100644
--- a/package.json
+++ b/package.json
@@ -21,6 +21,7 @@
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
+    "fastq": "^1.20.1",
     "globals": "^17.4.0",
     "husky": "^9.1.7",
     "prettier": "^2.8.8"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6cacc5da1..acb185dde 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -11,6 +11,7 @@ catalogs:
       version: 5.9.3
 
 importers:
+
   .:
     dependencies:
       '@typescript-eslint/parser':
@@ -59,6 +60,9 @@ importers:
       eslint-plugin-react-hooks:
         specifier: ^7.0.1
         version: 7.0.1(eslint@9.39.4(jiti@1.21.7))
+      fastq:
+        specifier: ^1.20.1
+        version: 1.20.1
       globals:
         specifier: ^17.4.0
         version: 17.4.0
@@ -74,6 +78,9 @@ importers:
       '@carriage-web/shared':
         specifier: workspace:*
         version: link:../shared
+      node-releases:
+        specifier: ^2.0.36
+        version: 2.0.36
     devDependencies:
       '@emotion/react':
         specifier: ^11.13.5
@@ -372,316 +379,182 @@ importers:
         version: 5.9.3
 
 packages:
+
   '@alloc/quick-lru@5.2.0':
-    resolution:
-      {
-        integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
+    engines: {node: '>=10'}
 
   '@aws-crypto/crc32@5.2.0':
-    resolution:
-      {
-        integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==,
-      }
-    engines: { node: '>=16.0.0' }
+    resolution: {integrity: sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-crypto/crc32c@5.2.0':
-    resolution:
-      {
-        integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==,
-      }
+    resolution: {integrity: sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==}
 
   '@aws-crypto/sha1-browser@5.2.0':
-    resolution:
-      {
-        integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==,
-      }
+    resolution: {integrity: sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==}
 
   '@aws-crypto/sha256-browser@5.2.0':
-    resolution:
-      {
-        integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==,
-      }
+    resolution: {integrity: sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==}
 
   '@aws-crypto/sha256-js@5.2.0':
-    resolution:
-      {
-        integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==,
-      }
-    engines: { node: '>=16.0.0' }
+    resolution: {integrity: sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==}
+    engines: {node: '>=16.0.0'}
 
   '@aws-crypto/supports-web-crypto@5.2.0':
-    resolution:
-      {
-        integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==,
-      }
+    resolution: {integrity: sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==}
 
   '@aws-crypto/util@5.2.0':
-    resolution:
-      {
-        integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==,
-      }
+    resolution: {integrity: sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==}
 
   '@aws-sdk/client-dynamodb@3.1006.0':
-    resolution:
-      {
-        integrity: sha512-PTGnTtTdOezfg7UsICBeS8BtxAxYfWI2/JNLflWjjryiJdHIl7aAprsHrIzlsD6qwQOloxhmwqp7C9JFY5BT2Q==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-PTGnTtTdOezfg7UsICBeS8BtxAxYfWI2/JNLflWjjryiJdHIl7aAprsHrIzlsD6qwQOloxhmwqp7C9JFY5BT2Q==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/client-s3@3.1006.0':
-    resolution:
-      {
-        integrity: sha512-tm8R/LgWDC3zWPMCdD990owvBrmuIM2A39+OWKW/HyAomWi6ancPz/H1K/hmxf0bqdXAaRUHBQMAmzwb1aR33Q==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-tm8R/LgWDC3zWPMCdD990owvBrmuIM2A39+OWKW/HyAomWi6ancPz/H1K/hmxf0bqdXAaRUHBQMAmzwb1aR33Q==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/client-sns@3.1006.0':
-    resolution:
-      {
-        integrity: sha512-VLj5vhf2yO52r+MROIYmNSlsaXdYrMFSnpbhRjI7AwG+4KO/PYuomOQqB5UjojF4JGlsOeEgm4y1JFM7qp+C8A==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-VLj5vhf2yO52r+MROIYmNSlsaXdYrMFSnpbhRjI7AwG+4KO/PYuomOQqB5UjojF4JGlsOeEgm4y1JFM7qp+C8A==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/core@3.973.19':
-    resolution:
-      {
-        integrity: sha512-56KePyOcZnKTWCd89oJS1G6j3HZ9Kc+bh/8+EbvtaCCXdP6T7O7NzCiPuHRhFLWnzXIaXX3CxAz0nI5My9spHQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-56KePyOcZnKTWCd89oJS1G6j3HZ9Kc+bh/8+EbvtaCCXdP6T7O7NzCiPuHRhFLWnzXIaXX3CxAz0nI5My9spHQ==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/crc64-nvme@3.972.4':
-    resolution:
-      {
-        integrity: sha512-HKZIZLbRyvzo/bXZU7Zmk6XqU+1C9DjI56xd02vwuDIxedxBEqP17t9ExhbP9QFeNq/a3l9GOcyirFXxmbDhmw==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-HKZIZLbRyvzo/bXZU7Zmk6XqU+1C9DjI56xd02vwuDIxedxBEqP17t9ExhbP9QFeNq/a3l9GOcyirFXxmbDhmw==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/credential-provider-env@3.972.17':
-    resolution:
-      {
-        integrity: sha512-MBAMW6YELzE1SdkOniqr51mrjapQUv8JXSGxtwRjQV0mwVDutVsn22OPAUt4RcLRvdiHQmNBDEFP9iTeSVCOlA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-MBAMW6YELzE1SdkOniqr51mrjapQUv8JXSGxtwRjQV0mwVDutVsn22OPAUt4RcLRvdiHQmNBDEFP9iTeSVCOlA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/credential-provider-http@3.972.19':
-    resolution:
-      {
-        integrity: sha512-9EJROO8LXll5a7eUFqu48k6BChrtokbmgeMWmsH7lBb6lVbtjslUYz/ShLi+SHkYzTomiGBhmzTW7y+H4BxsnA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-9EJROO8LXll5a7eUFqu48k6BChrtokbmgeMWmsH7lBb6lVbtjslUYz/ShLi+SHkYzTomiGBhmzTW7y+H4BxsnA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/credential-provider-ini@3.972.18':
-    resolution:
-      {
-        integrity: sha512-vthIAXJISZnj2576HeyLBj4WTeX+I7PwWeRkbOa0mVX39K13SCGxCgOFuKj2ytm9qTlLOmXe4cdEnroteFtJfw==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-vthIAXJISZnj2576HeyLBj4WTeX+I7PwWeRkbOa0mVX39K13SCGxCgOFuKj2ytm9qTlLOmXe4cdEnroteFtJfw==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/credential-provider-login@3.972.18':
-    resolution:
-      {
-        integrity: sha512-kINzc5BBxdYBkPZ0/i1AMPMOk5b5QaFNbYMElVw5QTX13AKj6jcxnv/YNl9oW9mg+Y08ti19hh01HhyEAxsSJQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-kINzc5BBxdYBkPZ0/i1AMPMOk5b5QaFNbYMElVw5QTX13AKj6jcxnv/YNl9oW9mg+Y08ti19hh01HhyEAxsSJQ==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/credential-provider-node@3.972.19':
-    resolution:
-      {
-        integrity: sha512-yDWQ9dFTr+IMxwanFe7+tbN5++q8psZBjlUwOiCXn1EzANoBgtqBwcpYcHaMGtn0Wlfj4NuXdf2JaEx1lz5RaQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-yDWQ9dFTr+IMxwanFe7+tbN5++q8psZBjlUwOiCXn1EzANoBgtqBwcpYcHaMGtn0Wlfj4NuXdf2JaEx1lz5RaQ==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/credential-provider-process@3.972.17':
-    resolution:
-      {
-        integrity: sha512-c8G8wT1axpJDgaP3xzcy+q8Y1fTi9A2eIQJvyhQ9xuXrUZhlCfXbC0vM9bM1CUXiZppFQ1p7g0tuUMvil/gCPg==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-c8G8wT1axpJDgaP3xzcy+q8Y1fTi9A2eIQJvyhQ9xuXrUZhlCfXbC0vM9bM1CUXiZppFQ1p7g0tuUMvil/gCPg==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/credential-provider-sso@3.972.18':
-    resolution:
-      {
-        integrity: sha512-YHYEfj5S2aqInRt5ub8nDOX8vAxgMvd84wm2Y3WVNfFa/53vOv9T7WOAqXI25qjj3uEcV46xxfqdDQk04h5XQA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-YHYEfj5S2aqInRt5ub8nDOX8vAxgMvd84wm2Y3WVNfFa/53vOv9T7WOAqXI25qjj3uEcV46xxfqdDQk04h5XQA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/credential-provider-web-identity@3.972.18':
-    resolution:
-      {
-        integrity: sha512-OqlEQpJ+J3T5B96qtC1zLLwkBloechP+fezKbCH0sbd2cCc0Ra55XpxWpk/hRj69xAOYtHvoC4orx6eTa4zU7g==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-OqlEQpJ+J3T5B96qtC1zLLwkBloechP+fezKbCH0sbd2cCc0Ra55XpxWpk/hRj69xAOYtHvoC4orx6eTa4zU7g==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/dynamodb-codec@3.972.20':
-    resolution:
-      {
-        integrity: sha512-MQ2W0zeBMNaQYgHcQ7aul7g5783qFdP2AKcJnpaID0ekl2QbiKF+St1JMx5lgOXHlnERD9X3exr2B0SIg35oOA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-MQ2W0zeBMNaQYgHcQ7aul7g5783qFdP2AKcJnpaID0ekl2QbiKF+St1JMx5lgOXHlnERD9X3exr2B0SIg35oOA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/endpoint-cache@3.972.4':
-    resolution:
-      {
-        integrity: sha512-GdASDnWanLnHxKK0hqV97xz23QmfA/C8yGe0PiuEmWiHSe+x+x+mFEj4sXqx9IbfyPncWz8f4EhNwBSG9cgYCg==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-GdASDnWanLnHxKK0hqV97xz23QmfA/C8yGe0PiuEmWiHSe+x+x+mFEj4sXqx9IbfyPncWz8f4EhNwBSG9cgYCg==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-bucket-endpoint@3.972.7':
-    resolution:
-      {
-        integrity: sha512-goX+axlJ6PQlRnzE2bQisZ8wVrlm6dXJfBzMJhd8LhAIBan/w1Kl73fJnalM/S+18VnpzIHumyV6DtgmvqG5IA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-goX+axlJ6PQlRnzE2bQisZ8wVrlm6dXJfBzMJhd8LhAIBan/w1Kl73fJnalM/S+18VnpzIHumyV6DtgmvqG5IA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-endpoint-discovery@3.972.7':
-    resolution:
-      {
-        integrity: sha512-ZeFfgAVOGR+fDq/JAPsVA3P07ba74hIppoGfmQyfzZMfAQAzc9Lbg5pndZU8EanzfKnlXbv6y09OMrSkTsUuOg==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-ZeFfgAVOGR+fDq/JAPsVA3P07ba74hIppoGfmQyfzZMfAQAzc9Lbg5pndZU8EanzfKnlXbv6y09OMrSkTsUuOg==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-expect-continue@3.972.7':
-    resolution:
-      {
-        integrity: sha512-mvWqvm61bmZUKmmrtl2uWbokqpenY3Mc3Jf4nXB/Hse6gWxLPaCQThmhPBDzsPSV8/Odn8V6ovWt3pZ7vy4BFQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-mvWqvm61bmZUKmmrtl2uWbokqpenY3Mc3Jf4nXB/Hse6gWxLPaCQThmhPBDzsPSV8/Odn8V6ovWt3pZ7vy4BFQ==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-flexible-checksums@3.973.5':
-    resolution:
-      {
-        integrity: sha512-Dp3hqE5W6hG8HQ3Uh+AINx9wjjqYmFHbxede54sGj3akx/haIQrkp85lNdTdC+ouNUcSYNiuGkzmyDREfHX1Gg==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-Dp3hqE5W6hG8HQ3Uh+AINx9wjjqYmFHbxede54sGj3akx/haIQrkp85lNdTdC+ouNUcSYNiuGkzmyDREfHX1Gg==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-host-header@3.972.7':
-    resolution:
-      {
-        integrity: sha512-aHQZgztBFEpDU1BB00VWCIIm85JjGjQW1OG9+98BdmaOpguJvzmXBGbnAiYcciCd+IS4e9BEq664lhzGnWJHgQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-aHQZgztBFEpDU1BB00VWCIIm85JjGjQW1OG9+98BdmaOpguJvzmXBGbnAiYcciCd+IS4e9BEq664lhzGnWJHgQ==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-location-constraint@3.972.7':
-    resolution:
-      {
-        integrity: sha512-vdK1LJfffBp87Lj0Bw3WdK1rJk9OLDYdQpqoKgmpIZPe+4+HawZ6THTbvjhJt4C4MNnRrHTKHQjkwBiIpDBoig==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-vdK1LJfffBp87Lj0Bw3WdK1rJk9OLDYdQpqoKgmpIZPe+4+HawZ6THTbvjhJt4C4MNnRrHTKHQjkwBiIpDBoig==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-logger@3.972.7':
-    resolution:
-      {
-        integrity: sha512-LXhiWlWb26txCU1vcI9PneESSeRp/RYY/McuM4SpdrimQR5NgwaPb4VJCadVeuGWgh6QmqZ6rAKSoL1ob16W6w==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-LXhiWlWb26txCU1vcI9PneESSeRp/RYY/McuM4SpdrimQR5NgwaPb4VJCadVeuGWgh6QmqZ6rAKSoL1ob16W6w==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-recursion-detection@3.972.7':
-    resolution:
-      {
-        integrity: sha512-l2VQdcBcYLzIzykCHtXlbpiVCZ94/xniLIkAj0jpnpjY4xlgZx7f56Ypn+uV1y3gG0tNVytJqo3K9bfMFee7SQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-l2VQdcBcYLzIzykCHtXlbpiVCZ94/xniLIkAj0jpnpjY4xlgZx7f56Ypn+uV1y3gG0tNVytJqo3K9bfMFee7SQ==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-sdk-s3@3.972.19':
-    resolution:
-      {
-        integrity: sha512-/CtOHHVFg4ZuN6CnLnYkrqWgVEnbOBC4kNiKa+4fldJ9cioDt3dD/f5vpq0cWLOXwmGL2zgVrVxNhjxWpxNMkg==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-/CtOHHVFg4ZuN6CnLnYkrqWgVEnbOBC4kNiKa+4fldJ9cioDt3dD/f5vpq0cWLOXwmGL2zgVrVxNhjxWpxNMkg==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-ssec@3.972.7':
-    resolution:
-      {
-        integrity: sha512-G9clGVuAml7d8DYzY6DnRi7TIIDRvZ3YpqJPz/8wnWS5fYx/FNWNmkO6iJVlVkQg9BfeMzd+bVPtPJOvC4B+nQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-G9clGVuAml7d8DYzY6DnRi7TIIDRvZ3YpqJPz/8wnWS5fYx/FNWNmkO6iJVlVkQg9BfeMzd+bVPtPJOvC4B+nQ==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/middleware-user-agent@3.972.20':
-    resolution:
-      {
-        integrity: sha512-3kNTLtpUdeahxtnJRnj/oIdLAUdzTfr9N40KtxNhtdrq+Q1RPMdCJINRXq37m4t5+r3H70wgC3opW46OzFcZYA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-3kNTLtpUdeahxtnJRnj/oIdLAUdzTfr9N40KtxNhtdrq+Q1RPMdCJINRXq37m4t5+r3H70wgC3opW46OzFcZYA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/nested-clients@3.996.8':
-    resolution:
-      {
-        integrity: sha512-6HlLm8ciMW8VzfB80kfIx16PBA9lOa9Dl+dmCBi78JDhvGlx3I7Rorwi5PpVRkL31RprXnYna3yBf6UKkD/PqA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-6HlLm8ciMW8VzfB80kfIx16PBA9lOa9Dl+dmCBi78JDhvGlx3I7Rorwi5PpVRkL31RprXnYna3yBf6UKkD/PqA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/region-config-resolver@3.972.7':
-    resolution:
-      {
-        integrity: sha512-/Ev/6AI8bvt4HAAptzSjThGUMjcWaX3GX8oERkB0F0F9x2dLSBdgFDiyrRz3i0u0ZFZFQ1b28is4QhyqXTUsVA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-/Ev/6AI8bvt4HAAptzSjThGUMjcWaX3GX8oERkB0F0F9x2dLSBdgFDiyrRz3i0u0ZFZFQ1b28is4QhyqXTUsVA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/signature-v4-multi-region@3.996.7':
-    resolution:
-      {
-        integrity: sha512-mYhh7FY+7OOqjkYkd6+6GgJOsXK1xBWmuR+c5mxJPj2kr5TBNeZq+nUvE9kANWAux5UxDVrNOSiEM/wlHzC3Lg==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-mYhh7FY+7OOqjkYkd6+6GgJOsXK1xBWmuR+c5mxJPj2kr5TBNeZq+nUvE9kANWAux5UxDVrNOSiEM/wlHzC3Lg==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/token-providers@3.1005.0':
-    resolution:
-      {
-        integrity: sha512-vMxd+ivKqSxU9bHx5vmAlFKDAkjGotFU56IOkDa5DaTu1WWwbcse0yFHEm9I537oVvodaiwMl3VBwgHfzQ2rvw==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-vMxd+ivKqSxU9bHx5vmAlFKDAkjGotFU56IOkDa5DaTu1WWwbcse0yFHEm9I537oVvodaiwMl3VBwgHfzQ2rvw==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/types@3.973.5':
-    resolution:
-      {
-        integrity: sha512-hl7BGwDCWsjH8NkZfx+HgS7H2LyM2lTMAI7ba9c8O0KqdBLTdNJivsHpqjg9rNlAlPyREb6DeDRXUl0s8uFdmQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-hl7BGwDCWsjH8NkZfx+HgS7H2LyM2lTMAI7ba9c8O0KqdBLTdNJivsHpqjg9rNlAlPyREb6DeDRXUl0s8uFdmQ==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/util-arn-parser@3.972.3':
-    resolution:
-      {
-        integrity: sha512-HzSD8PMFrvgi2Kserxuff5VitNq2sgf3w9qxmskKDiDTThWfVteJxuCS9JXiPIPtmCrp+7N9asfIaVhBFORllA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-HzSD8PMFrvgi2Kserxuff5VitNq2sgf3w9qxmskKDiDTThWfVteJxuCS9JXiPIPtmCrp+7N9asfIaVhBFORllA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/util-dynamodb@3.996.2':
-    resolution:
-      {
-        integrity: sha512-ddpwaZmjBzcApYN7lgtAXjk+u+GO8fiPsxzuc59UqP+zqdxI1gsenPvkyiHiF9LnYnyRGijz6oN2JylnN561qQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-ddpwaZmjBzcApYN7lgtAXjk+u+GO8fiPsxzuc59UqP+zqdxI1gsenPvkyiHiF9LnYnyRGijz6oN2JylnN561qQ==}
+    engines: {node: '>=20.0.0'}
     peerDependencies:
       '@aws-sdk/client-dynamodb': ^3.1003.0
 
   '@aws-sdk/util-endpoints@3.996.4':
-    resolution:
-      {
-        integrity: sha512-Hek90FBmd4joCFj+Vc98KLJh73Zqj3s2W56gjAcTkrNLMDI5nIFkG9YpfcJiVI1YlE2Ne1uOQNe+IgQ/Vz2XRA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-Hek90FBmd4joCFj+Vc98KLJh73Zqj3s2W56gjAcTkrNLMDI5nIFkG9YpfcJiVI1YlE2Ne1uOQNe+IgQ/Vz2XRA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/util-locate-window@3.965.5':
-    resolution:
-      {
-        integrity: sha512-WhlJNNINQB+9qtLtZJcpQdgZw3SCDCpXdUJP7cToGwHbCWCnRckGlc6Bx/OhWwIYFNAn+FIydY8SZ0QmVu3xTQ==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-WhlJNNINQB+9qtLtZJcpQdgZw3SCDCpXdUJP7cToGwHbCWCnRckGlc6Bx/OhWwIYFNAn+FIydY8SZ0QmVu3xTQ==}
+    engines: {node: '>=20.0.0'}
 
   '@aws-sdk/util-user-agent-browser@3.972.7':
-    resolution:
-      {
-        integrity: sha512-7SJVuvhKhMF/BkNS1n0QAJYgvEwYbK2QLKBrzDiwQGiTRU6Yf1f3nehTzm/l21xdAOtWSfp2uWSddPnP2ZtsVw==,
-      }
+    resolution: {integrity: sha512-7SJVuvhKhMF/BkNS1n0QAJYgvEwYbK2QLKBrzDiwQGiTRU6Yf1f3nehTzm/l21xdAOtWSfp2uWSddPnP2ZtsVw==}
 
   '@aws-sdk/util-user-agent-node@3.973.5':
-    resolution:
-      {
-        integrity: sha512-Dyy38O4GeMk7UQ48RupfHif//gqnOPbq/zlvRssc11E2mClT+aUfc3VS2yD8oLtzqO3RsqQ9I3gOBB4/+HjPOw==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-Dyy38O4GeMk7UQ48RupfHif//gqnOPbq/zlvRssc11E2mClT+aUfc3VS2yD8oLtzqO3RsqQ9I3gOBB4/+HjPOw==}
+    engines: {node: '>=20.0.0'}
     peerDependencies:
       aws-crt: '>=1.0.0'
     peerDependenciesMeta:
@@ -689,229 +562,133 @@ packages:
         optional: true
 
   '@aws-sdk/xml-builder@3.972.10':
-    resolution:
-      {
-        integrity: sha512-OnejAIVD+CxzyAUrVic7lG+3QRltyja9LoNqCE/1YVs8ichoTbJlVSaZ9iSMcnHLyzrSNtvaOGjSDRP+d/ouFA==,
-      }
-    engines: { node: '>=20.0.0' }
+    resolution: {integrity: sha512-OnejAIVD+CxzyAUrVic7lG+3QRltyja9LoNqCE/1YVs8ichoTbJlVSaZ9iSMcnHLyzrSNtvaOGjSDRP+d/ouFA==}
+    engines: {node: '>=20.0.0'}
 
   '@aws/lambda-invoke-store@0.2.3':
-    resolution:
-      {
-        integrity: sha512-oLvsaPMTBejkkmHhjf09xTgk71mOqyr/409NKhRIL08If7AhVfUsJhVsx386uJaqNd42v9kWamQ9lFbkoC2dYw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-oLvsaPMTBejkkmHhjf09xTgk71mOqyr/409NKhRIL08If7AhVfUsJhVsx386uJaqNd42v9kWamQ9lFbkoC2dYw==}
+    engines: {node: '>=18.0.0'}
 
   '@babel/code-frame@7.29.0':
-    resolution:
-      {
-        integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/compat-data@7.29.0':
-    resolution:
-      {
-        integrity: sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/core@7.29.0':
-    resolution:
-      {
-        integrity: sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/eslint-parser@7.28.6':
-    resolution:
-      {
-        integrity: sha512-QGmsKi2PBO/MHSQk+AAgA9R6OHQr+VqnniFE0eMWZcVcfBZoA2dKn2hUsl3Csg/Plt9opRUWdY7//VXsrIlEiA==,
-      }
-    engines: { node: ^10.13.0 || ^12.13.0 || >=14.0.0 }
+    resolution: {integrity: sha512-QGmsKi2PBO/MHSQk+AAgA9R6OHQr+VqnniFE0eMWZcVcfBZoA2dKn2hUsl3Csg/Plt9opRUWdY7//VXsrIlEiA==}
+    engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0}
     peerDependencies:
       '@babel/core': ^7.11.0
       eslint: ^7.5.0 || ^8.0.0 || ^9.0.0
 
   '@babel/generator@7.29.1':
-    resolution:
-      {
-        integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-compilation-targets@7.28.6':
-    resolution:
-      {
-        integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-globals@7.28.0':
-    resolution:
-      {
-        integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-module-imports@7.28.6':
-    resolution:
-      {
-        integrity: sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-module-transforms@7.28.6':
-    resolution:
-      {
-        integrity: sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
   '@babel/helper-plugin-utils@7.28.6':
-    resolution:
-      {
-        integrity: sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-string-parser@7.27.1':
-    resolution:
-      {
-        integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-validator-identifier@7.28.5':
-    resolution:
-      {
-        integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helper-validator-option@7.27.1':
-    resolution:
-      {
-        integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/helpers@7.28.6':
-    resolution:
-      {
-        integrity: sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/parser@7.29.0':
-    resolution:
-      {
-        integrity: sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==}
+    engines: {node: '>=6.0.0'}
     hasBin: true
 
   '@babel/plugin-transform-react-jsx-self@7.27.1':
-    resolution:
-      {
-        integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
   '@babel/plugin-transform-react-jsx-source@7.27.1':
-    resolution:
-      {
-        integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
   '@babel/runtime@7.28.6':
-    resolution:
-      {
-        integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/template@7.28.6':
-    resolution:
-      {
-        integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/traverse@7.29.0':
-    resolution:
-      {
-        integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==}
+    engines: {node: '>=6.9.0'}
 
   '@babel/types@7.29.0':
-    resolution:
-      {
-        integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
+    engines: {node: '>=6.9.0'}
 
   '@emnapi/core@1.8.1':
-    resolution:
-      {
-        integrity: sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==,
-      }
+    resolution: {integrity: sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==}
 
   '@emnapi/runtime@1.8.1':
-    resolution:
-      {
-        integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==,
-      }
+    resolution: {integrity: sha512-mehfKSMWjjNol8659Z8KxEMrdSJDDot5SXMq00dM8BN4o+CLNXQ0xH2V7EchNHV4RmbZLmmPdEaXZc5H2FXmDg==}
 
   '@emnapi/wasi-threads@1.1.0':
-    resolution:
-      {
-        integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==,
-      }
+    resolution: {integrity: sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==}
 
   '@emotion/babel-plugin@11.13.5':
-    resolution:
-      {
-        integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==,
-      }
+    resolution: {integrity: sha512-pxHCpT2ex+0q+HH91/zsdHkw/lXd468DIN2zvfvLtPKLLMo6gQj7oLObq8PhkrxOZb/gGCq03S3Z7PDhS8pduQ==}
 
   '@emotion/cache@11.14.0':
-    resolution:
-      {
-        integrity: sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==,
-      }
+    resolution: {integrity: sha512-L/B1lc/TViYk4DcpGxtAVbx0ZyiKM5ktoIyafGkH6zg/tj+mA+NE//aPYKG0k8kCHSHVJrpLpcAlOBEXQ3SavA==}
 
   '@emotion/hash@0.9.2':
-    resolution:
-      {
-        integrity: sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==,
-      }
+    resolution: {integrity: sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==}
 
   '@emotion/is-prop-valid@1.4.0':
-    resolution:
-      {
-        integrity: sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==,
-      }
+    resolution: {integrity: sha512-QgD4fyscGcbbKwJmqNvUMSE02OsHUa+lAWKdEUIJKgqe5IwRSKd7+KhibEWdaKwgjLj0DRSHA9biAIqGBk05lw==}
 
   '@emotion/memoize@0.9.0':
-    resolution:
-      {
-        integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==,
-      }
+    resolution: {integrity: sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==}
 
   '@emotion/react@11.14.0':
-    resolution:
-      {
-        integrity: sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==,
-      }
+    resolution: {integrity: sha512-O000MLDBDdk/EohJPFUqvnp4qnHeYkVP5B0xEG0D/L7cOKP9kefu2DXn8dj74cQfsEzUqh+sr1RzFqiL1o+PpA==}
     peerDependencies:
       '@types/react': '*'
       react: '>=16.8.0'
@@ -920,22 +697,13 @@ packages:
         optional: true
 
   '@emotion/serialize@1.3.3':
-    resolution:
-      {
-        integrity: sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==,
-      }
+    resolution: {integrity: sha512-EISGqt7sSNWHGI76hC7x1CksiXPahbxEOrC5RjmFRJTqLyEK9/9hZvBbiYn70dw4wuwMKiEMCUlR6ZXTSWQqxA==}
 
   '@emotion/sheet@1.4.0':
-    resolution:
-      {
-        integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==,
-      }
+    resolution: {integrity: sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==}
 
   '@emotion/styled@11.14.1':
-    resolution:
-      {
-        integrity: sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==,
-      }
+    resolution: {integrity: sha512-qEEJt42DuToa3gurlH4Qqc1kVpNq8wO8cJtDzU46TjlzWjDlsVyevtYCRijVq3SrHsROS+gVQ8Fnea108GnKzw==}
     peerDependencies:
       '@emotion/react': ^11.0.0-rc.0
       '@types/react': '*'
@@ -945,287 +713,188 @@ packages:
         optional: true
 
   '@emotion/unitless@0.10.0':
-    resolution:
-      {
-        integrity: sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==,
-      }
+    resolution: {integrity: sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==}
 
   '@emotion/use-insertion-effect-with-fallbacks@1.2.0':
-    resolution:
-      {
-        integrity: sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==,
-      }
+    resolution: {integrity: sha512-yJMtVdH59sxi/aVJBpk9FQq+OR8ll5GT8oWd57UpeaKEVGab41JWaCFA7FRLoMLloOZF/c/wsPoe+bfGmRKgDg==}
     peerDependencies:
       react: '>=16.8.0'
 
   '@emotion/utils@1.4.2':
-    resolution:
-      {
-        integrity: sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==,
-      }
+    resolution: {integrity: sha512-3vLclRofFziIa3J2wDh9jjbkUz9qk5Vi3IZ/FSTKViB0k+ef0fPV7dYrUIugbgupYDx7v9ud/SjrtEP8Y4xLoA==}
 
   '@emotion/weak-memoize@0.4.0':
-    resolution:
-      {
-        integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==,
-      }
+    resolution: {integrity: sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==}
 
   '@esbuild/aix-ppc64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==}
+    engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
 
   '@esbuild/android-arm64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
 
   '@esbuild/android-arm@0.27.3':
-    resolution:
-      {
-        integrity: sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==}
+    engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
 
   '@esbuild/android-x64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
 
   '@esbuild/darwin-arm64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
 
   '@esbuild/darwin-x64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
 
   '@esbuild/freebsd-arm64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
 
   '@esbuild/freebsd-x64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
 
   '@esbuild/linux-arm64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
 
   '@esbuild/linux-arm@0.27.3':
-    resolution:
-      {
-        integrity: sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==}
+    engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
 
   '@esbuild/linux-ia32@0.27.3':
-    resolution:
-      {
-        integrity: sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==}
+    engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
 
   '@esbuild/linux-loong64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==}
+    engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
 
   '@esbuild/linux-mips64el@0.27.3':
-    resolution:
-      {
-        integrity: sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==}
+    engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
 
   '@esbuild/linux-ppc64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==}
+    engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
 
   '@esbuild/linux-riscv64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==}
+    engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
 
   '@esbuild/linux-s390x@0.27.3':
-    resolution:
-      {
-        integrity: sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==}
+    engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
 
   '@esbuild/linux-x64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
 
   '@esbuild/netbsd-arm64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [netbsd]
 
   '@esbuild/netbsd-x64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
 
   '@esbuild/openbsd-arm64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
 
   '@esbuild/openbsd-x64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
 
   '@esbuild/openharmony-arm64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [openharmony]
 
   '@esbuild/sunos-x64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
 
   '@esbuild/win32-arm64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==}
+    engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
 
   '@esbuild/win32-ia32@0.27.3':
-    resolution:
-      {
-        integrity: sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==}
+    engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
 
   '@esbuild/win32-x64@0.27.3':
-    resolution:
-      {
-        integrity: sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==}
+    engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
 
   '@eslint-community/eslint-utils@4.9.1':
-    resolution:
-      {
-        integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
+    resolution: {integrity: sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
 
   '@eslint-community/regexpp@4.12.2':
-    resolution:
-      {
-        integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==,
-      }
-    engines: { node: ^12.0.0 || ^14.0.0 || >=16.0.0 }
+    resolution: {integrity: sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
 
   '@eslint/compat@2.0.3':
-    resolution:
-      {
-        integrity: sha512-SjIJhGigp8hmd1YGIBwh7Ovri7Kisl42GYFjrOyHhtfYGGoLW6teYi/5p8W50KSsawUPpuLOSmsq1bD0NGQLBw==,
-      }
-    engines: { node: ^20.19.0 || ^22.13.0 || >=24 }
+    resolution: {integrity: sha512-SjIJhGigp8hmd1YGIBwh7Ovri7Kisl42GYFjrOyHhtfYGGoLW6teYi/5p8W50KSsawUPpuLOSmsq1bD0NGQLBw==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
     peerDependencies:
       eslint: ^8.40 || 9 || 10
     peerDependenciesMeta:
@@ -1233,46 +902,28 @@ packages:
         optional: true
 
   '@eslint/config-array@0.21.2':
-    resolution:
-      {
-        integrity: sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-nJl2KGTlrf9GjLimgIru+V/mzgSK0ABCDQRvxw5BjURL7WfH5uoWmizbH7QB6MmnMBd8cIC9uceWnezL1VZWWw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/config-helpers@0.4.2':
-    resolution:
-      {
-        integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/core@0.17.0':
-    resolution:
-      {
-        integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/core@1.1.1':
-    resolution:
-      {
-        integrity: sha512-QUPblTtE51/7/Zhfv8BDwO0qkkzQL7P/aWWbqcf4xWLEYn1oKjdO0gglQBB4GAsu7u6wjijbCmzsUTy6mnk6oQ==,
-      }
-    engines: { node: ^20.19.0 || ^22.13.0 || >=24 }
+    resolution: {integrity: sha512-QUPblTtE51/7/Zhfv8BDwO0qkkzQL7P/aWWbqcf4xWLEYn1oKjdO0gglQBB4GAsu7u6wjijbCmzsUTy6mnk6oQ==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
   '@eslint/eslintrc@3.3.5':
-    resolution:
-      {
-        integrity: sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/js@10.0.1':
-    resolution:
-      {
-        integrity: sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==,
-      }
-    engines: { node: ^20.19.0 || ^22.13.0 || >=24 }
+    resolution: {integrity: sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
     peerDependencies:
       eslint: ^10.0.0
     peerDependenciesMeta:
@@ -1280,152 +931,86 @@ packages:
         optional: true
 
   '@eslint/js@9.39.4':
-    resolution:
-      {
-        integrity: sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/object-schema@2.1.7':
-    resolution:
-      {
-        integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@eslint/plugin-kit@0.4.1':
-    resolution:
-      {
-        integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@fast-csv/format@5.0.5':
-    resolution:
-      {
-        integrity: sha512-0P9SJXXnqKdmuWlLaTelqbrfdgN37Mvrb369J6eNmqL41IEIZQmV4sNM4GgAK2Dz3aH04J0HKGDMJFkYObThTw==,
-      }
+    resolution: {integrity: sha512-0P9SJXXnqKdmuWlLaTelqbrfdgN37Mvrb369J6eNmqL41IEIZQmV4sNM4GgAK2Dz3aH04J0HKGDMJFkYObThTw==}
 
   '@floating-ui/core@1.7.5':
-    resolution:
-      {
-        integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==,
-      }
+    resolution: {integrity: sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==}
 
   '@floating-ui/dom@1.7.6':
-    resolution:
-      {
-        integrity: sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==,
-      }
+    resolution: {integrity: sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==}
 
   '@floating-ui/react-dom@2.1.8':
-    resolution:
-      {
-        integrity: sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==,
-      }
+    resolution: {integrity: sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==}
     peerDependencies:
       react: '>=16.8.0'
       react-dom: '>=16.8.0'
 
   '@floating-ui/react@0.27.19':
-    resolution:
-      {
-        integrity: sha512-31B8h5mm8YxotlE7/AU/PhNAl8eWxAmjL/v2QOxroDNkTFLk3Uu82u63N3b6TXa4EGJeeZLVcd/9AlNlVqzeog==,
-      }
+    resolution: {integrity: sha512-31B8h5mm8YxotlE7/AU/PhNAl8eWxAmjL/v2QOxroDNkTFLk3Uu82u63N3b6TXa4EGJeeZLVcd/9AlNlVqzeog==}
     peerDependencies:
       react: '>=17.0.0'
       react-dom: '>=17.0.0'
 
   '@floating-ui/utils@0.2.11':
-    resolution:
-      {
-        integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==,
-      }
+    resolution: {integrity: sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==}
 
   '@googlemaps/markerclusterer@2.6.2':
-    resolution:
-      {
-        integrity: sha512-U6uVhq8iWhiIckA89sgRu8OK35mjd6/3CuoZKWakKEf0QmRRWpatlsPb3kqXkoWSmbcZkopRiI4dnW6DQSd7bQ==,
-      }
+    resolution: {integrity: sha512-U6uVhq8iWhiIckA89sgRu8OK35mjd6/3CuoZKWakKEf0QmRRWpatlsPb3kqXkoWSmbcZkopRiI4dnW6DQSd7bQ==}
 
   '@humanfs/core@0.19.1':
-    resolution:
-      {
-        integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==,
-      }
-    engines: { node: '>=18.18.0' }
+    resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
+    engines: {node: '>=18.18.0'}
 
   '@humanfs/node@0.16.7':
-    resolution:
-      {
-        integrity: sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==,
-      }
-    engines: { node: '>=18.18.0' }
+    resolution: {integrity: sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==}
+    engines: {node: '>=18.18.0'}
 
   '@humanwhocodes/module-importer@1.0.1':
-    resolution:
-      {
-        integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==,
-      }
-    engines: { node: '>=12.22' }
+    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
+    engines: {node: '>=12.22'}
 
   '@humanwhocodes/retry@0.4.3':
-    resolution:
-      {
-        integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==,
-      }
-    engines: { node: '>=18.18' }
+    resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
+    engines: {node: '>=18.18'}
 
   '@isaacs/cliui@8.0.2':
-    resolution:
-      {
-        integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
 
   '@jridgewell/gen-mapping@0.3.13':
-    resolution:
-      {
-        integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==,
-      }
+    resolution: {integrity: sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==}
 
   '@jridgewell/remapping@2.3.5':
-    resolution:
-      {
-        integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==,
-      }
+    resolution: {integrity: sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==}
 
   '@jridgewell/resolve-uri@3.1.2':
-    resolution:
-      {
-        integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+    engines: {node: '>=6.0.0'}
 
   '@jridgewell/sourcemap-codec@1.5.5':
-    resolution:
-      {
-        integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==,
-      }
+    resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
 
   '@jridgewell/trace-mapping@0.3.31':
-    resolution:
-      {
-        integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==,
-      }
+    resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
 
   '@mui/core-downloads-tracker@6.5.0':
-    resolution:
-      {
-        integrity: sha512-LGb8t8i6M2ZtS3Drn3GbTI1DVhDY6FJ9crEey2lZ0aN2EMZo8IZBZj9wRf4vqbZHaWjsYgtbOnJw5V8UWbmK2Q==,
-      }
+    resolution: {integrity: sha512-LGb8t8i6M2ZtS3Drn3GbTI1DVhDY6FJ9crEey2lZ0aN2EMZo8IZBZj9wRf4vqbZHaWjsYgtbOnJw5V8UWbmK2Q==}
 
   '@mui/icons-material@6.5.0':
-    resolution:
-      {
-        integrity: sha512-VPuPqXqbBPlcVSA0BmnoE4knW4/xG6Thazo8vCLWkOKusko6DtwFV6B665MMWJ9j0KFohTIf3yx2zYtYacvG1g==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-VPuPqXqbBPlcVSA0BmnoE4knW4/xG6Thazo8vCLWkOKusko6DtwFV6B665MMWJ9j0KFohTIf3yx2zYtYacvG1g==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       '@mui/material': ^6.5.0
       '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -1435,11 +1020,8 @@ packages:
         optional: true
 
   '@mui/material@6.5.0':
-    resolution:
-      {
-        integrity: sha512-yjvtXoFcrPLGtgKRxFaH6OQPtcLPhkloC0BML6rBG5UeldR0nPULR/2E2BfXdo5JNV7j7lOzrrLX2Qf/iSidow==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-yjvtXoFcrPLGtgKRxFaH6OQPtcLPhkloC0BML6rBG5UeldR0nPULR/2E2BfXdo5JNV7j7lOzrrLX2Qf/iSidow==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       '@emotion/react': ^11.5.0
       '@emotion/styled': ^11.3.0
@@ -1458,11 +1040,8 @@ packages:
         optional: true
 
   '@mui/private-theming@6.4.9':
-    resolution:
-      {
-        integrity: sha512-LktcVmI5X17/Q5SkwjCcdOLBzt1hXuc14jYa7NPShog0GBDCDvKtcnP0V7a2s6EiVRlv7BzbWEJzH6+l/zaCxw==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-LktcVmI5X17/Q5SkwjCcdOLBzt1hXuc14jYa7NPShog0GBDCDvKtcnP0V7a2s6EiVRlv7BzbWEJzH6+l/zaCxw==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
       react: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -1471,11 +1050,8 @@ packages:
         optional: true
 
   '@mui/styled-engine@6.5.0':
-    resolution:
-      {
-        integrity: sha512-8woC2zAqF4qUDSPIBZ8v3sakj+WgweolpyM/FXf8jAx6FMls+IE4Y8VDZc+zS805J7PRz31vz73n2SovKGaYgw==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-8woC2zAqF4qUDSPIBZ8v3sakj+WgweolpyM/FXf8jAx6FMls+IE4Y8VDZc+zS805J7PRz31vz73n2SovKGaYgw==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       '@emotion/react': ^11.4.1
       '@emotion/styled': ^11.3.0
@@ -1487,11 +1063,8 @@ packages:
         optional: true
 
   '@mui/system@6.5.0':
-    resolution:
-      {
-        integrity: sha512-XcbBYxDS+h/lgsoGe78ExXFZXtuIlSBpn/KsZq8PtZcIkUNJInkuDqcLd2rVBQrDC1u+rvVovdaWPf2FHKJf3w==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-XcbBYxDS+h/lgsoGe78ExXFZXtuIlSBpn/KsZq8PtZcIkUNJInkuDqcLd2rVBQrDC1u+rvVovdaWPf2FHKJf3w==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       '@emotion/react': ^11.5.0
       '@emotion/styled': ^11.3.0
@@ -1506,10 +1079,7 @@ packages:
         optional: true
 
   '@mui/types@7.2.24':
-    resolution:
-      {
-        integrity: sha512-3c8tRt/CbWZ+pEg7QpSwbdxOk36EfmhbKf6AGZsD1EcLDLTSZoxxJ86FVtcjxvjuhdyBiWKSTGZFaXCnidO2kw==,
-      }
+    resolution: {integrity: sha512-3c8tRt/CbWZ+pEg7QpSwbdxOk36EfmhbKf6AGZsD1EcLDLTSZoxxJ86FVtcjxvjuhdyBiWKSTGZFaXCnidO2kw==}
     peerDependencies:
       '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
     peerDependenciesMeta:
@@ -1517,10 +1087,7 @@ packages:
         optional: true
 
   '@mui/types@7.4.12':
-    resolution:
-      {
-        integrity: sha512-iKNAF2u9PzSIj40CjvKJWxFXJo122jXVdrmdh0hMYd+FR+NuJMkr/L88XwWLCRiJ5P1j+uyac25+Kp6YC4hu6w==,
-      }
+    resolution: {integrity: sha512-iKNAF2u9PzSIj40CjvKJWxFXJo122jXVdrmdh0hMYd+FR+NuJMkr/L88XwWLCRiJ5P1j+uyac25+Kp6YC4hu6w==}
     peerDependencies:
       '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
     peerDependenciesMeta:
@@ -1528,11 +1095,8 @@ packages:
         optional: true
 
   '@mui/utils@6.4.9':
-    resolution:
-      {
-        integrity: sha512-Y12Q9hbK9g+ZY0T3Rxrx9m2m10gaphDuUMgWxyV5kNJevVxXYCLclYUCC9vXaIk1/NdNDTcW2Yfr2OGvNFNmHg==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-Y12Q9hbK9g+ZY0T3Rxrx9m2m10gaphDuUMgWxyV5kNJevVxXYCLclYUCC9vXaIk1/NdNDTcW2Yfr2OGvNFNmHg==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
       react: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -1541,11 +1105,8 @@ packages:
         optional: true
 
   '@mui/utils@7.3.9':
-    resolution:
-      {
-        integrity: sha512-U6SdZaGbfb65fqTsH3V5oJdFj9uYwyLE2WVuNvmbggTSDBb8QHrFsqY8BN3taK9t3yJ8/BPHD/kNvLNyjwM7Yw==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-U6SdZaGbfb65fqTsH3V5oJdFj9uYwyLE2WVuNvmbggTSDBb8QHrFsqY8BN3taK9t3yJ8/BPHD/kNvLNyjwM7Yw==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0
       react: ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -1554,11 +1115,8 @@ packages:
         optional: true
 
   '@mui/x-date-pickers@7.29.4':
-    resolution:
-      {
-        integrity: sha512-wJ3tsqk/y6dp+mXGtT9czciAMEO5Zr3IIAHg9x6IL0Eqanqy0N3chbmQQZv3iq0m2qUpQDLvZ4utZBUTJdjNzw==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-wJ3tsqk/y6dp+mXGtT9czciAMEO5Zr3IIAHg9x6IL0Eqanqy0N3chbmQQZv3iq0m2qUpQDLvZ4utZBUTJdjNzw==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       '@emotion/react': ^11.9.0
       '@emotion/styled': ^11.8.1
@@ -1594,2030 +1152,1154 @@ packages:
         optional: true
 
   '@mui/x-internals@7.29.0':
-    resolution:
-      {
-        integrity: sha512-+Gk6VTZIFD70XreWvdXBwKd8GZ2FlSCuecQFzm6znwqXg1ZsndavrhG9tkxpxo2fM1Zf7Tk8+HcOO0hCbhTQFA==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-+Gk6VTZIFD70XreWvdXBwKd8GZ2FlSCuecQFzm6znwqXg1ZsndavrhG9tkxpxo2fM1Zf7Tk8+HcOO0hCbhTQFA==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       react: ^17.0.0 || ^18.0.0 || ^19.0.0
 
   '@napi-rs/wasm-runtime@0.2.12':
-    resolution:
-      {
-        integrity: sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==,
-      }
+    resolution: {integrity: sha512-ZVWUcfwY4E/yPitQJl481FjFo3K22D6qF0DuFH6Y/nbnE11GY5uguDxZMGXPQ8WQ0128MXQD7TnfHyK4oWoIJQ==}
 
   '@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1':
-    resolution:
-      {
-        integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==,
-      }
+    resolution: {integrity: sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==}
 
   '@noble/hashes@1.8.0':
-    resolution:
-      {
-        integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==,
-      }
-    engines: { node: ^14.21.3 || >=16 }
+    resolution: {integrity: sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==}
+    engines: {node: ^14.21.3 || >=16}
 
   '@node-saml/node-saml@5.1.0':
-    resolution:
-      {
-        integrity: sha512-t3cJnZ4aC7HhPZ6MGylGZULvUtBOZ6FzuUndaHGXjmIZHXnLfC/7L8a57O9Q9V7AxJGKAiRM5zu2wNm9EsvQpw==,
-      }
-    engines: { node: '>= 18' }
+    resolution: {integrity: sha512-t3cJnZ4aC7HhPZ6MGylGZULvUtBOZ6FzuUndaHGXjmIZHXnLfC/7L8a57O9Q9V7AxJGKAiRM5zu2wNm9EsvQpw==}
+    engines: {node: '>= 18'}
 
   '@node-saml/passport-saml@5.1.0':
-    resolution:
-      {
-        integrity: sha512-pBm+iFjv9eihcgeJuSUs4c0AuX1QEFdHwP8w1iaWCfDzXdeWZxUBU5HT2bY2S4dvNutcy+A9hYsH7ZLBGtgwDg==,
-      }
-    engines: { node: '>= 18' }
+    resolution: {integrity: sha512-pBm+iFjv9eihcgeJuSUs4c0AuX1QEFdHwP8w1iaWCfDzXdeWZxUBU5HT2bY2S4dvNutcy+A9hYsH7ZLBGtgwDg==}
+    engines: {node: '>= 18'}
 
   '@nodelib/fs.scandir@2.1.5':
-    resolution:
-      {
-        integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
+    engines: {node: '>= 8'}
 
   '@nodelib/fs.stat@2.0.5':
-    resolution:
-      {
-        integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
+    engines: {node: '>= 8'}
 
   '@nodelib/fs.walk@1.2.8':
-    resolution:
-      {
-        integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
+    engines: {node: '>= 8'}
 
   '@paralleldrive/cuid2@2.3.1':
-    resolution:
-      {
-        integrity: sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==,
-      }
+    resolution: {integrity: sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==}
 
   '@pkgjs/parseargs@0.11.0':
-    resolution:
-      {
-        integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
 
   '@popperjs/core@2.11.8':
-    resolution:
-      {
-        integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==,
-      }
+    resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==}
 
   '@react-aria/ssr@3.9.10':
-    resolution:
-      {
-        integrity: sha512-hvTm77Pf+pMBhuBm760Li0BVIO38jv1IBws1xFm1NoL26PU+fe+FMW5+VZWyANR6nYL65joaJKZqOdTQMkO9IQ==,
-      }
-    engines: { node: '>= 12' }
+    resolution: {integrity: sha512-hvTm77Pf+pMBhuBm760Li0BVIO38jv1IBws1xFm1NoL26PU+fe+FMW5+VZWyANR6nYL65joaJKZqOdTQMkO9IQ==}
+    engines: {node: '>= 12'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
 
   '@react-aria/utils@3.33.1':
-    resolution:
-      {
-        integrity: sha512-kIx1Sj6bbAT0pdqCegHuPanR9zrLn5zMRiM7LN12rgRf55S19ptd9g3ncahArifYTRkfEU9VIn+q0HjfMqS9/w==,
-      }
+    resolution: {integrity: sha512-kIx1Sj6bbAT0pdqCegHuPanR9zrLn5zMRiM7LN12rgRf55S19ptd9g3ncahArifYTRkfEU9VIn+q0HjfMqS9/w==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
       react-dom: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
 
   '@react-stately/flags@3.1.2':
-    resolution:
-      {
-        integrity: sha512-2HjFcZx1MyQXoPqcBGALwWWmgFVUk2TuKVIQxCbRq7fPyWXIl6VHcakCLurdtYC2Iks7zizvz0Idv48MQ38DWg==,
-      }
+    resolution: {integrity: sha512-2HjFcZx1MyQXoPqcBGALwWWmgFVUk2TuKVIQxCbRq7fPyWXIl6VHcakCLurdtYC2Iks7zizvz0Idv48MQ38DWg==}
 
   '@react-stately/utils@3.11.0':
-    resolution:
-      {
-        integrity: sha512-8LZpYowJ9eZmmYLpudbo/eclIRnbhWIJZ994ncmlKlouNzKohtM8qTC6B1w1pwUbiwGdUoyzLuQbeaIor5Dvcw==,
-      }
+    resolution: {integrity: sha512-8LZpYowJ9eZmmYLpudbo/eclIRnbhWIJZ994ncmlKlouNzKohtM8qTC6B1w1pwUbiwGdUoyzLuQbeaIor5Dvcw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
 
   '@react-types/shared@3.33.1':
-    resolution:
-      {
-        integrity: sha512-oJHtjvLG43VjwemQDadlR5g/8VepK56B/xKO2XORPHt9zlW6IZs3tZrYlvH29BMvoqC7RtE7E5UjgbnbFtDGag==,
-      }
+    resolution: {integrity: sha512-oJHtjvLG43VjwemQDadlR5g/8VepK56B/xKO2XORPHt9zlW6IZs3tZrYlvH29BMvoqC7RtE7E5UjgbnbFtDGag==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1
 
   '@remix-run/router@1.23.2':
-    resolution:
-      {
-        integrity: sha512-Ic6m2U/rMjTkhERIa/0ZtXJP17QUi2CbWE7cqx4J58M8aA3QTfW+2UlQ4psvTX9IO1RfNVhK3pcpdjej7L+t2w==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-Ic6m2U/rMjTkhERIa/0ZtXJP17QUi2CbWE7cqx4J58M8aA3QTfW+2UlQ4psvTX9IO1RfNVhK3pcpdjej7L+t2w==}
+    engines: {node: '>=14.0.0'}
 
   '@restart/hooks@0.4.16':
-    resolution:
-      {
-        integrity: sha512-f7aCv7c+nU/3mF7NWLtVVr0Ra80RqsO89hO72r+Y/nvQr5+q0UFGkocElTH6MJApvReVh6JHUFYn2cw1WdHF3w==,
-      }
+    resolution: {integrity: sha512-f7aCv7c+nU/3mF7NWLtVVr0Ra80RqsO89hO72r+Y/nvQr5+q0UFGkocElTH6MJApvReVh6JHUFYn2cw1WdHF3w==}
     peerDependencies:
       react: '>=16.8.0'
 
   '@rolldown/pluginutils@1.0.0-rc.3':
-    resolution:
-      {
-        integrity: sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==,
-      }
+    resolution: {integrity: sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==}
 
   '@rollup/rollup-android-arm-eabi@4.59.0':
-    resolution:
-      {
-        integrity: sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==,
-      }
+    resolution: {integrity: sha512-upnNBkA6ZH2VKGcBj9Fyl9IGNPULcjXRlg0LLeaioQWueH30p6IXtJEbKAgvyv+mJaMxSm1l6xwDXYjpEMiLMg==}
     cpu: [arm]
     os: [android]
 
   '@rollup/rollup-android-arm64@4.59.0':
-    resolution:
-      {
-        integrity: sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==,
-      }
+    resolution: {integrity: sha512-hZ+Zxj3SySm4A/DylsDKZAeVg0mvi++0PYVceVyX7hemkw7OreKdCvW2oQ3T1FMZvCaQXqOTHb8qmBShoqk69Q==}
     cpu: [arm64]
     os: [android]
 
   '@rollup/rollup-darwin-arm64@4.59.0':
-    resolution:
-      {
-        integrity: sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==,
-      }
+    resolution: {integrity: sha512-W2Psnbh1J8ZJw0xKAd8zdNgF9HRLkdWwwdWqubSVk0pUuQkoHnv7rx4GiF9rT4t5DIZGAsConRE3AxCdJ4m8rg==}
     cpu: [arm64]
     os: [darwin]
 
   '@rollup/rollup-darwin-x64@4.59.0':
-    resolution:
-      {
-        integrity: sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==,
-      }
+    resolution: {integrity: sha512-ZW2KkwlS4lwTv7ZVsYDiARfFCnSGhzYPdiOU4IM2fDbL+QGlyAbjgSFuqNRbSthybLbIJ915UtZBtmuLrQAT/w==}
     cpu: [x64]
     os: [darwin]
 
   '@rollup/rollup-freebsd-arm64@4.59.0':
-    resolution:
-      {
-        integrity: sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==,
-      }
+    resolution: {integrity: sha512-EsKaJ5ytAu9jI3lonzn3BgG8iRBjV4LxZexygcQbpiU0wU0ATxhNVEpXKfUa0pS05gTcSDMKpn3Sx+QB9RlTTA==}
     cpu: [arm64]
     os: [freebsd]
 
   '@rollup/rollup-freebsd-x64@4.59.0':
-    resolution:
-      {
-        integrity: sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==,
-      }
+    resolution: {integrity: sha512-d3DuZi2KzTMjImrxoHIAODUZYoUUMsuUiY4SRRcJy6NJoZ6iIqWnJu9IScV9jXysyGMVuW+KNzZvBLOcpdl3Vg==}
     cpu: [x64]
     os: [freebsd]
 
   '@rollup/rollup-linux-arm-gnueabihf@4.59.0':
-    resolution:
-      {
-        integrity: sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==,
-      }
+    resolution: {integrity: sha512-t4ONHboXi/3E0rT6OZl1pKbl2Vgxf9vJfWgmUoCEVQVxhW6Cw/c8I6hbbu7DAvgp82RKiH7TpLwxnJeKv2pbsw==}
     cpu: [arm]
     os: [linux]
 
   '@rollup/rollup-linux-arm-musleabihf@4.59.0':
-    resolution:
-      {
-        integrity: sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==,
-      }
+    resolution: {integrity: sha512-CikFT7aYPA2ufMD086cVORBYGHffBo4K8MQ4uPS/ZnY54GKj36i196u8U+aDVT2LX4eSMbyHtyOh7D7Zvk2VvA==}
     cpu: [arm]
     os: [linux]
 
   '@rollup/rollup-linux-arm64-gnu@4.59.0':
-    resolution:
-      {
-        integrity: sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==,
-      }
+    resolution: {integrity: sha512-jYgUGk5aLd1nUb1CtQ8E+t5JhLc9x5WdBKew9ZgAXg7DBk0ZHErLHdXM24rfX+bKrFe+Xp5YuJo54I5HFjGDAA==}
     cpu: [arm64]
     os: [linux]
 
   '@rollup/rollup-linux-arm64-musl@4.59.0':
-    resolution:
-      {
-        integrity: sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==,
-      }
+    resolution: {integrity: sha512-peZRVEdnFWZ5Bh2KeumKG9ty7aCXzzEsHShOZEFiCQlDEepP1dpUl/SrUNXNg13UmZl+gzVDPsiCwnV1uI0RUA==}
     cpu: [arm64]
     os: [linux]
 
   '@rollup/rollup-linux-loong64-gnu@4.59.0':
-    resolution:
-      {
-        integrity: sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==,
-      }
+    resolution: {integrity: sha512-gbUSW/97f7+r4gHy3Jlup8zDG190AuodsWnNiXErp9mT90iCy9NKKU0Xwx5k8VlRAIV2uU9CsMnEFg/xXaOfXg==}
     cpu: [loong64]
     os: [linux]
 
   '@rollup/rollup-linux-loong64-musl@4.59.0':
-    resolution:
-      {
-        integrity: sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==,
-      }
+    resolution: {integrity: sha512-yTRONe79E+o0FWFijasoTjtzG9EBedFXJMl888NBEDCDV9I2wGbFFfJQQe63OijbFCUZqxpHz1GzpbtSFikJ4Q==}
     cpu: [loong64]
     os: [linux]
 
   '@rollup/rollup-linux-ppc64-gnu@4.59.0':
-    resolution:
-      {
-        integrity: sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==,
-      }
+    resolution: {integrity: sha512-sw1o3tfyk12k3OEpRddF68a1unZ5VCN7zoTNtSn2KndUE+ea3m3ROOKRCZxEpmT9nsGnogpFP9x6mnLTCaoLkA==}
     cpu: [ppc64]
     os: [linux]
 
   '@rollup/rollup-linux-ppc64-musl@4.59.0':
-    resolution:
-      {
-        integrity: sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==,
-      }
+    resolution: {integrity: sha512-+2kLtQ4xT3AiIxkzFVFXfsmlZiG5FXYW7ZyIIvGA7Bdeuh9Z0aN4hVyXS/G1E9bTP/vqszNIN/pUKCk/BTHsKA==}
     cpu: [ppc64]
     os: [linux]
 
   '@rollup/rollup-linux-riscv64-gnu@4.59.0':
-    resolution:
-      {
-        integrity: sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==,
-      }
+    resolution: {integrity: sha512-NDYMpsXYJJaj+I7UdwIuHHNxXZ/b/N2hR15NyH3m2qAtb/hHPA4g4SuuvrdxetTdndfj9b1WOmy73kcPRoERUg==}
     cpu: [riscv64]
     os: [linux]
 
   '@rollup/rollup-linux-riscv64-musl@4.59.0':
-    resolution:
-      {
-        integrity: sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==,
-      }
+    resolution: {integrity: sha512-nLckB8WOqHIf1bhymk+oHxvM9D3tyPndZH8i8+35p/1YiVoVswPid2yLzgX7ZJP0KQvnkhM4H6QZ5m0LzbyIAg==}
     cpu: [riscv64]
     os: [linux]
 
   '@rollup/rollup-linux-s390x-gnu@4.59.0':
-    resolution:
-      {
-        integrity: sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==,
-      }
+    resolution: {integrity: sha512-oF87Ie3uAIvORFBpwnCvUzdeYUqi2wY6jRFWJAy1qus/udHFYIkplYRW+wo+GRUP4sKzYdmE1Y3+rY5Gc4ZO+w==}
     cpu: [s390x]
     os: [linux]
 
   '@rollup/rollup-linux-x64-gnu@4.59.0':
-    resolution:
-      {
-        integrity: sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==,
-      }
+    resolution: {integrity: sha512-3AHmtQq/ppNuUspKAlvA8HtLybkDflkMuLK4DPo77DfthRb71V84/c4MlWJXixZz4uruIH4uaa07IqoAkG64fg==}
     cpu: [x64]
     os: [linux]
 
   '@rollup/rollup-linux-x64-musl@4.59.0':
-    resolution:
-      {
-        integrity: sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==,
-      }
+    resolution: {integrity: sha512-2UdiwS/9cTAx7qIUZB/fWtToJwvt0Vbo0zmnYt7ED35KPg13Q0ym1g442THLC7VyI6JfYTP4PiSOWyoMdV2/xg==}
     cpu: [x64]
     os: [linux]
 
   '@rollup/rollup-openbsd-x64@4.59.0':
-    resolution:
-      {
-        integrity: sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==,
-      }
+    resolution: {integrity: sha512-M3bLRAVk6GOwFlPTIxVBSYKUaqfLrn8l0psKinkCFxl4lQvOSz8ZrKDz2gxcBwHFpci0B6rttydI4IpS4IS/jQ==}
     cpu: [x64]
     os: [openbsd]
 
   '@rollup/rollup-openharmony-arm64@4.59.0':
-    resolution:
-      {
-        integrity: sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==,
-      }
+    resolution: {integrity: sha512-tt9KBJqaqp5i5HUZzoafHZX8b5Q2Fe7UjYERADll83O4fGqJ49O1FsL6LpdzVFQcpwvnyd0i+K/VSwu/o/nWlA==}
     cpu: [arm64]
     os: [openharmony]
 
   '@rollup/rollup-win32-arm64-msvc@4.59.0':
-    resolution:
-      {
-        integrity: sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==,
-      }
+    resolution: {integrity: sha512-V5B6mG7OrGTwnxaNUzZTDTjDS7F75PO1ae6MJYdiMu60sq0CqN5CVeVsbhPxalupvTX8gXVSU9gq+Rx1/hvu6A==}
     cpu: [arm64]
     os: [win32]
 
   '@rollup/rollup-win32-ia32-msvc@4.59.0':
-    resolution:
-      {
-        integrity: sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==,
-      }
+    resolution: {integrity: sha512-UKFMHPuM9R0iBegwzKF4y0C4J9u8C6MEJgFuXTBerMk7EJ92GFVFYBfOZaSGLu6COf7FxpQNqhNS4c4icUPqxA==}
     cpu: [ia32]
     os: [win32]
 
   '@rollup/rollup-win32-x64-gnu@4.59.0':
-    resolution:
-      {
-        integrity: sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==,
-      }
+    resolution: {integrity: sha512-laBkYlSS1n2L8fSo1thDNGrCTQMmxjYY5G0WFWjFFYZkKPjsMBsgJfGf4TLxXrF6RyhI60L8TMOjBMvXiTcxeA==}
     cpu: [x64]
     os: [win32]
 
   '@rollup/rollup-win32-x64-msvc@4.59.0':
-    resolution:
-      {
-        integrity: sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==,
-      }
+    resolution: {integrity: sha512-2HRCml6OztYXyJXAvdDXPKcawukWY2GpR5/nxKp4iBgiO3wcoEGkAaqctIbZcNB6KlUQBIqt8VYkNSj2397EfA==}
     cpu: [x64]
     os: [win32]
 
   '@rtsao/scc@1.1.0':
-    resolution:
-      {
-        integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==,
-      }
+    resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
 
   '@smithy/abort-controller@4.2.11':
-    resolution:
-      {
-        integrity: sha512-Hj4WoYWMJnSpM6/kchsm4bUNTL9XiSyhvoMb2KIq4VJzyDt7JpGHUZHkVNPZVC7YE1tf8tPeVauxpFBKGW4/KQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-Hj4WoYWMJnSpM6/kchsm4bUNTL9XiSyhvoMb2KIq4VJzyDt7JpGHUZHkVNPZVC7YE1tf8tPeVauxpFBKGW4/KQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/chunked-blob-reader-native@4.2.3':
-    resolution:
-      {
-        integrity: sha512-jA5k5Udn7Y5717L86h4EIv06wIr3xn8GM1qHRi/Nf31annXcXHJjBKvgztnbn2TxH3xWrPBfgwHsOwZf0UmQWw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-jA5k5Udn7Y5717L86h4EIv06wIr3xn8GM1qHRi/Nf31annXcXHJjBKvgztnbn2TxH3xWrPBfgwHsOwZf0UmQWw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/chunked-blob-reader@5.2.2':
-    resolution:
-      {
-        integrity: sha512-St+kVicSyayWQca+I1rGitaOEH6uKgE8IUWoYnnEX26SWdWQcL6LvMSD19Lg+vYHKdT9B2Zuu7rd3i6Wnyb/iw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-St+kVicSyayWQca+I1rGitaOEH6uKgE8IUWoYnnEX26SWdWQcL6LvMSD19Lg+vYHKdT9B2Zuu7rd3i6Wnyb/iw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/config-resolver@4.4.10':
-    resolution:
-      {
-        integrity: sha512-IRTkd6ps0ru+lTWnfnsbXzW80A8Od8p3pYiZnW98K2Hb20rqfsX7VTlfUwhrcOeSSy68Gn9WBofwPuw3e5CCsg==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-IRTkd6ps0ru+lTWnfnsbXzW80A8Od8p3pYiZnW98K2Hb20rqfsX7VTlfUwhrcOeSSy68Gn9WBofwPuw3e5CCsg==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/core@3.23.9':
-    resolution:
-      {
-        integrity: sha512-1Vcut4LEL9HZsdpI0vFiRYIsaoPwZLjAxnVQDUMQK8beMS+EYPLDQCXtbzfxmM5GzSgjfe2Q9M7WaXwIMQllyQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-1Vcut4LEL9HZsdpI0vFiRYIsaoPwZLjAxnVQDUMQK8beMS+EYPLDQCXtbzfxmM5GzSgjfe2Q9M7WaXwIMQllyQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/credential-provider-imds@4.2.11':
-    resolution:
-      {
-        integrity: sha512-lBXrS6ku0kTj3xLmsJW0WwqWbGQ6ueooYyp/1L9lkyT0M02C+DWwYwc5aTyXFbRaK38ojALxNixg+LxKSHZc0g==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-lBXrS6ku0kTj3xLmsJW0WwqWbGQ6ueooYyp/1L9lkyT0M02C+DWwYwc5aTyXFbRaK38ojALxNixg+LxKSHZc0g==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/eventstream-codec@4.2.11':
-    resolution:
-      {
-        integrity: sha512-Sf39Ml0iVX+ba/bgMPxaXWAAFmHqYLTmbjAPfLPLY8CrYkRDEqZdUsKC1OwVMCdJXfAt0v4j49GIJ8DoSYAe6w==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-Sf39Ml0iVX+ba/bgMPxaXWAAFmHqYLTmbjAPfLPLY8CrYkRDEqZdUsKC1OwVMCdJXfAt0v4j49GIJ8DoSYAe6w==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/eventstream-serde-browser@4.2.11':
-    resolution:
-      {
-        integrity: sha512-3rEpo3G6f/nRS7fQDsZmxw/ius6rnlIpz4UX6FlALEzz8JoSxFmdBt0SZnthis+km7sQo6q5/3e+UJcuQivoXA==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-3rEpo3G6f/nRS7fQDsZmxw/ius6rnlIpz4UX6FlALEzz8JoSxFmdBt0SZnthis+km7sQo6q5/3e+UJcuQivoXA==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/eventstream-serde-config-resolver@4.3.11':
-    resolution:
-      {
-        integrity: sha512-XeNIA8tcP/GDWnnKkO7qEm/bg0B/bP9lvIXZBXcGZwZ+VYM8h8k9wuDvUODtdQ2Wcp2RcBkPTCSMmaniVHrMlA==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-XeNIA8tcP/GDWnnKkO7qEm/bg0B/bP9lvIXZBXcGZwZ+VYM8h8k9wuDvUODtdQ2Wcp2RcBkPTCSMmaniVHrMlA==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/eventstream-serde-node@4.2.11':
-    resolution:
-      {
-        integrity: sha512-fzbCh18rscBDTQSCrsp1fGcclLNF//nJyhjldsEl/5wCYmgpHblv5JSppQAyQI24lClsFT0wV06N1Porn0IsEw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-fzbCh18rscBDTQSCrsp1fGcclLNF//nJyhjldsEl/5wCYmgpHblv5JSppQAyQI24lClsFT0wV06N1Porn0IsEw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/eventstream-serde-universal@4.2.11':
-    resolution:
-      {
-        integrity: sha512-MJ7HcI+jEkqoWT5vp+uoVaAjBrmxBtKhZTeynDRG/seEjJfqyg3SiqMMqyPnAMzmIfLaeJ/uiuSDP/l9AnMy/Q==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-MJ7HcI+jEkqoWT5vp+uoVaAjBrmxBtKhZTeynDRG/seEjJfqyg3SiqMMqyPnAMzmIfLaeJ/uiuSDP/l9AnMy/Q==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/fetch-http-handler@5.3.13':
-    resolution:
-      {
-        integrity: sha512-U2Hcfl2s3XaYjikN9cT4mPu8ybDbImV3baXR0PkVlC0TTx808bRP3FaPGAzPtB8OByI+JqJ1kyS+7GEgae7+qQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-U2Hcfl2s3XaYjikN9cT4mPu8ybDbImV3baXR0PkVlC0TTx808bRP3FaPGAzPtB8OByI+JqJ1kyS+7GEgae7+qQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/hash-blob-browser@4.2.12':
-    resolution:
-      {
-        integrity: sha512-1wQE33DsxkM/waftAhCH9VtJbUGyt1PJ9YRDpOu+q9FUi73LLFUZ2fD8A61g2mT1UY9k7b99+V1xZ41Rz4SHRQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-1wQE33DsxkM/waftAhCH9VtJbUGyt1PJ9YRDpOu+q9FUi73LLFUZ2fD8A61g2mT1UY9k7b99+V1xZ41Rz4SHRQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/hash-node@4.2.11':
-    resolution:
-      {
-        integrity: sha512-T+p1pNynRkydpdL015ruIoyPSRw9e/SQOWmSAMmmprfswMrd5Ow5igOWNVlvyVFZlxXqGmyH3NQwfwy8r5Jx0A==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-T+p1pNynRkydpdL015ruIoyPSRw9e/SQOWmSAMmmprfswMrd5Ow5igOWNVlvyVFZlxXqGmyH3NQwfwy8r5Jx0A==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/hash-stream-node@4.2.11':
-    resolution:
-      {
-        integrity: sha512-hQsTjwPCRY8w9GK07w1RqJi3e+myh0UaOWBBhZ1UMSDgofH/Q1fEYzU1teaX6HkpX/eWDdm7tAGR0jBPlz9QEQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-hQsTjwPCRY8w9GK07w1RqJi3e+myh0UaOWBBhZ1UMSDgofH/Q1fEYzU1teaX6HkpX/eWDdm7tAGR0jBPlz9QEQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/invalid-dependency@4.2.11':
-    resolution:
-      {
-        integrity: sha512-cGNMrgykRmddrNhYy1yBdrp5GwIgEkniS7k9O1VLB38yxQtlvrxpZtUVvo6T4cKpeZsriukBuuxfJcdZQc/f/g==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-cGNMrgykRmddrNhYy1yBdrp5GwIgEkniS7k9O1VLB38yxQtlvrxpZtUVvo6T4cKpeZsriukBuuxfJcdZQc/f/g==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/is-array-buffer@2.2.0':
-    resolution:
-      {
-        integrity: sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==}
+    engines: {node: '>=14.0.0'}
 
   '@smithy/is-array-buffer@4.2.2':
-    resolution:
-      {
-        integrity: sha512-n6rQ4N8Jj4YTQO3YFrlgZuwKodf4zUFs7EJIWH86pSCWBaAtAGBFfCM7Wx6D2bBJ2xqFNxGBSrUWswT3M0VJow==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-n6rQ4N8Jj4YTQO3YFrlgZuwKodf4zUFs7EJIWH86pSCWBaAtAGBFfCM7Wx6D2bBJ2xqFNxGBSrUWswT3M0VJow==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/md5-js@4.2.11':
-    resolution:
-      {
-        integrity: sha512-350X4kGIrty0Snx2OWv7rPM6p6vM7RzryvFs6B/56Cux3w3sChOb3bymo5oidXJlPcP9fIRxGUCk7GqpiSOtng==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-350X4kGIrty0Snx2OWv7rPM6p6vM7RzryvFs6B/56Cux3w3sChOb3bymo5oidXJlPcP9fIRxGUCk7GqpiSOtng==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/middleware-content-length@4.2.11':
-    resolution:
-      {
-        integrity: sha512-UvIfKYAKhCzr4p6jFevPlKhQwyQwlJ6IeKLDhmV1PlYfcW3RL4ROjNEDtSik4NYMi9kDkH7eSwyTP3vNJ/u/Dw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-UvIfKYAKhCzr4p6jFevPlKhQwyQwlJ6IeKLDhmV1PlYfcW3RL4ROjNEDtSik4NYMi9kDkH7eSwyTP3vNJ/u/Dw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/middleware-endpoint@4.4.23':
-    resolution:
-      {
-        integrity: sha512-UEFIejZy54T1EJn2aWJ45voB7RP2T+IRzUqocIdM6GFFa5ClZncakYJfcYnoXt3UsQrZZ9ZRauGm77l9UCbBLw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-UEFIejZy54T1EJn2aWJ45voB7RP2T+IRzUqocIdM6GFFa5ClZncakYJfcYnoXt3UsQrZZ9ZRauGm77l9UCbBLw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/middleware-retry@4.4.40':
-    resolution:
-      {
-        integrity: sha512-YhEMakG1Ae57FajERdHNZ4ShOPIY7DsgV+ZoAxo/5BT0KIe+f6DDU2rtIymNNFIj22NJfeeI6LWIifrwM0f+rA==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-YhEMakG1Ae57FajERdHNZ4ShOPIY7DsgV+ZoAxo/5BT0KIe+f6DDU2rtIymNNFIj22NJfeeI6LWIifrwM0f+rA==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/middleware-serde@4.2.12':
-    resolution:
-      {
-        integrity: sha512-W9g1bOLui7Xn5FABRVS0o3rXL0gfN37d/8I/W7i0N7oxjx9QecUmXEMSUMADTODwdtka9cN43t5BI2CodLJpng==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-W9g1bOLui7Xn5FABRVS0o3rXL0gfN37d/8I/W7i0N7oxjx9QecUmXEMSUMADTODwdtka9cN43t5BI2CodLJpng==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/middleware-stack@4.2.11':
-    resolution:
-      {
-        integrity: sha512-s+eenEPW6RgliDk2IhjD2hWOxIx1NKrOHxEwNUaUXxYBxIyCcDfNULZ2Mu15E3kwcJWBedTET/kEASPV1A1Akg==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-s+eenEPW6RgliDk2IhjD2hWOxIx1NKrOHxEwNUaUXxYBxIyCcDfNULZ2Mu15E3kwcJWBedTET/kEASPV1A1Akg==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/node-config-provider@4.3.11':
-    resolution:
-      {
-        integrity: sha512-xD17eE7kaLgBBGf5CZQ58hh2YmwK1Z0O8YhffwB/De2jsL0U3JklmhVYJ9Uf37OtUDLF2gsW40Xwwag9U869Gg==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-xD17eE7kaLgBBGf5CZQ58hh2YmwK1Z0O8YhffwB/De2jsL0U3JklmhVYJ9Uf37OtUDLF2gsW40Xwwag9U869Gg==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/node-http-handler@4.4.14':
-    resolution:
-      {
-        integrity: sha512-DamSqaU8nuk0xTJDrYnRzZndHwwRnyj/n/+RqGGCcBKB4qrQem0mSDiWdupaNWdwxzyMU91qxDmHOCazfhtO3A==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-DamSqaU8nuk0xTJDrYnRzZndHwwRnyj/n/+RqGGCcBKB4qrQem0mSDiWdupaNWdwxzyMU91qxDmHOCazfhtO3A==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/property-provider@4.2.11':
-    resolution:
-      {
-        integrity: sha512-14T1V64o6/ndyrnl1ze1ZhyLzIeYNN47oF/QU6P5m82AEtyOkMJTb0gO1dPubYjyyKuPD6OSVMPDKe+zioOnCg==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-14T1V64o6/ndyrnl1ze1ZhyLzIeYNN47oF/QU6P5m82AEtyOkMJTb0gO1dPubYjyyKuPD6OSVMPDKe+zioOnCg==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/protocol-http@5.3.11':
-    resolution:
-      {
-        integrity: sha512-hI+barOVDJBkNt4y0L2mu3Ugc0w7+BpJ2CZuLwXtSltGAAwCb3IvnalGlbDV/UCS6a9ZuT3+exd1WxNdLb5IlQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-hI+barOVDJBkNt4y0L2mu3Ugc0w7+BpJ2CZuLwXtSltGAAwCb3IvnalGlbDV/UCS6a9ZuT3+exd1WxNdLb5IlQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/querystring-builder@4.2.11':
-    resolution:
-      {
-        integrity: sha512-7spdikrYiljpket6u0up2Ck2mxhy7dZ0+TDd+S53Dg2DHd6wg+YNJrTCHiLdgZmEXZKI7LJZcwL3721ZRDFiqA==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-7spdikrYiljpket6u0up2Ck2mxhy7dZ0+TDd+S53Dg2DHd6wg+YNJrTCHiLdgZmEXZKI7LJZcwL3721ZRDFiqA==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/querystring-parser@4.2.11':
-    resolution:
-      {
-        integrity: sha512-nE3IRNjDltvGcoThD2abTozI1dkSy8aX+a2N1Rs55en5UsdyyIXgGEmevUL3okZFoJC77JgRGe99xYohhsjivQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-nE3IRNjDltvGcoThD2abTozI1dkSy8aX+a2N1Rs55en5UsdyyIXgGEmevUL3okZFoJC77JgRGe99xYohhsjivQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/service-error-classification@4.2.11':
-    resolution:
-      {
-        integrity: sha512-HkMFJZJUhzU3HvND1+Yw/kYWXp4RPDLBWLcK1n+Vqw8xn4y2YiBhdww8IxhkQjP/QlZun5bwm3vcHc8AqIU3zw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-HkMFJZJUhzU3HvND1+Yw/kYWXp4RPDLBWLcK1n+Vqw8xn4y2YiBhdww8IxhkQjP/QlZun5bwm3vcHc8AqIU3zw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/shared-ini-file-loader@4.4.6':
-    resolution:
-      {
-        integrity: sha512-IB/M5I8G0EeXZTHsAxpx51tMQ5R719F3aq+fjEB6VtNcCHDc0ajFDIGDZw+FW9GxtEkgTduiPpjveJdA/CX7sw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-IB/M5I8G0EeXZTHsAxpx51tMQ5R719F3aq+fjEB6VtNcCHDc0ajFDIGDZw+FW9GxtEkgTduiPpjveJdA/CX7sw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/signature-v4@5.3.11':
-    resolution:
-      {
-        integrity: sha512-V1L6N9aKOBAN4wEHLyqjLBnAz13mtILU0SeDrjOaIZEeN6IFa6DxwRt1NNpOdmSpQUfkBj0qeD3m6P77uzMhgQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-V1L6N9aKOBAN4wEHLyqjLBnAz13mtILU0SeDrjOaIZEeN6IFa6DxwRt1NNpOdmSpQUfkBj0qeD3m6P77uzMhgQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/smithy-client@4.12.3':
-    resolution:
-      {
-        integrity: sha512-7k4UxjSpHmPN2AxVhvIazRSzFQjWnud3sOsXcFStzagww17j1cFQYqTSiQ8xuYK3vKLR1Ni8FzuT3VlKr3xCNw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-7k4UxjSpHmPN2AxVhvIazRSzFQjWnud3sOsXcFStzagww17j1cFQYqTSiQ8xuYK3vKLR1Ni8FzuT3VlKr3xCNw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/types@4.13.0':
-    resolution:
-      {
-        integrity: sha512-COuLsZILbbQsdrwKQpkkpyep7lCsByxwj7m0Mg5v66/ZTyenlfBc40/QFQ5chO0YN/PNEH1Bi3fGtfXPnYNeDw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-COuLsZILbbQsdrwKQpkkpyep7lCsByxwj7m0Mg5v66/ZTyenlfBc40/QFQ5chO0YN/PNEH1Bi3fGtfXPnYNeDw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/url-parser@4.2.11':
-    resolution:
-      {
-        integrity: sha512-oTAGGHo8ZYc5VZsBREzuf5lf2pAurJQsccMusVZ85wDkX66ojEc/XauiGjzCj50A61ObFTPe6d7Pyt6UBYaing==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-oTAGGHo8ZYc5VZsBREzuf5lf2pAurJQsccMusVZ85wDkX66ojEc/XauiGjzCj50A61ObFTPe6d7Pyt6UBYaing==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-base64@4.3.2':
-    resolution:
-      {
-        integrity: sha512-XRH6b0H/5A3SgblmMa5ErXQ2XKhfbQB+Fm/oyLZ2O2kCUrwgg55bU0RekmzAhuwOjA9qdN5VU2BprOvGGUkOOQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-XRH6b0H/5A3SgblmMa5ErXQ2XKhfbQB+Fm/oyLZ2O2kCUrwgg55bU0RekmzAhuwOjA9qdN5VU2BprOvGGUkOOQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-body-length-browser@4.2.2':
-    resolution:
-      {
-        integrity: sha512-JKCrLNOup3OOgmzeaKQwi4ZCTWlYR5H4Gm1r2uTMVBXoemo1UEghk5vtMi1xSu2ymgKVGW631e2fp9/R610ZjQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-JKCrLNOup3OOgmzeaKQwi4ZCTWlYR5H4Gm1r2uTMVBXoemo1UEghk5vtMi1xSu2ymgKVGW631e2fp9/R610ZjQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-body-length-node@4.2.3':
-    resolution:
-      {
-        integrity: sha512-ZkJGvqBzMHVHE7r/hcuCxlTY8pQr1kMtdsVPs7ex4mMU+EAbcXppfo5NmyxMYi2XU49eqaz56j2gsk4dHHPG/g==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-ZkJGvqBzMHVHE7r/hcuCxlTY8pQr1kMtdsVPs7ex4mMU+EAbcXppfo5NmyxMYi2XU49eqaz56j2gsk4dHHPG/g==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-buffer-from@2.2.0':
-    resolution:
-      {
-        integrity: sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==}
+    engines: {node: '>=14.0.0'}
 
   '@smithy/util-buffer-from@4.2.2':
-    resolution:
-      {
-        integrity: sha512-FDXD7cvUoFWwN6vtQfEta540Y/YBe5JneK3SoZg9bThSoOAC/eGeYEua6RkBgKjGa/sz6Y+DuBZj3+YEY21y4Q==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-FDXD7cvUoFWwN6vtQfEta540Y/YBe5JneK3SoZg9bThSoOAC/eGeYEua6RkBgKjGa/sz6Y+DuBZj3+YEY21y4Q==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-config-provider@4.2.2':
-    resolution:
-      {
-        integrity: sha512-dWU03V3XUprJwaUIFVv4iOnS1FC9HnMHDfUrlNDSh4315v0cWyaIErP8KiqGVbf5z+JupoVpNM7ZB3jFiTejvQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-dWU03V3XUprJwaUIFVv4iOnS1FC9HnMHDfUrlNDSh4315v0cWyaIErP8KiqGVbf5z+JupoVpNM7ZB3jFiTejvQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-defaults-mode-browser@4.3.39':
-    resolution:
-      {
-        integrity: sha512-ui7/Ho/+VHqS7Km2wBw4/Ab4RktoiSshgcgpJzC4keFPs6tLJS4IQwbeahxQS3E/w98uq6E1mirCH/id9xIXeQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-ui7/Ho/+VHqS7Km2wBw4/Ab4RktoiSshgcgpJzC4keFPs6tLJS4IQwbeahxQS3E/w98uq6E1mirCH/id9xIXeQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-defaults-mode-node@4.2.42':
-    resolution:
-      {
-        integrity: sha512-QDA84CWNe8Akpj15ofLO+1N3Rfg8qa2K5uX0y6HnOp4AnRYRgWrKx/xzbYNbVF9ZsyJUYOfcoaN3y93wA/QJ2A==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-QDA84CWNe8Akpj15ofLO+1N3Rfg8qa2K5uX0y6HnOp4AnRYRgWrKx/xzbYNbVF9ZsyJUYOfcoaN3y93wA/QJ2A==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-endpoints@3.3.2':
-    resolution:
-      {
-        integrity: sha512-+4HFLpE5u29AbFlTdlKIT7jfOzZ8PDYZKTb3e+AgLz986OYwqTourQ5H+jg79/66DB69Un1+qKecLnkZdAsYcA==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-+4HFLpE5u29AbFlTdlKIT7jfOzZ8PDYZKTb3e+AgLz986OYwqTourQ5H+jg79/66DB69Un1+qKecLnkZdAsYcA==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-hex-encoding@4.2.2':
-    resolution:
-      {
-        integrity: sha512-Qcz3W5vuHK4sLQdyT93k/rfrUwdJ8/HZ+nMUOyGdpeGA1Wxt65zYwi3oEl9kOM+RswvYq90fzkNDahPS8K0OIg==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-Qcz3W5vuHK4sLQdyT93k/rfrUwdJ8/HZ+nMUOyGdpeGA1Wxt65zYwi3oEl9kOM+RswvYq90fzkNDahPS8K0OIg==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-middleware@4.2.11':
-    resolution:
-      {
-        integrity: sha512-r3dtF9F+TpSZUxpOVVtPfk09Rlo4lT6ORBqEvX3IBT6SkQAdDSVKR5GcfmZbtl7WKhKnmb3wbDTQ6ibR2XHClw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-r3dtF9F+TpSZUxpOVVtPfk09Rlo4lT6ORBqEvX3IBT6SkQAdDSVKR5GcfmZbtl7WKhKnmb3wbDTQ6ibR2XHClw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-retry@4.2.11':
-    resolution:
-      {
-        integrity: sha512-XSZULmL5x6aCTTii59wJqKsY1l3eMIAomRAccW7Tzh9r8s7T/7rdo03oektuH5jeYRlJMPcNP92EuRDvk9aXbw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-XSZULmL5x6aCTTii59wJqKsY1l3eMIAomRAccW7Tzh9r8s7T/7rdo03oektuH5jeYRlJMPcNP92EuRDvk9aXbw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-stream@4.5.17':
-    resolution:
-      {
-        integrity: sha512-793BYZ4h2JAQkNHcEnyFxDTcZbm9bVybD0UV/LEWmZ5bkTms7JqjfrLMi2Qy0E5WFcCzLwCAPgcvcvxoeALbAQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-793BYZ4h2JAQkNHcEnyFxDTcZbm9bVybD0UV/LEWmZ5bkTms7JqjfrLMi2Qy0E5WFcCzLwCAPgcvcvxoeALbAQ==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-uri-escape@4.2.2':
-    resolution:
-      {
-        integrity: sha512-2kAStBlvq+lTXHyAZYfJRb/DfS3rsinLiwb+69SstC9Vb0s9vNWkRwpnj918Pfi85mzi42sOqdV72OLxWAISnw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-2kAStBlvq+lTXHyAZYfJRb/DfS3rsinLiwb+69SstC9Vb0s9vNWkRwpnj918Pfi85mzi42sOqdV72OLxWAISnw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-utf8@2.3.0':
-    resolution:
-      {
-        integrity: sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==}
+    engines: {node: '>=14.0.0'}
 
   '@smithy/util-utf8@4.2.2':
-    resolution:
-      {
-        integrity: sha512-75MeYpjdWRe8M5E3AW0O4Cx3UadweS+cwdXjwYGBW5h/gxxnbeZ877sLPX/ZJA9GVTlL/qG0dXP29JWFCD1Ayw==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-75MeYpjdWRe8M5E3AW0O4Cx3UadweS+cwdXjwYGBW5h/gxxnbeZ877sLPX/ZJA9GVTlL/qG0dXP29JWFCD1Ayw==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/util-waiter@4.2.12':
-    resolution:
-      {
-        integrity: sha512-ek5hyDrzS6mBFsNCEX8LpM+EWSLq6b9FdmPRlkpXXhiJE6aIZehKT9clC6+nFpZAA+i/Yg0xlaPeWGNbf5rzQA==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-ek5hyDrzS6mBFsNCEX8LpM+EWSLq6b9FdmPRlkpXXhiJE6aIZehKT9clC6+nFpZAA+i/Yg0xlaPeWGNbf5rzQA==}
+    engines: {node: '>=18.0.0'}
 
   '@smithy/uuid@1.1.2':
-    resolution:
-      {
-        integrity: sha512-O/IEdcCUKkubz60tFbGA7ceITTAJsty+lBjNoorP4Z6XRqaFb/OjQjZODophEcuq68nKm6/0r+6/lLQ+XVpk8g==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-O/IEdcCUKkubz60tFbGA7ceITTAJsty+lBjNoorP4Z6XRqaFb/OjQjZODophEcuq68nKm6/0r+6/lLQ+XVpk8g==}
+    engines: {node: '>=18.0.0'}
 
   '@swc/helpers@0.5.19':
-    resolution:
-      {
-        integrity: sha512-QamiFeIK3txNjgUTNppE6MiG3p7TdninpZu0E0PbqVh1a9FNLT2FRhisaa4NcaX52XVhA5l7Pk58Ft7Sqi/2sA==,
-      }
+    resolution: {integrity: sha512-QamiFeIK3txNjgUTNppE6MiG3p7TdninpZu0E0PbqVh1a9FNLT2FRhisaa4NcaX52XVhA5l7Pk58Ft7Sqi/2sA==}
 
   '@tybys/wasm-util@0.10.1':
-    resolution:
-      {
-        integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==,
-      }
+    resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
 
   '@types/babel__core@7.20.5':
-    resolution:
-      {
-        integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==,
-      }
+    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
 
   '@types/babel__generator@7.27.0':
-    resolution:
-      {
-        integrity: sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==,
-      }
+    resolution: {integrity: sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==}
 
   '@types/babel__template@7.4.4':
-    resolution:
-      {
-        integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==,
-      }
+    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
 
   '@types/babel__traverse@7.28.0':
-    resolution:
-      {
-        integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==,
-      }
+    resolution: {integrity: sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==}
 
   '@types/body-parser@1.19.6':
-    resolution:
-      {
-        integrity: sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==,
-      }
+    resolution: {integrity: sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==}
 
   '@types/chai@4.3.20':
-    resolution:
-      {
-        integrity: sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==,
-      }
+    resolution: {integrity: sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==}
 
   '@types/connect@3.4.38':
-    resolution:
-      {
-        integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==,
-      }
+    resolution: {integrity: sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==}
 
   '@types/cookiejar@2.1.5':
-    resolution:
-      {
-        integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==,
-      }
+    resolution: {integrity: sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==}
 
   '@types/cors@2.8.19':
-    resolution:
-      {
-        integrity: sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==,
-      }
+    resolution: {integrity: sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==}
 
   '@types/crypto-js@4.2.2':
-    resolution:
-      {
-        integrity: sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==,
-      }
+    resolution: {integrity: sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==}
 
   '@types/date-arithmetic@4.1.4':
-    resolution:
-      {
-        integrity: sha512-p9eZ2X9B80iKiTW4ukVj8B4K6q9/+xFtQ5MGYA5HWToY9nL4EkhV9+6ftT2VHpVMEZb5Tv00Iel516bVdO+yRw==,
-      }
+    resolution: {integrity: sha512-p9eZ2X9B80iKiTW4ukVj8B4K6q9/+xFtQ5MGYA5HWToY9nL4EkhV9+6ftT2VHpVMEZb5Tv00Iel516bVdO+yRw==}
 
   '@types/debug@4.1.12':
-    resolution:
-      {
-        integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==,
-      }
+    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
 
   '@types/estree@1.0.8':
-    resolution:
-      {
-        integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==,
-      }
+    resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
 
   '@types/express-serve-static-core@4.19.8':
-    resolution:
-      {
-        integrity: sha512-02S5fmqeoKzVZCHPZid4b8JH2eM5HzQLZWN2FohQEy/0eXTq8VXZfSN6Pcr3F6N9R/vNrj7cpgbhjie6m/1tCA==,
-      }
+    resolution: {integrity: sha512-02S5fmqeoKzVZCHPZid4b8JH2eM5HzQLZWN2FohQEy/0eXTq8VXZfSN6Pcr3F6N9R/vNrj7cpgbhjie6m/1tCA==}
 
   '@types/express-session@1.18.2':
-    resolution:
-      {
-        integrity: sha512-k+I0BxwVXsnEU2hV77cCobC08kIsn4y44C3gC0b46uxZVMaXA04lSPgRLR/bSL2w0t0ShJiG8o4jPzRG/nscFg==,
-      }
+    resolution: {integrity: sha512-k+I0BxwVXsnEU2hV77cCobC08kIsn4y44C3gC0b46uxZVMaXA04lSPgRLR/bSL2w0t0ShJiG8o4jPzRG/nscFg==}
 
   '@types/express@4.17.25':
-    resolution:
-      {
-        integrity: sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==,
-      }
+    resolution: {integrity: sha512-dVd04UKsfpINUnK0yBoYHDF3xu7xVH4BuDotC/xGuycx4CgbP48X/KF/586bcObxT0HENHXEU8Nqtu6NR+eKhw==}
 
   '@types/geojson@7946.0.16':
-    resolution:
-      {
-        integrity: sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==,
-      }
+    resolution: {integrity: sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==}
 
   '@types/google.maps@3.58.1':
-    resolution:
-      {
-        integrity: sha512-X9QTSvGJ0nCfMzYOnaVs/k6/4L+7F5uCS+4iUmkLEls6J9S/Phv+m/i3mDeyc49ZBgwab3EFO1HEoBY7k98EGQ==,
-      }
+    resolution: {integrity: sha512-X9QTSvGJ0nCfMzYOnaVs/k6/4L+7F5uCS+4iUmkLEls6J9S/Phv+m/i3mDeyc49ZBgwab3EFO1HEoBY7k98EGQ==}
 
   '@types/history@4.7.11':
-    resolution:
-      {
-        integrity: sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==,
-      }
+    resolution: {integrity: sha512-qjDJRrmvBMiTx+jyLxvLfJU7UznFuokDv4f3WRuriHKERccVpFU+8XMQUAbDzoiJCsmexxRExQeMwwCdamSKDA==}
 
   '@types/http-errors@2.0.5':
-    resolution:
-      {
-        integrity: sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==,
-      }
+    resolution: {integrity: sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==}
 
   '@types/json-schema@7.0.15':
-    resolution:
-      {
-        integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==,
-      }
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
 
   '@types/json5@0.0.29':
-    resolution:
-      {
-        integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==,
-      }
+    resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==}
 
   '@types/jsonwebtoken@9.0.10':
-    resolution:
-      {
-        integrity: sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==,
-      }
+    resolution: {integrity: sha512-asx5hIG9Qmf/1oStypjanR7iKTv0gXQ1Ov/jfrX6kS/EO0OFni8orbmGCn0672NHR3kXHwpAwR+B368ZGN/2rA==}
 
   '@types/methods@1.1.4':
-    resolution:
-      {
-        integrity: sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==,
-      }
+    resolution: {integrity: sha512-ymXWVrDiCxTBE3+RIrrP533E70eA+9qu7zdWoHuOmGujkYtzf4HQF96b8nwHLqhuf4ykX61IGRIB38CC6/sImQ==}
 
   '@types/mime@1.3.5':
-    resolution:
-      {
-        integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==,
-      }
+    resolution: {integrity: sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==}
 
   '@types/mocha@10.0.10':
-    resolution:
-      {
-        integrity: sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==,
-      }
+    resolution: {integrity: sha512-xPyYSz1cMPnJQhl0CLMH68j3gprKZaTjG3s5Vi+fDgx+uhG9NOXwbVt52eFS8ECyXhyKcjDLCBEqBExKuiZb7Q==}
 
   '@types/ms@2.1.0':
-    resolution:
-      {
-        integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==,
-      }
+    resolution: {integrity: sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==}
 
   '@types/node-schedule@2.1.8':
-    resolution:
-      {
-        integrity: sha512-k00g6Yj/oUg/CDC+MeLHUzu0+OFxWbIqrFfDiLi6OPKxTujvpv29mHGM8GtKr7B+9Vv92FcK/8mRqi1DK5f3hA==,
-      }
+    resolution: {integrity: sha512-k00g6Yj/oUg/CDC+MeLHUzu0+OFxWbIqrFfDiLi6OPKxTujvpv29mHGM8GtKr7B+9Vv92FcK/8mRqi1DK5f3hA==}
 
   '@types/node@22.19.15':
-    resolution:
-      {
-        integrity: sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==,
-      }
+    resolution: {integrity: sha512-F0R/h2+dsy5wJAUe3tAU6oqa2qbWY5TpNfL/RGmo1y38hiyO1w3x2jPtt76wmuaJI4DQnOBu21cNXQ2STIUUWg==}
 
   '@types/parse-json@4.0.2':
-    resolution:
-      {
-        integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==,
-      }
+    resolution: {integrity: sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==}
 
   '@types/passport-strategy@0.2.38':
-    resolution:
-      {
-        integrity: sha512-GC6eMqqojOooq993Tmnmp7AUTbbQSgilyvpCYQjT+H6JfG/g6RGc7nXEniZlp0zyKJ0WUdOiZWLBZft9Yug1uA==,
-      }
+    resolution: {integrity: sha512-GC6eMqqojOooq993Tmnmp7AUTbbQSgilyvpCYQjT+H6JfG/g6RGc7nXEniZlp0zyKJ0WUdOiZWLBZft9Yug1uA==}
 
   '@types/passport@1.0.17':
-    resolution:
-      {
-        integrity: sha512-aciLyx+wDwT2t2/kJGJR2AEeBz0nJU4WuRX04Wu9Dqc5lSUtwu0WERPHYsLhF9PtseiAMPBGNUOtFjxZ56prsg==,
-      }
+    resolution: {integrity: sha512-aciLyx+wDwT2t2/kJGJR2AEeBz0nJU4WuRX04Wu9Dqc5lSUtwu0WERPHYsLhF9PtseiAMPBGNUOtFjxZ56prsg==}
 
   '@types/prop-types@15.7.15':
-    resolution:
-      {
-        integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==,
-      }
+    resolution: {integrity: sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==}
 
   '@types/qs@6.15.0':
-    resolution:
-      {
-        integrity: sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==,
-      }
+    resolution: {integrity: sha512-JawvT8iBVWpzTrz3EGw9BTQFg3BQNmwERdKE22vlTxawwtbyUSlMppvZYKLZzB5zgACXdXxbD3m1bXaMqP/9ow==}
 
   '@types/range-parser@1.2.7':
-    resolution:
-      {
-        integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==,
-      }
+    resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==}
 
   '@types/react-big-calendar@1.16.3':
-    resolution:
-      {
-        integrity: sha512-CR+5BKMhlr/wPgsp+sXOeNKNkoU1h/+6H1XoWuL7xnurvzGRQv/EnM8jPS9yxxBvXI8pjQBaJcI7RTSGiewG/Q==,
-      }
+    resolution: {integrity: sha512-CR+5BKMhlr/wPgsp+sXOeNKNkoU1h/+6H1XoWuL7xnurvzGRQv/EnM8jPS9yxxBvXI8pjQBaJcI7RTSGiewG/Q==}
 
   '@types/react-csv@1.1.10':
-    resolution:
-      {
-        integrity: sha512-PESAyASL7Nfi/IyBR3ufd8qZkyoS+7jOylKmJxRZUZLFASLo4NZaRsJ8rNP8pCcbIziADyWBbLPD1nPddhsL4g==,
-      }
+    resolution: {integrity: sha512-PESAyASL7Nfi/IyBR3ufd8qZkyoS+7jOylKmJxRZUZLFASLo4NZaRsJ8rNP8pCcbIziADyWBbLPD1nPddhsL4g==}
 
   '@types/react-dom@18.3.7':
-    resolution:
-      {
-        integrity: sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==,
-      }
+    resolution: {integrity: sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==}
     peerDependencies:
       '@types/react': ^18.0.0
 
   '@types/react-router-dom@5.3.3':
-    resolution:
-      {
-        integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==,
-      }
+    resolution: {integrity: sha512-kpqnYK4wcdm5UaWI3fLcELopqLrHgLqNsdpHauzlQktfkHL3npOSwtj1Uz9oKBAzs7lFtVkV8j83voAz2D8fhw==}
 
   '@types/react-router-hash-link@2.4.9':
-    resolution:
-      {
-        integrity: sha512-zl/VMj+lfJZhvjOAQXIlBVPNKSK+/fRG8AUHhlP9++LhlA2ziLeTmbRxIMJI3PCiCTS+W/FosEoDRoNOGH0OzA==,
-      }
+    resolution: {integrity: sha512-zl/VMj+lfJZhvjOAQXIlBVPNKSK+/fRG8AUHhlP9++LhlA2ziLeTmbRxIMJI3PCiCTS+W/FosEoDRoNOGH0OzA==}
 
   '@types/react-router@5.1.20':
-    resolution:
-      {
-        integrity: sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==,
-      }
+    resolution: {integrity: sha512-jGjmu/ZqS7FjSH6owMcD5qpq19+1RS9DeVRqfl1FeBMxTDQAGwlMWOcs52NDoXaNKyG3d1cYQFMs9rCrb88o9Q==}
 
   '@types/react-transition-group@4.4.12':
-    resolution:
-      {
-        integrity: sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==,
-      }
+    resolution: {integrity: sha512-8TV6R3h2j7a91c+1DXdJi3Syo69zzIZbz7Lg5tORM5LEJG7X/E6a1V3drRyBRZq7/utz7A+c4OgYLiLcYGHG6w==}
     peerDependencies:
       '@types/react': '*'
 
   '@types/react@18.3.28':
-    resolution:
-      {
-        integrity: sha512-z9VXpC7MWrhfWipitjNdgCauoMLRdIILQsAEV+ZesIzBq/oUlxk0m3ApZuMFCXdnS4U7KrI+l3WRUEGQ8K1QKw==,
-      }
+    resolution: {integrity: sha512-z9VXpC7MWrhfWipitjNdgCauoMLRdIILQsAEV+ZesIzBq/oUlxk0m3ApZuMFCXdnS4U7KrI+l3WRUEGQ8K1QKw==}
 
   '@types/send@0.17.6':
-    resolution:
-      {
-        integrity: sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==,
-      }
+    resolution: {integrity: sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==}
 
   '@types/send@1.2.1':
-    resolution:
-      {
-        integrity: sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==,
-      }
+    resolution: {integrity: sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==}
 
   '@types/serve-static@1.15.10':
-    resolution:
-      {
-        integrity: sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==,
-      }
+    resolution: {integrity: sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==}
 
   '@types/session-file-store@1.2.6':
-    resolution:
-      {
-        integrity: sha512-5SqSrqUr6/Ah0g46202WoFE3Fd9P5gLUW34b8bitA0qffOanUzbArVDOx1bvchUK56yZCzhHNREXK7e56lsQ4w==,
-      }
+    resolution: {integrity: sha512-5SqSrqUr6/Ah0g46202WoFE3Fd9P5gLUW34b8bitA0qffOanUzbArVDOx1bvchUK56yZCzhHNREXK7e56lsQ4w==}
 
   '@types/superagent@8.1.9':
-    resolution:
-      {
-        integrity: sha512-pTVjI73witn+9ILmoJdajHGW2jkSaOzhiFYF1Rd3EQ94kymLqB9PjD9ISg7WaALC7+dCHT0FGe9T2LktLq/3GQ==,
-      }
+    resolution: {integrity: sha512-pTVjI73witn+9ILmoJdajHGW2jkSaOzhiFYF1Rd3EQ94kymLqB9PjD9ISg7WaALC7+dCHT0FGe9T2LktLq/3GQ==}
 
   '@types/supercluster@7.1.3':
-    resolution:
-      {
-        integrity: sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==,
-      }
+    resolution: {integrity: sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==}
 
   '@types/supertest@6.0.3':
-    resolution:
-      {
-        integrity: sha512-8WzXq62EXFhJ7QsH3Ocb/iKQ/Ty9ZVWnVzoTKc9tyyFRRF3a74Tk2+TLFgaFFw364Ere+npzHKEJ6ga2LzIL7w==,
-      }
+    resolution: {integrity: sha512-8WzXq62EXFhJ7QsH3Ocb/iKQ/Ty9ZVWnVzoTKc9tyyFRRF3a74Tk2+TLFgaFFw364Ere+npzHKEJ6ga2LzIL7w==}
 
   '@types/uuid@10.0.0':
-    resolution:
-      {
-        integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==,
-      }
+    resolution: {integrity: sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==}
 
   '@types/validator@13.15.10':
-    resolution:
-      {
-        integrity: sha512-T8L6i7wCuyoK8A/ZeLYt1+q0ty3Zb9+qbSSvrIVitzT3YjZqkTZ40IbRsPanlB4h1QB3JVL1SYCdR6ngtFYcuA==,
-      }
+    resolution: {integrity: sha512-T8L6i7wCuyoK8A/ZeLYt1+q0ty3Zb9+qbSSvrIVitzT3YjZqkTZ40IbRsPanlB4h1QB3JVL1SYCdR6ngtFYcuA==}
 
   '@types/warning@3.0.3':
-    resolution:
-      {
-        integrity: sha512-D1XC7WK8K+zZEveUPY+cf4+kgauk8N4eHr/XIHXGlGYkHLud6hK9lYfZk1ry1TNh798cZUCgb6MqGEG8DkJt6Q==,
-      }
+    resolution: {integrity: sha512-D1XC7WK8K+zZEveUPY+cf4+kgauk8N4eHr/XIHXGlGYkHLud6hK9lYfZk1ry1TNh798cZUCgb6MqGEG8DkJt6Q==}
 
   '@types/web-push@3.6.4':
-    resolution:
-      {
-        integrity: sha512-GnJmSr40H3RAnj0s34FNTcJi1hmWFV5KXugE0mYWnYhgTAHLJ/dJKAwDmvPJYMke0RplY2XE9LnM4hqSqKIjhQ==,
-      }
+    resolution: {integrity: sha512-GnJmSr40H3RAnj0s34FNTcJi1hmWFV5KXugE0mYWnYhgTAHLJ/dJKAwDmvPJYMke0RplY2XE9LnM4hqSqKIjhQ==}
 
   '@types/xml-encryption@1.2.4':
-    resolution:
-      {
-        integrity: sha512-I69K/WW1Dv7j6O3jh13z0X8sLWJRXbu5xnHDl9yHzUNDUBtUoBY058eb5s+x/WG6yZC1h8aKdI2EoyEPjyEh+Q==,
-      }
+    resolution: {integrity: sha512-I69K/WW1Dv7j6O3jh13z0X8sLWJRXbu5xnHDl9yHzUNDUBtUoBY058eb5s+x/WG6yZC1h8aKdI2EoyEPjyEh+Q==}
 
   '@types/xml2js@0.4.14':
-    resolution:
-      {
-        integrity: sha512-4YnrRemBShWRO2QjvUin8ESA41rH+9nQGLUGZV/1IDhi3SL9OhdpNC/MrulTWuptXKwhx/aDxE7toV0f/ypIXQ==,
-      }
+    resolution: {integrity: sha512-4YnrRemBShWRO2QjvUin8ESA41rH+9nQGLUGZV/1IDhi3SL9OhdpNC/MrulTWuptXKwhx/aDxE7toV0f/ypIXQ==}
 
   '@typescript-eslint/eslint-plugin@8.57.0':
-    resolution:
-      {
-        integrity: sha512-qeu4rTHR3/IaFORbD16gmjq9+rEs9fGKdX0kF6BKSfi+gCuG3RCKLlSBYzn/bGsY9Tj7KE/DAQStbp8AHJGHEQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-qeu4rTHR3/IaFORbD16gmjq9+rEs9fGKdX0kF6BKSfi+gCuG3RCKLlSBYzn/bGsY9Tj7KE/DAQStbp8AHJGHEQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       '@typescript-eslint/parser': ^8.57.0
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/parser@8.57.0':
-    resolution:
-      {
-        integrity: sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-XZzOmihLIr8AD1b9hL9ccNMzEMWt/dE2u7NyTY9jJG6YNiNthaD5XtUHVF2uCXZ15ng+z2hT3MVuxnUYhq6k1g==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/project-service@8.57.0':
-    resolution:
-      {
-        integrity: sha512-pR+dK0BlxCLxtWfaKQWtYr7MhKmzqZxuii+ZjuFlZlIGRZm22HnXFqa2eY+90MUz8/i80YJmzFGDUsi8dMOV5w==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-pR+dK0BlxCLxtWfaKQWtYr7MhKmzqZxuii+ZjuFlZlIGRZm22HnXFqa2eY+90MUz8/i80YJmzFGDUsi8dMOV5w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/scope-manager@8.57.0':
-    resolution:
-      {
-        integrity: sha512-nvExQqAHF01lUM66MskSaZulpPL5pgy5hI5RfrxviLgzZVffB5yYzw27uK/ft8QnKXI2X0LBrHJFr1TaZtAibw==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-nvExQqAHF01lUM66MskSaZulpPL5pgy5hI5RfrxviLgzZVffB5yYzw27uK/ft8QnKXI2X0LBrHJFr1TaZtAibw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/tsconfig-utils@8.57.0':
-    resolution:
-      {
-        integrity: sha512-LtXRihc5ytjJIQEH+xqjB0+YgsV4/tW35XKX3GTZHpWtcC8SPkT/d4tqdf1cKtesryHm2bgp6l555NYcT2NLvA==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-LtXRihc5ytjJIQEH+xqjB0+YgsV4/tW35XKX3GTZHpWtcC8SPkT/d4tqdf1cKtesryHm2bgp6l555NYcT2NLvA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/type-utils@8.57.0':
-    resolution:
-      {
-        integrity: sha512-yjgh7gmDcJ1+TcEg8x3uWQmn8ifvSupnPfjP21twPKrDP/pTHlEQgmKcitzF/rzPSmv7QjJ90vRpN4U+zoUjwQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-yjgh7gmDcJ1+TcEg8x3uWQmn8ifvSupnPfjP21twPKrDP/pTHlEQgmKcitzF/rzPSmv7QjJ90vRpN4U+zoUjwQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/types@8.57.0':
-    resolution:
-      {
-        integrity: sha512-dTLI8PEXhjUC7B9Kre+u0XznO696BhXcTlOn0/6kf1fHaQW8+VjJAVHJ3eTI14ZapTxdkOmc80HblPQLaEeJdg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-dTLI8PEXhjUC7B9Kre+u0XznO696BhXcTlOn0/6kf1fHaQW8+VjJAVHJ3eTI14ZapTxdkOmc80HblPQLaEeJdg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@typescript-eslint/typescript-estree@8.57.0':
-    resolution:
-      {
-        integrity: sha512-m7faHcyVg0BT3VdYTlX8GdJEM7COexXxS6KqGopxdtkQRvBanK377QDHr4W/vIPAR+ah9+B/RclSW5ldVniO1Q==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-m7faHcyVg0BT3VdYTlX8GdJEM7COexXxS6KqGopxdtkQRvBanK377QDHr4W/vIPAR+ah9+B/RclSW5ldVniO1Q==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/utils@8.57.0':
-    resolution:
-      {
-        integrity: sha512-5iIHvpD3CZe06riAsbNxxreP+MuYgVUsV0n4bwLH//VJmgtt54sQeY2GszntJ4BjYCpMzrfVh2SBnUQTtys2lQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-5iIHvpD3CZe06riAsbNxxreP+MuYgVUsV0n4bwLH//VJmgtt54sQeY2GszntJ4BjYCpMzrfVh2SBnUQTtys2lQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0 || ^10.0.0
       typescript: '>=4.8.4 <6.0.0'
 
   '@typescript-eslint/visitor-keys@8.57.0':
-    resolution:
-      {
-        integrity: sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-zm6xx8UT/Xy2oSr2ZXD0pZo7Jx2XsCoID2IUh9YSTFRu7z+WdwYTRk6LhUftm1crwqbuoF6I8zAFeCMw0YjwDg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   '@unrs/resolver-binding-android-arm-eabi@1.11.1':
-    resolution:
-      {
-        integrity: sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==,
-      }
+    resolution: {integrity: sha512-ppLRUgHVaGRWUx0R0Ut06Mjo9gBaBkg3v/8AxusGLhsIotbBLuRk51rAzqLC8gq6NyyAojEXglNjzf6R948DNw==}
     cpu: [arm]
     os: [android]
 
   '@unrs/resolver-binding-android-arm64@1.11.1':
-    resolution:
-      {
-        integrity: sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==,
-      }
+    resolution: {integrity: sha512-lCxkVtb4wp1v+EoN+HjIG9cIIzPkX5OtM03pQYkG+U5O/wL53LC4QbIeazgiKqluGeVEeBlZahHalCaBvU1a2g==}
     cpu: [arm64]
     os: [android]
 
   '@unrs/resolver-binding-darwin-arm64@1.11.1':
-    resolution:
-      {
-        integrity: sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==,
-      }
+    resolution: {integrity: sha512-gPVA1UjRu1Y/IsB/dQEsp2V1pm44Of6+LWvbLc9SDk1c2KhhDRDBUkQCYVWe6f26uJb3fOK8saWMgtX8IrMk3g==}
     cpu: [arm64]
     os: [darwin]
 
   '@unrs/resolver-binding-darwin-x64@1.11.1':
-    resolution:
-      {
-        integrity: sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==,
-      }
+    resolution: {integrity: sha512-cFzP7rWKd3lZaCsDze07QX1SC24lO8mPty9vdP+YVa3MGdVgPmFc59317b2ioXtgCMKGiCLxJ4HQs62oz6GfRQ==}
     cpu: [x64]
     os: [darwin]
 
   '@unrs/resolver-binding-freebsd-x64@1.11.1':
-    resolution:
-      {
-        integrity: sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==,
-      }
+    resolution: {integrity: sha512-fqtGgak3zX4DCB6PFpsH5+Kmt/8CIi4Bry4rb1ho6Av2QHTREM+47y282Uqiu3ZRF5IQioJQ5qWRV6jduA+iGw==}
     cpu: [x64]
     os: [freebsd]
 
   '@unrs/resolver-binding-linux-arm-gnueabihf@1.11.1':
-    resolution:
-      {
-        integrity: sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==,
-      }
+    resolution: {integrity: sha512-u92mvlcYtp9MRKmP+ZvMmtPN34+/3lMHlyMj7wXJDeXxuM0Vgzz0+PPJNsro1m3IZPYChIkn944wW8TYgGKFHw==}
     cpu: [arm]
     os: [linux]
 
   '@unrs/resolver-binding-linux-arm-musleabihf@1.11.1':
-    resolution:
-      {
-        integrity: sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==,
-      }
+    resolution: {integrity: sha512-cINaoY2z7LVCrfHkIcmvj7osTOtm6VVT16b5oQdS4beibX2SYBwgYLmqhBjA1t51CarSaBuX5YNsWLjsqfW5Cw==}
     cpu: [arm]
     os: [linux]
 
   '@unrs/resolver-binding-linux-arm64-gnu@1.11.1':
-    resolution:
-      {
-        integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==,
-      }
+    resolution: {integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==}
     cpu: [arm64]
     os: [linux]
 
   '@unrs/resolver-binding-linux-arm64-musl@1.11.1':
-    resolution:
-      {
-        integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==,
-      }
+    resolution: {integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==}
     cpu: [arm64]
     os: [linux]
 
   '@unrs/resolver-binding-linux-ppc64-gnu@1.11.1':
-    resolution:
-      {
-        integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==,
-      }
+    resolution: {integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==}
     cpu: [ppc64]
     os: [linux]
 
   '@unrs/resolver-binding-linux-riscv64-gnu@1.11.1':
-    resolution:
-      {
-        integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==,
-      }
+    resolution: {integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==}
     cpu: [riscv64]
     os: [linux]
 
   '@unrs/resolver-binding-linux-riscv64-musl@1.11.1':
-    resolution:
-      {
-        integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==,
-      }
+    resolution: {integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==}
     cpu: [riscv64]
     os: [linux]
 
   '@unrs/resolver-binding-linux-s390x-gnu@1.11.1':
-    resolution:
-      {
-        integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==,
-      }
+    resolution: {integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==}
     cpu: [s390x]
     os: [linux]
 
   '@unrs/resolver-binding-linux-x64-gnu@1.11.1':
-    resolution:
-      {
-        integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==,
-      }
+    resolution: {integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==}
     cpu: [x64]
     os: [linux]
 
   '@unrs/resolver-binding-linux-x64-musl@1.11.1':
-    resolution:
-      {
-        integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==,
-      }
+    resolution: {integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==}
     cpu: [x64]
     os: [linux]
 
   '@unrs/resolver-binding-wasm32-wasi@1.11.1':
-    resolution:
-      {
-        integrity: sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==}
+    engines: {node: '>=14.0.0'}
     cpu: [wasm32]
 
   '@unrs/resolver-binding-win32-arm64-msvc@1.11.1':
-    resolution:
-      {
-        integrity: sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==,
-      }
+    resolution: {integrity: sha512-nRcz5Il4ln0kMhfL8S3hLkxI85BXs3o8EYoattsJNdsX4YUU89iOkVn7g0VHSRxFuVMdM4Q1jEpIId1Ihim/Uw==}
     cpu: [arm64]
     os: [win32]
 
   '@unrs/resolver-binding-win32-ia32-msvc@1.11.1':
-    resolution:
-      {
-        integrity: sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==,
-      }
+    resolution: {integrity: sha512-DCEI6t5i1NmAZp6pFonpD5m7i6aFrpofcp4LA2i8IIq60Jyo28hamKBxNrZcyOwVOZkgsRp9O2sXWBWP8MnvIQ==}
     cpu: [ia32]
     os: [win32]
 
   '@unrs/resolver-binding-win32-x64-msvc@1.11.1':
-    resolution:
-      {
-        integrity: sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==,
-      }
+    resolution: {integrity: sha512-lrW200hZdbfRtztbygyaq/6jP6AKE8qQN2KvPcJ+x7wiD038YtnYtZ82IMNJ69GJibV7bwL3y9FgK+5w/pYt6g==}
     cpu: [x64]
     os: [win32]
 
   '@vis.gl/react-google-maps@1.7.1':
-    resolution:
-      {
-        integrity: sha512-F/GJzJyri7Jqf+bkLNxoi2RcH2hCIo1I3//PyiILqQzdzglMoqZVO1DLXlHPifNdebk1/zib6dMJA3i73nwmuQ==,
-      }
+    resolution: {integrity: sha512-F/GJzJyri7Jqf+bkLNxoi2RcH2hCIo1I3//PyiILqQzdzglMoqZVO1DLXlHPifNdebk1/zib6dMJA3i73nwmuQ==}
     peerDependencies:
       react: '>=16.8.0 || ^19.0 || ^19.0.0-rc'
       react-dom: '>=16.8.0 || ^19.0 || ^19.0.0-rc'
 
   '@vitejs/plugin-react@5.1.4':
-    resolution:
-      {
-        integrity: sha512-VIcFLdRi/VYRU8OL/puL7QXMYafHmqOnwTZY50U1JPlCNj30PxCMx65c494b1K9be9hX83KVt0+gTEwTWLqToA==,
-      }
-    engines: { node: ^20.19.0 || >=22.12.0 }
+    resolution: {integrity: sha512-VIcFLdRi/VYRU8OL/puL7QXMYafHmqOnwTZY50U1JPlCNj30PxCMx65c494b1K9be9hX83KVt0+gTEwTWLqToA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     peerDependencies:
       vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
 
   '@xmldom/is-dom-node@1.0.1':
-    resolution:
-      {
-        integrity: sha512-CJDxIgE5I0FH+ttq/Fxy6nRpxP70+e2O048EPe85J2use3XKdatVM7dDVvFNjQudd9B49NPoZ+8PG49zj4Er8Q==,
-      }
-    engines: { node: '>= 16' }
+    resolution: {integrity: sha512-CJDxIgE5I0FH+ttq/Fxy6nRpxP70+e2O048EPe85J2use3XKdatVM7dDVvFNjQudd9B49NPoZ+8PG49zj4Er8Q==}
+    engines: {node: '>= 16'}
 
   '@xmldom/xmldom@0.8.11':
-    resolution:
-      {
-        integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==,
-      }
-    engines: { node: '>=10.0.0' }
+    resolution: {integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==}
+    engines: {node: '>=10.0.0'}
 
   accepts@1.3.8:
-    resolution:
-      {
-        integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==}
+    engines: {node: '>= 0.6'}
 
   acorn-jsx@5.3.2:
-    resolution:
-      {
-        integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==,
-      }
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
 
   acorn@8.16.0:
-    resolution:
-      {
-        integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==,
-      }
-    engines: { node: '>=0.4.0' }
+    resolution: {integrity: sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==}
+    engines: {node: '>=0.4.0'}
     hasBin: true
 
   addresser@1.1.20:
-    resolution:
-      {
-        integrity: sha512-+RF7y2RkgulLWdiKNwWW2d21RXneDcYasFdeR+kbUmSXp5HqrAAIh3f8YLaHV4WsjzN4L0XG2GhlfHwa1jkeLg==,
-      }
+    resolution: {integrity: sha512-+RF7y2RkgulLWdiKNwWW2d21RXneDcYasFdeR+kbUmSXp5HqrAAIh3f8YLaHV4WsjzN4L0XG2GhlfHwa1jkeLg==}
 
   agent-base@7.1.4:
-    resolution:
-      {
-        integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==,
-      }
-    engines: { node: '>= 14' }
+    resolution: {integrity: sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==}
+    engines: {node: '>= 14'}
 
   ajv@6.14.0:
-    resolution:
-      {
-        integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==,
-      }
+    resolution: {integrity: sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==}
 
   ansi-regex@5.0.1:
-    resolution:
-      {
-        integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
 
   ansi-regex@6.2.2:
-    resolution:
-      {
-        integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==}
+    engines: {node: '>=12'}
 
   ansi-styles@4.3.0:
-    resolution:
-      {
-        integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
 
   ansi-styles@6.2.3:
-    resolution:
-      {
-        integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==}
+    engines: {node: '>=12'}
 
   any-promise@1.3.0:
-    resolution:
-      {
-        integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==,
-      }
+    resolution: {integrity: sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==}
 
   anymatch@3.1.3:
-    resolution:
-      {
-        integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
 
   arg@4.1.3:
-    resolution:
-      {
-        integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==,
-      }
+    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
 
   arg@5.0.2:
-    resolution:
-      {
-        integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==,
-      }
+    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
 
   argparse@2.0.1:
-    resolution:
-      {
-        integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==,
-      }
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
   array-buffer-byte-length@1.0.2:
-    resolution:
-      {
-        integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==}
+    engines: {node: '>= 0.4'}
 
   array-flatten@1.1.1:
-    resolution:
-      {
-        integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==,
-      }
+    resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
 
   array-includes@3.1.9:
-    resolution:
-      {
-        integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==}
+    engines: {node: '>= 0.4'}
 
   array.prototype.findlast@1.2.5:
-    resolution:
-      {
-        integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==}
+    engines: {node: '>= 0.4'}
 
   array.prototype.findlastindex@1.2.6:
-    resolution:
-      {
-        integrity: sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==}
+    engines: {node: '>= 0.4'}
 
   array.prototype.flat@1.3.3:
-    resolution:
-      {
-        integrity: sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==}
+    engines: {node: '>= 0.4'}
 
   array.prototype.flatmap@1.3.3:
-    resolution:
-      {
-        integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==}
+    engines: {node: '>= 0.4'}
 
   array.prototype.tosorted@1.1.4:
-    resolution:
-      {
-        integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==}
+    engines: {node: '>= 0.4'}
 
   arraybuffer.prototype.slice@1.0.4:
-    resolution:
-      {
-        integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==}
+    engines: {node: '>= 0.4'}
 
   asap@2.0.6:
-    resolution:
-      {
-        integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==,
-      }
+    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
   asn1.js@5.4.1:
-    resolution:
-      {
-        integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==,
-      }
+    resolution: {integrity: sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==}
 
   assertion-error@1.1.0:
-    resolution:
-      {
-        integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==,
-      }
+    resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
 
   async-function@1.0.0:
-    resolution:
-      {
-        integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
+    engines: {node: '>= 0.4'}
 
   asynckit@0.4.0:
-    resolution:
-      {
-        integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==,
-      }
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
 
   autoprefixer@10.4.27:
-    resolution:
-      {
-        integrity: sha512-NP9APE+tO+LuJGn7/9+cohklunJsXWiaWEfV3si4Gi/XHDwVNgkwr1J3RQYFIvPy76GmJ9/bW8vyoU1LcxwKHA==,
-      }
-    engines: { node: ^10 || ^12 || >=14 }
+    resolution: {integrity: sha512-NP9APE+tO+LuJGn7/9+cohklunJsXWiaWEfV3si4Gi/XHDwVNgkwr1J3RQYFIvPy76GmJ9/bW8vyoU1LcxwKHA==}
+    engines: {node: ^10 || ^12 || >=14}
     hasBin: true
     peerDependencies:
       postcss: ^8.1.0
 
   available-typed-arrays@1.0.7:
-    resolution:
-      {
-        integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
 
   axios@1.13.6:
-    resolution:
-      {
-        integrity: sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==,
-      }
+    resolution: {integrity: sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==}
 
   babel-plugin-macros@3.1.0:
-    resolution:
-      {
-        integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==,
-      }
-    engines: { node: '>=10', npm: '>=6' }
+    resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
+    engines: {node: '>=10', npm: '>=6'}
 
   bagpipe@0.3.5:
-    resolution:
-      {
-        integrity: sha512-42sAlmPDKes1nLm/aly+0VdaopSU9br+jkRELedhQxI5uXHgtk47I83Mpmf4zoNTRMASdLFtUkimlu/Z9zQ8+g==,
-      }
+    resolution: {integrity: sha512-42sAlmPDKes1nLm/aly+0VdaopSU9br+jkRELedhQxI5uXHgtk47I83Mpmf4zoNTRMASdLFtUkimlu/Z9zQ8+g==}
 
   balanced-match@1.0.2:
-    resolution:
-      {
-        integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==,
-      }
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
   balanced-match@4.0.4:
-    resolution:
-      {
-        integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==,
-      }
-    engines: { node: 18 || 20 || >=22 }
+    resolution: {integrity: sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==}
+    engines: {node: 18 || 20 || >=22}
 
   base64-js@1.5.1:
-    resolution:
-      {
-        integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==,
-      }
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
   baseline-browser-mapping@2.9.3:
-    resolution:
-      {
-        integrity: sha512-8QdH6czo+G7uBsNo0GiUfouPN1lRzKdJTGnKXwe12gkFbnnOUaUKGN55dMkfy+mnxmvjwl9zcI4VncczcVXDhA==,
-      }
+    resolution: {integrity: sha512-8QdH6czo+G7uBsNo0GiUfouPN1lRzKdJTGnKXwe12gkFbnnOUaUKGN55dMkfy+mnxmvjwl9zcI4VncczcVXDhA==}
     hasBin: true
 
   bignumber.js@9.3.1:
-    resolution:
-      {
-        integrity: sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==,
-      }
+    resolution: {integrity: sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==}
 
   binary-extensions@2.3.0:
-    resolution:
-      {
-        integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
+    engines: {node: '>=8'}
 
   bn.js@4.12.3:
-    resolution:
-      {
-        integrity: sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==,
-      }
+    resolution: {integrity: sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==}
 
   body-parser@1.20.4:
-    resolution:
-      {
-        integrity: sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==,
-      }
-    engines: { node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16 }
+    resolution: {integrity: sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
 
   bowser@2.14.1:
-    resolution:
-      {
-        integrity: sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==,
-      }
+    resolution: {integrity: sha512-tzPjzCxygAKWFOJP011oxFHs57HzIhOEracIgAePE4pqB3LikALKnSzUyU4MGs9/iCEUuHlAJTjTc5M+u7YEGg==}
 
   brace-expansion@1.1.12:
-    resolution:
-      {
-        integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==,
-      }
+    resolution: {integrity: sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==}
 
   brace-expansion@2.0.2:
-    resolution:
-      {
-        integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==,
-      }
+    resolution: {integrity: sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==}
 
   brace-expansion@5.0.4:
-    resolution:
-      {
-        integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==,
-      }
-    engines: { node: 18 || 20 || >=22 }
+    resolution: {integrity: sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg==}
+    engines: {node: 18 || 20 || >=22}
 
   braces@3.0.3:
-    resolution:
-      {
-        integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
 
   browser-stdout@1.3.1:
-    resolution:
-      {
-        integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==,
-      }
+    resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==}
 
   browserslist@4.28.1:
-    resolution:
-      {
-        integrity: sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==,
-      }
-    engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 }
+    resolution: {integrity: sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
   buffer-equal-constant-time@1.0.1:
-    resolution:
-      {
-        integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==,
-      }
+    resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
 
   buffer-from@1.1.2:
-    resolution:
-      {
-        integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==,
-      }
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
   bytes@3.1.2:
-    resolution:
-      {
-        integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
+    engines: {node: '>= 0.8'}
 
   call-bind-apply-helpers@1.0.2:
-    resolution:
-      {
-        integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==}
+    engines: {node: '>= 0.4'}
 
   call-bind@1.0.7:
-    resolution:
-      {
-        integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+    engines: {node: '>= 0.4'}
 
   call-bind@1.0.8:
-    resolution:
-      {
-        integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==}
+    engines: {node: '>= 0.4'}
 
   call-bound@1.0.4:
-    resolution:
-      {
-        integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==}
+    engines: {node: '>= 0.4'}
 
   callsites@3.1.0:
-    resolution:
-      {
-        integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
 
   camelcase-css@2.0.1:
-    resolution:
-      {
-        integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
+    engines: {node: '>= 6'}
 
   camelcase@6.3.0:
-    resolution:
-      {
-        integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
+    engines: {node: '>=10'}
 
   caniuse-lite@1.0.30001759:
-    resolution:
-      {
-        integrity: sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==,
-      }
+    resolution: {integrity: sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==}
 
   caniuse-lite@1.0.30001777:
-    resolution:
-      {
-        integrity: sha512-tmN+fJxroPndC74efCdp12j+0rk0RHwV5Jwa1zWaFVyw2ZxAuPeG8ZgWC3Wz7uSjT3qMRQ5XHZ4COgQmsCMJAQ==,
-      }
+    resolution: {integrity: sha512-tmN+fJxroPndC74efCdp12j+0rk0RHwV5Jwa1zWaFVyw2ZxAuPeG8ZgWC3Wz7uSjT3qMRQ5XHZ4COgQmsCMJAQ==}
 
   chai@4.5.0:
-    resolution:
-      {
-        integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==}
+    engines: {node: '>=4'}
 
   chalk@4.1.2:
-    resolution:
-      {
-        integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
 
   check-error@1.0.3:
-    resolution:
-      {
-        integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==,
-      }
+    resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
 
   chokidar@3.6.0:
-    resolution:
-      {
-        integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==,
-      }
-    engines: { node: '>= 8.10.0' }
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
+    engines: {node: '>= 8.10.0'}
 
   chokidar@4.0.3:
-    resolution:
-      {
-        integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==,
-      }
-    engines: { node: '>= 14.16.0' }
+    resolution: {integrity: sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==}
+    engines: {node: '>= 14.16.0'}
 
   classnames@2.5.1:
-    resolution:
-      {
-        integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==,
-      }
+    resolution: {integrity: sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==}
 
   cliui@8.0.1:
-    resolution:
-      {
-        integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
 
   clsx@1.2.1:
-    resolution:
-      {
-        integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==}
+    engines: {node: '>=6'}
 
   clsx@2.1.1:
-    resolution:
-      {
-        integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
+    engines: {node: '>=6'}
 
   color-convert@2.0.1:
-    resolution:
-      {
-        integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==,
-      }
-    engines: { node: '>=7.0.0' }
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
 
   color-name@1.1.4:
-    resolution:
-      {
-        integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==,
-      }
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
 
   combined-stream@1.0.8:
-    resolution:
-      {
-        integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
 
   commander@4.1.1:
-    resolution:
-      {
-        integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
+    engines: {node: '>= 6'}
 
   component-emitter@1.3.1:
-    resolution:
-      {
-        integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==,
-      }
+    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
 
   concat-map@0.0.1:
-    resolution:
-      {
-        integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==,
-      }
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
   content-disposition@0.5.4:
-    resolution:
-      {
-        integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
+    engines: {node: '>= 0.6'}
 
   content-type@1.0.5:
-    resolution:
-      {
-        integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==}
+    engines: {node: '>= 0.6'}
 
   convert-source-map@1.9.0:
-    resolution:
-      {
-        integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==,
-      }
+    resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
 
   convert-source-map@2.0.0:
-    resolution:
-      {
-        integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==,
-      }
+    resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==}
 
   cookie-signature@1.0.7:
-    resolution:
-      {
-        integrity: sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==,
-      }
+    resolution: {integrity: sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==}
 
   cookie-signature@1.2.2:
-    resolution:
-      {
-        integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==,
-      }
-    engines: { node: '>=6.6.0' }
+    resolution: {integrity: sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==}
+    engines: {node: '>=6.6.0'}
 
   cookie@0.7.2:
-    resolution:
-      {
-        integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==}
+    engines: {node: '>= 0.6'}
 
   cookiejar@2.1.4:
-    resolution:
-      {
-        integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==,
-      }
+    resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
 
   cors@2.8.6:
-    resolution:
-      {
-        integrity: sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==,
-      }
-    engines: { node: '>= 0.10' }
+    resolution: {integrity: sha512-tJtZBBHA6vjIAaF6EnIaq6laBBP9aq/Y3ouVJjEfoHbRBcHBAHYcMh/w8LDrk2PvIMMq8gmopa5D4V8RmbrxGw==}
+    engines: {node: '>= 0.10'}
 
   cosmiconfig@7.1.0:
-    resolution:
-      {
-        integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==}
+    engines: {node: '>=10'}
 
   create-require@1.1.1:
-    resolution:
-      {
-        integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==,
-      }
+    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
 
   cron-parser@4.9.0:
-    resolution:
-      {
-        integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==,
-      }
-    engines: { node: '>=12.0.0' }
+    resolution: {integrity: sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==}
+    engines: {node: '>=12.0.0'}
 
   cross-env@7.0.3:
-    resolution:
-      {
-        integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==,
-      }
-    engines: { node: '>=10.14', npm: '>=6', yarn: '>=1' }
+    resolution: {integrity: sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==}
+    engines: {node: '>=10.14', npm: '>=6', yarn: '>=1'}
     hasBin: true
 
   cross-spawn@7.0.6:
-    resolution:
-      {
-        integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
+    engines: {node: '>= 8'}
 
   crypto-js@4.2.0:
-    resolution:
-      {
-        integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==,
-      }
+    resolution: {integrity: sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q==}
 
   cssesc@3.0.0:
-    resolution:
-      {
-        integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
     hasBin: true
 
   csstype@3.2.3:
-    resolution:
-      {
-        integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==,
-      }
+    resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
 
   data-view-buffer@1.0.2:
-    resolution:
-      {
-        integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==}
+    engines: {node: '>= 0.4'}
 
   data-view-byte-length@1.0.2:
-    resolution:
-      {
-        integrity: sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==}
+    engines: {node: '>= 0.4'}
 
   data-view-byte-offset@1.0.1:
-    resolution:
-      {
-        integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==}
+    engines: {node: '>= 0.4'}
 
   date-arithmetic@4.1.0:
-    resolution:
-      {
-        integrity: sha512-QWxYLR5P/6GStZcdem+V1xoto6DMadYWpMXU82ES3/RfR3Wdwr3D0+be7mgOJ+Ov0G9D5Dmb9T17sNLQYj9XOg==,
-      }
+    resolution: {integrity: sha512-QWxYLR5P/6GStZcdem+V1xoto6DMadYWpMXU82ES3/RfR3Wdwr3D0+be7mgOJ+Ov0G9D5Dmb9T17sNLQYj9XOg==}
 
   date-fns@2.30.0:
-    resolution:
-      {
-        integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==,
-      }
-    engines: { node: '>=0.11' }
+    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
+    engines: {node: '>=0.11'}
 
   date-fns@4.1.0:
-    resolution:
-      {
-        integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==,
-      }
+    resolution: {integrity: sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==}
 
   dayjs@1.11.19:
-    resolution:
-      {
-        integrity: sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==,
-      }
+    resolution: {integrity: sha512-t5EcLVS6QPBNqM2z8fakk/NKel+Xzshgt8FFKAn+qwlD1pzZWxh0nVCrvFK7ZDb6XucZeF9z8C7CBWTRIVApAw==}
 
   debug@2.6.9:
-    resolution:
-      {
-        integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==,
-      }
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
     peerDependencies:
       supports-color: '*'
     peerDependenciesMeta:
@@ -3625,10 +2307,7 @@ packages:
         optional: true
 
   debug@3.2.7:
-    resolution:
-      {
-        integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==,
-      }
+    resolution: {integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==}
     peerDependencies:
       supports-color: '*'
     peerDependenciesMeta:
@@ -3636,11 +2315,8 @@ packages:
         optional: true
 
   debug@4.4.3:
-    resolution:
-      {
-        integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==,
-      }
-    engines: { node: '>=6.0' }
+    resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
+    engines: {node: '>=6.0'}
     peerDependencies:
       supports-color: '*'
     peerDependenciesMeta:
@@ -3648,293 +2324,164 @@ packages:
         optional: true
 
   decamelize@4.0.0:
-    resolution:
-      {
-        integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==}
+    engines: {node: '>=10'}
 
   deep-eql@4.1.4:
-    resolution:
-      {
-        integrity: sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==}
+    engines: {node: '>=6'}
 
   deep-is@0.1.4:
-    resolution:
-      {
-        integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==,
-      }
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
 
   define-data-property@1.1.4:
-    resolution:
-      {
-        integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
 
   define-properties@1.2.1:
-    resolution:
-      {
-        integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
 
   delayed-stream@1.0.0:
-    resolution:
-      {
-        integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==,
-      }
-    engines: { node: '>=0.4.0' }
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
 
   depd@2.0.0:
-    resolution:
-      {
-        integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
+    engines: {node: '>= 0.8'}
 
   dequal@2.0.3:
-    resolution:
-      {
-        integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
 
   destroy@1.2.0:
-    resolution:
-      {
-        integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==,
-      }
-    engines: { node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16 }
+    resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
 
   dezalgo@1.0.4:
-    resolution:
-      {
-        integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==,
-      }
+    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
 
   didyoumean@1.2.2:
-    resolution:
-      {
-        integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==,
-      }
+    resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
 
   diff@4.0.4:
-    resolution:
-      {
-        integrity: sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==,
-      }
-    engines: { node: '>=0.3.1' }
+    resolution: {integrity: sha512-X07nttJQkwkfKfvTPG/KSnE2OMdcUCao6+eXF3wmnIQRn2aPAHH3VxDbDOdegkd6JbPsXqShpvEOHfAT+nCNwQ==}
+    engines: {node: '>=0.3.1'}
 
   diff@7.0.0:
-    resolution:
-      {
-        integrity: sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==,
-      }
-    engines: { node: '>=0.3.1' }
+    resolution: {integrity: sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==}
+    engines: {node: '>=0.3.1'}
 
   dlv@1.1.3:
-    resolution:
-      {
-        integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==,
-      }
+    resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
 
   doctrine@2.1.0:
-    resolution:
-      {
-        integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==}
+    engines: {node: '>=0.10.0'}
 
   dom-helpers@5.2.1:
-    resolution:
-      {
-        integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==,
-      }
+    resolution: {integrity: sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==}
 
   dotenv@16.6.1:
-    resolution:
-      {
-        integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}
+    engines: {node: '>=12'}
 
   dunder-proto@1.0.1:
-    resolution:
-      {
-        integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
+    engines: {node: '>= 0.4'}
 
   dynamoose-utils@4.1.5:
-    resolution:
-      {
-        integrity: sha512-flC/H02WyBjG02BTKF5Vj7dd+3rUQISyi1xEC8B7hlwoQWRWEUY+c062nDudpUGoxq7WM9NaKPLfh8lmX80icg==,
-      }
+    resolution: {integrity: sha512-flC/H02WyBjG02BTKF5Vj7dd+3rUQISyi1xEC8B7hlwoQWRWEUY+c062nDudpUGoxq7WM9NaKPLfh8lmX80icg==}
 
   dynamoose@4.1.5:
-    resolution:
-      {
-        integrity: sha512-DS9HJuBYCKsvsfwsjo6bsfPg2py4sSTS5Dj+CrntHJCc1WMhqJzG4j9MSeNGevGW3q5B1Gh+dx9J/ScUZqAz1g==,
-      }
+    resolution: {integrity: sha512-DS9HJuBYCKsvsfwsjo6bsfPg2py4sSTS5Dj+CrntHJCc1WMhqJzG4j9MSeNGevGW3q5B1Gh+dx9J/ScUZqAz1g==}
 
   eastasianwidth@0.2.0:
-    resolution:
-      {
-        integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==,
-      }
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
 
   ecdsa-sig-formatter@1.0.11:
-    resolution:
-      {
-        integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==,
-      }
+    resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
 
   ee-first@1.1.1:
-    resolution:
-      {
-        integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==,
-      }
+    resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
   electron-to-chromium@1.5.266:
-    resolution:
-      {
-        integrity: sha512-kgWEglXvkEfMH7rxP5OSZZwnaDWT7J9EoZCujhnpLbfi0bbNtRkgdX2E3gt0Uer11c61qCYktB3hwkAS325sJg==,
-      }
+    resolution: {integrity: sha512-kgWEglXvkEfMH7rxP5OSZZwnaDWT7J9EoZCujhnpLbfi0bbNtRkgdX2E3gt0Uer11c61qCYktB3hwkAS325sJg==}
 
   emoji-regex@8.0.0:
-    resolution:
-      {
-        integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==,
-      }
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
   emoji-regex@9.2.2:
-    resolution:
-      {
-        integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==,
-      }
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
 
   encodeurl@2.0.0:
-    resolution:
-      {
-        integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
+    engines: {node: '>= 0.8'}
 
   error-ex@1.3.4:
-    resolution:
-      {
-        integrity: sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==,
-      }
+    resolution: {integrity: sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==}
 
   es-abstract@1.24.1:
-    resolution:
-      {
-        integrity: sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-zHXBLhP+QehSSbsS9Pt23Gg964240DPd6QCf8WpkqEXxQ7fhdZzYsocOr5u7apWonsS5EjZDmTF+/slGMyasvw==}
+    engines: {node: '>= 0.4'}
 
   es-define-property@1.0.0:
-    resolution:
-      {
-        integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
+    engines: {node: '>= 0.4'}
 
   es-define-property@1.0.1:
-    resolution:
-      {
-        integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==}
+    engines: {node: '>= 0.4'}
 
   es-errors@1.3.0:
-    resolution:
-      {
-        integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
 
   es-iterator-helpers@1.2.2:
-    resolution:
-      {
-        integrity: sha512-BrUQ0cPTB/IwXj23HtwHjS9n7O4h9FX94b4xc5zlTHxeLgTAdzYUDyy6KdExAl9lbN5rtfe44xpjpmj9grxs5w==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-BrUQ0cPTB/IwXj23HtwHjS9n7O4h9FX94b4xc5zlTHxeLgTAdzYUDyy6KdExAl9lbN5rtfe44xpjpmj9grxs5w==}
+    engines: {node: '>= 0.4'}
 
   es-object-atoms@1.1.1:
-    resolution:
-      {
-        integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==}
+    engines: {node: '>= 0.4'}
 
   es-set-tostringtag@2.1.0:
-    resolution:
-      {
-        integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
+    engines: {node: '>= 0.4'}
 
   es-shim-unscopables@1.1.0:
-    resolution:
-      {
-        integrity: sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==}
+    engines: {node: '>= 0.4'}
 
   es-to-primitive@1.3.0:
-    resolution:
-      {
-        integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==}
+    engines: {node: '>= 0.4'}
 
   esbuild@0.27.3:
-    resolution:
-      {
-        integrity: sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==}
+    engines: {node: '>=18'}
     hasBin: true
 
   escalade@3.2.0:
-    resolution:
-      {
-        integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
 
   escape-html@1.0.3:
-    resolution:
-      {
-        integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==,
-      }
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
 
   escape-string-regexp@4.0.0:
-    resolution:
-      {
-        integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
 
   eslint-config-prettier@10.1.8:
-    resolution:
-      {
-        integrity: sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==,
-      }
+    resolution: {integrity: sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
 
   eslint-import-context@0.1.9:
-    resolution:
-      {
-        integrity: sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==,
-      }
-    engines: { node: ^12.20.0 || ^14.18.0 || >=16.0.0 }
+    resolution: {integrity: sha512-K9Hb+yRaGAGUbwjhFNHvSmmkZs9+zbuoe3kFQ4V1wYjrepUFYM2dZAfNtjbbj3qsPfUfsA68Bx/ICWQMi+C8Eg==}
+    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
     peerDependencies:
       unrs-resolver: ^1.0.0
     peerDependenciesMeta:
@@ -3942,17 +2489,11 @@ packages:
         optional: true
 
   eslint-import-resolver-node@0.3.9:
-    resolution:
-      {
-        integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==,
-      }
+    resolution: {integrity: sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==}
 
   eslint-import-resolver-typescript@4.4.4:
-    resolution:
-      {
-        integrity: sha512-1iM2zeBvrYmUNTj2vSC/90JTHDth+dfOfiNKkxApWRsTJYNrc8rOdxxIf5vazX+BiAXTeOT0UvWpGI/7qIWQOw==,
-      }
-    engines: { node: ^16.17.0 || >=18.6.0 }
+    resolution: {integrity: sha512-1iM2zeBvrYmUNTj2vSC/90JTHDth+dfOfiNKkxApWRsTJYNrc8rOdxxIf5vazX+BiAXTeOT0UvWpGI/7qIWQOw==}
+    engines: {node: ^16.17.0 || >=18.6.0}
     peerDependencies:
       eslint: '*'
       eslint-plugin-import: '*'
@@ -3964,11 +2505,8 @@ packages:
         optional: true
 
   eslint-module-utils@2.12.1:
-    resolution:
-      {
-        integrity: sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==}
+    engines: {node: '>=4'}
     peerDependencies:
       '@typescript-eslint/parser': '*'
       eslint: '*'
@@ -3988,11 +2526,8 @@ packages:
         optional: true
 
   eslint-plugin-import@2.32.0:
-    resolution:
-      {
-        integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==}
+    engines: {node: '>=4'}
     peerDependencies:
       '@typescript-eslint/parser': '*'
       eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
@@ -4001,80 +2536,50 @@ packages:
         optional: true
 
   eslint-plugin-promise@7.2.1:
-    resolution:
-      {
-        integrity: sha512-SWKjd+EuvWkYaS+uN2csvj0KoP43YTu7+phKQ5v+xw6+A0gutVX2yqCeCkC3uLCJFiPfR2dD8Es5L7yUsmvEaA==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-SWKjd+EuvWkYaS+uN2csvj0KoP43YTu7+phKQ5v+xw6+A0gutVX2yqCeCkC3uLCJFiPfR2dD8Es5L7yUsmvEaA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
 
   eslint-plugin-react-hooks@7.0.1:
-    resolution:
-      {
-        integrity: sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==}
+    engines: {node: '>=18'}
     peerDependencies:
       eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0
 
   eslint-plugin-react@7.37.5:
-    resolution:
-      {
-        integrity: sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==}
+    engines: {node: '>=4'}
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
 
   eslint-scope@5.1.1:
-    resolution:
-      {
-        integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==,
-      }
-    engines: { node: '>=8.0.0' }
+    resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
+    engines: {node: '>=8.0.0'}
 
   eslint-scope@8.4.0:
-    resolution:
-      {
-        integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   eslint-visitor-keys@2.1.0:
-    resolution:
-      {
-        integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
+    engines: {node: '>=10'}
 
   eslint-visitor-keys@3.4.3:
-    resolution:
-      {
-        integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==,
-      }
-    engines: { node: ^12.22.0 || ^14.17.0 || >=16.0.0 }
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   eslint-visitor-keys@4.2.1:
-    resolution:
-      {
-        integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   eslint-visitor-keys@5.0.1:
-    resolution:
-      {
-        integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==,
-      }
-    engines: { node: ^20.19.0 || ^22.13.0 || >=24 }
+    resolution: {integrity: sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==}
+    engines: {node: ^20.19.0 || ^22.13.0 || >=24}
 
   eslint@9.39.4:
-    resolution:
-      {
-        integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
     peerDependencies:
       jiti: '*'
@@ -4083,137 +2588,77 @@ packages:
         optional: true
 
   espree@10.4.0:
-    resolution:
-      {
-        integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
 
   esquery@1.7.0:
-    resolution:
-      {
-        integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==,
-      }
-    engines: { node: '>=0.10' }
+    resolution: {integrity: sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==}
+    engines: {node: '>=0.10'}
 
   esrecurse@4.3.0:
-    resolution:
-      {
-        integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
 
   estraverse@4.3.0:
-    resolution:
-      {
-        integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==}
+    engines: {node: '>=4.0'}
 
   estraverse@5.3.0:
-    resolution:
-      {
-        integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
 
   esutils@2.0.3:
-    resolution:
-      {
-        integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
 
   etag@1.8.1:
-    resolution:
-      {
-        integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
+    engines: {node: '>= 0.6'}
 
   express-session@1.19.0:
-    resolution:
-      {
-        integrity: sha512-0csaMkGq+vaiZTmSMMGkfdCOabYv192VbytFypcvI0MANrp+4i/7yEkJ0sbAEhycQjntaKGzYfjfXQyVb7BHMA==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-0csaMkGq+vaiZTmSMMGkfdCOabYv192VbytFypcvI0MANrp+4i/7yEkJ0sbAEhycQjntaKGzYfjfXQyVb7BHMA==}
+    engines: {node: '>= 0.8.0'}
 
   express@4.22.1:
-    resolution:
-      {
-        integrity: sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==,
-      }
-    engines: { node: '>= 0.10.0' }
+    resolution: {integrity: sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==}
+    engines: {node: '>= 0.10.0'}
 
   extend@3.0.2:
-    resolution:
-      {
-        integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==,
-      }
+    resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
   fast-deep-equal@3.1.3:
-    resolution:
-      {
-        integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==,
-      }
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
   fast-equals@5.4.0:
-    resolution:
-      {
-        integrity: sha512-jt2DW/aNFNwke7AUd+Z+e6pz39KO5rzdbbFCg2sGafS4mk13MI7Z8O5z9cADNn5lhGODIgLwug6TZO2ctf7kcw==,
-      }
-    engines: { node: '>=6.0.0' }
+    resolution: {integrity: sha512-jt2DW/aNFNwke7AUd+Z+e6pz39KO5rzdbbFCg2sGafS4mk13MI7Z8O5z9cADNn5lhGODIgLwug6TZO2ctf7kcw==}
+    engines: {node: '>=6.0.0'}
 
   fast-glob@3.3.3:
-    resolution:
-      {
-        integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==,
-      }
-    engines: { node: '>=8.6.0' }
+    resolution: {integrity: sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==}
+    engines: {node: '>=8.6.0'}
 
   fast-json-stable-stringify@2.1.0:
-    resolution:
-      {
-        integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==,
-      }
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
 
   fast-levenshtein@2.0.6:
-    resolution:
-      {
-        integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==,
-      }
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
 
   fast-safe-stringify@2.1.1:
-    resolution:
-      {
-        integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==,
-      }
+    resolution: {integrity: sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==}
 
   fast-xml-builder@1.1.0:
-    resolution:
-      {
-        integrity: sha512-7mtITW/we2/wTUZqMyBOR2F8xP4CRxMiSEcQxPIqdRWdO2L/HZSOlzoNyghmyDwNB8BDxePooV1ZTJpkOUhdRg==,
-      }
+    resolution: {integrity: sha512-7mtITW/we2/wTUZqMyBOR2F8xP4CRxMiSEcQxPIqdRWdO2L/HZSOlzoNyghmyDwNB8BDxePooV1ZTJpkOUhdRg==}
 
   fast-xml-parser@5.4.1:
-    resolution:
-      {
-        integrity: sha512-BQ30U1mKkvXQXXkAGcuyUA/GA26oEB7NzOtsxCDtyu62sjGw5QraKFhx2Em3WQNjPw9PG6MQ9yuIIgkSDfGu5A==,
-      }
+    resolution: {integrity: sha512-BQ30U1mKkvXQXXkAGcuyUA/GA26oEB7NzOtsxCDtyu62sjGw5QraKFhx2Em3WQNjPw9PG6MQ9yuIIgkSDfGu5A==}
     hasBin: true
 
   fastq@1.20.1:
-    resolution:
-      {
-        integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==,
-      }
+    resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
 
   fdir@6.5.0:
-    resolution:
-      {
-        integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==,
-      }
-    engines: { node: '>=12.0.0' }
+    resolution: {integrity: sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==}
+    engines: {node: '>=12.0.0'}
     peerDependencies:
       picomatch: ^3 || ^4
     peerDependenciesMeta:
@@ -4221,81 +2666,48 @@ packages:
         optional: true
 
   file-entry-cache@8.0.0:
-    resolution:
-      {
-        integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==,
-      }
-    engines: { node: '>=16.0.0' }
+    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
+    engines: {node: '>=16.0.0'}
 
   fill-range@7.1.1:
-    resolution:
-      {
-        integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
 
   finalhandler@1.3.2:
-    resolution:
-      {
-        integrity: sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==}
+    engines: {node: '>= 0.8'}
 
   find-root@1.1.0:
-    resolution:
-      {
-        integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==,
-      }
+    resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
 
   find-up@5.0.0:
-    resolution:
-      {
-        integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
 
   flat-cache@4.0.1:
-    resolution:
-      {
-        integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==,
-      }
-    engines: { node: '>=16' }
+    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
+    engines: {node: '>=16'}
 
   flat@5.0.2:
-    resolution:
-      {
-        integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==,
-      }
+    resolution: {integrity: sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==}
     hasBin: true
 
   flatted@3.4.1:
-    resolution:
-      {
-        integrity: sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==,
-      }
+    resolution: {integrity: sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==}
 
   focus-trap-react@10.3.1:
-    resolution:
-      {
-        integrity: sha512-PN4Ya9xf9nyj/Nd9VxBNMuD7IrlRbmaG6POAQ8VLqgtc6IY/Ln1tYakow+UIq4fihYYYFM70/2oyidE6bbiPgw==,
-      }
+    resolution: {integrity: sha512-PN4Ya9xf9nyj/Nd9VxBNMuD7IrlRbmaG6POAQ8VLqgtc6IY/Ln1tYakow+UIq4fihYYYFM70/2oyidE6bbiPgw==}
     peerDependencies:
       prop-types: ^15.8.1
       react: '>=16.3.0'
       react-dom: '>=16.3.0'
 
   focus-trap@7.8.0:
-    resolution:
-      {
-        integrity: sha512-/yNdlIkpWbM0ptxno3ONTuf+2g318kh2ez3KSeZN5dZ8YC6AAmgeWz+GasYYiBJPFaYcSAPeu4GfhUaChzIJXA==,
-      }
+    resolution: {integrity: sha512-/yNdlIkpWbM0ptxno3ONTuf+2g318kh2ez3KSeZN5dZ8YC6AAmgeWz+GasYYiBJPFaYcSAPeu4GfhUaChzIJXA==}
 
   follow-redirects@1.15.11:
-    resolution:
-      {
-        integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
+    engines: {node: '>=4.0'}
     peerDependencies:
       debug: '*'
     peerDependenciesMeta:
@@ -4303,1498 +2715,835 @@ packages:
         optional: true
 
   for-each@0.3.5:
-    resolution:
-      {
-        integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==}
+    engines: {node: '>= 0.4'}
 
   foreground-child@3.3.1:
-    resolution:
-      {
-        integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
+    engines: {node: '>=14'}
 
   form-data@4.0.5:
-    resolution:
-      {
-        integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==}
+    engines: {node: '>= 6'}
 
   formidable@3.5.4:
-    resolution:
-      {
-        integrity: sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==}
+    engines: {node: '>=14.0.0'}
 
   forwarded@0.2.0:
-    resolution:
-      {
-        integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
+    engines: {node: '>= 0.6'}
 
   fraction.js@5.3.4:
-    resolution:
-      {
-        integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==,
-      }
+    resolution: {integrity: sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==}
 
   fresh@0.5.2:
-    resolution:
-      {
-        integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==}
+    engines: {node: '>= 0.6'}
 
   fs-extra@8.1.0:
-    resolution:
-      {
-        integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==,
-      }
-    engines: { node: '>=6 <7 || >=8' }
+    resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
+    engines: {node: '>=6 <7 || >=8'}
 
   fsevents@2.3.3:
-    resolution:
-      {
-        integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==,
-      }
-    engines: { node: ^8.16.0 || ^10.6.0 || >=11.0.0 }
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
     os: [darwin]
 
   function-bind@1.1.2:
-    resolution:
-      {
-        integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==,
-      }
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
   function.prototype.name@1.1.8:
-    resolution:
-      {
-        integrity: sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==}
+    engines: {node: '>= 0.4'}
 
   functions-have-names@1.2.3:
-    resolution:
-      {
-        integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==,
-      }
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
 
   gaxios@6.7.1:
-    resolution:
-      {
-        integrity: sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==}
+    engines: {node: '>=14'}
 
   gcp-metadata@6.1.1:
-    resolution:
-      {
-        integrity: sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==}
+    engines: {node: '>=14'}
 
   generator-function@2.0.1:
-    resolution:
-      {
-        integrity: sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==}
+    engines: {node: '>= 0.4'}
 
   gensync@1.0.0-beta.2:
-    resolution:
-      {
-        integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==,
-      }
-    engines: { node: '>=6.9.0' }
+    resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==}
+    engines: {node: '>=6.9.0'}
 
   get-caller-file@2.0.5:
-    resolution:
-      {
-        integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==,
-      }
-    engines: { node: 6.* || 8.* || >= 10.* }
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
 
   get-func-name@2.0.2:
-    resolution:
-      {
-        integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==,
-      }
+    resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
 
   get-intrinsic@1.2.4:
-    resolution:
-      {
-        integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
+    engines: {node: '>= 0.4'}
 
   get-intrinsic@1.3.0:
-    resolution:
-      {
-        integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==}
+    engines: {node: '>= 0.4'}
 
   get-proto@1.0.1:
-    resolution:
-      {
-        integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==}
+    engines: {node: '>= 0.4'}
 
   get-symbol-description@1.1.0:
-    resolution:
-      {
-        integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==}
+    engines: {node: '>= 0.4'}
 
   get-tsconfig@4.13.6:
-    resolution:
-      {
-        integrity: sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==,
-      }
+    resolution: {integrity: sha512-shZT/QMiSHc/YBLxxOkMtgSid5HFoauqCE3/exfsEcwg1WkeqjG+V40yBbBrsD+jW2HDXcs28xOfcbm2jI8Ddw==}
 
   glob-parent@5.1.2:
-    resolution:
-      {
-        integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
 
   glob-parent@6.0.2:
-    resolution:
-      {
-        integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==,
-      }
-    engines: { node: '>=10.13.0' }
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
 
   glob@10.5.0:
-    resolution:
-      {
-        integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==,
-      }
+    resolution: {integrity: sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==}
     deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
     hasBin: true
 
   globalize@0.1.1:
-    resolution:
-      {
-        integrity: sha512-5e01v8eLGfuQSOvx2MsDMOWS0GFtCx1wPzQSmcHw4hkxFzrQDBO3Xwg/m8Hr/7qXMrHeOIE29qWVzyv06u1TZA==,
-      }
+    resolution: {integrity: sha512-5e01v8eLGfuQSOvx2MsDMOWS0GFtCx1wPzQSmcHw4hkxFzrQDBO3Xwg/m8Hr/7qXMrHeOIE29qWVzyv06u1TZA==}
 
   globals@14.0.0:
-    resolution:
-      {
-        integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+    engines: {node: '>=18'}
 
   globals@17.4.0:
-    resolution:
-      {
-        integrity: sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-hjrNztw/VajQwOLsMNT1cbJiH2muO3OROCHnbehc8eY5JyD2gqz4AcMHPqgaOR59DjgUjYAYLeH699g/eWi2jw==}
+    engines: {node: '>=18'}
 
   globalthis@1.0.4:
-    resolution:
-      {
-        integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
 
   globrex@0.1.2:
-    resolution:
-      {
-        integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==,
-      }
+    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
 
   google-auth-library@9.15.1:
-    resolution:
-      {
-        integrity: sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==}
+    engines: {node: '>=14'}
 
   google-logging-utils@0.0.2:
-    resolution:
-      {
-        integrity: sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==}
+    engines: {node: '>=14'}
 
   gopd@1.2.0:
-    resolution:
-      {
-        integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==}
+    engines: {node: '>= 0.4'}
 
   graceful-fs@4.2.11:
-    resolution:
-      {
-        integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==,
-      }
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
   gtoken@7.1.0:
-    resolution:
-      {
-        integrity: sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==}
+    engines: {node: '>=14.0.0'}
 
   has-bigints@1.1.0:
-    resolution:
-      {
-        integrity: sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==}
+    engines: {node: '>= 0.4'}
 
   has-flag@3.0.0:
-    resolution:
-      {
-        integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
 
   has-flag@4.0.0:
-    resolution:
-      {
-        integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
 
   has-property-descriptors@1.0.2:
-    resolution:
-      {
-        integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==,
-      }
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
 
   has-proto@1.2.0:
-    resolution:
-      {
-        integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==}
+    engines: {node: '>= 0.4'}
 
   has-symbols@1.1.0:
-    resolution:
-      {
-        integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==}
+    engines: {node: '>= 0.4'}
 
   has-tostringtag@1.0.2:
-    resolution:
-      {
-        integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
 
   hasown@2.0.2:
-    resolution:
-      {
-        integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
 
   he@1.2.0:
-    resolution:
-      {
-        integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==,
-      }
+    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
 
   hermes-estree@0.25.1:
-    resolution:
-      {
-        integrity: sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==,
-      }
+    resolution: {integrity: sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==}
 
   hermes-parser@0.25.1:
-    resolution:
-      {
-        integrity: sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==,
-      }
+    resolution: {integrity: sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==}
 
   hoist-non-react-statics@3.3.2:
-    resolution:
-      {
-        integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==,
-      }
+    resolution: {integrity: sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==}
 
   http-errors@2.0.1:
-    resolution:
-      {
-        integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
+    engines: {node: '>= 0.8'}
 
   http_ece@1.2.0:
-    resolution:
-      {
-        integrity: sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==,
-      }
-    engines: { node: '>=16' }
+    resolution: {integrity: sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==}
+    engines: {node: '>=16'}
 
   https-proxy-agent@7.0.6:
-    resolution:
-      {
-        integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==,
-      }
-    engines: { node: '>= 14' }
+    resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==}
+    engines: {node: '>= 14'}
 
   husky@9.1.7:
-    resolution:
-      {
-        integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==}
+    engines: {node: '>=18'}
     hasBin: true
 
   iconv-lite@0.4.24:
-    resolution:
-      {
-        integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
+    engines: {node: '>=0.10.0'}
 
   ignore-by-default@1.0.1:
-    resolution:
-      {
-        integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==,
-      }
+    resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==}
 
   ignore@5.3.2:
-    resolution:
-      {
-        integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==,
-      }
-    engines: { node: '>= 4' }
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
 
   ignore@7.0.5:
-    resolution:
-      {
-        integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==,
-      }
-    engines: { node: '>= 4' }
+    resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
+    engines: {node: '>= 4'}
 
   import-fresh@3.3.1:
-    resolution:
-      {
-        integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
+    engines: {node: '>=6'}
 
   imurmurhash@0.1.4:
-    resolution:
-      {
-        integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==,
-      }
-    engines: { node: '>=0.8.19' }
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
 
   inherits@2.0.4:
-    resolution:
-      {
-        integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==,
-      }
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
   internal-slot@1.1.0:
-    resolution:
-      {
-        integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==}
+    engines: {node: '>= 0.4'}
 
   invariant@2.2.4:
-    resolution:
-      {
-        integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==,
-      }
+    resolution: {integrity: sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==}
 
   ipaddr.js@1.9.1:
-    resolution:
-      {
-        integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==,
-      }
-    engines: { node: '>= 0.10' }
+    resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
+    engines: {node: '>= 0.10'}
 
   is-array-buffer@3.0.5:
-    resolution:
-      {
-        integrity: sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==}
+    engines: {node: '>= 0.4'}
 
   is-arrayish@0.2.1:
-    resolution:
-      {
-        integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==,
-      }
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
 
   is-async-function@2.1.1:
-    resolution:
-      {
-        integrity: sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==}
+    engines: {node: '>= 0.4'}
 
   is-bigint@1.1.0:
-    resolution:
-      {
-        integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==}
+    engines: {node: '>= 0.4'}
 
   is-binary-path@2.1.0:
-    resolution:
-      {
-        integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
 
   is-boolean-object@1.2.2:
-    resolution:
-      {
-        integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==}
+    engines: {node: '>= 0.4'}
 
   is-bun-module@2.0.0:
-    resolution:
-      {
-        integrity: sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==,
-      }
+    resolution: {integrity: sha512-gNCGbnnnnFAUGKeZ9PdbyeGYJqewpmc2aKHUEMO5nQPWU9lOmv7jcmQIv+qHD8fXW6W7qfuCwX4rY9LNRjXrkQ==}
 
   is-callable@1.2.7:
-    resolution:
-      {
-        integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
 
   is-core-module@2.16.1:
-    resolution:
-      {
-        integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
+    engines: {node: '>= 0.4'}
 
   is-data-view@1.0.2:
-    resolution:
-      {
-        integrity: sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==}
+    engines: {node: '>= 0.4'}
 
   is-date-object@1.1.0:
-    resolution:
-      {
-        integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==}
+    engines: {node: '>= 0.4'}
 
   is-extglob@2.1.1:
-    resolution:
-      {
-        integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
 
   is-finalizationregistry@1.1.1:
-    resolution:
-      {
-        integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==}
+    engines: {node: '>= 0.4'}
 
   is-fullwidth-code-point@3.0.0:
-    resolution:
-      {
-        integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
 
   is-generator-function@1.1.2:
-    resolution:
-      {
-        integrity: sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==}
+    engines: {node: '>= 0.4'}
 
   is-glob@4.0.3:
-    resolution:
-      {
-        integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
 
   is-map@2.0.3:
-    resolution:
-      {
-        integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==}
+    engines: {node: '>= 0.4'}
 
   is-negative-zero@2.0.3:
-    resolution:
-      {
-        integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
 
   is-number-object@1.1.1:
-    resolution:
-      {
-        integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==}
+    engines: {node: '>= 0.4'}
 
   is-number@7.0.0:
-    resolution:
-      {
-        integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==,
-      }
-    engines: { node: '>=0.12.0' }
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
 
   is-path-inside@3.0.3:
-    resolution:
-      {
-        integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
+    engines: {node: '>=8'}
 
   is-plain-obj@2.1.0:
-    resolution:
-      {
-        integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==}
+    engines: {node: '>=8'}
 
   is-regex@1.2.1:
-    resolution:
-      {
-        integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==}
+    engines: {node: '>= 0.4'}
 
   is-set@2.0.3:
-    resolution:
-      {
-        integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==}
+    engines: {node: '>= 0.4'}
 
   is-shared-array-buffer@1.0.4:
-    resolution:
-      {
-        integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==}
+    engines: {node: '>= 0.4'}
 
   is-stream@2.0.1:
-    resolution:
-      {
-        integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
+    engines: {node: '>=8'}
 
   is-string@1.1.1:
-    resolution:
-      {
-        integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==}
+    engines: {node: '>= 0.4'}
 
   is-symbol@1.1.1:
-    resolution:
-      {
-        integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==}
+    engines: {node: '>= 0.4'}
 
   is-typed-array@1.1.15:
-    resolution:
-      {
-        integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==}
+    engines: {node: '>= 0.4'}
 
   is-typedarray@1.0.0:
-    resolution:
-      {
-        integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==,
-      }
+    resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
 
   is-unicode-supported@0.1.0:
-    resolution:
-      {
-        integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
+    engines: {node: '>=10'}
 
   is-weakmap@2.0.2:
-    resolution:
-      {
-        integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==}
+    engines: {node: '>= 0.4'}
 
   is-weakref@1.1.1:
-    resolution:
-      {
-        integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==}
+    engines: {node: '>= 0.4'}
 
   is-weakset@2.0.3:
-    resolution:
-      {
-        integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==}
+    engines: {node: '>= 0.4'}
 
   isarray@2.0.5:
-    resolution:
-      {
-        integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==,
-      }
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
 
   isexe@2.0.0:
-    resolution:
-      {
-        integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==,
-      }
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
   iterator.prototype@1.1.5:
-    resolution:
-      {
-        integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==}
+    engines: {node: '>= 0.4'}
 
   jackspeak@3.4.3:
-    resolution:
-      {
-        integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==,
-      }
+    resolution: {integrity: sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==}
 
   jiti@1.21.7:
-    resolution:
-      {
-        integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==,
-      }
+    resolution: {integrity: sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==}
     hasBin: true
 
   js-object-utilities@2.2.1:
-    resolution:
-      {
-        integrity: sha512-0Ki0uXeMEga6OVM7ESxLjSaCYMdrQ46av0VomzaQT7BWNwMsEodmrtImkdD6K7SCq0ADw1uoQm4HBrsMQqtEww==,
-      }
+    resolution: {integrity: sha512-0Ki0uXeMEga6OVM7ESxLjSaCYMdrQ46av0VomzaQT7BWNwMsEodmrtImkdD6K7SCq0ADw1uoQm4HBrsMQqtEww==}
 
   js-tokens@4.0.0:
-    resolution:
-      {
-        integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==,
-      }
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
 
   js-yaml@4.1.1:
-    resolution:
-      {
-        integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==,
-      }
+    resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
 
   jsesc@3.1.0:
-    resolution:
-      {
-        integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==}
+    engines: {node: '>=6'}
     hasBin: true
 
   json-bigint@1.0.0:
-    resolution:
-      {
-        integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==,
-      }
+    resolution: {integrity: sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==}
 
   json-buffer@3.0.1:
-    resolution:
-      {
-        integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==,
-      }
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
 
   json-parse-even-better-errors@2.3.1:
-    resolution:
-      {
-        integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==,
-      }
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
   json-schema-traverse@0.4.1:
-    resolution:
-      {
-        integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==,
-      }
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
   json-stable-stringify-without-jsonify@1.0.1:
-    resolution:
-      {
-        integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==,
-      }
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
 
   json5@1.0.2:
-    resolution:
-      {
-        integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==,
-      }
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
     hasBin: true
 
   json5@2.2.3:
-    resolution:
-      {
-        integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
     hasBin: true
 
   jsonfile@4.0.0:
-    resolution:
-      {
-        integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==,
-      }
+    resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
 
   jsonwebtoken@9.0.3:
-    resolution:
-      {
-        integrity: sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==,
-      }
-    engines: { node: '>=12', npm: '>=6' }
+    resolution: {integrity: sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==}
+    engines: {node: '>=12', npm: '>=6'}
 
   jsx-ast-utils@3.3.5:
-    resolution:
-      {
-        integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==}
+    engines: {node: '>=4.0'}
 
   jwa@2.0.1:
-    resolution:
-      {
-        integrity: sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==,
-      }
+    resolution: {integrity: sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==}
 
   jws@4.0.1:
-    resolution:
-      {
-        integrity: sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==,
-      }
+    resolution: {integrity: sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==}
 
   jwt-decode@4.0.0:
-    resolution:
-      {
-        integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==,
-      }
-    engines: { node: '>=18' }
+    resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==}
+    engines: {node: '>=18'}
 
   kdbush@4.0.2:
-    resolution:
-      {
-        integrity: sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==,
-      }
+    resolution: {integrity: sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==}
 
   keyv@4.5.4:
-    resolution:
-      {
-        integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==,
-      }
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
 
   kruptein@2.2.3:
-    resolution:
-      {
-        integrity: sha512-BTwprBPTzkFT9oTugxKd3WnWrX630MqUDsnmBuoa98eQs12oD4n4TeI0GbpdGcYn/73Xueg2rfnw+oK4dovnJg==,
-      }
-    engines: { node: '>6' }
+    resolution: {integrity: sha512-BTwprBPTzkFT9oTugxKd3WnWrX630MqUDsnmBuoa98eQs12oD4n4TeI0GbpdGcYn/73Xueg2rfnw+oK4dovnJg==}
+    engines: {node: '>6'}
 
   levn@0.4.1:
-    resolution:
-      {
-        integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
 
   lilconfig@3.1.3:
-    resolution:
-      {
-        integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==}
+    engines: {node: '>=14'}
 
   lines-and-columns@1.2.4:
-    resolution:
-      {
-        integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==,
-      }
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
 
   locate-path@6.0.0:
-    resolution:
-      {
-        integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
 
   lodash-es@4.17.23:
-    resolution:
-      {
-        integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==,
-      }
+    resolution: {integrity: sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==}
 
   lodash.escaperegexp@4.1.2:
-    resolution:
-      {
-        integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==,
-      }
+    resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
 
   lodash.includes@4.3.0:
-    resolution:
-      {
-        integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==,
-      }
+    resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
 
   lodash.isboolean@3.0.3:
-    resolution:
-      {
-        integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==,
-      }
+    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
 
   lodash.isfunction@3.0.9:
-    resolution:
-      {
-        integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==,
-      }
+    resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==}
 
   lodash.isinteger@4.0.4:
-    resolution:
-      {
-        integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==,
-      }
+    resolution: {integrity: sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==}
 
   lodash.isnil@4.0.0:
-    resolution:
-      {
-        integrity: sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==,
-      }
+    resolution: {integrity: sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==}
 
   lodash.isnumber@3.0.3:
-    resolution:
-      {
-        integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==,
-      }
+    resolution: {integrity: sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==}
 
   lodash.isplainobject@4.0.6:
-    resolution:
-      {
-        integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==,
-      }
+    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
 
   lodash.isstring@4.0.1:
-    resolution:
-      {
-        integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==,
-      }
+    resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
 
   lodash.merge@4.6.2:
-    resolution:
-      {
-        integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==,
-      }
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
 
   lodash.once@4.1.1:
-    resolution:
-      {
-        integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==,
-      }
+    resolution: {integrity: sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==}
 
   lodash@4.17.23:
-    resolution:
-      {
-        integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==,
-      }
+    resolution: {integrity: sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==}
 
   log-symbols@4.1.0:
-    resolution:
-      {
-        integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+    engines: {node: '>=10'}
 
   long-timeout@0.1.1:
-    resolution:
-      {
-        integrity: sha512-BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w==,
-      }
+    resolution: {integrity: sha512-BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w==}
 
   loose-envify@1.4.0:
-    resolution:
-      {
-        integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==,
-      }
+    resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
     hasBin: true
 
   loupe@2.3.7:
-    resolution:
-      {
-        integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==,
-      }
+    resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
 
   lru-cache@10.4.3:
-    resolution:
-      {
-        integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==,
-      }
+    resolution: {integrity: sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==}
 
   lru-cache@5.1.1:
-    resolution:
-      {
-        integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==,
-      }
+    resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
   luxon@3.7.2:
-    resolution:
-      {
-        integrity: sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==}
+    engines: {node: '>=12'}
 
   make-error@1.3.6:
-    resolution:
-      {
-        integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==,
-      }
+    resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
 
   math-intrinsics@1.1.0:
-    resolution:
-      {
-        integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==}
+    engines: {node: '>= 0.4'}
 
   media-typer@0.3.0:
-    resolution:
-      {
-        integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
+    engines: {node: '>= 0.6'}
 
   memoize-one@6.0.0:
-    resolution:
-      {
-        integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==,
-      }
+    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
 
   merge-descriptors@1.0.3:
-    resolution:
-      {
-        integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==,
-      }
+    resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
 
   merge2@1.4.1:
-    resolution:
-      {
-        integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
 
   methods@1.1.2:
-    resolution:
-      {
-        integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==}
+    engines: {node: '>= 0.6'}
 
   micromatch@4.0.8:
-    resolution:
-      {
-        integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==,
-      }
-    engines: { node: '>=8.6' }
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
 
   mime-db@1.52.0:
-    resolution:
-      {
-        integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
 
   mime-types@2.1.35:
-    resolution:
-      {
-        integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
 
   mime@1.6.0:
-    resolution:
-      {
-        integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==}
+    engines: {node: '>=4'}
     hasBin: true
 
   mime@2.6.0:
-    resolution:
-      {
-        integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==,
-      }
-    engines: { node: '>=4.0.0' }
+    resolution: {integrity: sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==}
+    engines: {node: '>=4.0.0'}
     hasBin: true
 
   minimalistic-assert@1.0.1:
-    resolution:
-      {
-        integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==,
-      }
+    resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
 
   minimatch@10.2.4:
-    resolution:
-      {
-        integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==,
-      }
-    engines: { node: 18 || 20 || >=22 }
+    resolution: {integrity: sha512-oRjTw/97aTBN0RHbYCdtF1MQfvusSIBQM0IZEgzl6426+8jSC0nF1a/GmnVLpfB9yyr6g6FTqWqiZVbxrtaCIg==}
+    engines: {node: 18 || 20 || >=22}
 
   minimatch@3.1.5:
-    resolution:
-      {
-        integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==,
-      }
+    resolution: {integrity: sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==}
 
   minimatch@9.0.9:
-    resolution:
-      {
-        integrity: sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+    resolution: {integrity: sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==}
+    engines: {node: '>=16 || 14 >=14.17'}
 
   minimist@1.2.8:
-    resolution:
-      {
-        integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==,
-      }
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
   minipass@7.1.3:
-    resolution:
-      {
-        integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+    resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
+    engines: {node: '>=16 || 14 >=14.17'}
 
   mnemonist@0.38.3:
-    resolution:
-      {
-        integrity: sha512-2K9QYubXx/NAjv4VLq1d1Ly8pWNC5L3BrixtdkyTegXWJIqY+zLNDhhX/A+ZwWt70tB1S8H4BE8FLYEFyNoOBw==,
-      }
+    resolution: {integrity: sha512-2K9QYubXx/NAjv4VLq1d1Ly8pWNC5L3BrixtdkyTegXWJIqY+zLNDhhX/A+ZwWt70tB1S8H4BE8FLYEFyNoOBw==}
 
   mocha@11.7.5:
-    resolution:
-      {
-        integrity: sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==,
-      }
-    engines: { node: ^18.18.0 || ^20.9.0 || >=21.1.0 }
+    resolution: {integrity: sha512-mTT6RgopEYABzXWFx+GcJ+ZQ32kp4fMf0xvpZIIfSq9Z8lC/++MtcCnQ9t5FP2veYEP95FIYSvW+U9fV4xrlig==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
 
   moment-timezone@0.5.48:
-    resolution:
-      {
-        integrity: sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==,
-      }
+    resolution: {integrity: sha512-f22b8LV1gbTO2ms2j2z13MuPogNoh5UzxL3nzNAYKGraILnbGc9NEE6dyiiiLv46DGRb8A4kg8UKWLjPthxBHw==}
 
   moment@2.30.1:
-    resolution:
-      {
-        integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==,
-      }
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
 
   ms@2.0.0:
-    resolution:
-      {
-        integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==,
-      }
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
   ms@2.1.3:
-    resolution:
-      {
-        integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==,
-      }
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
 
   mz@2.7.0:
-    resolution:
-      {
-        integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==,
-      }
+    resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
 
   nanoid@3.3.11:
-    resolution:
-      {
-        integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==,
-      }
-    engines: { node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1 }
+    resolution: {integrity: sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
   napi-postinstall@0.3.4:
-    resolution:
-      {
-        integrity: sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==,
-      }
-    engines: { node: ^12.20.0 || ^14.18.0 || >=16.0.0 }
+    resolution: {integrity: sha512-PHI5f1O0EP5xJ9gQmFGMS6IZcrVvTjpXjz7Na41gTE7eE2hK11lg04CECCYEEjdc17EV4DO+fkGEtt7TpTaTiQ==}
+    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
     hasBin: true
 
   natural-compare@1.4.0:
-    resolution:
-      {
-        integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==,
-      }
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
 
   negotiator@0.6.3:
-    resolution:
-      {
-        integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==}
+    engines: {node: '>= 0.6'}
 
   node-exports-info@1.6.0:
-    resolution:
-      {
-        integrity: sha512-pyFS63ptit/P5WqUkt+UUfe+4oevH+bFeIiPPdfb0pFeYEu/1ELnJu5l+5EcTKYL5M7zaAa7S8ddywgXypqKCw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-pyFS63ptit/P5WqUkt+UUfe+4oevH+bFeIiPPdfb0pFeYEu/1ELnJu5l+5EcTKYL5M7zaAa7S8ddywgXypqKCw==}
+    engines: {node: '>= 0.4'}
 
   node-fetch@2.7.0:
-    resolution:
-      {
-        integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==,
-      }
-    engines: { node: 4.x || >=6.0.0 }
+    resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
+    engines: {node: 4.x || >=6.0.0}
     peerDependencies:
       encoding: ^0.1.0
     peerDependenciesMeta:
       encoding:
         optional: true
 
-  node-releases@2.0.27:
-    resolution:
-      {
-        integrity: sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==,
-      }
+  node-releases@2.0.36:
+    resolution: {integrity: sha512-TdC8FSgHz8Mwtw9g5L4gR/Sh9XhSP/0DEkQxfEFXOpiul5IiHgHan2VhYYb6agDSfp4KuvltmGApc8HMgUrIkA==}
 
   node-schedule@2.1.1:
-    resolution:
-      {
-        integrity: sha512-OXdegQq03OmXEjt2hZP33W2YPs/E5BcFQks46+G2gAxs4gHOIVD1u7EqlYLYSKsaIpyKCK9Gbk0ta1/gjRSMRQ==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-OXdegQq03OmXEjt2hZP33W2YPs/E5BcFQks46+G2gAxs4gHOIVD1u7EqlYLYSKsaIpyKCK9Gbk0ta1/gjRSMRQ==}
+    engines: {node: '>=6'}
 
   nodemon@3.1.14:
-    resolution:
-      {
-        integrity: sha512-jakjZi93UtB3jHMWsXL68FXSAosbLfY0In5gtKq3niLSkrWznrVBzXFNOEMJUfc9+Ke7SHWoAZsiMkNP3vq6Jw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-jakjZi93UtB3jHMWsXL68FXSAosbLfY0In5gtKq3niLSkrWznrVBzXFNOEMJUfc9+Ke7SHWoAZsiMkNP3vq6Jw==}
+    engines: {node: '>=10'}
     hasBin: true
 
   normalize-path@3.0.0:
-    resolution:
-      {
-        integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
 
   object-assign@4.1.1:
-    resolution:
-      {
-        integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
 
   object-hash@3.0.0:
-    resolution:
-      {
-        integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
+    engines: {node: '>= 6'}
 
   object-inspect@1.13.4:
-    resolution:
-      {
-        integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==}
+    engines: {node: '>= 0.4'}
 
   object-keys@1.1.1:
-    resolution:
-      {
-        integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
 
   object.assign@4.1.7:
-    resolution:
-      {
-        integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==}
+    engines: {node: '>= 0.4'}
 
   object.entries@1.1.9:
-    resolution:
-      {
-        integrity: sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==}
+    engines: {node: '>= 0.4'}
 
   object.fromentries@2.0.8:
-    resolution:
-      {
-        integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==}
+    engines: {node: '>= 0.4'}
 
   object.groupby@1.0.3:
-    resolution:
-      {
-        integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==}
+    engines: {node: '>= 0.4'}
 
   object.values@1.2.1:
-    resolution:
-      {
-        integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==}
+    engines: {node: '>= 0.4'}
 
   obliterator@1.6.1:
-    resolution:
-      {
-        integrity: sha512-9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig==,
-      }
+    resolution: {integrity: sha512-9WXswnqINnnhOG/5SLimUlzuU1hFJUc8zkwyD59Sd+dPOMf05PmnYG/d6Q7HZ+KmgkZJa1PxRso6QdM3sTNHig==}
 
   on-finished@2.4.1:
-    resolution:
-      {
-        integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
+    engines: {node: '>= 0.8'}
 
   on-headers@1.1.0:
-    resolution:
-      {
-        integrity: sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==}
+    engines: {node: '>= 0.8'}
 
   once@1.4.0:
-    resolution:
-      {
-        integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==,
-      }
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
 
   optionator@0.9.4:
-    resolution:
-      {
-        integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
 
   own-keys@1.0.1:
-    resolution:
-      {
-        integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==}
+    engines: {node: '>= 0.4'}
 
   p-limit@3.1.0:
-    resolution:
-      {
-        integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
 
   p-locate@5.0.0:
-    resolution:
-      {
-        integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
 
   package-json-from-dist@1.0.1:
-    resolution:
-      {
-        integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==,
-      }
+    resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==}
 
   parent-module@1.0.1:
-    resolution:
-      {
-        integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
 
   parse-json@5.2.0:
-    resolution:
-      {
-        integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
 
   parseurl@1.3.3:
-    resolution:
-      {
-        integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==}
+    engines: {node: '>= 0.8'}
 
   passport-strategy@1.0.0:
-    resolution:
-      {
-        integrity: sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==,
-      }
-    engines: { node: '>= 0.4.0' }
+    resolution: {integrity: sha512-CB97UUvDKJde2V0KDWWB3lyf6PC3FaZP7YxZ2G8OAtn9p4HI9j9JLP9qjOGZFvyl8uwNT8qM+hGnz/n16NI7oA==}
+    engines: {node: '>= 0.4.0'}
 
   passport@0.7.0:
-    resolution:
-      {
-        integrity: sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==,
-      }
-    engines: { node: '>= 0.4.0' }
+    resolution: {integrity: sha512-cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==}
+    engines: {node: '>= 0.4.0'}
 
   path-exists@4.0.0:
-    resolution:
-      {
-        integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
 
   path-expression-matcher@1.1.2:
-    resolution:
-      {
-        integrity: sha512-LXWqJmcpp2BKOEmgt4CyuESFmBfPuhJlAHKJsFzuJU6CxErWk75BrO+Ni77M9OxHN6dCYKM4vj+21Z6cOL96YQ==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-LXWqJmcpp2BKOEmgt4CyuESFmBfPuhJlAHKJsFzuJU6CxErWk75BrO+Ni77M9OxHN6dCYKM4vj+21Z6cOL96YQ==}
+    engines: {node: '>=14.0.0'}
 
   path-key@3.1.1:
-    resolution:
-      {
-        integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
 
   path-parse@1.0.7:
-    resolution:
-      {
-        integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==,
-      }
+    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
   path-scurry@1.11.1:
-    resolution:
-      {
-        integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==,
-      }
-    engines: { node: '>=16 || 14 >=14.18' }
+    resolution: {integrity: sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==}
+    engines: {node: '>=16 || 14 >=14.18'}
 
   path-to-regexp@0.1.12:
-    resolution:
-      {
-        integrity: sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==,
-      }
+    resolution: {integrity: sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==}
 
   path-type@4.0.0:
-    resolution:
-      {
-        integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
+    engines: {node: '>=8'}
 
   pathval@1.1.1:
-    resolution:
-      {
-        integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==,
-      }
+    resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
 
   pause@0.0.1:
-    resolution:
-      {
-        integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==,
-      }
+    resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==}
 
   picocolors@1.1.1:
-    resolution:
-      {
-        integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==,
-      }
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
   picomatch@2.3.1:
-    resolution:
-      {
-        integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==,
-      }
-    engines: { node: '>=8.6' }
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
 
   picomatch@4.0.3:
-    resolution:
-      {
-        integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==}
+    engines: {node: '>=12'}
 
   pify@2.3.0:
-    resolution:
-      {
-        integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
+    engines: {node: '>=0.10.0'}
 
   pirates@4.0.7:
-    resolution:
-      {
-        integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==}
+    engines: {node: '>= 6'}
 
   possible-typed-array-names@1.1.0:
-    resolution:
-      {
-        integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==}
+    engines: {node: '>= 0.4'}
 
   postcss-import@15.1.0:
-    resolution:
-      {
-        integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       postcss: ^8.0.0
 
   postcss-js@4.1.0:
-    resolution:
-      {
-        integrity: sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==,
-      }
-    engines: { node: ^12 || ^14 || >= 16 }
+    resolution: {integrity: sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==}
+    engines: {node: ^12 || ^14 || >= 16}
     peerDependencies:
       postcss: ^8.4.21
 
   postcss-load-config@6.0.1:
-    resolution:
-      {
-        integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==,
-      }
-    engines: { node: '>= 18' }
+    resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
+    engines: {node: '>= 18'}
     peerDependencies:
       jiti: '>=1.21.0'
       postcss: '>=8.0.9'
@@ -5811,148 +3560,85 @@ packages:
         optional: true
 
   postcss-nested@6.2.0:
-    resolution:
-      {
-        integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==,
-      }
-    engines: { node: '>=12.0' }
+    resolution: {integrity: sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==}
+    engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.2.14
 
   postcss-selector-parser@6.1.2:
-    resolution:
-      {
-        integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
+    engines: {node: '>=4'}
 
   postcss-value-parser@4.2.0:
-    resolution:
-      {
-        integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==,
-      }
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
 
   postcss@8.5.8:
-    resolution:
-      {
-        integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==,
-      }
-    engines: { node: ^10 || ^12 || >=14 }
+    resolution: {integrity: sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==}
+    engines: {node: ^10 || ^12 || >=14}
 
   prelude-ls@1.2.1:
-    resolution:
-      {
-        integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
 
   prettier@2.8.8:
-    resolution:
-      {
-        integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==,
-      }
-    engines: { node: '>=10.13.0' }
+    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
+    engines: {node: '>=10.13.0'}
     hasBin: true
 
   prop-types@15.8.1:
-    resolution:
-      {
-        integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==,
-      }
+    resolution: {integrity: sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==}
 
   proxy-addr@2.0.7:
-    resolution:
-      {
-        integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==,
-      }
-    engines: { node: '>= 0.10' }
+    resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==}
+    engines: {node: '>= 0.10'}
 
   proxy-from-env@1.1.0:
-    resolution:
-      {
-        integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==,
-      }
+    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
 
   pstree.remy@1.1.8:
-    resolution:
-      {
-        integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==,
-      }
+    resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
 
   punycode@2.3.1:
-    resolution:
-      {
-        integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
 
   qs@6.14.2:
-    resolution:
-      {
-        integrity: sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==,
-      }
-    engines: { node: '>=0.6' }
+    resolution: {integrity: sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==}
+    engines: {node: '>=0.6'}
 
   qs@6.15.0:
-    resolution:
-      {
-        integrity: sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==,
-      }
-    engines: { node: '>=0.6' }
+    resolution: {integrity: sha512-mAZTtNCeetKMH+pSjrb76NAM8V9a05I9aBZOHztWy/UqcJdQYNsf59vrRKWnojAT9Y+GbIvoTBC++CPHqpDBhQ==}
+    engines: {node: '>=0.6'}
 
   queue-microtask@1.2.3:
-    resolution:
-      {
-        integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==,
-      }
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
 
   random-bytes@1.0.0:
-    resolution:
-      {
-        integrity: sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==}
+    engines: {node: '>= 0.8'}
 
   randombytes@2.1.0:
-    resolution:
-      {
-        integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==,
-      }
+    resolution: {integrity: sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==}
 
   range-parser@1.2.1:
-    resolution:
-      {
-        integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
+    engines: {node: '>= 0.6'}
 
   raw-body@2.5.3:
-    resolution:
-      {
-        integrity: sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==}
+    engines: {node: '>= 0.8'}
 
   react-big-calendar@1.19.4:
-    resolution:
-      {
-        integrity: sha512-FrvbDx2LF6JAWFD96LU1jjloppC5OgIvMYUYIPzAw5Aq+ArYFPxAjLqXc4DyxfsQDN0TJTMuS/BIbcSB7Pg0YA==,
-      }
+    resolution: {integrity: sha512-FrvbDx2LF6JAWFD96LU1jjloppC5OgIvMYUYIPzAw5Aq+ArYFPxAjLqXc4DyxfsQDN0TJTMuS/BIbcSB7Pg0YA==}
     peerDependencies:
       react: ^16.14.0 || ^17 || ^18 || ^19
       react-dom: ^16.14.0 || ^17 || ^18 || ^19
 
   react-csv@2.2.2:
-    resolution:
-      {
-        integrity: sha512-RG5hOcZKZFigIGE8LxIEV/OgS1vigFQT4EkaHeKgyuCbUAu9Nbd/1RYq++bJcJJ9VOqO/n9TZRADsXNDR4VEpw==,
-      }
+    resolution: {integrity: sha512-RG5hOcZKZFigIGE8LxIEV/OgS1vigFQT4EkaHeKgyuCbUAu9Nbd/1RYq++bJcJJ9VOqO/n9TZRADsXNDR4VEpw==}
 
   react-datepicker@9.1.0:
-    resolution:
-      {
-        integrity: sha512-lOp+m5bc+ttgtB5MHEjwiVu4nlp4CvJLS/PG1OiOe5pmg9kV73pEqO8H0Geqvg2E8gjqTaL9eRhSe+ZpeKP3nA==,
-      }
+    resolution: {integrity: sha512-lOp+m5bc+ttgtB5MHEjwiVu4nlp4CvJLS/PG1OiOe5pmg9kV73pEqO8H0Geqvg2E8gjqTaL9eRhSe+ZpeKP3nA==}
     peerDependencies:
       date-fns-tz: ^3.0.0
       react: ^16.9.0 || ^17 || ^18 || ^19 || ^19.0.0-rc
@@ -5962,684 +3648,396 @@ packages:
         optional: true
 
   react-dom@18.3.1:
-    resolution:
-      {
-        integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==,
-      }
+    resolution: {integrity: sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==}
     peerDependencies:
       react: ^18.3.1
 
   react-hook-form@7.71.2:
-    resolution:
-      {
-        integrity: sha512-1CHvcDYzuRUNOflt4MOq3ZM46AronNJtQ1S7tnX6YN4y72qhgiUItpacZUAQ0TyWYci3yz1X+rXaSxiuEm86PA==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-1CHvcDYzuRUNOflt4MOq3ZM46AronNJtQ1S7tnX6YN4y72qhgiUItpacZUAQ0TyWYci3yz1X+rXaSxiuEm86PA==}
+    engines: {node: '>=18.0.0'}
     peerDependencies:
       react: ^16.8.0 || ^17 || ^18 || ^19
 
   react-is@16.13.1:
-    resolution:
-      {
-        integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==,
-      }
+    resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==}
 
   react-is@19.2.4:
-    resolution:
-      {
-        integrity: sha512-W+EWGn2v0ApPKgKKCy/7s7WHXkboGcsrXE+2joLyVxkbyVQfO3MUEaUQDHoSmb8TFFrSKYa9mw64WZHNHSDzYA==,
-      }
+    resolution: {integrity: sha512-W+EWGn2v0ApPKgKKCy/7s7WHXkboGcsrXE+2joLyVxkbyVQfO3MUEaUQDHoSmb8TFFrSKYa9mw64WZHNHSDzYA==}
 
   react-lifecycles-compat@3.0.4:
-    resolution:
-      {
-        integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==,
-      }
+    resolution: {integrity: sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==}
 
   react-overlays@5.2.1:
-    resolution:
-      {
-        integrity: sha512-GLLSOLWr21CqtJn8geSwQfoJufdt3mfdsnIiQswouuQ2MMPns+ihZklxvsTDKD3cR2tF8ELbi5xUsvqVhR6WvA==,
-      }
+    resolution: {integrity: sha512-GLLSOLWr21CqtJn8geSwQfoJufdt3mfdsnIiQswouuQ2MMPns+ihZklxvsTDKD3cR2tF8ELbi5xUsvqVhR6WvA==}
     peerDependencies:
       react: '>=16.3.0'
       react-dom: '>=16.3.0'
 
   react-refresh@0.18.0:
-    resolution:
-      {
-        integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
+    engines: {node: '>=0.10.0'}
 
   react-router-dom@6.30.3:
-    resolution:
-      {
-        integrity: sha512-pxPcv1AczD4vso7G4Z3TKcvlxK7g7TNt3/FNGMhfqyntocvYKj+GCatfigGDjbLozC4baguJ0ReCigoDJXb0ag==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-pxPcv1AczD4vso7G4Z3TKcvlxK7g7TNt3/FNGMhfqyntocvYKj+GCatfigGDjbLozC4baguJ0ReCigoDJXb0ag==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
       react-dom: '>=16.8'
 
   react-router-hash-link@2.4.3:
-    resolution:
-      {
-        integrity: sha512-NU7GWc265m92xh/aYD79Vr1W+zAIXDWp3L2YZOYP4rCqPnJ6LI6vh3+rKgkidtYijozHclaEQTAHaAaMWPVI4A==,
-      }
+    resolution: {integrity: sha512-NU7GWc265m92xh/aYD79Vr1W+zAIXDWp3L2YZOYP4rCqPnJ6LI6vh3+rKgkidtYijozHclaEQTAHaAaMWPVI4A==}
     peerDependencies:
       react: '>=15'
       react-router-dom: '>=4'
 
   react-router@6.30.3:
-    resolution:
-      {
-        integrity: sha512-XRnlbKMTmktBkjCLE8/XcZFlnHvr2Ltdr1eJX4idL55/9BbORzyZEaIkBFDhFGCEWBBItsVrDxwx3gnisMitdw==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-XRnlbKMTmktBkjCLE8/XcZFlnHvr2Ltdr1eJX4idL55/9BbORzyZEaIkBFDhFGCEWBBItsVrDxwx3gnisMitdw==}
+    engines: {node: '>=14.0.0'}
     peerDependencies:
       react: '>=16.8'
 
   react-select@5.10.2:
-    resolution:
-      {
-        integrity: sha512-Z33nHdEFWq9tfnfVXaiM12rbJmk+QjFEztWLtmXqQhz6Al4UZZ9xc0wiatmGtUOCCnHN0WizL3tCMYRENX4rVQ==,
-      }
+    resolution: {integrity: sha512-Z33nHdEFWq9tfnfVXaiM12rbJmk+QjFEztWLtmXqQhz6Al4UZZ9xc0wiatmGtUOCCnHN0WizL3tCMYRENX4rVQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
 
   react-transition-group@4.4.5:
-    resolution:
-      {
-        integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==,
-      }
+    resolution: {integrity: sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==}
     peerDependencies:
       react: '>=16.6.0'
       react-dom: '>=16.6.0'
 
   react@18.3.1:
-    resolution:
-      {
-        integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==}
+    engines: {node: '>=0.10.0'}
 
   reactjs-popup@2.0.6:
-    resolution:
-      {
-        integrity: sha512-A+tt+x9wdgZiZjv0e2WzYLD3IfFwJALaRaqwrCSXGjo0iQdsry/EtBEbQXRSmQs7cHmOi5eytCiSlOm8k4C+dg==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-A+tt+x9wdgZiZjv0e2WzYLD3IfFwJALaRaqwrCSXGjo0iQdsry/EtBEbQXRSmQs7cHmOi5eytCiSlOm8k4C+dg==}
+    engines: {node: '>=10'}
     peerDependencies:
       react: '>=16'
       react-dom: '>=16'
 
   read-cache@1.0.0:
-    resolution:
-      {
-        integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==,
-      }
+    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
 
   readdirp@3.6.0:
-    resolution:
-      {
-        integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==,
-      }
-    engines: { node: '>=8.10.0' }
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
 
   readdirp@4.1.2:
-    resolution:
-      {
-        integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==,
-      }
-    engines: { node: '>= 14.18.0' }
+    resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
+    engines: {node: '>= 14.18.0'}
 
   reflect.getprototypeof@1.0.10:
-    resolution:
-      {
-        integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
+    engines: {node: '>= 0.4'}
 
   regexp.prototype.flags@1.5.4:
-    resolution:
-      {
-        integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==}
+    engines: {node: '>= 0.4'}
 
   require-directory@2.1.1:
-    resolution:
-      {
-        integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
 
   resolve-from@4.0.0:
-    resolution:
-      {
-        integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
 
   resolve-pkg-maps@1.0.0:
-    resolution:
-      {
-        integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==,
-      }
+    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
 
   resolve@1.22.11:
-    resolution:
-      {
-        integrity: sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==}
+    engines: {node: '>= 0.4'}
     hasBin: true
 
   resolve@2.0.0-next.6:
-    resolution:
-      {
-        integrity: sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-3JmVl5hMGtJ3kMmB3zi3DL25KfkCEyy3Tw7Gmw7z5w8M9WlwoPFnIvwChzu1+cF3iaK3sp18hhPz8ANeimdJfA==}
+    engines: {node: '>= 0.4'}
     hasBin: true
 
   retry@0.12.0:
-    resolution:
-      {
-        integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==,
-      }
-    engines: { node: '>= 4' }
+    resolution: {integrity: sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==}
+    engines: {node: '>= 4'}
 
   reusify@1.1.0:
-    resolution:
-      {
-        integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==,
-      }
-    engines: { iojs: '>=1.0.0', node: '>=0.10.0' }
+    resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
 
   rollup@4.59.0:
-    resolution:
-      {
-        integrity: sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==,
-      }
-    engines: { node: '>=18.0.0', npm: '>=8.0.0' }
+    resolution: {integrity: sha512-2oMpl67a3zCH9H79LeMcbDhXW/UmWG/y2zuqnF2jQq5uq9TbM9TVyXvA4+t+ne2IIkBdrLpAaRQAvo7YI/Yyeg==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
 
   run-parallel@1.2.0:
-    resolution:
-      {
-        integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==,
-      }
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
 
   safe-array-concat@1.1.3:
-    resolution:
-      {
-        integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==,
-      }
-    engines: { node: '>=0.4' }
+    resolution: {integrity: sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==}
+    engines: {node: '>=0.4'}
 
   safe-buffer@5.2.1:
-    resolution:
-      {
-        integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==,
-      }
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
   safe-push-apply@1.0.0:
-    resolution:
-      {
-        integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==}
+    engines: {node: '>= 0.4'}
 
   safe-regex-test@1.1.0:
-    resolution:
-      {
-        integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==}
+    engines: {node: '>= 0.4'}
 
   safer-buffer@2.1.2:
-    resolution:
-      {
-        integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==,
-      }
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
   sax@1.5.0:
-    resolution:
-      {
-        integrity: sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==,
-      }
-    engines: { node: '>=11.0.0' }
+    resolution: {integrity: sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==}
+    engines: {node: '>=11.0.0'}
 
   scheduler@0.23.2:
-    resolution:
-      {
-        integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==,
-      }
+    resolution: {integrity: sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==}
 
   semver@6.3.1:
-    resolution:
-      {
-        integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==,
-      }
+    resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
     hasBin: true
 
   semver@7.7.4:
-    resolution:
-      {
-        integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==}
+    engines: {node: '>=10'}
     hasBin: true
 
   send@0.19.2:
-    resolution:
-      {
-        integrity: sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==}
+    engines: {node: '>= 0.8.0'}
 
   serialize-javascript@6.0.2:
-    resolution:
-      {
-        integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==,
-      }
+    resolution: {integrity: sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==}
 
   serve-static@1.16.3:
-    resolution:
-      {
-        integrity: sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==}
+    engines: {node: '>= 0.8.0'}
 
   session-file-store@1.5.0:
-    resolution:
-      {
-        integrity: sha512-60IZaJNzyu2tIeHutkYE8RiXVx3KRvacOxfLr2Mj92SIsRIroDsH0IlUUR6fJAjoTW4RQISbaOApa2IZpIwFdQ==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-60IZaJNzyu2tIeHutkYE8RiXVx3KRvacOxfLr2Mj92SIsRIroDsH0IlUUR6fJAjoTW4RQISbaOApa2IZpIwFdQ==}
+    engines: {node: '>= 6'}
 
   set-function-length@1.2.2:
-    resolution:
-      {
-        integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
 
   set-function-name@2.0.2:
-    resolution:
-      {
-        integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
 
   set-proto@1.0.0:
-    resolution:
-      {
-        integrity: sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==}
+    engines: {node: '>= 0.4'}
 
   setprototypeof@1.2.0:
-    resolution:
-      {
-        integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==,
-      }
+    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
   shebang-command@2.0.0:
-    resolution:
-      {
-        integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
 
   shebang-regex@3.0.0:
-    resolution:
-      {
-        integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
 
   side-channel-list@1.0.0:
-    resolution:
-      {
-        integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
+    engines: {node: '>= 0.4'}
 
   side-channel-map@1.0.1:
-    resolution:
-      {
-        integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==}
+    engines: {node: '>= 0.4'}
 
   side-channel-weakmap@1.0.2:
-    resolution:
-      {
-        integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==}
+    engines: {node: '>= 0.4'}
 
   side-channel@1.1.0:
-    resolution:
-      {
-        integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==}
+    engines: {node: '>= 0.4'}
 
   signal-exit@3.0.7:
-    resolution:
-      {
-        integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==,
-      }
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
   signal-exit@4.1.0:
-    resolution:
-      {
-        integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==,
-      }
-    engines: { node: '>=14' }
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
 
   simple-update-notifier@2.0.0:
-    resolution:
-      {
-        integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==}
+    engines: {node: '>=10'}
 
   sorted-array-functions@1.3.0:
-    resolution:
-      {
-        integrity: sha512-2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==,
-      }
+    resolution: {integrity: sha512-2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==}
 
   source-map-js@1.2.1:
-    resolution:
-      {
-        integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
 
   source-map-support@0.5.21:
-    resolution:
-      {
-        integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==,
-      }
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
 
   source-map@0.5.7:
-    resolution:
-      {
-        integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
+    engines: {node: '>=0.10.0'}
 
   source-map@0.6.1:
-    resolution:
-      {
-        integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
 
   stable-hash-x@0.2.0:
-    resolution:
-      {
-        integrity: sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==,
-      }
-    engines: { node: '>=12.0.0' }
+    resolution: {integrity: sha512-o3yWv49B/o4QZk5ZcsALc6t0+eCelPc44zZsLtCQnZPDwFpDYSWcDnrv2TtMmMbQ7uKo3J0HTURCqckw23czNQ==}
+    engines: {node: '>=12.0.0'}
 
   statuses@2.0.2:
-    resolution:
-      {
-        integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==}
+    engines: {node: '>= 0.8'}
 
   stop-iteration-iterator@1.1.0:
-    resolution:
-      {
-        integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==}
+    engines: {node: '>= 0.4'}
 
   string-width@4.2.3:
-    resolution:
-      {
-        integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
 
   string-width@5.1.2:
-    resolution:
-      {
-        integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
 
   string.prototype.matchall@4.0.12:
-    resolution:
-      {
-        integrity: sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==}
+    engines: {node: '>= 0.4'}
 
   string.prototype.repeat@1.0.0:
-    resolution:
-      {
-        integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==,
-      }
+    resolution: {integrity: sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==}
 
   string.prototype.trim@1.2.10:
-    resolution:
-      {
-        integrity: sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==}
+    engines: {node: '>= 0.4'}
 
   string.prototype.trimend@1.0.9:
-    resolution:
-      {
-        integrity: sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==}
+    engines: {node: '>= 0.4'}
 
   string.prototype.trimstart@1.0.8:
-    resolution:
-      {
-        integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
 
   strip-ansi@6.0.1:
-    resolution:
-      {
-        integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
 
   strip-ansi@7.2.0:
-    resolution:
-      {
-        integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==}
+    engines: {node: '>=12'}
 
   strip-bom@3.0.0:
-    resolution:
-      {
-        integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
+    engines: {node: '>=4'}
 
   strip-json-comments@3.1.1:
-    resolution:
-      {
-        integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
 
   strnum@2.2.0:
-    resolution:
-      {
-        integrity: sha512-Y7Bj8XyJxnPAORMZj/xltsfo55uOiyHcU2tnAVzHUnSJR/KsEX+9RoDeXEnsXtl/CX4fAcrt64gZ13aGaWPeBg==,
-      }
+    resolution: {integrity: sha512-Y7Bj8XyJxnPAORMZj/xltsfo55uOiyHcU2tnAVzHUnSJR/KsEX+9RoDeXEnsXtl/CX4fAcrt64gZ13aGaWPeBg==}
 
   stylis@4.2.0:
-    resolution:
-      {
-        integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==,
-      }
+    resolution: {integrity: sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==}
 
   sucrase@3.35.1:
-    resolution:
-      {
-        integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==,
-      }
-    engines: { node: '>=16 || 14 >=14.17' }
+    resolution: {integrity: sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==}
+    engines: {node: '>=16 || 14 >=14.17'}
     hasBin: true
 
   superagent@10.3.0:
-    resolution:
-      {
-        integrity: sha512-B+4Ik7ROgVKrQsXTV0Jwp2u+PXYLSlqtDAhYnkkD+zn3yg8s/zjA2MeGayPoY/KICrbitwneDHrjSotxKL+0XQ==,
-      }
-    engines: { node: '>=14.18.0' }
+    resolution: {integrity: sha512-B+4Ik7ROgVKrQsXTV0Jwp2u+PXYLSlqtDAhYnkkD+zn3yg8s/zjA2MeGayPoY/KICrbitwneDHrjSotxKL+0XQ==}
+    engines: {node: '>=14.18.0'}
 
   supercluster@8.0.1:
-    resolution:
-      {
-        integrity: sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==,
-      }
+    resolution: {integrity: sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==}
 
   supertest@7.2.2:
-    resolution:
-      {
-        integrity: sha512-oK8WG9diS3DlhdUkcFn4tkNIiIbBx9lI2ClF8K+b2/m8Eyv47LSawxUzZQSNKUrVb2KsqeTDCcjAAVPYaSLVTA==,
-      }
-    engines: { node: '>=14.18.0' }
+    resolution: {integrity: sha512-oK8WG9diS3DlhdUkcFn4tkNIiIbBx9lI2ClF8K+b2/m8Eyv47LSawxUzZQSNKUrVb2KsqeTDCcjAAVPYaSLVTA==}
+    engines: {node: '>=14.18.0'}
 
   supports-color@5.5.0:
-    resolution:
-      {
-        integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
 
   supports-color@7.2.0:
-    resolution:
-      {
-        integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==,
-      }
-    engines: { node: '>=8' }
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
 
   supports-color@8.1.1:
-    resolution:
-      {
-        integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==}
+    engines: {node: '>=10'}
 
   supports-preserve-symlinks-flag@1.0.0:
-    resolution:
-      {
-        integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
+    engines: {node: '>= 0.4'}
 
   tabbable@6.4.0:
-    resolution:
-      {
-        integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==,
-      }
+    resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==}
 
   tailwindcss@3.4.19:
-    resolution:
-      {
-        integrity: sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==,
-      }
-    engines: { node: '>=14.0.0' }
+    resolution: {integrity: sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==}
+    engines: {node: '>=14.0.0'}
     hasBin: true
 
   thenify-all@1.6.0:
-    resolution:
-      {
-        integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==,
-      }
-    engines: { node: '>=0.8' }
+    resolution: {integrity: sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==}
+    engines: {node: '>=0.8'}
 
   thenify@3.3.1:
-    resolution:
-      {
-        integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==,
-      }
+    resolution: {integrity: sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==}
 
   tinyglobby@0.2.15:
-    resolution:
-      {
-        integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==,
-      }
-    engines: { node: '>=12.0.0' }
+    resolution: {integrity: sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==}
+    engines: {node: '>=12.0.0'}
 
   to-regex-range@5.0.1:
-    resolution:
-      {
-        integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==,
-      }
-    engines: { node: '>=8.0' }
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
 
   toidentifier@1.0.1:
-    resolution:
-      {
-        integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==,
-      }
-    engines: { node: '>=0.6' }
+    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
+    engines: {node: '>=0.6'}
 
   touch@3.1.1:
-    resolution:
-      {
-        integrity: sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==,
-      }
+    resolution: {integrity: sha512-r0eojU4bI8MnHr8c5bNo7lJDdI2qXlWWJk6a9EAFG7vbhTjElYhBVS3/miuE0uOuoLdb8Mc/rVfsmm6eo5o9GA==}
     hasBin: true
 
   tr46@0.0.3:
-    resolution:
-      {
-        integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==,
-      }
+    resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
   ts-api-utils@2.4.0:
-    resolution:
-      {
-        integrity: sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==,
-      }
-    engines: { node: '>=18.12' }
+    resolution: {integrity: sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==}
+    engines: {node: '>=18.12'}
     peerDependencies:
       typescript: '>=4.8.4'
 
   ts-interface-checker@0.1.13:
-    resolution:
-      {
-        integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==,
-      }
+    resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
   ts-node@9.1.1:
-    resolution:
-      {
-        integrity: sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==,
-      }
-    engines: { node: '>=10.0.0' }
+    resolution: {integrity: sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==}
+    engines: {node: '>=10.0.0'}
     hasBin: true
     peerDependencies:
       typescript: '>=2.7'
 
   tsconfck@3.1.6:
-    resolution:
-      {
-        integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==,
-      }
-    engines: { node: ^18 || >=20 }
+    resolution: {integrity: sha512-ks6Vjr/jEw0P1gmOVwutM3B7fWxoWBL2KRDb1JfqGVawBmO5UsvmWOQFGHBPl5yxYz4eERr19E6L7NMv+Fej4w==}
+    engines: {node: ^18 || >=20}
     hasBin: true
     peerDependencies:
       typescript: ^5.0.0
@@ -6648,154 +4046,88 @@ packages:
         optional: true
 
   tsconfig-paths@3.15.0:
-    resolution:
-      {
-        integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==,
-      }
+    resolution: {integrity: sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==}
 
   tslib@2.8.1:
-    resolution:
-      {
-        integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==,
-      }
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
 
   type-check@0.4.0:
-    resolution:
-      {
-        integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==,
-      }
-    engines: { node: '>= 0.8.0' }
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
 
   type-detect@4.1.0:
-    resolution:
-      {
-        integrity: sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==,
-      }
-    engines: { node: '>=4' }
+    resolution: {integrity: sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==}
+    engines: {node: '>=4'}
 
   type-is@1.6.18:
-    resolution:
-      {
-        integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==,
-      }
-    engines: { node: '>= 0.6' }
+    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
+    engines: {node: '>= 0.6'}
 
   typed-array-buffer@1.0.3:
-    resolution:
-      {
-        integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==}
+    engines: {node: '>= 0.4'}
 
   typed-array-byte-length@1.0.3:
-    resolution:
-      {
-        integrity: sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==}
+    engines: {node: '>= 0.4'}
 
   typed-array-byte-offset@1.0.4:
-    resolution:
-      {
-        integrity: sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==}
+    engines: {node: '>= 0.4'}
 
   typed-array-length@1.0.7:
-    resolution:
-      {
-        integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==}
+    engines: {node: '>= 0.4'}
 
   typedarray-to-buffer@3.1.5:
-    resolution:
-      {
-        integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==,
-      }
+    resolution: {integrity: sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==}
 
   typescript@5.9.3:
-    resolution:
-      {
-        integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==,
-      }
-    engines: { node: '>=14.17' }
+    resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
+    engines: {node: '>=14.17'}
     hasBin: true
 
   uid-safe@2.1.5:
-    resolution:
-      {
-        integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==}
+    engines: {node: '>= 0.8'}
 
   unbox-primitive@1.1.0:
-    resolution:
-      {
-        integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==}
+    engines: {node: '>= 0.4'}
 
   uncontrollable@7.2.1:
-    resolution:
-      {
-        integrity: sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==,
-      }
+    resolution: {integrity: sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==}
     peerDependencies:
       react: '>=15.0.0'
 
   undefsafe@2.0.5:
-    resolution:
-      {
-        integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==,
-      }
+    resolution: {integrity: sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==}
 
   undici-types@6.21.0:
-    resolution:
-      {
-        integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==,
-      }
+    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
   universalify@0.1.2:
-    resolution:
-      {
-        integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==,
-      }
-    engines: { node: '>= 4.0.0' }
+    resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
+    engines: {node: '>= 4.0.0'}
 
   unpipe@1.0.0:
-    resolution:
-      {
-        integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
+    engines: {node: '>= 0.8'}
 
   unrs-resolver@1.11.1:
-    resolution:
-      {
-        integrity: sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==,
-      }
+    resolution: {integrity: sha512-bSjt9pjaEBnNiGgc9rUiHGKv5l4/TGzDmYw3RhnkJGtLhbnnA/5qJj7x3dNDCRx/PJxu774LlH8lCOlB4hEfKg==}
 
   update-browserslist-db@1.2.2:
-    resolution:
-      {
-        integrity: sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA==,
-      }
+    resolution: {integrity: sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA==}
     hasBin: true
     peerDependencies:
       browserslist: '>= 4.21.0'
 
   uri-js@4.4.1:
-    resolution:
-      {
-        integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==,
-      }
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
 
   use-isomorphic-layout-effect@1.2.1:
-    resolution:
-      {
-        integrity: sha512-tpZZ+EX0gaghDAiFR37hj5MgY6ZN55kLiPkJsKxBMZ6GZdOSPJXiOzPM984oPYZ5AnehYx5WQp1+ME8I/P/pRA==,
-      }
+    resolution: {integrity: sha512-tpZZ+EX0gaghDAiFR37hj5MgY6ZN55kLiPkJsKxBMZ6GZdOSPJXiOzPM984oPYZ5AnehYx5WQp1+ME8I/P/pRA==}
     peerDependencies:
       '@types/react': '*'
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
@@ -6804,58 +4136,34 @@ packages:
         optional: true
 
   util-deprecate@1.0.2:
-    resolution:
-      {
-        integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==,
-      }
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
   utils-merge@1.0.1:
-    resolution:
-      {
-        integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==,
-      }
-    engines: { node: '>= 0.4.0' }
+    resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
+    engines: {node: '>= 0.4.0'}
 
   uuid@10.0.0:
-    resolution:
-      {
-        integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==,
-      }
+    resolution: {integrity: sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==}
     hasBin: true
 
   uuid@13.0.0:
-    resolution:
-      {
-        integrity: sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==,
-      }
+    resolution: {integrity: sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==}
     hasBin: true
 
   uuid@9.0.1:
-    resolution:
-      {
-        integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==,
-      }
+    resolution: {integrity: sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==}
     hasBin: true
 
   validator@13.15.26:
-    resolution:
-      {
-        integrity: sha512-spH26xU080ydGggxRyR1Yhcbgx+j3y5jbNXk/8L+iRvdIEQ4uTRH2Sgf2dokud6Q4oAtsbNvJ1Ft+9xmm6IZcA==,
-      }
-    engines: { node: '>= 0.10' }
+    resolution: {integrity: sha512-spH26xU080ydGggxRyR1Yhcbgx+j3y5jbNXk/8L+iRvdIEQ4uTRH2Sgf2dokud6Q4oAtsbNvJ1Ft+9xmm6IZcA==}
+    engines: {node: '>= 0.10'}
 
   vary@1.1.2:
-    resolution:
-      {
-        integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==,
-      }
-    engines: { node: '>= 0.8' }
+    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
+    engines: {node: '>= 0.8'}
 
   vite-tsconfig-paths@5.1.4:
-    resolution:
-      {
-        integrity: sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==,
-      }
+    resolution: {integrity: sha512-cYj0LRuLV2c2sMqhqhGpaO3LretdtMn/BVX4cPLanIZuwwrkVl+lK84E/miEXkCHWXuq65rhNN4rXsBcOB3S4w==}
     peerDependencies:
       vite: '*'
     peerDependenciesMeta:
@@ -6863,11 +4171,8 @@ packages:
         optional: true
 
   vite@7.3.1:
-    resolution:
-      {
-        integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==,
-      }
-    engines: { node: ^20.19.0 || >=22.12.0 }
+    resolution: {integrity: sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==}
+    engines: {node: ^20.19.0 || >=22.12.0}
     hasBin: true
     peerDependencies:
       '@types/node': ^20.19.0 || >=22.12.0
@@ -6906,232 +4211,134 @@ packages:
         optional: true
 
   warning@4.0.3:
-    resolution:
-      {
-        integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==,
-      }
+    resolution: {integrity: sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==}
 
   web-push@3.6.7:
-    resolution:
-      {
-        integrity: sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==,
-      }
-    engines: { node: '>= 16' }
+    resolution: {integrity: sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==}
+    engines: {node: '>= 16'}
     hasBin: true
 
   webidl-conversions@3.0.1:
-    resolution:
-      {
-        integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==,
-      }
+    resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
   whatwg-url@5.0.0:
-    resolution:
-      {
-        integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==,
-      }
+    resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
   which-boxed-primitive@1.1.1:
-    resolution:
-      {
-        integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==}
+    engines: {node: '>= 0.4'}
 
   which-builtin-type@1.2.1:
-    resolution:
-      {
-        integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==}
+    engines: {node: '>= 0.4'}
 
   which-collection@1.0.2:
-    resolution:
-      {
-        integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==}
+    engines: {node: '>= 0.4'}
 
   which-typed-array@1.1.20:
-    resolution:
-      {
-        integrity: sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==,
-      }
-    engines: { node: '>= 0.4' }
+    resolution: {integrity: sha512-LYfpUkmqwl0h9A2HL09Mms427Q1RZWuOHsukfVcKRq9q95iQxdw0ix1JQrqbcDR9PH1QDwf5Qo8OZb5lksZ8Xg==}
+    engines: {node: '>= 0.4'}
 
   which@2.0.2:
-    resolution:
-      {
-        integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==,
-      }
-    engines: { node: '>= 8' }
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
     hasBin: true
 
   word-wrap@1.2.5:
-    resolution:
-      {
-        integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==,
-      }
-    engines: { node: '>=0.10.0' }
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
 
   workerpool@9.3.4:
-    resolution:
-      {
-        integrity: sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==,
-      }
+    resolution: {integrity: sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==}
 
   wrap-ansi@7.0.0:
-    resolution:
-      {
-        integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
 
   wrap-ansi@8.1.0:
-    resolution:
-      {
-        integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
 
   wrappy@1.0.2:
-    resolution:
-      {
-        integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==,
-      }
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
 
   write-file-atomic@3.0.3:
-    resolution:
-      {
-        integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==,
-      }
+    resolution: {integrity: sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==}
 
   xml-crypto@6.1.2:
-    resolution:
-      {
-        integrity: sha512-leBOVQdVi8FvPJrMYoum7Ici9qyxfE4kVi+AkpUoYCSXaQF4IlBm1cneTK9oAxR61LpYxTx7lNcsnBIeRpGW2w==,
-      }
-    engines: { node: '>=16' }
+    resolution: {integrity: sha512-leBOVQdVi8FvPJrMYoum7Ici9qyxfE4kVi+AkpUoYCSXaQF4IlBm1cneTK9oAxR61LpYxTx7lNcsnBIeRpGW2w==}
+    engines: {node: '>=16'}
 
   xml-encryption@3.1.0:
-    resolution:
-      {
-        integrity: sha512-PV7qnYpoAMXbf1kvQkqMScLeQpjCMixddAKq9PtqVrho8HnYbBOWNfG0kA4R7zxQDo7w9kiYAyzS/ullAyO55Q==,
-      }
+    resolution: {integrity: sha512-PV7qnYpoAMXbf1kvQkqMScLeQpjCMixddAKq9PtqVrho8HnYbBOWNfG0kA4R7zxQDo7w9kiYAyzS/ullAyO55Q==}
 
   xml2js@0.6.2:
-    resolution:
-      {
-        integrity: sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==,
-      }
-    engines: { node: '>=4.0.0' }
+    resolution: {integrity: sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==}
+    engines: {node: '>=4.0.0'}
 
   xmlbuilder@11.0.1:
-    resolution:
-      {
-        integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==,
-      }
-    engines: { node: '>=4.0' }
+    resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==}
+    engines: {node: '>=4.0'}
 
   xmlbuilder@15.1.1:
-    resolution:
-      {
-        integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==,
-      }
-    engines: { node: '>=8.0' }
+    resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==}
+    engines: {node: '>=8.0'}
 
   xpath@0.0.32:
-    resolution:
-      {
-        integrity: sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==,
-      }
-    engines: { node: '>=0.6.0' }
+    resolution: {integrity: sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==}
+    engines: {node: '>=0.6.0'}
 
   xpath@0.0.33:
-    resolution:
-      {
-        integrity: sha512-NNXnzrkDrAzalLhIUc01jO2mOzXGXh1JwPgkihcLLzw98c0WgYDmmjSh1Kl3wzaxSVWMuA+fe0WTWOBDWCBmNA==,
-      }
-    engines: { node: '>=0.6.0' }
+    resolution: {integrity: sha512-NNXnzrkDrAzalLhIUc01jO2mOzXGXh1JwPgkihcLLzw98c0WgYDmmjSh1Kl3wzaxSVWMuA+fe0WTWOBDWCBmNA==}
+    engines: {node: '>=0.6.0'}
 
   xpath@0.0.34:
-    resolution:
-      {
-        integrity: sha512-FxF6+rkr1rNSQrhUNYrAFJpRXNzlDoMxeXN5qI84939ylEv3qqPFKa85Oxr6tDaJKqwW6KKyo2v26TSv3k6LeA==,
-      }
-    engines: { node: '>=0.6.0' }
+    resolution: {integrity: sha512-FxF6+rkr1rNSQrhUNYrAFJpRXNzlDoMxeXN5qI84939ylEv3qqPFKa85Oxr6tDaJKqwW6KKyo2v26TSv3k6LeA==}
+    engines: {node: '>=0.6.0'}
 
   y18n@5.0.8:
-    resolution:
-      {
-        integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
 
   yallist@3.1.1:
-    resolution:
-      {
-        integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==,
-      }
+    resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==}
 
   yaml@1.10.2:
-    resolution:
-      {
-        integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==,
-      }
-    engines: { node: '>= 6' }
+    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
+    engines: {node: '>= 6'}
 
   yargs-parser@21.1.1:
-    resolution:
-      {
-        integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
 
   yargs-unparser@2.0.0:
-    resolution:
-      {
-        integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==}
+    engines: {node: '>=10'}
 
   yargs@17.7.2:
-    resolution:
-      {
-        integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==,
-      }
-    engines: { node: '>=12' }
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
 
   yn@3.1.1:
-    resolution:
-      {
-        integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==,
-      }
-    engines: { node: '>=6' }
+    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
+    engines: {node: '>=6'}
 
   yocto-queue@0.1.0:
-    resolution:
-      {
-        integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==,
-      }
-    engines: { node: '>=10' }
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
 
   zod-validation-error@4.0.2:
-    resolution:
-      {
-        integrity: sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==,
-      }
-    engines: { node: '>=18.0.0' }
+    resolution: {integrity: sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==}
+    engines: {node: '>=18.0.0'}
     peerDependencies:
       zod: ^3.25.0 || ^4.0.0
 
   zod@4.3.6:
-    resolution:
-      {
-        integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==,
-      }
+    resolution: {integrity: sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==}
 
 snapshots:
+
   '@alloc/quick-lru@5.2.0': {}
 
   '@aws-crypto/crc32@5.2.0':
@@ -9388,7 +6595,7 @@ snapshots:
       baseline-browser-mapping: 2.9.3
       caniuse-lite: 1.0.30001759
       electron-to-chromium: 1.5.266
-      node-releases: 2.0.27
+      node-releases: 2.0.36
       update-browserslist-db: 1.2.2(browserslist@4.28.1)
 
   buffer-equal-constant-time@1.0.1: {}
@@ -10815,7 +8022,7 @@ snapshots:
     dependencies:
       whatwg-url: 5.0.0
 
-  node-releases@2.0.27: {}
+  node-releases@2.0.36: {}
 
   node-schedule@2.1.1:
     dependencies:

From 2c6260cd6a60d6da59d641ec56ec7b0e2187024e Mon Sep 17 00:00:00 2001
From: Matthew Kim <mk2672@cornell.edu>
Date: Sun, 22 Mar 2026 14:12:49 -0400
Subject: [PATCH 04/10] Fix types

---
 .../src/components/RiderComponents/RequestRideMap.tsx  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/RiderComponents/RequestRideMap.tsx b/frontend/src/components/RiderComponents/RequestRideMap.tsx
index f78f2d561..5c2ee4a25 100644
--- a/frontend/src/components/RiderComponents/RequestRideMap.tsx
+++ b/frontend/src/components/RiderComponents/RequestRideMap.tsx
@@ -24,13 +24,13 @@ interface RequestRideMapProps {
     name: string;
     address: string;
   }>;
-  availableLocations?: Location[];
+  availableLocations?: LocationType[];
   /** When true, clicking the map sets the pickup location (e.g. when there are no DB locations). */
   enablePickupMapClick?: boolean;
   /** When true, clicking the map sets the dropoff location. */
   enableDropoffMapClick?: boolean;
-  onPickupSelect: (location: Location | null) => void;
-  onDropoffSelect: (location: Location | null) => void;
+  onPickupSelect: (location: LocationType | null) => void;
+  onDropoffSelect: (location: LocationType | null) => void;
 }
 
 const RequestRideMap: React.FC<RequestRideMapProps> = ({
@@ -179,7 +179,7 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
       )
         return;
 
-      const locationFromClick: Location = {
+      const locationFromClick: LocationType = {
         id: 'custom',
         name: 'Selected location',
         address: `${lat.toFixed(6)}, ${lng.toFixed(6)}`,
@@ -191,7 +191,7 @@ const RequestRideMap: React.FC<RequestRideMapProps> = ({
       };
 
       const applyGeocoded = (
-        loc: Location,
+        loc: LocationType,
         results: google.maps.GeocoderResult[] | null
       ) => {
         if (results?.[0]?.formatted_address) {

From ffbadd9f703b791ea439cbf9c168ce9c1ed37621 Mon Sep 17 00:00:00 2001
From: Matthew Kim <mk2672@cornell.edu>
Date: Sun, 22 Mar 2026 14:41:33 -0400
Subject: [PATCH 05/10] Fix switch/case syntax

---
 .../src/components/RequestRideModal/RequestRideWizard.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/RequestRideModal/RequestRideWizard.tsx b/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
index 2d555f541..bbdb6a4fa 100644
--- a/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
+++ b/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
@@ -1,8 +1,7 @@
 import React, { useState } from 'react';
 import { useFormContext } from 'react-hook-form';
-import { Ride } from '../../types';
+import { RideType } from '@carriage-web/shared/types/ride';
 import { RideModalType } from './types';
-import { Button } from '../FormElements/FormElements';
 import DateStep from './steps/DateStep';
 import PickupLocationStep from './steps/PickupLocationStep';
 import DropoffLocationStep from './steps/DropoffLocationStep';
@@ -12,7 +11,7 @@ import styles from './requestridemodal.module.css';
 export type WizardStep = 'date' | 'pickup' | 'dropoff' | 'summary';
 
 type RequestRideWizardProps = {
-  ride?: Ride;
+  ride?: RideType;
   showRepeatingCheckbox: boolean;
   showRepeatingInfo: boolean;
   modalType: RideModalType;
@@ -45,7 +44,7 @@ const RequestRideWizard: React.FC<RequestRideWizardProps> = ({
   // Get fields to validate for each step
   const getStepFields = (step: WizardStep): string[] => {
     switch (step) {
-      case 'date':
+      case 'date': {
         // Include repeat fields if repeating is enabled
         const watchRepeating = watch('recurring', false);
         const baseFields = ['startDate'];
@@ -53,6 +52,7 @@ const RequestRideWizard: React.FC<RequestRideWizardProps> = ({
           return [...baseFields, 'whenRepeat', 'endDate'];
         }
         return baseFields;
+      }
       case 'pickup':
         return ['startLocation', 'pickupTime'];
       case 'dropoff':

From d8ad8c02bef5bafb9470ada038244c2745787eeb Mon Sep 17 00:00:00 2001
From: Emir Icyer <emiricyer07@gmail.com>
Date: Tue, 24 Mar 2026 15:54:15 -0400
Subject: [PATCH 06/10] state lifting

---
 .../CreateOrEditRideModal.tsx                 | 129 ++++++++++++--
 .../RequestRideModal/RequestRideWizard.tsx    | 159 ------------------
 .../steps/DropoffLocationStep.tsx             |   6 +
 .../steps/PickupLocationStep.tsx              |   7 +
 4 files changed, 128 insertions(+), 173 deletions(-)
 delete mode 100644 frontend/src/components/RequestRideModal/RequestRideWizard.tsx

diff --git a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
index a295fccd0..f5997c714 100644
--- a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
+++ b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
@@ -1,4 +1,4 @@
-import React, { useContext, useRef } from 'react';
+import React, { useContext, useRef, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import moment from 'moment';
 import AuthContext from '../../context/auth';
@@ -7,11 +7,19 @@ import { Button } from '../FormElements/FormElements';
 import { ObjectType } from '../../types/index';
 import { RideType } from '@carriage-web/shared/types/ride';
 import styles from './requestridemodal.module.css';
-import RequestRideWizard from './RequestRideWizard';
+import DateStep from './steps/DateStep';
+import PickupLocationStep from './steps/PickupLocationStep';
+import DropoffLocationStep from './steps/DropoffLocationStep';
+import RequestSummaryStep from './steps/RequestSummaryStep';
 import { RideModalType } from './types';
 import { format_date } from '../../util/index';
 import axios from '../../util/axios';
 
+type WizardStep = 'date' | 'pickup' | 'dropoff' | 'summary';
+ 
+const stepOrder: WizardStep[] = ['date', 'pickup', 'dropoff', 'summary'];
+ 
+
 type CreateOrEditRideModalProps = {
   isOpen: boolean;
   modalType: RideModalType;
@@ -27,6 +35,7 @@ const CreateOrEditRideModal = ({
   onClose = () => {},
   ride,
 }: CreateOrEditRideModalProps) => {
+  const [currentStep, setCurrentStep] = useState<WizardStep>('date');
   const defaultStartDate = () => {
     if (ride) {
       if (
@@ -36,11 +45,10 @@ const CreateOrEditRideModal = ({
         return format_date(ride.startTime);
       }
       if (modalType === 'EDIT_ALL_RECURRING') {
-        // For now, recurring rides aren't supported - treat as regular edit
         return format_date(ride.startTime);
       }
     }
-    // For new rides, start with empty date so button is disabled
+    return format_date();
     return '';
   };
 
@@ -57,19 +65,67 @@ const CreateOrEditRideModal = ({
   const formRef = useRef<HTMLFormElement>(null);
 
   const closeModal = () => {
+    setCurrentStep('date');
     methods.clearErrors();
     onClose();
   };
 
+
+
   const handleFormSubmit = async () => {
-    // Trigger form submission
     const isValid = await methods.trigger();
     if (isValid) {
       methods.handleSubmit(handleSubmit)();
     }
   };
 
-  // Removes null fields from object
+  const getStepFields = (step: WizardStep): string[] => {
+    switch (step) {
+      case 'date': {
+        const isRepeating = methods.watch('recurring', false);
+        const baseFields = ['startDate'];
+        if (isRepeating) {
+          return [...baseFields, 'whenRepeat', 'endDate'];
+        }
+        return baseFields;
+      }
+      case 'pickup':
+        return ['startLocation', 'pickupTime'];
+      case 'dropoff':
+        return ['endLocation', 'dropoffTime'];
+      case 'summary':
+        return [];
+      default:
+        return [];
+    }
+  };
+ 
+  const handleNext = async () => {
+    const currentIndex = stepOrder.indexOf(currentStep);
+    const fieldsToValidate = getStepFields(currentStep);
+    const isValid = await methods.trigger(fieldsToValidate as any);
+ 
+    if (isValid) {
+      if (currentIndex < stepOrder.length - 1) {
+        setCurrentStep(stepOrder[currentIndex + 1]);
+      }
+    } else {
+      const basicFieldsFilled = fieldsToValidate.every((field) => {
+        const value = methods.watch(field as any);
+        return value && value !== '' && value !== undefined;
+      });
+      if (basicFieldsFilled && currentIndex < stepOrder.length - 1) {
+        setCurrentStep(stepOrder[currentIndex + 1]);
+      }
+    }
+  };
+ 
+  const handleBack = () => {
+    const currentIndex = stepOrder.indexOf(currentStep);
+    if (currentIndex > 0) {
+      setCurrentStep(stepOrder[currentIndex - 1]);
+    }
+  };
   const cleanData = (data: ObjectType) =>
     Object.fromEntries(Object.entries(data).filter(([_, v]) => v !== null));
 
@@ -159,6 +215,56 @@ const CreateOrEditRideModal = ({
     }
   };
 
+   const renderStep = () => {
+    switch (currentStep) {
+      case 'date':
+        return (
+          <DateStep
+            ride={ride}
+            modalType={modalType}
+            showRepeatingCheckbox={!ride}
+            showRepeatingInfo={modalType !== 'EDIT_SINGLE_RECURRING'}
+            onClose={closeModal}
+            onNext={handleNext}
+            currentStep={currentStep}
+          />
+        );
+      case 'pickup':
+        return (
+          <PickupLocationStep
+            ride={ride}
+            modalType={modalType}
+            currentStep={currentStep}
+            onClose={closeModal}
+            onNext={handleNext}
+            onBack={handleBack}
+          />
+        );
+      case 'dropoff':
+        return (
+          <DropoffLocationStep
+            ride={ride}
+            modalType={modalType}
+            currentStep={currentStep}
+            onClose={closeModal}
+            onNext={handleNext}
+            onBack={handleBack}
+          />
+        );
+      case 'summary':
+        return (
+          <RequestSummaryStep
+            onClose={closeModal}
+            onNext={handleFormSubmit}
+            onBack={handleBack}
+          />
+        );
+      default:
+        return null;
+    }
+  };
+ 
+
   return (
     <Modal
       title=""
@@ -174,14 +280,9 @@ const CreateOrEditRideModal = ({
           id="ride-form"
         >
           <div className={styles.inputContainer}>
-            <RequestRideWizard
-              ride={ride}
-              showRepeatingCheckbox={!ride}
-              showRepeatingInfo={modalType !== 'EDIT_SINGLE_RECURRING'}
-              modalType={modalType}
-              onClose={closeModal}
-              onSubmit={handleFormSubmit}
-            />
+                        <div className={styles.wizardContainer}>
+              <div className={styles.stepContent}>{renderStep()}</div>
+            </div>
           </div>
         </form>
       </FormProvider>
diff --git a/frontend/src/components/RequestRideModal/RequestRideWizard.tsx b/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
deleted file mode 100644
index bbdb6a4fa..000000000
--- a/frontend/src/components/RequestRideModal/RequestRideWizard.tsx
+++ /dev/null
@@ -1,159 +0,0 @@
-import React, { useState } from 'react';
-import { useFormContext } from 'react-hook-form';
-import { RideType } from '@carriage-web/shared/types/ride';
-import { RideModalType } from './types';
-import DateStep from './steps/DateStep';
-import PickupLocationStep from './steps/PickupLocationStep';
-import DropoffLocationStep from './steps/DropoffLocationStep';
-import RequestSummaryStep from './steps/RequestSummaryStep';
-import styles from './requestridemodal.module.css';
-
-export type WizardStep = 'date' | 'pickup' | 'dropoff' | 'summary';
-
-type RequestRideWizardProps = {
-  ride?: RideType;
-  showRepeatingCheckbox: boolean;
-  showRepeatingInfo: boolean;
-  modalType: RideModalType;
-  onSubmit?: () => void;
-  onClose?: () => void;
-};
-
-const RequestRideWizard: React.FC<RequestRideWizardProps> = ({
-  ride,
-  showRepeatingCheckbox,
-  showRepeatingInfo,
-  modalType,
-  onSubmit,
-  onClose,
-}) => {
-  const [currentStep, setCurrentStep] = useState<WizardStep>('date');
-  const {
-    trigger,
-    formState: { errors },
-    watch,
-  } = useFormContext();
-
-  // Define step order - 4 steps including summary
-  const stepOrder: WizardStep[] = ['date', 'pickup', 'dropoff', 'summary'];
-
-  const currentStepIndex = stepOrder.indexOf(currentStep);
-  const isFirstStep = currentStepIndex === 0;
-  const isLastStep = currentStepIndex === stepOrder.length - 1;
-
-  // Get fields to validate for each step
-  const getStepFields = (step: WizardStep): string[] => {
-    switch (step) {
-      case 'date': {
-        // Include repeat fields if repeating is enabled
-        const watchRepeating = watch('recurring', false);
-        const baseFields = ['startDate'];
-        if (watchRepeating) {
-          return [...baseFields, 'whenRepeat', 'endDate'];
-        }
-        return baseFields;
-      }
-      case 'pickup':
-        return ['startLocation', 'pickupTime'];
-      case 'dropoff':
-        return ['endLocation', 'dropoffTime'];
-      case 'summary':
-        return [];
-      default:
-        return [];
-    }
-  };
-
-  const handleNext = async () => {
-    const fieldsToValidate = getStepFields(currentStep);
-    const isValid = await trigger(fieldsToValidate as any);
-
-    if (isValid) {
-      const nextIndex = currentStepIndex + 1;
-      if (nextIndex < stepOrder.length) {
-        setCurrentStep(stepOrder[nextIndex]);
-      }
-    } else {
-      // If validation fails, check if basic fields are filled
-      // This allows navigation even if strict validation fails (will be caught on final submit)
-      const basicFieldsFilled = fieldsToValidate.every((field) => {
-        const value = watch(field as any);
-        return value && value !== '' && value !== undefined;
-      });
-
-      if (basicFieldsFilled) {
-        const nextIndex = currentStepIndex + 1;
-        if (nextIndex < stepOrder.length) {
-          setCurrentStep(stepOrder[nextIndex]);
-        }
-      }
-    }
-  };
-
-  const handleBack = () => {
-    const prevIndex = currentStepIndex - 1;
-    if (prevIndex >= 0) {
-      setCurrentStep(stepOrder[prevIndex]);
-    }
-  };
-
-  const renderStep = () => {
-    switch (currentStep) {
-      case 'date':
-        return (
-          <DateStep
-            ride={ride}
-            modalType={modalType}
-            showRepeatingCheckbox={showRepeatingCheckbox}
-            showRepeatingInfo={showRepeatingInfo}
-            onClose={onClose}
-            onNext={handleNext}
-            currentStep={currentStep}
-          />
-        );
-      case 'pickup':
-        return (
-          <PickupLocationStep
-            ride={ride}
-            modalType={modalType}
-            currentStep={currentStep}
-            onClose={onClose}
-            onNext={handleNext}
-            onBack={handleBack}
-          />
-        );
-      case 'dropoff':
-        return (
-          <DropoffLocationStep
-            ride={ride}
-            modalType={modalType}
-            currentStep={currentStep}
-            onClose={onClose}
-            onNext={handleNext}
-            onBack={handleBack}
-          />
-        );
-      case 'summary':
-        return (
-          <RequestSummaryStep
-            onClose={onClose}
-            onNext={onSubmit}
-            onBack={handleBack}
-          />
-        );
-      default:
-        return null;
-    }
-  };
-
-  return (
-    <div className={styles.wizardContainer}>
-      {/* Step content */}
-      <div className={styles.stepContent}>{renderStep()}</div>
-
-      {/* Navigation buttons - removed Continue button, each step handles its own navigation */}
-    </div>
-  );
-};
-
-export default RequestRideWizard;
diff --git a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
index c0e5d19b2..0514d370e 100644
--- a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
@@ -114,6 +114,12 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
     // and let the map handle filtering by coordinates internally
     setLocations(loc);
     setFilteredLocations(loc);
+  
+    const savedId = watchEndLocation;
+    if (savedId && savedId !== 'Other' && loc.length > 0) {
+      const found = loc.find((l) => l.id === savedId);
+      if (found) setDropoffLocation(found);
+    }
   }, [loc]);
 
   useEffect(() => {
diff --git a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
index 1002c2e8d..81a458ed4 100644
--- a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
@@ -106,6 +106,13 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
     // and let the map handle filtering by coordinates internally
     setLocations(loc);
     setFilteredLocations(loc);
+     
+    // Restore pickupLocation object from form value (e.g. when navigating back to this step)
+    const savedId = watchStartLocation;
+    if (savedId && savedId !== 'Other' && loc.length > 0) {
+      const found = loc.find((l) => l.id === savedId);
+      if (found) setPickupLocation(found);
+    }
   }, [loc]);
 
   useEffect(() => {

From 7f134305b54c3a590ce86ce3ae53d2d0d5862863 Mon Sep 17 00:00:00 2001
From: Emir Icyer <emiricyer07@gmail.com>
Date: Tue, 24 Mar 2026 21:56:00 -0400
Subject: [PATCH 07/10] mui and error handling bug fixes

---
 .../CreateOrEditRideModal.tsx                 |  31 +-
 .../RequestRideModal/CustomDatePicker.tsx     | 299 ++++-------------
 .../RequestRideModal/CustomTimePicker.tsx     | 197 ++----------
 .../RequestRideModal/steps/DateStep.tsx       |  79 +----
 .../steps/DropoffLocationStep.tsx             | 140 +-------
 .../steps/PickupLocationStep.tsx              | 147 +--------
 .../steps/RequestSummaryStep.tsx              | 300 +-----------------
 7 files changed, 146 insertions(+), 1047 deletions(-)

diff --git a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
index f5997c714..e9bd9912b 100644
--- a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
+++ b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
@@ -16,9 +16,8 @@ import { format_date } from '../../util/index';
 import axios from '../../util/axios';
 
 type WizardStep = 'date' | 'pickup' | 'dropoff' | 'summary';
- 
+
 const stepOrder: WizardStep[] = ['date', 'pickup', 'dropoff', 'summary'];
- 
 
 type CreateOrEditRideModalProps = {
   isOpen: boolean;
@@ -48,7 +47,6 @@ const CreateOrEditRideModal = ({
         return format_date(ride.startTime);
       }
     }
-    return format_date();
     return '';
   };
 
@@ -70,8 +68,6 @@ const CreateOrEditRideModal = ({
     onClose();
   };
 
-
-
   const handleFormSubmit = async () => {
     const isValid = await methods.trigger();
     if (isValid) {
@@ -99,27 +95,17 @@ const CreateOrEditRideModal = ({
         return [];
     }
   };
- 
+
   const handleNext = async () => {
     const currentIndex = stepOrder.indexOf(currentStep);
     const fieldsToValidate = getStepFields(currentStep);
     const isValid = await methods.trigger(fieldsToValidate as any);
- 
-    if (isValid) {
-      if (currentIndex < stepOrder.length - 1) {
-        setCurrentStep(stepOrder[currentIndex + 1]);
-      }
-    } else {
-      const basicFieldsFilled = fieldsToValidate.every((field) => {
-        const value = methods.watch(field as any);
-        return value && value !== '' && value !== undefined;
-      });
-      if (basicFieldsFilled && currentIndex < stepOrder.length - 1) {
-        setCurrentStep(stepOrder[currentIndex + 1]);
-      }
+
+    if (isValid && currentIndex < stepOrder.length - 1) {
+      setCurrentStep(stepOrder[currentIndex + 1]);
     }
   };
- 
+
   const handleBack = () => {
     const currentIndex = stepOrder.indexOf(currentStep);
     if (currentIndex > 0) {
@@ -215,7 +201,7 @@ const CreateOrEditRideModal = ({
     }
   };
 
-   const renderStep = () => {
+  const renderStep = () => {
     switch (currentStep) {
       case 'date':
         return (
@@ -263,7 +249,6 @@ const CreateOrEditRideModal = ({
         return null;
     }
   };
- 
 
   return (
     <Modal
@@ -280,7 +265,7 @@ const CreateOrEditRideModal = ({
           id="ride-form"
         >
           <div className={styles.inputContainer}>
-                        <div className={styles.wizardContainer}>
+            <div className={styles.wizardContainer}>
               <div className={styles.stepContent}>{renderStep()}</div>
             </div>
           </div>
diff --git a/frontend/src/components/RequestRideModal/CustomDatePicker.tsx b/frontend/src/components/RequestRideModal/CustomDatePicker.tsx
index 827765d36..ff5cc1448 100644
--- a/frontend/src/components/RequestRideModal/CustomDatePicker.tsx
+++ b/frontend/src/components/RequestRideModal/CustomDatePicker.tsx
@@ -1,259 +1,68 @@
-import React, { useState, useEffect, useRef } from 'react';
-import moment from 'moment';
+import React, { useState } from 'react';
+import { format, parse } from 'date-fns';
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
+import { MobileDatePicker } from '@mui/x-date-pickers/MobileDatePicker';
 import styles from './requestridemodal.module.css';
 
 type CustomDatePickerProps = {
-  selectedDate: moment.Moment;
-  currentMonth: moment.Moment;
-  onMonthChange: (month: moment.Moment) => void;
-  onDateSelect: (date: moment.Moment) => void;
-  onCancel: () => void;
-  buttonRef: React.RefObject<HTMLButtonElement>;
+  value: string; // YYYY-MM-DD
+  onChange: (dateStr: string) => void;
+  className?: string;
 };
 
 const CustomDatePicker: React.FC<CustomDatePickerProps> = ({
-  selectedDate,
-  currentMonth,
-  onMonthChange,
-  onDateSelect,
-  onCancel,
-  buttonRef,
+  value,
+  onChange,
+  className,
 }) => {
-  const pickerRef = useRef<HTMLDivElement>(null);
+  const [open, setOpen] = useState(false);
 
-  // Close picker when clicking outside
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (
-        pickerRef.current &&
-        !pickerRef.current.contains(event.target as Node) &&
-        buttonRef.current &&
-        !buttonRef.current.contains(event.target as Node)
-      ) {
-        // onCancel will be called by parent
-      }
-    };
-
-    document.addEventListener('mousedown', handleClickOutside);
-    return () => {
-      document.removeEventListener('mousedown', handleClickOutside);
-    };
-  }, []);
-
-  const monthNames = moment.months();
-  const currentYear = currentMonth.year();
-  const years = Array.from({ length: 10 }, (_, i) => currentYear - 5 + i);
-
-  const handlePreviousMonth = () => {
-    onMonthChange(currentMonth.clone().subtract(1, 'month'));
-  };
-
-  const handleNextMonth = () => {
-    onMonthChange(currentMonth.clone().add(1, 'month'));
-  };
-
-  const handlePreviousYear = () => {
-    onMonthChange(currentMonth.clone().subtract(1, 'year'));
-  };
-
-  const handleNextYear = () => {
-    onMonthChange(currentMonth.clone().add(1, 'year'));
-  };
-
-  const handleMonthChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    const monthIndex = parseInt(e.target.value);
-    onMonthChange(currentMonth.clone().month(monthIndex));
-  };
-
-  const handleYearChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    const year = parseInt(e.target.value);
-    onMonthChange(currentMonth.clone().year(year));
-  };
-
-  // Get calendar days for the current month
-  const startOfMonth = currentMonth.clone().startOf('month');
-  const endOfMonth = currentMonth.clone().endOf('month');
-  const startDate = startOfMonth.clone().startOf('week');
-  const endDate = endOfMonth.clone().endOf('week');
-  const days: moment.Moment[] = [];
-  let current = startDate.clone();
-  while (current.isSameOrBefore(endDate, 'day')) {
-    days.push(current.clone());
-    current.add(1, 'day');
-  }
+  const displayValue = value
+    ? format(parse(value, 'yyyy-MM-dd', new Date()), 'MM/dd/yyyy')
+    : null;
 
   return (
-    <div
-      ref={pickerRef}
-      className={styles.customDatePicker}
-      onClick={(e) => e.stopPropagation()}
-    >
-      {/* Top frame with month and year selectors */}
-      <div className={styles.datePickerTopFrame}>
-        {/* Month selector on left */}
-        <div className={styles.monthYearSelector}>
-          <button
-            type="button"
-            className={styles.datePickerArrow}
-            onClick={handlePreviousMonth}
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
-              viewBox="0 0 24 24"
-              fill="none"
-            >
-              <path
-                d="M15.41 7.41L14 6L8 12L14 18L15.41 16.59L10.83 12L15.41 7.41Z"
-                fill="#49454F"
-              />
-            </svg>
-          </button>
-          <select
-            className={styles.monthYearSelect}
-            value={currentMonth.month()}
-            onChange={handleMonthChange}
+    <LocalizationProvider dateAdapter={AdapterDateFns}>
+      <button
+        type="button"
+        className={className || styles.optionButton}
+        onClick={() => setOpen(true)}
+      >
+        <span className={!displayValue ? styles.dateButtonPlaceholder : ''}>
+          {displayValue || 'Date'}
+        </span>
+        <span aria-hidden="true" className={styles.optionIcon}>
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            width="24"
+            height="24"
+            viewBox="0 0 24 24"
+            fill="none"
           >
-            {monthNames.map((month, index) => (
-              <option key={index} value={index}>
-                {month}
-              </option>
-            ))}
-          </select>
-          <button
-            type="button"
-            className={styles.datePickerArrow}
-            onClick={handleNextMonth}
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
-              viewBox="0 0 24 24"
-              fill="none"
-            >
-              <path
-                d="M8.59 16.59L10 18L16 12L10 6L8.59 7.41L13.17 12L8.59 16.59Z"
-                fill="#49454F"
-              />
-            </svg>
-          </button>
-        </div>
-
-        {/* Year selector on right */}
-        <div className={styles.monthYearSelector}>
-          <button
-            type="button"
-            className={styles.datePickerArrow}
-            onClick={handlePreviousYear}
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
-              viewBox="0 0 24 24"
-              fill="none"
-            >
-              <path
-                d="M15.41 7.41L14 6L8 12L14 18L15.41 16.59L10.83 12L15.41 7.41Z"
-                fill="#49454F"
-              />
-            </svg>
-          </button>
-          <select
-            className={styles.monthYearSelect}
-            value={currentYear}
-            onChange={handleYearChange}
-          >
-            {years.map((year) => (
-              <option key={year} value={year}>
-                {year}
-              </option>
-            ))}
-          </select>
-          <button
-            type="button"
-            className={styles.datePickerArrow}
-            onClick={handleNextYear}
-          >
-            <svg
-              xmlns="http://www.w3.org/2000/svg"
-              width="24"
-              height="24"
-              viewBox="0 0 24 24"
-              fill="none"
-            >
-              <path
-                d="M8.59 16.59L10 18L16 12L10 6L8.59 7.41L13.17 12L8.59 16.59Z"
-                fill="#49454F"
-              />
-            </svg>
-          </button>
-        </div>
-      </div>
-
-      {/* Calendar grid */}
-      <div className={styles.datePickerCalendar}>
-        {/* Day headers */}
-        <div className={styles.datePickerWeekdays}>
-          {['Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa'].map((day) => (
-            <div key={day} className={styles.datePickerWeekday}>
-              {day}
-            </div>
-          ))}
-        </div>
-
-        {/* Calendar days */}
-        <div className={styles.datePickerDays}>
-          {days.map((day, index) => {
-            const isCurrentMonth = day.month() === currentMonth.month();
-            const isSelected = day.isSame(selectedDate, 'day');
-            const isToday = day.isSame(moment(), 'day');
-
-            return (
-              <button
-                key={index}
-                type="button"
-                className={`${styles.datePickerDay} ${
-                  !isCurrentMonth ? styles.datePickerDayOtherMonth : ''
-                } ${isSelected ? styles.datePickerDaySelected : ''} ${
-                  isToday ? styles.datePickerDayToday : ''
-                }`}
-                onClick={() => {
-                  if (isCurrentMonth) {
-                    onDateSelect(day);
-                  }
-                }}
-                disabled={!isCurrentMonth}
-              >
-                {day.date()}
-              </button>
-            );
-          })}
-        </div>
-      </div>
-
-      {/* Bottom frame with Cancel and OK buttons */}
-      <div className={styles.datePickerBottomFrame}>
-        <button
-          type="button"
-          className={styles.datePickerCancelButton}
-          onClick={onCancel}
-        >
-          Cancel
-        </button>
-        <button
-          type="button"
-          className={styles.datePickerOkButton}
-          onClick={() => {
-            onDateSelect(selectedDate);
-          }}
-        >
-          OK
-        </button>
-      </div>
-    </div>
+            <path
+              d="M19 19H5V8H19M16 1V3H8V1H6V3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3H18V1"
+              fill="black"
+            />
+          </svg>
+        </span>
+      </button>
+      <MobileDatePicker
+        open={open}
+        onClose={() => setOpen(false)}
+        value={value ? parse(value, 'yyyy-MM-dd', new Date()) : null}
+        onChange={(date) => {
+          if (date) onChange(format(date, 'yyyy-MM-dd'));
+        }}
+        slotProps={{
+          textField: { sx: { display: 'none' } },
+          dialog: {
+            disablePortal: true,
+            onClick: (e: React.MouseEvent) => e.stopPropagation(),
+          },
+        }}
+      />
+    </LocalizationProvider>
   );
 };
 
diff --git a/frontend/src/components/RequestRideModal/CustomTimePicker.tsx b/frontend/src/components/RequestRideModal/CustomTimePicker.tsx
index 509ed21d4..3893059ab 100644
--- a/frontend/src/components/RequestRideModal/CustomTimePicker.tsx
+++ b/frontend/src/components/RequestRideModal/CustomTimePicker.tsx
@@ -1,180 +1,39 @@
-import React, { useState, useRef, useEffect } from 'react';
-import moment from 'moment';
-import styles from './requestridemodal.module.css';
+import React from 'react';
+import { format, parse } from 'date-fns';
+import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider';
+import { AdapterDateFns } from '@mui/x-date-pickers/AdapterDateFns';
+import { TimePicker } from '@mui/x-date-pickers/TimePicker';
 
 type CustomTimePickerProps = {
-  selectedTime: string; // Format: "HH:mm"
-  onTimeSelect: (time: string) => void;
-  onCancel: () => void;
-  buttonRef: React.RefObject<HTMLButtonElement>;
+  value: string; // HH:mm (24-hour)
+  onChange: (timeStr: string) => void;
+  label?: string;
 };
 
 const CustomTimePicker: React.FC<CustomTimePickerProps> = ({
-  selectedTime,
-  onTimeSelect,
-  onCancel,
-  buttonRef,
+  value,
+  onChange,
+  label,
 }) => {
-  const pickerRef = useRef<HTMLDivElement>(null);
-  const [selectedHour, setSelectedHour] = useState<number>(() => {
-    if (selectedTime) {
-      return parseInt(selectedTime.split(':')[0]) || 12;
-    }
-    return 12;
-  });
-  const [selectedMinute, setSelectedMinute] = useState<number>(() => {
-    if (selectedTime) {
-      return parseInt(selectedTime.split(':')[1]) || 0;
-    }
-    return 0;
-  });
-  const [isAM, setIsAM] = useState<boolean>(() => {
-    if (selectedTime) {
-      const hour = parseInt(selectedTime.split(':')[0]) || 12;
-      return hour < 12;
-    }
-    return true;
-  });
-
-  // Close picker when clicking outside
-  useEffect(() => {
-    const handleClickOutside = (event: MouseEvent) => {
-      if (
-        pickerRef.current &&
-        !pickerRef.current.contains(event.target as Node) &&
-        buttonRef.current &&
-        !buttonRef.current.contains(event.target as Node)
-      ) {
-        // onCancel will be called by parent
-      }
-    };
-
-    document.addEventListener('mousedown', handleClickOutside);
-    return () => {
-      document.removeEventListener('mousedown', handleClickOutside);
-    };
-  }, []);
-
-  const hours = Array.from({ length: 12 }, (_, i) => i + 1);
-  const minutes = Array.from({ length: 60 }, (_, i) => i);
-
-  const handleHourSelect = (hour: number) => {
-    setSelectedHour(hour);
-  };
-
-  const handleMinuteSelect = (minute: number) => {
-    setSelectedMinute(minute);
-  };
-
-  const handleAMPMToggle = (am: boolean) => {
-    setIsAM(am);
-  };
-
-  const handleOK = () => {
-    let hour24 = selectedHour;
-    if (!isAM && selectedHour !== 12) {
-      hour24 = selectedHour + 12;
-    } else if (isAM && selectedHour === 12) {
-      hour24 = 0;
-    }
-    const timeString = `${hour24.toString().padStart(2, '0')}:${selectedMinute
-      .toString()
-      .padStart(2, '0')}`;
-    onTimeSelect(timeString);
-  };
+  const dateValue = value ? parse(value, 'HH:mm', new Date(2000, 0, 1)) : null;
 
   return (
-    <div
-      ref={pickerRef}
-      className={styles.customTimePicker}
-      onClick={(e) => e.stopPropagation()}
-    >
-      {/* Time selection grid */}
-      <div className={styles.timePickerContent}>
-        {/* Hours */}
-        <div className={styles.timePickerColumn}>
-          <div className={styles.timePickerLabel}>Hour</div>
-          <div className={styles.timePickerValues}>
-            {hours.map((hour) => (
-              <button
-                key={hour}
-                type="button"
-                className={`${styles.timePickerValue} ${
-                  selectedHour === hour ? styles.timePickerValueSelected : ''
-                }`}
-                onClick={() => handleHourSelect(hour)}
-              >
-                {hour}
-              </button>
-            ))}
-          </div>
-        </div>
-
-        {/* Minutes */}
-        <div className={styles.timePickerColumn}>
-          <div className={styles.timePickerLabel}>Minute</div>
-          <div className={styles.timePickerValues}>
-            {minutes.map((minute) => (
-              <button
-                key={minute}
-                type="button"
-                className={`${styles.timePickerValue} ${
-                  selectedMinute === minute
-                    ? styles.timePickerValueSelected
-                    : ''
-                }`}
-                onClick={() => handleMinuteSelect(minute)}
-              >
-                {minute.toString().padStart(2, '0')}
-              </button>
-            ))}
-          </div>
-        </div>
-
-        {/* AM/PM */}
-        <div className={styles.timePickerColumn}>
-          <div className={styles.timePickerLabel}>Period</div>
-          <div className={styles.timePickerValues}>
-            <button
-              type="button"
-              className={`${styles.timePickerValue} ${
-                isAM ? styles.timePickerValueSelected : ''
-              }`}
-              onClick={() => handleAMPMToggle(true)}
-            >
-              AM
-            </button>
-            <button
-              type="button"
-              className={`${styles.timePickerValue} ${
-                !isAM ? styles.timePickerValueSelected : ''
-              }`}
-              onClick={() => handleAMPMToggle(false)}
-            >
-              PM
-            </button>
-          </div>
-        </div>
-      </div>
-
-      {/* Bottom frame with Cancel and OK buttons */}
-      <div className={styles.datePickerBottomFrame}>
-        <button
-          type="button"
-          className={styles.datePickerCancelButton}
-          onClick={onCancel}
-        >
-          Cancel
-        </button>
-        <button
-          type="button"
-          className={styles.datePickerOkButton}
-          onClick={handleOK}
-        >
-          OK
-        </button>
-      </div>
-    </div>
+    <LocalizationProvider dateAdapter={AdapterDateFns}>
+      <TimePicker
+        label={label || 'Time'}
+        value={dateValue}
+        onChange={(newValue: Date | null) => {
+          if (newValue) onChange(format(newValue, 'HH:mm'));
+        }}
+        minutesStep={1}
+        enableAccessibleFieldDOMStructure={false}
+        slotProps={{
+          popper: { disablePortal: true },
+          mobilePaper: { onClick: (e: React.MouseEvent) => e.stopPropagation() },
+          textField: { fullWidth: true },
+        }}
+      />
+    </LocalizationProvider>
   );
 };
 
diff --git a/frontend/src/components/RequestRideModal/steps/DateStep.tsx b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
index d953cf436..1f86d1057 100644
--- a/frontend/src/components/RequestRideModal/steps/DateStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState } from 'react';
 import { useFormContext } from 'react-hook-form';
 import moment from 'moment';
 import { Ride } from '../../../types';
@@ -31,7 +31,6 @@ const DateStep: React.FC<DateStepProps> = ({
   const {
     register,
     formState: { errors },
-    getValues,
     watch,
     trigger,
     reset,
@@ -42,9 +41,6 @@ const DateStep: React.FC<DateStepProps> = ({
   const [dragStartY, setDragStartY] = useState<number | null>(null);
   const [showRepeatOptions, setShowRepeatOptions] = useState(false);
   const [selectedDays, setSelectedDays] = useState<Set<string>>(new Set());
-  const [showDatePicker, setShowDatePicker] = useState(false);
-  const [datePickerMonth, setDatePickerMonth] = useState(moment());
-  const dateButtonRef = useRef<HTMLButtonElement>(null);
   const watchRepeating = watch('recurring', false);
   const watchStartDate = watch('startDate');
   const watchWhenRepeat = watch('whenRepeat', 'no-repeat');
@@ -101,59 +97,11 @@ const DateStep: React.FC<DateStepProps> = ({
         <div className={styles.mobileHeaderFrame}>
           <div className={styles.mobileTitleLeft}>Request a Ride</div>
           <div className={styles.datePickerAnchor}>
-            <button
-              ref={dateButtonRef}
-              type="button"
+            <CustomDatePicker
+              value={watchStartDate || ''}
+              onChange={(date) => setValue('startDate', date)}
               className={styles.optionButton}
-              onClick={() => {
-                setShowDatePicker(!showDatePicker);
-              }}
-            >
-              <span
-                className={
-                  !watchStartDate || watchStartDate === ''
-                    ? styles.dateButtonPlaceholder
-                    : ''
-                }
-              >
-                {watchStartDate && watchStartDate !== ''
-                  ? moment(watchStartDate).format('MM/DD/YYYY')
-                  : 'Date'}
-              </span>
-              <span aria-hidden="true" className={styles.optionIcon}>
-                {/* Calendar icon */}
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width="24"
-                  height="24"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                >
-                  <path
-                    d="M19 19H5V8H19M16 1V3H8V1H6V3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3H18V1"
-                    fill="black"
-                  />
-                </svg>
-              </span>
-            </button>
-            {showDatePicker && dateButtonRef.current && (
-              <CustomDatePicker
-                selectedDate={
-                  watchStartDate && watchStartDate !== ''
-                    ? moment(watchStartDate)
-                    : moment()
-                }
-                currentMonth={datePickerMonth}
-                onMonthChange={setDatePickerMonth}
-                onDateSelect={(date) => {
-                  const formattedDate = date.format('YYYY-MM-DD');
-                  setValue('startDate', formattedDate);
-                  setShowDatePicker(false);
-                }}
-                onCancel={() => setShowDatePicker(false)}
-                buttonRef={dateButtonRef}
-              />
-            )}
+            />
           </div>
           <button
             type="button"
@@ -298,20 +246,15 @@ const DateStep: React.FC<DateStepProps> = ({
           {...register('startDate', {
             required: 'Please select a date',
             validate: (startDate) => {
-              const pickupTime = getValues('pickupTime');
               const notWeekend =
                 moment(startDate).day() !== 0 && moment(startDate).day() !== 6;
-              if (pickupTime && notWeekend) {
-                return (
-                  isTimeValid(startDate, pickupTime) ||
-                  "Can't schedule rides for less than 2 days from today"
-                );
-              } else {
-                return (
-                  notWeekend ||
-                  'Please enter a valid date. (Note: CULifts does not operate during weekends or university-wide breaks.)'
-                );
+              if (!notWeekend) {
+                return 'Please enter a valid date. (Note: CULifts does not operate during weekends or university-wide breaks.)';
               }
+              return (
+                isTimeValid(startDate, '00:00') ||
+                "Can't schedule rides for less than 2 days from today"
+              );
             },
           })}
         />
diff --git a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
index 0514d370e..bc82a2e4e 100644
--- a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
@@ -4,11 +4,12 @@ import addresser from 'addresser';
 import moment from 'moment';
 import { Ride } from '../../../types';
 import { RideModalType } from '../types';
-import { Label, Input } from '../../FormElements/FormElements';
+import { Input } from '../../FormElements/FormElements';
 import { checkBounds, isTimeValid } from '../../../util/index';
 import { useLocations } from '../../../context/LocationsContext';
 import RequestRideMap from '../../RiderComponents/RequestRideMap';
 import { Location } from '../../../types';
+import CustomTimePicker from '../CustomTimePicker';
 import styles from '../requestridemodal.module.css';
 
 type DropoffLocationStepProps = {
@@ -45,9 +46,6 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   const [showLocationDropdown, setShowLocationDropdown] = useState(false);
   const [showLocationButton, setShowLocationButton] = useState(false);
   const [dragStartY, setDragStartY] = useState<number | null>(null);
-  const [timeHour, setTimeHour] = useState<string>('');
-  const [timeMinute, setTimeMinute] = useState<string>('');
-  const [timePeriod, setTimePeriod] = useState<'AM' | 'PM'>('AM');
   const searchInputRef = useRef<HTMLDivElement>(null);
   const locationButtonRef = useRef<HTMLButtonElement>(null);
   const watchDropoffCustom = watch('endLocation');
@@ -56,39 +54,6 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   const watchDropoffTime = watch('dropoffTime');
   const loc = useLocations().locations;
 
-  // Initialize time fields from watchDropoffTime
-  useEffect(() => {
-    if (watchDropoffTime && watchDropoffTime !== '') {
-      const time = moment(watchDropoffTime, 'HH:mm');
-      setTimeHour(time.format('h'));
-      setTimeMinute(time.format('mm'));
-      setTimePeriod(time.format('A') as 'AM' | 'PM');
-    }
-  }, [watchDropoffTime]);
-
-  // Update form value only when minute is complete and valid (2 digits, 00–59)
-  const timeMinuteNum =
-    timeMinute.length === 2 ? parseInt(timeMinute, 10) : null;
-  const timeMinuteInvalid =
-    timeMinuteNum !== null &&
-    (Number.isNaN(timeMinuteNum) || timeMinuteNum > 59);
-  useEffect(() => {
-    if (timeHour && timeMinute.length === 2 && !timeMinuteInvalid) {
-      const hour24 =
-        timePeriod === 'AM'
-          ? timeHour === '12'
-            ? 0
-            : parseInt(timeHour, 10)
-          : timeHour === '12'
-          ? 12
-          : parseInt(timeHour, 10) + 12;
-      const timeString = `${hour24
-        .toString()
-        .padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
-      setValue('dropoffTime', timeString);
-    }
-  }, [timeHour, timeMinute, timePeriod, setValue, timeMinuteInvalid]);
-
   // Close dropdown when clicking outside
   useEffect(() => {
     const handleClickOutside = (event: MouseEvent) => {
@@ -114,7 +79,7 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
     // and let the map handle filtering by coordinates internally
     setLocations(loc);
     setFilteredLocations(loc);
-  
+
     const savedId = watchEndLocation;
     if (savedId && savedId !== 'Other' && loc.length > 0) {
       const found = loc.find((l) => l.id === savedId);
@@ -336,6 +301,9 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
               </div>
             )}
           </div>
+          {errors.endLocation && (
+            <p className={styles.error}>{errors.endLocation.message as string}</p>
+          )}
 
           {/* Map */}
           <div className={styles.pickupMapContainer}>
@@ -352,94 +320,14 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
           {/* Dropoff time text */}
           <div className={styles.pickupTimeText}>Drop me off by ...</div>
 
-          {/* Time input - Figma-style */}
-          <div className={styles.timeInputWrapper}>
-            <div
-              className={`${styles.timeInputContainer} ${
-                timeMinuteInvalid ? styles.timeInputContainerError : ''
-              }`}
-            >
-              <input
-                type="text"
-                className={styles.timeInputHour}
-                placeholder="12"
-                value={timeHour}
-                onChange={(e) => {
-                  const value = e.target.value.replace(/\D/g, '');
-                  if (
-                    value === '' ||
-                    (parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12)
-                  ) {
-                    setTimeHour(value);
-                  }
-                }}
-                maxLength={2}
-                aria-label="Hour"
-              />
-              <span className={styles.timeSeparator}>:</span>
-              <input
-                type="text"
-                className={styles.timeInputMinute}
-                placeholder="00"
-                value={timeMinute}
-                onChange={(e) => {
-                  const value = e.target.value.replace(/\D/g, '').slice(0, 2);
-                  setTimeMinute(value);
-                }}
-                onBlur={() => {
-                  if (timeMinute === '') return;
-                  if (timeMinute.length === 1) {
-                    setTimeMinute(timeMinute.padStart(2, '0'));
-                  }
-                  /* When minutes > 59 we leave the value so the user can correct it; error is shown below */
-                }}
-                maxLength={2}
-                aria-label="Minute"
-              />
-              <div className={styles.timePeriodContainer}>
-                <button
-                  type="button"
-                  className={`${styles.timePeriodButton} ${
-                    timePeriod === 'AM' ? styles.timePeriodButtonActive : ''
-                  }`}
-                  onClick={() => setTimePeriod('AM')}
-                >
-                  AM
-                </button>
-                <button
-                  type="button"
-                  className={`${styles.timePeriodButton} ${
-                    timePeriod === 'PM' ? styles.timePeriodButtonActive : ''
-                  }`}
-                  onClick={() => setTimePeriod('PM')}
-                >
-                  PM
-                </button>
-              </div>
-              <span className={styles.timeIcon} aria-hidden="true">
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width="20"
-                  height="20"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  stroke="currentColor"
-                  strokeWidth="2"
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                >
-                  <circle cx="12" cy="12" r="10" />
-                  <polyline points="12 6 12 12 16 14" />
-                </svg>
-              </span>
-            </div>
-            {timeMinuteInvalid && (
-              <p className={styles.timeInputError} role="alert">
-                Please enter minutes between 00 and 59. You can correct it
-                above.
-              </p>
-            )}
-          </div>
+          <CustomTimePicker
+            value={watchDropoffTime || ''}
+            onChange={(t) => setValue('dropoffTime', t)}
+            label="Time"
+          />
+          {errors.dropoffTime && (
+            <p className={styles.error}>{errors.dropoffTime.message as string}</p>
+          )}
         </div>
       </div>
 
diff --git a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
index 81a458ed4..1bcfd4818 100644
--- a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
@@ -5,10 +5,11 @@ import moment from 'moment';
 import { Ride } from '../../../types';
 import { RideModalType } from '../types';
 import { Input } from '../../FormElements/FormElements';
-import { checkBounds, isTimeValid } from '../../../util/index';
+import { checkBounds } from '../../../util/index';
 import { useLocations } from '../../../context/LocationsContext';
 import RequestRideMap from '../../RiderComponents/RequestRideMap';
 import { Location } from '../../../types';
+import CustomTimePicker from '../CustomTimePicker';
 import styles from '../requestridemodal.module.css';
 
 type PickupLocationStepProps = {
@@ -28,7 +29,7 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   onNext,
   onBack,
 }) => {
-  const { register, getValues, watch, setValue } = useFormContext();
+  const { register, getValues, watch, setValue, formState: { errors } } = useFormContext();
 
   const [locations, setLocations] = useState<Location[]>([]);
   const [pickupLocation, setPickupLocation] = useState<Location | null>(null);
@@ -37,9 +38,6 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   const [showLocationDropdown, setShowLocationDropdown] = useState(false);
   const [showLocationButton, setShowLocationButton] = useState(false);
   const [dragStartY, setDragStartY] = useState<number | null>(null);
-  const [timeHour, setTimeHour] = useState<string>('');
-  const [timeMinute, setTimeMinute] = useState<string>('');
-  const [timePeriod, setTimePeriod] = useState<'AM' | 'PM'>('AM');
   const searchInputRef = useRef<HTMLDivElement>(null);
   const locationButtonRef = useRef<HTMLButtonElement>(null);
   const watchPickupCustom = watch('startLocation');
@@ -48,39 +46,6 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   const watchPickupTime = watch('pickupTime');
   const loc = useLocations().locations;
 
-  // Initialize time fields from watchPickupTime
-  useEffect(() => {
-    if (watchPickupTime && watchPickupTime !== '') {
-      const time = moment(watchPickupTime, 'HH:mm');
-      setTimeHour(time.format('h'));
-      setTimeMinute(time.format('mm'));
-      setTimePeriod(time.format('A') as 'AM' | 'PM');
-    }
-  }, [watchPickupTime]);
-
-  // Update form value only when minute is complete and valid (2 digits, 00–59)
-  const timeMinuteNum =
-    timeMinute.length === 2 ? parseInt(timeMinute, 10) : null;
-  const timeMinuteInvalid =
-    timeMinuteNum !== null &&
-    (Number.isNaN(timeMinuteNum) || timeMinuteNum > 59);
-  useEffect(() => {
-    if (timeHour && timeMinute.length === 2 && !timeMinuteInvalid) {
-      const hour24 =
-        timePeriod === 'AM'
-          ? timeHour === '12'
-            ? 0
-            : parseInt(timeHour, 10)
-          : timeHour === '12'
-          ? 12
-          : parseInt(timeHour, 10) + 12;
-      const timeString = `${hour24
-        .toString()
-        .padStart(2, '0')}:${timeMinute.padStart(2, '0')}`;
-      setValue('pickupTime', timeString);
-    }
-  }, [timeHour, timeMinute, timePeriod, setValue, timeMinuteInvalid]);
-
   // Close dropdown when clicking outside
   useEffect(() => {
     const handleClickOutside = (event: MouseEvent) => {
@@ -106,7 +71,7 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
     // and let the map handle filtering by coordinates internally
     setLocations(loc);
     setFilteredLocations(loc);
-     
+
     // Restore pickupLocation object from form value (e.g. when navigating back to this step)
     const savedId = watchStartLocation;
     if (savedId && savedId !== 'Other' && loc.length > 0) {
@@ -320,6 +285,9 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
               </div>
             )}
           </div>
+          {errors.startLocation && (
+            <p className={styles.error}>{errors.startLocation.message as string}</p>
+          )}
 
           {/* Map */}
           <div className={styles.pickupMapContainer}>
@@ -336,94 +304,14 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
           {/* Pickup time text */}
           <div className={styles.pickupTimeText}>Pick me up by ...</div>
 
-          {/* Time input - Figma-style */}
-          <div className={styles.timeInputWrapper}>
-            <div
-              className={`${styles.timeInputContainer} ${
-                timeMinuteInvalid ? styles.timeInputContainerError : ''
-              }`}
-            >
-              <input
-                type="text"
-                className={styles.timeInputHour}
-                placeholder="12"
-                value={timeHour}
-                onChange={(e) => {
-                  const value = e.target.value.replace(/\D/g, '');
-                  if (
-                    value === '' ||
-                    (parseInt(value, 10) >= 1 && parseInt(value, 10) <= 12)
-                  ) {
-                    setTimeHour(value);
-                  }
-                }}
-                maxLength={2}
-                aria-label="Hour"
-              />
-              <span className={styles.timeSeparator}>:</span>
-              <input
-                type="text"
-                className={styles.timeInputMinute}
-                placeholder="00"
-                value={timeMinute}
-                onChange={(e) => {
-                  const value = e.target.value.replace(/\D/g, '').slice(0, 2);
-                  setTimeMinute(value);
-                }}
-                onBlur={() => {
-                  if (timeMinute === '') return;
-                  if (timeMinute.length === 1) {
-                    setTimeMinute(timeMinute.padStart(2, '0'));
-                  }
-                  /* When minutes > 59 we leave the value so the user can correct it; error is shown below */
-                }}
-                maxLength={2}
-                aria-label="Minute"
-              />
-              <div className={styles.timePeriodContainer}>
-                <button
-                  type="button"
-                  className={`${styles.timePeriodButton} ${
-                    timePeriod === 'AM' ? styles.timePeriodButtonActive : ''
-                  }`}
-                  onClick={() => setTimePeriod('AM')}
-                >
-                  AM
-                </button>
-                <button
-                  type="button"
-                  className={`${styles.timePeriodButton} ${
-                    timePeriod === 'PM' ? styles.timePeriodButtonActive : ''
-                  }`}
-                  onClick={() => setTimePeriod('PM')}
-                >
-                  PM
-                </button>
-              </div>
-              <span className={styles.timeIcon} aria-hidden="true">
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width="20"
-                  height="20"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  stroke="currentColor"
-                  strokeWidth="2"
-                  strokeLinecap="round"
-                  strokeLinejoin="round"
-                >
-                  <circle cx="12" cy="12" r="10" />
-                  <polyline points="12 6 12 12 16 14" />
-                </svg>
-              </span>
-            </div>
-            {timeMinuteInvalid && (
-              <p className={styles.timeInputError} role="alert">
-                Please enter minutes between 00 and 59. You can correct it
-                above.
-              </p>
-            )}
-          </div>
+          <CustomTimePicker
+            value={watchPickupTime || ''}
+            onChange={(t) => setValue('pickupTime', t)}
+            label="Time"
+          />
+          {errors.pickupTime && (
+            <p className={styles.error}>{errors.pickupTime.message as string}</p>
+          )}
         </div>
       </div>
 
@@ -460,11 +348,6 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
             validate: (pickupTime: string) => {
               const startDate = getValues('startDate');
               const pickup = moment(`${startDate} ${pickupTime}`);
-              if (startDate) {
-                if (!isTimeValid(startDate, pickupTime)) {
-                  return 'Please enter a valid date. (Note: CULifts does not operate during weekends or university-wide breaks.)';
-                }
-              }
               return (
                 checkBounds(startDate, pickup) ||
                 'Please select a valid pickup time between 7:45 AM and 10:00 PM.'
diff --git a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
index eb4142e3c..25a8b1f3f 100644
--- a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
@@ -1,8 +1,9 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useRef } from 'react';
 import { useFormContext } from 'react-hook-form';
 import moment from 'moment';
 import { useLocations } from '../../../context/LocationsContext';
 import CustomDatePicker from '../CustomDatePicker';
+import CustomTimePicker from '../CustomTimePicker';
 import { Location } from '../../../types';
 import styles from '../requestridemodal.module.css';
 
@@ -47,18 +48,9 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
 }) => {
   const [dragStartY, setDragStartY] = useState<number | null>(null);
   const [editingSection, setEditingSection] = useState<EditingSection>(null);
-  const [showDatePicker, setShowDatePicker] = useState(false);
-  const [datePickerMonth, setDatePickerMonth] = useState(moment());
   const [showPickupDropdown, setShowPickupDropdown] = useState(false);
   const [showDropoffDropdown, setShowDropoffDropdown] = useState(false);
-  const [pickupTimeHour, setPickupTimeHour] = useState<string>('');
-  const [pickupTimeMinute, setPickupTimeMinute] = useState<string>('');
-  const [pickupTimePeriod, setPickupTimePeriod] = useState<'AM' | 'PM'>('AM');
-  const [dropoffTimeHour, setDropoffTimeHour] = useState<string>('');
-  const [dropoffTimeMinute, setDropoffTimeMinute] = useState<string>('');
-  const [dropoffTimePeriod, setDropoffTimePeriod] = useState<'AM' | 'PM'>('AM');
 
-  const dateButtonRef = useRef<HTMLButtonElement>(null);
   const pickupDropdownRef = useRef<HTMLDivElement>(null);
   const dropoffDropdownRef = useRef<HTMLDivElement>(null);
 
@@ -90,95 +82,6 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
     )
   );
 
-  // Sync pickup time state when entering pickup edit mode
-  useEffect(() => {
-    if (editingSection === 'pickup' && pickupTime) {
-      const t = moment(pickupTime, 'HH:mm');
-      setPickupTimeHour(t.format('h'));
-      setPickupTimeMinute(t.format('mm'));
-      setPickupTimePeriod(t.format('A') as 'AM' | 'PM');
-    }
-  }, [editingSection, pickupTime]);
-
-  // Sync dropoff time state when entering dropoff edit mode
-  useEffect(() => {
-    if (editingSection === 'dropoff' && dropoffTime) {
-      const t = moment(dropoffTime, 'HH:mm');
-      setDropoffTimeHour(t.format('h'));
-      setDropoffTimeMinute(t.format('mm'));
-      setDropoffTimePeriod(t.format('A') as 'AM' | 'PM');
-    }
-  }, [editingSection, dropoffTime]);
-
-  // Write pickup time back to form
-  const pickupMinuteNum =
-    pickupTimeMinute.length === 2 ? parseInt(pickupTimeMinute, 10) : null;
-  const pickupMinuteInvalid =
-    pickupMinuteNum !== null &&
-    (Number.isNaN(pickupMinuteNum) || pickupMinuteNum > 59);
-  const dropoffMinuteNum =
-    dropoffTimeMinute.length === 2 ? parseInt(dropoffTimeMinute, 10) : null;
-  const dropoffMinuteInvalid =
-    dropoffMinuteNum !== null &&
-    (Number.isNaN(dropoffMinuteNum) || dropoffMinuteNum > 59);
-
-  useEffect(() => {
-    if (
-      editingSection === 'pickup' &&
-      pickupTimeHour &&
-      pickupTimeMinute.length === 2 &&
-      !pickupMinuteInvalid
-    ) {
-      const hour24 =
-        pickupTimePeriod === 'AM'
-          ? pickupTimeHour === '12'
-            ? 0
-            : parseInt(pickupTimeHour, 10)
-          : pickupTimeHour === '12'
-          ? 12
-          : parseInt(pickupTimeHour, 10) + 12;
-      const timeString = `${hour24
-        .toString()
-        .padStart(2, '0')}:${pickupTimeMinute.padStart(2, '0')}`;
-      setValue('pickupTime', timeString);
-    }
-  }, [
-    editingSection,
-    pickupTimeHour,
-    pickupTimeMinute,
-    pickupTimePeriod,
-    setValue,
-  ]);
-
-  // Write dropoff time back to form
-  useEffect(() => {
-    if (
-      editingSection === 'dropoff' &&
-      dropoffTimeHour &&
-      dropoffTimeMinute.length === 2 &&
-      !dropoffMinuteInvalid
-    ) {
-      const hour24 =
-        dropoffTimePeriod === 'AM'
-          ? dropoffTimeHour === '12'
-            ? 0
-            : parseInt(dropoffTimeHour, 10)
-          : dropoffTimeHour === '12'
-          ? 12
-          : parseInt(dropoffTimeHour, 10) + 12;
-      const timeString = `${hour24
-        .toString()
-        .padStart(2, '0')}:${dropoffTimeMinute.padStart(2, '0')}`;
-      setValue('dropoffTime', timeString);
-    }
-  }, [
-    editingSection,
-    dropoffTimeHour,
-    dropoffTimeMinute,
-    dropoffTimePeriod,
-    setValue,
-  ]);
-
   const getPickupLocationDisplay = () => {
     if (!startLocation || startLocation === '') return '';
     if (startLocation === 'Other') return 'Other (Custom Address)';
@@ -253,49 +156,10 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
           {editingSection === 'date' ? (
             <div className={styles.summaryInlineEdit}>
               <div className={styles.datePickerAnchor}>
-                <button
-                  ref={dateButtonRef}
-                  type="button"
-                  className={styles.optionButton}
-                  onClick={() => setShowDatePicker(!showDatePicker)}
-                >
-                  <span>
-                    {startDate && moment(startDate).isValid()
-                      ? moment(startDate).format('MM/DD/YYYY')
-                      : 'Select date'}
-                  </span>
-                  <span className={styles.optionIcon} aria-hidden="true">
-                    <svg
-                      xmlns="http://www.w3.org/2000/svg"
-                      width="24"
-                      height="24"
-                      viewBox="0 0 24 24"
-                      fill="none"
-                    >
-                      <path
-                        d="M19 19H5V8H19M16 1V3H8V1H6V3H5C3.89 3 3 3.89 3 5V19C3 19.5304 3.21071 20.0391 3.58579 20.4142C3.96086 20.7893 4.46957 21 5 21H19C19.5304 21 20.0391 20.7893 20.4142 20.4142C20.7893 20.0391 21 19.5304 21 19V5C21 3.89 20.1 3 19 3H18V1"
-                        fill="black"
-                      />
-                    </svg>
-                  </span>
-                </button>
-                {showDatePicker && dateButtonRef.current && (
-                  <CustomDatePicker
-                    selectedDate={
-                      startDate && moment(startDate).isValid()
-                        ? moment(startDate)
-                        : moment()
-                    }
-                    currentMonth={datePickerMonth}
-                    onMonthChange={setDatePickerMonth}
-                    onDateSelect={(date) => {
-                      setValue('startDate', date.format('YYYY-MM-DD'));
-                      setShowDatePicker(false);
-                    }}
-                    onCancel={() => setShowDatePicker(false)}
-                    buttonRef={dateButtonRef}
-                  />
-                )}
+                <CustomDatePicker
+                  value={startDate || ''}
+                  onChange={(date) => setValue('startDate', date)}
+                />
               </div>
               <div className={styles.summaryRepeatBlock}>
                 <div className={styles.repeatOptionsContainer}>
@@ -467,76 +331,11 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
               >
                 Pickup Time
               </h3>
-              <div className={styles.timeInputWrapper}>
-                <div
-                  className={`${styles.timeInputContainer} ${
-                    pickupMinuteInvalid ? styles.timeInputContainerError : ''
-                  }`}
-                >
-                  <input
-                    type="text"
-                    className={styles.timeInputHour}
-                    placeholder="12"
-                    value={pickupTimeHour}
-                    onChange={(e) => {
-                      const v = e.target.value.replace(/\D/g, '');
-                      if (
-                        v === '' ||
-                        (parseInt(v, 10) >= 1 && parseInt(v, 10) <= 12)
-                      )
-                        setPickupTimeHour(v);
-                    }}
-                    maxLength={2}
-                  />
-                  <span className={styles.timeSeparator}>:</span>
-                  <input
-                    type="text"
-                    className={styles.timeInputMinute}
-                    placeholder="00"
-                    value={pickupTimeMinute}
-                    onChange={(e) => {
-                      const v = e.target.value.replace(/\D/g, '').slice(0, 2);
-                      setPickupTimeMinute(v);
-                    }}
-                    onBlur={() => {
-                      if (pickupTimeMinute === '') return;
-                      if (pickupTimeMinute.length === 1)
-                        setPickupTimeMinute(pickupTimeMinute.padStart(2, '0'));
-                    }}
-                    maxLength={2}
-                  />
-                  <div className={styles.timePeriodContainer}>
-                    <button
-                      type="button"
-                      className={`${styles.timePeriodButton} ${
-                        pickupTimePeriod === 'AM'
-                          ? styles.timePeriodButtonActive
-                          : ''
-                      }`}
-                      onClick={() => setPickupTimePeriod('AM')}
-                    >
-                      AM
-                    </button>
-                    <button
-                      type="button"
-                      className={`${styles.timePeriodButton} ${
-                        pickupTimePeriod === 'PM'
-                          ? styles.timePeriodButtonActive
-                          : ''
-                      }`}
-                      onClick={() => setPickupTimePeriod('PM')}
-                    >
-                      PM
-                    </button>
-                  </div>
-                </div>
-                {pickupMinuteInvalid && (
-                  <p className={styles.timeInputError} role="alert">
-                    Please enter minutes between 00 and 59. You can correct it
-                    above.
-                  </p>
-                )}
-              </div>
+              <CustomTimePicker
+                value={pickupTime || ''}
+                onChange={(time) => setValue('pickupTime', time)}
+                label="Pickup Time"
+              />
               <button
                 type="button"
                 className={styles.summaryDoneButton}
@@ -641,78 +440,11 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
               >
                 Dropoff Time
               </h3>
-              <div className={styles.timeInputWrapper}>
-                <div
-                  className={`${styles.timeInputContainer} ${
-                    dropoffMinuteInvalid ? styles.timeInputContainerError : ''
-                  }`}
-                >
-                  <input
-                    type="text"
-                    className={styles.timeInputHour}
-                    placeholder="12"
-                    value={dropoffTimeHour}
-                    onChange={(e) => {
-                      const v = e.target.value.replace(/\D/g, '');
-                      if (
-                        v === '' ||
-                        (parseInt(v, 10) >= 1 && parseInt(v, 10) <= 12)
-                      )
-                        setDropoffTimeHour(v);
-                    }}
-                    maxLength={2}
-                  />
-                  <span className={styles.timeSeparator}>:</span>
-                  <input
-                    type="text"
-                    className={styles.timeInputMinute}
-                    placeholder="00"
-                    value={dropoffTimeMinute}
-                    onChange={(e) => {
-                      const v = e.target.value.replace(/\D/g, '').slice(0, 2);
-                      setDropoffTimeMinute(v);
-                    }}
-                    onBlur={() => {
-                      if (dropoffTimeMinute === '') return;
-                      if (dropoffTimeMinute.length === 1)
-                        setDropoffTimeMinute(
-                          dropoffTimeMinute.padStart(2, '0')
-                        );
-                    }}
-                    maxLength={2}
-                  />
-                  <div className={styles.timePeriodContainer}>
-                    <button
-                      type="button"
-                      className={`${styles.timePeriodButton} ${
-                        dropoffTimePeriod === 'AM'
-                          ? styles.timePeriodButtonActive
-                          : ''
-                      }`}
-                      onClick={() => setDropoffTimePeriod('AM')}
-                    >
-                      AM
-                    </button>
-                    <button
-                      type="button"
-                      className={`${styles.timePeriodButton} ${
-                        dropoffTimePeriod === 'PM'
-                          ? styles.timePeriodButtonActive
-                          : ''
-                      }`}
-                      onClick={() => setDropoffTimePeriod('PM')}
-                    >
-                      PM
-                    </button>
-                  </div>
-                </div>
-                {dropoffMinuteInvalid && (
-                  <p className={styles.timeInputError} role="alert">
-                    Please enter minutes between 00 and 59. You can correct it
-                    above.
-                  </p>
-                )}
-              </div>
+              <CustomTimePicker
+                value={dropoffTime || ''}
+                onChange={(time) => setValue('dropoffTime', time)}
+                label="Dropoff Time"
+              />
               <button
                 type="button"
                 className={styles.summaryDoneButton}

From e4b83f94a93bc5b725d5663a5928242de6dad9f3 Mon Sep 17 00:00:00 2001
From: Emir Icyer <emiricyer07@gmail.com>
Date: Tue, 24 Mar 2026 22:43:18 -0400
Subject: [PATCH 08/10] css split

---
 .../requestridemodal.module.css               | 1156 +----------------
 .../RequestRideModal/steps/DateStep.tsx       |    4 +-
 .../steps/DropoffLocationStep.tsx             |   27 +-
 .../steps/PickupLocationStep.tsx              |   36 +-
 .../steps/RequestSummaryStep.tsx              |    9 +-
 .../steps/datestep.module.css                 |   21 +
 .../steps/locationstep.module.css             |   32 +
 .../steps/requestsummarystep.module.css       |  161 +++
 8 files changed, 316 insertions(+), 1130 deletions(-)
 create mode 100644 frontend/src/components/RequestRideModal/steps/datestep.module.css
 create mode 100644 frontend/src/components/RequestRideModal/steps/locationstep.module.css
 create mode 100644 frontend/src/components/RequestRideModal/steps/requestsummarystep.module.css

diff --git a/frontend/src/components/RequestRideModal/requestridemodal.module.css b/frontend/src/components/RequestRideModal/requestridemodal.module.css
index 03a98c9d9..ec84ced96 100644
--- a/frontend/src/components/RequestRideModal/requestridemodal.module.css
+++ b/frontend/src/components/RequestRideModal/requestridemodal.module.css
@@ -2,148 +2,12 @@
   max-width: 45rem;
 }
 
-.input[type='time']::-webkit-datetime-edit-hour-field:focus,
-.input[type='time']::-webkit-datetime-edit-minute-field:focus,
-.input[type='time']::-webkit-datetime-edit-ampm-field:focus {
-  background-color: #3783f6;
-}
-
-.input[type='time']::-o-datetime-edit-hour-field:focus,
-.input[type='time']::-o-datetime-edit-minute-field:focus,
-.input[type='time']::-o-datetime-edit-ampm-field:focus {
-  background-color: #3783f6;
-}
-
-.input[type='time']::-moz-datetime-edit-hour-field:focus,
-.input[type='time']::-moz-datetime-edit-minute-field:focus,
-.input[type='time']::-moz-datetime-edit-ampm-field:focus {
-  background-color: #3783f6;
-}
-
-.input[type='time']::-ms-datetime-edit-hour-field,
-.input[type='time']::-ms-datetime-edit-minute-field:focus,
-.input[type='time']::-ms-datetime-edit-ampm-field:focus {
-  background-color: #3783f6;
-}
-
-.input {
-  display: inline-block;
-  border-radius: 0.5rem;
-  border: 1px solid black;
-  font-size: 0.9rem;
-  max-width: 100%;
-  margin: 0.5rem;
-  min-width: 0;
-}
-
-.largeLabel {
-  font-size: 1.25rem;
-  font-weight: bold;
-  display: block;
-}
-
-.label {
-  font-size: 0.875rem;
-  margin: 0 0.5rem;
-}
-
-.radioLabel {
-  font-size: 0.875rem;
-  margin: 0 0.5rem;
-}
-
-.boldLabel {
-  font-weight: bold;
-  font-size: 0.875rem;
-}
-
-.box {
-  display: flex;
-}
-
-.btn {
-  margin-right: 10px;
-}
-
-.dayBox {
-  display: flex;
-}
-
-.errorBox {
-  display: flex;
-  flex-direction: column;
-  flex-wrap: nowrap;
-  align-items: stretch;
-}
-
-.formHeading {
-  margin: 0;
-  padding: 0;
-}
-
-.day {
-  border-radius: 40%;
-  height: 1rem;
-  width: 1rem;
-  border: none;
-  padding: 0;
-  cursor: pointer;
-  margin: 0 0.125rem;
-  background-color: rgba(0, 0, 0, 0.1);
-}
-
-.day:focus {
-  box-shadow: 0 0 0 3px rgba(0, 0, 0, 0.5);
-}
-
-.daySelected {
-  background-color: black;
-  color: white;
-}
-
-.daySelected:focus {
-  background-color: black;
-}
-
-.submit {
-  float: right;
-  margin-top: 0.25rem;
-}
-
 .error {
   color: #eb0023;
   font-size: 0.66rem;
   margin: 0.5rem;
 }
 
-.flexGrow {
-  flex-grow: 2;
-}
-
-.flexShrink {
-  flex-shrink: 2;
-}
-
-.whenRepeat:focus {
-  outline: 3px solid black;
-}
-
-.recurring:focus {
-  outline: 3px solid black;
-}
-
-.mapSection {
-  margin: 1rem 0;
-}
-
-.mapContainer {
-  height: 400px;
-  width: 100%;
-  border: 1px solid #ccc;
-  border-radius: 0.5rem;
-  overflow: hidden;
-}
-
 /* Mobile-first outer frame for each step */
 .stepPage {
   display: flex;
@@ -214,20 +78,6 @@
   overflow: hidden;
 }
 
-.summaryTitle {
-  align-self: stretch;
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 20px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: normal;
-  margin: 0;
-  padding: 16px 16px 0;
-  flex-shrink: 0;
-}
-
 .summaryScrollContainer {
   flex: 1;
   width: 100%;
@@ -271,156 +121,6 @@
   margin-right: auto;
 }
 
-.summarySectionLabel {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  margin: 0 0 10px 0;
-}
-
-.summarySectionLabelAfterValue {
-  margin-top: 16px;
-  margin-bottom: 10px;
-}
-
-/* Divider 40px below a section (e.g. below Edit button) */
-.summaryDividerAfterSection {
-  margin-top: 40px;
-}
-
-.summaryDateTimeTitle {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  margin: 0 0 10px 0;
-}
-
-.summaryValueBox {
-  display: flex;
-  height: 40px;
-  padding: 10px;
-  justify-content: space-between;
-  align-items: center;
-  align-self: stretch;
-  border-radius: 4px;
-  border: 1px solid #dadada;
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-}
-
-.summaryValueBox + .summaryValueBox {
-  margin-top: 10px;
-}
-
-.summaryRepeatBlock {
-  margin-top: 10px;
-}
-
-.summaryCustomDaysInSummary {
-  margin-top: 10px;
-}
-
-.summaryCustomDaysInSummary .summaryDayBlockReadOnly {
-  display: flex;
-  width: 40px;
-  height: 40px;
-  padding: 10px;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  gap: 10px;
-  flex-shrink: 0;
-  border-radius: 8px;
-  border: 1px solid #dadada;
-  background: var(--bg-main, #fff);
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  pointer-events: none;
-  cursor: default;
-}
-
-.summaryCustomDaysInSummary
-  .summaryDayBlockReadOnly.summaryDayBlockReadOnlySelected {
-  background: #000;
-  color: #fff;
-  border: 1px solid #000;
-}
-
-.summaryEditContainer {
-  display: flex;
-  padding: 10px;
-  justify-content: center;
-  align-items: center;
-  gap: 10px;
-  align-self: stretch;
-  border-radius: 4px;
-  border: 1px solid #dadada;
-  margin-top: 40px;
-  background: #fff;
-  cursor: pointer;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.summaryEditContainer:hover {
-  background: #f5f5f5;
-}
-
-.summaryEditText {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-}
-
-/* Inline edit area on summary (date/repeat, pickup, dropoff) */
-.summaryInlineEdit {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  width: 100%;
-  margin-top: 8px;
-}
-
-.summaryDoneButton {
-  align-self: flex-start;
-  margin-top: 8px;
-  padding: 8px 16px;
-  border-radius: 4px;
-  border: 1px solid #dadada;
-  background: #fff;
-  cursor: pointer;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 14px;
-  font-weight: 500;
-}
-
-.summaryDoneButton:hover {
-  background: #f5f5f5;
-}
-
 /* Drag handle at the top of the sheet (sits above inner frame) */
 .dragHandle {
   width: 72px;
@@ -442,28 +142,6 @@
   position: relative;
 }
 
-.pickupLocationFrame {
-  display: flex;
-  padding: 16px;
-  flex-direction: column;
-  align-items: center;
-  gap: 12px;
-  align-self: stretch;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.pickupLocationTitle {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  align-self: flex-start;
-}
-
 .locationSelectButton {
   display: flex;
   width: 100%;
@@ -475,429 +153,20 @@
   position: relative;
   z-index: 201;
   align-self: stretch;
-  border-radius: 4px;
-  border: 1px solid #dadada;
-  background: #fff;
-  cursor: pointer;
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-weight: 400;
-  line-height: normal;
-  box-sizing: border-box;
-}
-
-.locationButtonPlaceholder {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  opacity: 0.3;
-}
-
-.pickupMapContainer {
-  width: 363px;
-  max-width: 100%;
-  height: 209.928px;
-  aspect-ratio: 83/48;
-  border-radius: 4px;
-  border: 1px solid #dadada;
-  background: lightgray;
-  background-size: cover;
-  background-position: 50%;
-  background-repeat: no-repeat;
-  overflow: hidden;
-  flex-shrink: 0;
-  position: relative;
-  z-index: 0;
-}
-
-.pickupMapContainer > * {
-  width: 100% !important;
-  height: 100% !important;
-  max-width: 100% !important;
-  max-height: 100% !important;
-  position: absolute;
-  top: 0;
-  left: 0;
-}
-
-.pickupTimeText {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  align-self: flex-start;
-}
-
-.pickupTimeSelector {
-  display: flex;
-  height: 40px;
-  padding: 10px;
-  justify-content: space-between;
-  align-items: center;
-  align-self: stretch;
-  border-radius: 4px;
-  border: 1px solid #dadada;
-  background: #fff;
-  cursor: pointer;
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-}
-
-.pickupTimePlaceholder {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  opacity: 0.3;
-}
-
-/* Time input - single row, Figma-style */
-.timeInputContainer {
-  display: flex;
-  height: 48px;
-  padding: 0 16px;
-  align-items: center;
-  align-self: stretch;
-  border-radius: 8px;
-  border: 1px solid #e0e0e0;
-  background: #fff;
-  gap: 6px;
-  transition: border-color 0.2s ease, box-shadow 0.2s ease;
-}
-
-.timeInputContainer:focus-within {
-  border-color: #000;
-  box-shadow: 0 0 0 2px rgba(0, 0, 0, 0.08);
-}
-
-.timeInputHour,
-.timeInputMinute {
-  width: 32px;
-  height: 32px;
-  border: none;
-  outline: none;
-  background: transparent;
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 1.25;
-  text-align: center;
-  padding: 0;
-  flex-shrink: 0;
-}
-
-.timeInputHour::placeholder,
-.timeInputMinute::placeholder {
-  color: #9e9e9e;
-  font-weight: 400;
-}
-
-.timeSeparator {
-  color: #616161;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 1;
-  margin: 0 2px;
-  flex-shrink: 0;
-}
-
-.timePeriodContainer {
-  display: flex;
-  gap: 4px;
-  margin-left: auto;
-}
-
-.timePeriodButton {
-  padding: 6px 12px;
-  border: 1px solid #e0e0e0;
-  border-radius: 6px;
-  background: #fff;
-  color: #616161;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 13px;
-  font-weight: 500;
-  line-height: 1.25;
-  cursor: pointer;
-  transition: background 0.2s ease, color 0.2s ease, border-color 0.2s ease;
-  white-space: nowrap;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.timePeriodButton:hover {
-  background: #f5f5f5;
-  color: #212121;
-  border-color: #bdbdbd;
-}
-
-.timePeriodButtonActive {
-  background: #000;
-  color: #fff;
-  border-color: #000;
-}
-
-.timePeriodButtonActive:hover {
-  background: #333;
-  border-color: #333;
-  color: #fff;
-}
-
-.timeIcon {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 20px;
-  height: 20px;
-  margin-left: 8px;
-  flex-shrink: 0;
-  color: #757575;
-}
-
-.timeInputWrapper {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  width: 100%;
-  align-self: stretch;
-}
-
-.timeInputContainerError {
-  border-color: #c62828;
-  box-shadow: 0 0 0 2px rgba(198, 40, 40, 0.12);
-}
-
-.timeInputContainerError:focus-within {
-  border-color: #c62828;
-  box-shadow: 0 0 0 2px rgba(198, 40, 40, 0.2);
-}
-
-.timeInputError {
-  margin: 0;
-  padding: 0;
-  color: #c62828;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 13px;
-  font-weight: 400;
-  line-height: 1.35;
-}
-
-/* Time slot chips (pickup/dropoff) */
-.timeSlotsContainer {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-  width: 100%;
-  align-self: stretch;
-}
-
-.timeSlotChip {
-  padding: 10px 16px;
-  border-radius: 8px;
-  border: 1px solid #dadada;
-  background: #fff;
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 14px;
-  font-weight: 400;
-  line-height: 1.25;
-  cursor: pointer;
-  transition: background 0.2s ease, border-color 0.2s ease, color 0.2s ease;
-  white-space: nowrap;
-}
-
-.timeSlotChip:hover {
-  background: #f5f5f5;
-  border-color: #bbb;
-}
-
-.timeSlotChipActive {
-  background: #000;
-  color: #fff;
-  border-color: #000;
-}
-
-.timeSlotChipActive:hover {
-  background: #333;
-  border-color: #333;
-}
-
-/* Custom Time Picker */
-.customTimePicker {
-  display: flex;
-  flex-direction: column;
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: calc(100% - 32px);
-  max-width: 363px;
-  border-radius: 4px;
-  border: 1px solid #dadada;
-  background: #fff;
-  z-index: 1001;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-}
-
-.timePickerContent {
-  display: flex;
-  justify-content: center;
-  align-items: flex-start;
-  gap: 16px;
-  padding: 24px;
-  min-height: 300px;
-  max-height: 400px;
-  overflow-y: auto;
-}
-
-.timePickerColumn {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 8px;
-  flex: 1;
-}
-
-.timePickerLabel {
-  color: var(
-    --M3-sys-light-on-surface-variant,
-    var(--Schemes-On-Surface-Variant, #49454f)
-  );
-  text-align: center;
-  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system,
-    BlinkMacSystemFont, 'Segoe UI', sans-serif;
-  font-size: var(--Static-Label-Large-Size, 14px);
-  font-style: normal;
-  font-weight: 500;
-  line-height: var(--Static-Label-Large-Line-Height, 20px);
-  letter-spacing: var(--Static-Label-Large-Tracking, 0.1px);
-  margin-bottom: 8px;
-}
-
-.timePickerValues {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 4px;
-  width: 100%;
-  max-height: 250px;
-  overflow-y: auto;
-}
-
-.timePickerValue {
-  min-width: 48px;
-  width: 48px;
-  min-height: 48px;
-  height: 48px;
-  border: none;
-  background: transparent;
-  border-radius: 50%;
-  color: var(
-    --M3-sys-light-on-surface-variant,
-    var(--Schemes-On-Surface-Variant, #49454f)
-  );
-  text-align: center;
-  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system,
-    BlinkMacSystemFont, 'Segoe UI', sans-serif;
-  font-size: var(--Static-Label-Large-Size, 14px);
-  font-style: normal;
-  font-weight: 500;
-  line-height: 1;
-  letter-spacing: var(--Static-Label-Large-Tracking, 0.1px);
-  cursor: pointer;
-  transition: all 0.2s ease;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0;
-  flex-shrink: 0;
-  box-sizing: border-box;
-}
-
-.timePickerValue:hover {
-  background-color: #f5f5f5;
-}
-
-.timePickerValueSelected {
-  background: #000;
-  color: #fff;
-  border-radius: 50%;
-}
-
-.timePickerValueSelected:hover {
-  background: #333;
-}
-
-.mobileTitle {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-}
-
-.mobileTitleLeft {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-  text-align: left;
-  align-self: flex-start;
-}
-
-/* Apply font styles to all buttons and text */
-.optionButton {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
-}
-
-.dateButtonPlaceholder {
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: #fff;
+  cursor: pointer;
   color: #000;
   font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
     sans-serif;
   font-size: 16px;
-  font-style: normal;
   font-weight: 400;
   line-height: normal;
-  opacity: 0.3;
+  box-sizing: border-box;
 }
 
-.repeatOption {
+.locationButtonPlaceholder {
   color: #000;
   font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
     sans-serif;
@@ -905,26 +174,34 @@
   font-style: normal;
   font-weight: 400;
   line-height: normal;
+  opacity: 0.3;
 }
 
-.cancelButton {
-  color: #000;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
+.pickupMapContainer {
+  width: 363px;
+  max-width: 100%;
+  height: 209.928px;
+  aspect-ratio: 83/48;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: lightgray;
+  background-size: cover;
+  background-position: 50%;
+  background-repeat: no-repeat;
+  overflow: hidden;
+  flex-shrink: 0;
+  position: relative;
+  z-index: 0;
 }
 
-.saveContinueButton {
-  color: #fff;
-  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
-    sans-serif;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 400;
-  line-height: normal;
+.pickupMapContainer > * {
+  width: 100% !important;
+  height: 100% !important;
+  max-width: 100% !important;
+  max-height: 100% !important;
+  position: absolute;
+  top: 0;
+  left: 0;
 }
 
 .optionButton {
@@ -938,6 +215,13 @@
   border: 1px solid #dadada;
   background-color: #ffffff;
   cursor: pointer;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
 }
 
 .optionButton:hover {
@@ -970,6 +254,13 @@
   border: 1px solid #dadada;
   cursor: pointer;
   transition: all 0.2s ease;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
 }
 
 .repeatOption:hover {
@@ -1062,218 +353,6 @@
   box-sizing: border-box;
 }
 
-/* Custom Date Picker */
-.customDatePicker {
-  display: flex;
-  width: calc(100% - 32px);
-  flex-direction: column;
-  align-items: flex-start;
-  position: absolute;
-  bottom: -418px;
-  left: 16px;
-  border-radius: 4px;
-  border: 1px solid #dadada;
-  background: var(--bg-main, #fff);
-  z-index: 1000;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1d1b20));
-  text-align: center;
-  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system,
-    BlinkMacSystemFont, 'Segoe UI', sans-serif;
-  font-size: var(--Static-Body-Large-Size, 16px);
-  font-style: normal;
-  font-weight: 400;
-  line-height: var(--Static-Body-Large-Line-Height, 24px);
-  letter-spacing: var(--Static-Body-Large-Tracking, 0.5px);
-}
-
-.datePickerTopFrame {
-  display: flex;
-  height: 64px;
-  justify-content: space-between;
-  align-items: center;
-  align-self: stretch;
-  padding: 0 16px;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.monthYearSelector {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  gap: 8px;
-}
-
-.datePickerArrow {
-  width: 24px;
-  height: 24px;
-  border: none;
-  background: none;
-  cursor: pointer;
-  padding: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.datePickerArrow:hover {
-  opacity: 0.7;
-}
-
-.monthYearSelect {
-  border: 1px solid #dadada;
-  border-radius: 4px;
-  padding: 4px 8px;
-  padding-right: 24px;
-  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1d1b20));
-  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system,
-    BlinkMacSystemFont, 'Segoe UI', sans-serif;
-  font-size: var(--Static-Body-Large-Size, 16px);
-  font-style: normal;
-  font-weight: 400;
-  line-height: var(--Static-Body-Large-Line-Height, 24px);
-  letter-spacing: var(--Static-Body-Large-Tracking, 0.5px);
-  background: #fff;
-  cursor: pointer;
-  appearance: none;
-  background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='0 0 12 12' fill='none'%3E%3Cpath d='M2 4L6 8L10 4' stroke='%2349454F' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'/%3E%3C/svg%3E");
-  background-repeat: no-repeat;
-  background-position: right 8px center;
-}
-
-.datePickerCalendar {
-  padding: 16px;
-}
-
-.datePickerWeekdays {
-  display: grid;
-  grid-template-columns: repeat(7, 1fr);
-  gap: 4px;
-  margin-bottom: 8px;
-}
-
-.datePickerWeekday {
-  text-align: center;
-  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1d1b20));
-  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system,
-    BlinkMacSystemFont, 'Segoe UI', sans-serif;
-  font-size: var(--Static-Body-Large-Size, 16px);
-  font-style: normal;
-  font-weight: 400;
-  line-height: var(--Static-Body-Large-Line-Height, 24px);
-  letter-spacing: var(--Static-Body-Large-Tracking, 0.5px);
-  padding: 8px 0;
-}
-
-.datePickerDays {
-  display: grid;
-  grid-template-columns: repeat(7, 1fr);
-  gap: 4px;
-}
-
-.datePickerDay {
-  width: 40px;
-  height: 40px;
-  border: none;
-  background: none;
-  border-radius: 4px;
-  text-align: center;
-  color: var(--M3-sys-light-on-surface, var(--Schemes-On-Surface, #1d1b20));
-  font-family: var(--Static-Body-Large-Font, Roboto), system-ui, -apple-system,
-    BlinkMacSystemFont, 'Segoe UI', sans-serif;
-  font-size: var(--Static-Body-Large-Size, 16px);
-  font-style: normal;
-  font-weight: 400;
-  line-height: var(--Static-Body-Large-Line-Height, 24px);
-  letter-spacing: var(--Static-Body-Large-Tracking, 0.5px);
-  cursor: pointer;
-  transition: all 0.2s ease;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.datePickerDay:hover {
-  background-color: #f5f5f5;
-}
-
-.datePickerDayOtherMonth {
-  color: #ccc;
-  cursor: not-allowed;
-}
-
-.datePickerDayOtherMonth:hover {
-  background-color: transparent;
-}
-
-.datePickerDaySelected {
-  background: #000;
-  color: #fff;
-  border-radius: 50%;
-}
-
-.datePickerDaySelected:hover {
-  background: #333;
-}
-
-.datePickerDayToday {
-  border: 1px solid #000;
-}
-
-.datePickerBottomFrame {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  gap: 16px;
-  flex: 1 0 0;
-  padding: 16px;
-  border-top: 1px solid #f0f0f0;
-  background: #fff;
-  width: 100%;
-  box-sizing: border-box;
-}
-
-.datePickerCancelButton,
-.datePickerOkButton {
-  display: flex;
-  height: 48px;
-  justify-content: center;
-  align-items: center;
-  padding: 0;
-  border: none;
-  background: transparent;
-  text-align: right;
-  color: var(
-    --M3-sys-light-on-surface-variant,
-    var(--Schemes-On-Surface-Variant, #49454f)
-  );
-  font-family: var(--Static-Label-Large-Font, Roboto), system-ui, -apple-system,
-    BlinkMacSystemFont, 'Segoe UI', sans-serif;
-  font-size: var(--Static-Label-Large-Size, 14px);
-  font-style: normal;
-  font-weight: 500;
-  line-height: var(--Static-Label-Large-Line-Height, 20px);
-  letter-spacing: var(--Static-Label-Large-Tracking, 0.1px);
-  cursor: pointer;
-  transition: opacity 0.2s ease;
-}
-
-.datePickerCancelButton {
-  margin-left: auto;
-}
-
-.datePickerOkButton {
-  color: var(
-    --M3-sys-light-on-surface-variant,
-    var(--Schemes-On-Surface-Variant, #49454f)
-  );
-}
-
-.datePickerCancelButton:hover,
-.datePickerOkButton:hover {
-  opacity: 0.7;
-}
-
 /* Search Input with Icon - z-index so location button/dropdown stay above map and are always clickable */
 .searchInputWrapper {
   position: relative;
@@ -1283,39 +362,6 @@
   pointer-events: auto;
 }
 
-.searchInput {
-  width: 100%;
-  padding: 0.75rem 1rem 0.75rem 2.75rem;
-  border: 1px solid #e0e0e0;
-  border-radius: 0.5rem;
-  font-size: 1rem;
-  transition: all 0.2s ease;
-  background-color: white;
-}
-
-.searchInput:focus {
-  outline: none;
-  border-color: #3783f6;
-  box-shadow: 0 0 0 3px rgba(55, 131, 246, 0.1);
-}
-
-.searchInput:disabled {
-  background-color: #f5f5f5;
-  cursor: not-allowed;
-  opacity: 0.6;
-}
-
-.inputIcon {
-  position: absolute;
-  left: 0.75rem;
-  top: 50%;
-  transform: translateY(-50%);
-  width: 1.25rem;
-  height: 1.25rem;
-  pointer-events: none;
-  opacity: 0.6;
-}
-
 /* Location Dropdown - above map so it's clickable when changing selection */
 .locationDropdown {
   position: absolute;
@@ -1348,51 +394,6 @@
   background-color: #f5f5f5;
 }
 
-/* Time Input with Icon */
-.timeInputWrapper {
-  position: relative;
-  width: 100%;
-}
-
-.timeInput {
-  width: 100%;
-  padding: 0.75rem 1rem 0.75rem 2.75rem;
-  border: 1px solid #e0e0e0;
-  border-radius: 0.5rem;
-  font-size: 1rem;
-  transition: all 0.2s ease;
-  background-color: white;
-}
-
-.timeInput:focus {
-  outline: none;
-  border-color: #3783f6;
-  box-shadow: 0 0 0 3px rgba(55, 131, 246, 0.1);
-}
-
-/* Notes Textarea */
-.notesTextarea {
-  width: 100%;
-  padding: 0.75rem 1rem;
-  border: 1px solid #e0e0e0;
-  border-radius: 0.5rem;
-  font-size: 1rem;
-  font-family: inherit;
-  resize: vertical;
-  transition: all 0.2s ease;
-  background-color: white;
-}
-
-.notesTextarea:focus {
-  outline: none;
-  border-color: #3783f6;
-  box-shadow: 0 0 0 3px rgba(55, 131, 246, 0.1);
-}
-
-.notesTextarea::placeholder {
-  color: #999;
-}
-
 /* Bottom button frame */
 .bottomButtonFrame {
   display: flex;
@@ -1416,6 +417,13 @@
   background-color: #fff;
   cursor: pointer;
   transition: background-color 0.2s ease;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
 }
 
 .cancelButton:hover {
@@ -1434,6 +442,13 @@
   background: #000;
   cursor: pointer;
   transition: opacity 0.2s ease;
+  color: #fff;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
 }
 
 .saveContinueButton:disabled {
@@ -1458,26 +473,6 @@
 }
 
 @media screen and (max-width: 768px) {
-  .box {
-    display: block;
-  }
-
-  .label {
-    display: inline-block;
-  }
-
-  .radioBox {
-    display: block;
-  }
-
-  .whenRepeat {
-    display: inline-block;
-  }
-
-  .mapContainer {
-    height: 300px;
-  }
-
   .locationDropdown {
     max-height: 150px;
   }
@@ -1587,39 +582,4 @@
     width: 719px;
     max-width: 100%;
   }
-
-  .requestRideModal .timeInputContainer {
-    width: 719px;
-    max-width: 100%;
-    align-self: stretch;
-  }
-
-  /* Date picker: top-left of calendar at bottom-left of date button, fixed size */
-  .requestRideModal .datePickerAnchor .customDatePicker {
-    top: 100%;
-    left: 0;
-    bottom: auto;
-    margin-top: 4px;
-    width: 320px;
-    max-width: calc(100vw - 24px);
-  }
-
-  .requestRideModal .datePickerAnchor .datePickerTopFrame {
-    height: 48px;
-    padding: 0 12px;
-  }
-
-  .requestRideModal .datePickerAnchor .datePickerCalendar {
-    padding: 12px;
-  }
-
-  .requestRideModal .datePickerAnchor .datePickerDay {
-    width: 32px;
-    height: 32px;
-    font-size: 14px;
-  }
-
-  .requestRideModal .datePickerAnchor .datePickerBottomFrame {
-    padding: 12px;
-  }
 }
diff --git a/frontend/src/components/RequestRideModal/steps/DateStep.tsx b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
index 1f86d1057..b27ad058f 100644
--- a/frontend/src/components/RequestRideModal/steps/DateStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
@@ -7,7 +7,9 @@ import { Label, Input } from '../../FormElements/FormElements';
 import { isTimeValid } from '../../../util/index';
 import CustomRepeatingRides from '../CustomRepeatingRides';
 import CustomDatePicker from '../CustomDatePicker';
-import styles from '../requestridemodal.module.css';
+import sharedStyles from '../requestridemodal.module.css';
+import ownStyles from './datestep.module.css';
+const styles = { ...sharedStyles, ...ownStyles };
 
 type DateStepProps = {
   ride?: Ride;
diff --git a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
index bc82a2e4e..32d1c8222 100644
--- a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
@@ -10,7 +10,9 @@ import { useLocations } from '../../../context/LocationsContext';
 import RequestRideMap from '../../RiderComponents/RequestRideMap';
 import { Location } from '../../../types';
 import CustomTimePicker from '../CustomTimePicker';
-import styles from '../requestridemodal.module.css';
+import sharedStyles from '../requestridemodal.module.css';
+import ownStyles from './locationstep.module.css';
+const styles = { ...sharedStyles, ...ownStyles };
 
 type DropoffLocationStepProps = {
   ride?: Ride;
@@ -40,7 +42,6 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   } = useFormContext();
 
   const [locations, setLocations] = useState<Location[]>([]);
-  const [dropoffLocation, setDropoffLocation] = useState<Location | null>(null);
   const [searchQuery, setSearchQuery] = useState('');
   const [filteredLocations, setFilteredLocations] = useState<Location[]>([]);
   const [showLocationDropdown, setShowLocationDropdown] = useState(false);
@@ -54,6 +55,10 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   const watchDropoffTime = watch('dropoffTime');
   const loc = useLocations().locations;
 
+  // Derive selected location from form value — persists across Back navigation
+  const dropoffLocation =
+    loc.find((l) => l.id === watchEndLocation) ?? null;
+
   // Close dropdown when clicking outside
   useEffect(() => {
     const handleClickOutside = (event: MouseEvent) => {
@@ -75,16 +80,8 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   }, []);
 
   useEffect(() => {
-    // Use all locations from context for the selector,
-    // and let the map handle filtering by coordinates internally
     setLocations(loc);
     setFilteredLocations(loc);
-
-    const savedId = watchEndLocation;
-    if (savedId && savedId !== 'Other' && loc.length > 0) {
-      const found = loc.find((l) => l.id === savedId);
-      if (found) setDropoffLocation(found);
-    }
   }, [loc]);
 
   useEffect(() => {
@@ -123,7 +120,6 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   }, [watchCustomCheckbox, setValue]);
 
   const handleDropoffSelect = (location: Location | null) => {
-    setDropoffLocation(location);
     if (location) {
       const foundLocation = locations.find((loc) => loc.id === location.id);
       if (foundLocation) {
@@ -157,7 +153,6 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
     setSearchQuery(location.name);
     setShowLocationDropdown(false);
     setShowLocationButton(false);
-    setDropoffLocation(location);
   };
 
   // Check if form is valid for enabling "Save and Continue" button
@@ -302,7 +297,9 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
             )}
           </div>
           {errors.endLocation && (
-            <p className={styles.error}>{errors.endLocation.message as string}</p>
+            <p className={styles.error}>
+              {errors.endLocation.message as string}
+            </p>
           )}
 
           {/* Map */}
@@ -326,7 +323,9 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
             label="Time"
           />
           {errors.dropoffTime && (
-            <p className={styles.error}>{errors.dropoffTime.message as string}</p>
+            <p className={styles.error}>
+              {errors.dropoffTime.message as string}
+            </p>
           )}
         </div>
       </div>
diff --git a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
index 1bcfd4818..c6201a224 100644
--- a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
@@ -10,7 +10,9 @@ import { useLocations } from '../../../context/LocationsContext';
 import RequestRideMap from '../../RiderComponents/RequestRideMap';
 import { Location } from '../../../types';
 import CustomTimePicker from '../CustomTimePicker';
-import styles from '../requestridemodal.module.css';
+import sharedStyles from '../requestridemodal.module.css';
+import ownStyles from './locationstep.module.css';
+const styles = { ...sharedStyles, ...ownStyles };
 
 type PickupLocationStepProps = {
   ride?: Ride;
@@ -29,10 +31,15 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   onNext,
   onBack,
 }) => {
-  const { register, getValues, watch, setValue, formState: { errors } } = useFormContext();
+  const {
+    register,
+    getValues,
+    watch,
+    setValue,
+    formState: { errors },
+  } = useFormContext();
 
   const [locations, setLocations] = useState<Location[]>([]);
-  const [pickupLocation, setPickupLocation] = useState<Location | null>(null);
   const [searchQuery, setSearchQuery] = useState('');
   const [filteredLocations, setFilteredLocations] = useState<Location[]>([]);
   const [showLocationDropdown, setShowLocationDropdown] = useState(false);
@@ -46,6 +53,10 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   const watchPickupTime = watch('pickupTime');
   const loc = useLocations().locations;
 
+  // Derive selected location from form value — persists across Back navigation
+  const pickupLocation =
+    loc.find((l) => l.id === watchStartLocation) ?? null;
+
   // Close dropdown when clicking outside
   useEffect(() => {
     const handleClickOutside = (event: MouseEvent) => {
@@ -67,17 +78,8 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   }, []);
 
   useEffect(() => {
-    // Use all locations from context for the selector,
-    // and let the map handle filtering by coordinates internally
     setLocations(loc);
     setFilteredLocations(loc);
-
-    // Restore pickupLocation object from form value (e.g. when navigating back to this step)
-    const savedId = watchStartLocation;
-    if (savedId && savedId !== 'Other' && loc.length > 0) {
-      const found = loc.find((l) => l.id === savedId);
-      if (found) setPickupLocation(found);
-    }
   }, [loc]);
 
   useEffect(() => {
@@ -118,7 +120,6 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   }, [watchCustomCheckbox, setValue]);
 
   const handlePickupSelect = (location: Location | null) => {
-    setPickupLocation(location);
     if (location) {
       const foundLocation = locations.find((loc) => loc.id === location.id);
       if (foundLocation) {
@@ -141,7 +142,6 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
     setSearchQuery(location.name);
     setShowLocationDropdown(false);
     setShowLocationButton(false);
-    setPickupLocation(location);
   };
 
   // Check if form is valid for enabling "Save and Continue" button
@@ -286,7 +286,9 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
             )}
           </div>
           {errors.startLocation && (
-            <p className={styles.error}>{errors.startLocation.message as string}</p>
+            <p className={styles.error}>
+              {errors.startLocation.message as string}
+            </p>
           )}
 
           {/* Map */}
@@ -310,7 +312,9 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
             label="Time"
           />
           {errors.pickupTime && (
-            <p className={styles.error}>{errors.pickupTime.message as string}</p>
+            <p className={styles.error}>
+              {errors.pickupTime.message as string}
+            </p>
           )}
         </div>
       </div>
diff --git a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
index 25a8b1f3f..d5762b085 100644
--- a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
@@ -5,12 +5,15 @@ import { useLocations } from '../../../context/LocationsContext';
 import CustomDatePicker from '../CustomDatePicker';
 import CustomTimePicker from '../CustomTimePicker';
 import { Location } from '../../../types';
-import styles from '../requestridemodal.module.css';
+import sharedStyles from '../requestridemodal.module.css';
+import ownStyles from './requestsummarystep.module.css';
+const styles = { ...sharedStyles, ...ownStyles };
 
 type RequestSummaryStepProps = {
   onClose?: () => void;
   onNext?: () => void;
   onBack?: () => void;
+  submitError?: string | null;
 };
 
 const REPEAT_LABELS: Record<string, string> = {
@@ -45,6 +48,7 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
   onClose,
   onNext,
   onBack,
+  submitError,
 }) => {
   const [dragStartY, setDragStartY] = useState<number | null>(null);
   const [editingSection, setEditingSection] = useState<EditingSection>(null);
@@ -479,6 +483,9 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
       </div>
 
       <div className={styles.bottomSection}>
+        {submitError && (
+          <p className={styles.error}>{submitError}</p>
+        )}
         <div className={styles.bottomButtonFrame}>
           <button
             type="button"
diff --git a/frontend/src/components/RequestRideModal/steps/datestep.module.css b/frontend/src/components/RequestRideModal/steps/datestep.module.css
new file mode 100644
index 000000000..029c84865
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/steps/datestep.module.css
@@ -0,0 +1,21 @@
+.mobileHeaderFrame {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  gap: 16px;
+  align-self: stretch;
+  padding: 16px;
+  position: relative;
+}
+
+.mobileTitleLeft {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  text-align: left;
+  align-self: flex-start;
+}
diff --git a/frontend/src/components/RequestRideModal/steps/locationstep.module.css b/frontend/src/components/RequestRideModal/steps/locationstep.module.css
new file mode 100644
index 000000000..eb73e7f3a
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/steps/locationstep.module.css
@@ -0,0 +1,32 @@
+.pickupLocationFrame {
+  display: flex;
+  padding: 16px;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+  align-self: stretch;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.pickupLocationTitle {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  align-self: flex-start;
+}
+
+.pickupTimeText {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  align-self: flex-start;
+}
diff --git a/frontend/src/components/RequestRideModal/steps/requestsummarystep.module.css b/frontend/src/components/RequestRideModal/steps/requestsummarystep.module.css
new file mode 100644
index 000000000..524c6fee8
--- /dev/null
+++ b/frontend/src/components/RequestRideModal/steps/requestsummarystep.module.css
@@ -0,0 +1,161 @@
+.summaryTitle {
+  align-self: stretch;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 20px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: normal;
+  margin: 0;
+  padding: 16px 16px 0;
+  flex-shrink: 0;
+}
+
+.summarySectionLabel {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  margin: 0 0 10px 0;
+}
+
+.summarySectionLabelAfterValue {
+  margin-top: 16px;
+  margin-bottom: 10px;
+}
+
+.summaryDividerAfterSection {
+  margin-top: 40px;
+}
+
+.summaryDateTimeTitle {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  margin: 0 0 10px 0;
+}
+
+.summaryValueBox {
+  display: flex;
+  height: 40px;
+  padding: 10px;
+  justify-content: space-between;
+  align-items: center;
+  align-self: stretch;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.summaryValueBox + .summaryValueBox {
+  margin-top: 10px;
+}
+
+.summaryRepeatBlock {
+  margin-top: 10px;
+}
+
+.summaryCustomDaysInSummary {
+  margin-top: 10px;
+}
+
+.summaryCustomDaysInSummary .summaryDayBlockReadOnly {
+  display: flex;
+  width: 40px;
+  height: 40px;
+  padding: 10px;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  flex-shrink: 0;
+  border-radius: 8px;
+  border: 1px solid #dadada;
+  background: var(--bg-main, #fff);
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+  pointer-events: none;
+  cursor: default;
+}
+
+.summaryCustomDaysInSummary
+  .summaryDayBlockReadOnly.summaryDayBlockReadOnlySelected {
+  background: #000;
+  color: #fff;
+  border: 1px solid #000;
+}
+
+.summaryEditContainer {
+  display: flex;
+  padding: 10px;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  align-self: stretch;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  margin-top: 40px;
+  background: #fff;
+  cursor: pointer;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.summaryEditContainer:hover {
+  background: #f5f5f5;
+}
+
+.summaryEditText {
+  color: #000;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: normal;
+}
+
+.summaryInlineEdit {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  width: 100%;
+  margin-top: 8px;
+}
+
+.summaryDoneButton {
+  align-self: flex-start;
+  margin-top: 8px;
+  padding: 8px 16px;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: #fff;
+  cursor: pointer;
+  font-family: Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI',
+    sans-serif;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.summaryDoneButton:hover {
+  background: #f5f5f5;
+}

From dd77c0f5ad9b72334588cfedeac6f0e4546192c6 Mon Sep 17 00:00:00 2001
From: Emir Icyer <emiricyer07@gmail.com>
Date: Wed, 25 Mar 2026 09:27:01 -0400
Subject: [PATCH 09/10] catch blocks and add toast

---
 .../CreateOrEditRideModal.tsx                 | 25 ++++++++++++++-----
 .../steps/RequestSummaryStep.tsx              |  5 ----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
index e9bd9912b..e2d8b4ed6 100644
--- a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
+++ b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
@@ -14,6 +14,7 @@ import RequestSummaryStep from './steps/RequestSummaryStep';
 import { RideModalType } from './types';
 import { format_date } from '../../util/index';
 import axios from '../../util/axios';
+import { useToast, ToastStatus } from '../../context/toastContext';
 
 type WizardStep = 'date' | 'pickup' | 'dropoff' | 'summary';
 
@@ -61,6 +62,7 @@ const CreateOrEditRideModal = ({
   const methods = useForm({ defaultValues });
   const { id } = useContext(AuthContext);
   const formRef = useRef<HTMLFormElement>(null);
+  const { showToast } = useToast();
 
   const closeModal = () => {
     setCurrentStep('date');
@@ -152,9 +154,9 @@ const CreateOrEditRideModal = ({
     const isRecurringRide =
       recurring || (whenRepeat && whenRepeat !== 'no-repeat');
     if (isRecurringRide) {
-      // For now, block recurring rides as they're not fully implemented
-      alert(
-        'Recurring rides are not yet supported. Please create a single ride instead.'
+      showToast(
+        'Recurring rides are not yet supported. Please create a single ride instead.',
+        ToastStatus.ERROR
       );
       return;
     } else {
@@ -177,11 +179,18 @@ const CreateOrEditRideModal = ({
       closeModal();
     };
 
+    const handleError = (err: any) => {
+      showToast(
+        err?.response?.data?.message ?? 'Something went wrong. Please try again.',
+        ToastStatus.ERROR
+      );
+    };
+
     if (!ride) {
       // create ride
       rideData.type = 'upcoming';
       rideData.schedulingState = 'unscheduled';
-      axios.post('/api/rides', rideData).then(afterSubmit);
+      axios.post('/api/rides', rideData).then(afterSubmit).catch(handleError);
     } else if (modalType === 'EDIT_SINGLE_RECURRING') {
       // edit single instance of recurring ride
       rideData.type = 'upcoming';
@@ -192,12 +201,16 @@ const CreateOrEditRideModal = ({
           origDate: format_date(ride.startTime),
           ...rideData,
         })
-        .then(afterSubmit);
+        .then(afterSubmit)
+        .catch(handleError);
     } else {
       // edit single ride - for now all rides are treated as single rides
       rideData.type = 'upcoming';
       rideData.schedulingState = 'unscheduled';
-      axios.put(`/api/rides/${ride.id}`, rideData).then(afterSubmit);
+      axios
+        .put(`/api/rides/${ride.id}`, rideData)
+        .then(afterSubmit)
+        .catch(handleError);
     }
   };
 
diff --git a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
index d5762b085..700e4d72e 100644
--- a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
@@ -13,7 +13,6 @@ type RequestSummaryStepProps = {
   onClose?: () => void;
   onNext?: () => void;
   onBack?: () => void;
-  submitError?: string | null;
 };
 
 const REPEAT_LABELS: Record<string, string> = {
@@ -48,7 +47,6 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
   onClose,
   onNext,
   onBack,
-  submitError,
 }) => {
   const [dragStartY, setDragStartY] = useState<number | null>(null);
   const [editingSection, setEditingSection] = useState<EditingSection>(null);
@@ -483,9 +481,6 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
       </div>
 
       <div className={styles.bottomSection}>
-        {submitError && (
-          <p className={styles.error}>{submitError}</p>
-        )}
         <div className={styles.bottomButtonFrame}>
           <button
             type="button"

From b8ab4080296ee8d250cd8dfe4b572beda66eb873 Mon Sep 17 00:00:00 2001
From: Emir Icyer <emiricyer07@gmail.com>
Date: Wed, 25 Mar 2026 09:42:37 -0400
Subject: [PATCH 10/10] close button and early warning for recurring rides

---
 .../CreateOrEditRideModal.tsx                 | 69 ++++++++++---------
 .../requestridemodal.module.css               | 35 ++++++----
 .../RequestRideModal/steps/DateStep.tsx       | 44 ++++--------
 .../steps/DropoffLocationStep.tsx             | 36 ++--------
 .../steps/PickupLocationStep.tsx              | 36 ++--------
 .../steps/RequestSummaryStep.tsx              | 32 ++-------
 .../steps/datestep.module.css                 |  2 +-
 .../steps/locationstep.module.css             |  2 +-
 8 files changed, 90 insertions(+), 166 deletions(-)

diff --git a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
index e2d8b4ed6..f7abfb0c5 100644
--- a/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
+++ b/frontend/src/components/RequestRideModal/CreateOrEditRideModal.tsx
@@ -36,6 +36,7 @@ const CreateOrEditRideModal = ({
   ride,
 }: CreateOrEditRideModalProps) => {
   const [currentStep, setCurrentStep] = useState<WizardStep>('date');
+  const [dragStartY, setDragStartY] = useState<number | null>(null);
   const defaultStartDate = () => {
     if (ride) {
       if (
@@ -70,6 +71,24 @@ const CreateOrEditRideModal = ({
     onClose();
   };
 
+  const handleTouchStart = (e: React.TouchEvent) => {
+    setDragStartY(e.touches[0].clientY);
+  };
+
+  const handleTouchMove = (e: React.TouchEvent) => {
+    if (dragStartY !== null) {
+      const diff = e.touches[0].clientY - dragStartY;
+      if (diff > 100) {
+        closeModal();
+        setDragStartY(null);
+      }
+    }
+  };
+
+  const handleTouchEnd = () => {
+    setDragStartY(null);
+  };
+
   const handleFormSubmit = async () => {
     const isValid = await methods.trigger();
     if (isValid) {
@@ -120,18 +139,10 @@ const CreateOrEditRideModal = ({
   const handleSubmit = async (formData: ObjectType) => {
     const {
       startDate,
-      recurring,
-      whenRepeat,
-      Mon,
-      Tue,
-      Wed,
-      Thu,
-      Fri,
       startLocation,
       endLocation,
       pickupTime,
       dropoffTime,
-      endDate,
       customPickup,
       pickupCity,
       pickupZip,
@@ -149,28 +160,16 @@ const CreateOrEditRideModal = ({
       endLocation !== 'Other'
         ? endLocation
         : `${customDropoff}, ${dropoffCity} NY, ${dropoffZip}`;
-    let rideData: ObjectType;
-    // Check if it's a recurring ride (not "no-repeat")
-    const isRecurringRide =
-      recurring || (whenRepeat && whenRepeat !== 'no-repeat');
-    if (isRecurringRide) {
-      showToast(
-        'Recurring rides are not yet supported. Please create a single ride instead.',
-        ToastStatus.ERROR
-      );
-      return;
-    } else {
-      // Single ride (non-recurring) - "No repeat" or no repeat selection
-      rideData = {
-        startLocation: startLoc,
-        endLocation: endLoc,
-        rider: id,
-        startTime,
-        endTime,
-        isRecurring: false,
-        timezone: 'America/New_York',
-      };
-    }
+    // Single ride only — recurring is blocked at DateStep
+    const rideData: ObjectType = {
+      startLocation: startLoc,
+      endLocation: endLoc,
+      rider: id,
+      startTime,
+      endTime,
+      isRecurring: false,
+      timezone: 'America/New_York',
+    };
 
     rideData = cleanData(rideData);
 
@@ -181,7 +180,8 @@ const CreateOrEditRideModal = ({
 
     const handleError = (err: any) => {
       showToast(
-        err?.response?.data?.message ?? 'Something went wrong. Please try again.',
+        err?.response?.data?.message ??
+          'Something went wrong. Please try again.',
         ToastStatus.ERROR
       );
     };
@@ -277,7 +277,12 @@ const CreateOrEditRideModal = ({
           onSubmit={methods.handleSubmit(handleSubmit)}
           id="ride-form"
         >
-          <div className={styles.inputContainer}>
+          <div
+            className={styles.inputContainer}
+            onTouchStart={handleTouchStart}
+            onTouchMove={handleTouchMove}
+            onTouchEnd={handleTouchEnd}
+          >
             <div className={styles.wizardContainer}>
               <div className={styles.stepContent}>{renderStep()}</div>
             </div>
diff --git a/frontend/src/components/RequestRideModal/requestridemodal.module.css b/frontend/src/components/RequestRideModal/requestridemodal.module.css
index ec84ced96..44edcafe3 100644
--- a/frontend/src/components/RequestRideModal/requestridemodal.module.css
+++ b/frontend/src/components/RequestRideModal/requestridemodal.module.css
@@ -16,7 +16,6 @@
   flex-direction: column;
   justify-content: space-between;
   align-items: center;
-  border-top: 1px solid #dadada;
   background: #fff;
   margin: 0 auto;
 }
@@ -72,7 +71,6 @@
   width: 395px;
   height: 752px;
   align-items: center;
-  border-top: 1px solid #dadada;
   background: #fff;
   margin: 0 auto;
   overflow: hidden;
@@ -102,19 +100,19 @@
   margin: 0 auto;
 }
 
-/* Summary: Date and time section (40px below Request Summary title) */
+/* Summary: Date and time section */
 .summaryDateTimeBlock {
-  margin-top: 40px;
-  margin-bottom: 40px;
+  margin-top: 16px;
+  margin-bottom: 16px;
   width: 100%;
   max-width: 363px;
   margin-left: auto;
   margin-right: auto;
 }
 
-/* Summary: section block (e.g. Pickup) - 40px below divider */
+/* Summary: section block (e.g. Pickup) */
 .summarySectionBlock {
-  margin-top: 40px;
+  margin-top: 16px;
   width: 100%;
   max-width: 363px;
   margin-left: auto;
@@ -122,14 +120,21 @@
 }
 
 /* Drag handle at the top of the sheet (sits above inner frame) */
-.dragHandle {
-  width: 72px;
-  height: 4px;
-  background: #dadada;
-  border-radius: 999px;
-  align-self: center;
-  margin-bottom: 8px;
+.closeButton {
+  display: flex;
+  width: 36px;
+  height: 36px;
+  padding: 10px;
+  justify-content: center;
+  align-items: center;
+  gap: 10px;
+  flex-shrink: 0;
+  border-radius: 4px;
+  border: 1px solid #dadada;
+  background: none;
   cursor: pointer;
+  align-self: flex-end;
+  margin-bottom: 4px;
 }
 
 .mobileHeaderFrame {
@@ -138,7 +143,7 @@
   align-items: stretch;
   gap: 16px;
   align-self: stretch;
-  padding: 16px;
+  padding: 8px 16px 16px;
   position: relative;
 }
 
diff --git a/frontend/src/components/RequestRideModal/steps/DateStep.tsx b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
index b27ad058f..f50283fb3 100644
--- a/frontend/src/components/RequestRideModal/steps/DateStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DateStep.tsx
@@ -40,7 +40,6 @@ const DateStep: React.FC<DateStepProps> = ({
   } = useFormContext();
 
   const [custom, setCustom] = useState(false);
-  const [dragStartY, setDragStartY] = useState<number | null>(null);
   const [showRepeatOptions, setShowRepeatOptions] = useState(false);
   const [selectedDays, setSelectedDays] = useState<Set<string>>(new Set());
   const watchRepeating = watch('recurring', false);
@@ -59,42 +58,20 @@ const DateStep: React.FC<DateStepProps> = ({
       watchStartDate !== 'Invalid date'
   );
 
+  const isRecurring = watchWhenRepeat !== 'no-repeat';
   const isCustom = watchWhenRepeat === 'custom';
   const hasValidRepeats = !isCustom || selectedDays.size > 0;
 
-  const isFormValid = hasValidDate && hasValidRepeats;
-
-  const handleTouchStart = (e: React.TouchEvent<HTMLDivElement>) => {
-    setDragStartY(e.touches[0].clientY);
-  };
-
-  const handleTouchMove = (e: React.TouchEvent<HTMLDivElement>) => {
-    if (dragStartY === null) return;
-    const currentY = e.touches[0].clientY;
-    const deltaY = currentY - dragStartY;
-
-    // If user drags down more than 60px, close the modal
-    if (deltaY > 60) {
-      onClose?.();
-      setDragStartY(null);
-    }
-  };
-
-  const handleTouchEnd = () => {
-    setDragStartY(null);
-  };
+  const isFormValid = hasValidDate && hasValidRepeats && !isRecurring;
 
   return (
     <div className={styles.stepPage}>
       <div className={styles.topContent}>
-        {/* Drag handle at the top (click to close on desktop, drag down on mobile) */}
-        <div
-          className={styles.dragHandle}
-          onClick={onClose}
-          onTouchStart={handleTouchStart}
-          onTouchMove={handleTouchMove}
-          onTouchEnd={handleTouchEnd}
-        />
+        <button className={styles.closeButton} onClick={onClose} aria-label="Close">
+          <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+            <path d="M15 5L5 15M5 5L15 15" stroke="#ABABAB" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
+          </svg>
+        </button>
 
         <div className={styles.mobileHeaderFrame}>
           <div className={styles.mobileTitleLeft}>Request a Ride</div>
@@ -185,6 +162,13 @@ const DateStep: React.FC<DateStepProps> = ({
             </div>
           )}
 
+          {/* Recurring not supported warning */}
+          {isRecurring && (
+            <p className={styles.error}>
+              Recurring rides are not yet supported. Please select "No Repeat" to continue.
+            </p>
+          )}
+
           {/* Custom repeat day selection - appears when Custom is selected */}
           {showRepeatingInfo && watchWhenRepeat === 'custom' && (
             <div className={styles.customRepeatSection}>
diff --git a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
index 32d1c8222..5e3e69e82 100644
--- a/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/DropoffLocationStep.tsx
@@ -46,7 +46,6 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   const [filteredLocations, setFilteredLocations] = useState<Location[]>([]);
   const [showLocationDropdown, setShowLocationDropdown] = useState(false);
   const [showLocationButton, setShowLocationButton] = useState(false);
-  const [dragStartY, setDragStartY] = useState<number | null>(null);
   const searchInputRef = useRef<HTMLDivElement>(null);
   const locationButtonRef = useRef<HTMLButtonElement>(null);
   const watchDropoffCustom = watch('endLocation');
@@ -56,8 +55,7 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   const loc = useLocations().locations;
 
   // Derive selected location from form value — persists across Back navigation
-  const dropoffLocation =
-    loc.find((l) => l.id === watchEndLocation) ?? null;
+  const dropoffLocation = loc.find((l) => l.id === watchEndLocation) ?? null;
 
   // Close dropdown when clicking outside
   useEffect(() => {
@@ -183,25 +181,6 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
     }
   };
 
-  const handleTouchStart = (e: React.TouchEvent) => {
-    setDragStartY(e.touches[0].clientY);
-  };
-
-  const handleTouchMove = (e: React.TouchEvent) => {
-    if (dragStartY !== null) {
-      const currentY = e.touches[0].clientY;
-      const diff = currentY - dragStartY;
-      if (diff > 100 && onClose) {
-        onClose();
-        setDragStartY(null);
-      }
-    }
-  };
-
-  const handleTouchEnd = () => {
-    setDragStartY(null);
-  };
-
   // Get selected location name for display
   const getSelectedLocationName = () => {
     if (watchEndLocation && watchEndLocation !== '') {
@@ -217,14 +196,11 @@ const DropoffLocationStep: React.FC<DropoffLocationStepProps> = ({
   return (
     <div className={styles.stepPage}>
       <div className={styles.topContent}>
-        {/* Drag handle at the top */}
-        <div
-          className={styles.dragHandle}
-          onClick={onClose}
-          onTouchStart={handleTouchStart}
-          onTouchMove={handleTouchMove}
-          onTouchEnd={handleTouchEnd}
-        />
+        <button className={styles.closeButton} onClick={onClose} aria-label="Close">
+          <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+            <path d="M15 5L5 15M5 5L15 15" stroke="#ABABAB" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
+          </svg>
+        </button>
 
         {/* Top frame with dropoff location selection */}
         <div className={styles.pickupLocationFrame}>
diff --git a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
index c6201a224..0f5a09a9f 100644
--- a/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/PickupLocationStep.tsx
@@ -44,7 +44,6 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   const [filteredLocations, setFilteredLocations] = useState<Location[]>([]);
   const [showLocationDropdown, setShowLocationDropdown] = useState(false);
   const [showLocationButton, setShowLocationButton] = useState(false);
-  const [dragStartY, setDragStartY] = useState<number | null>(null);
   const searchInputRef = useRef<HTMLDivElement>(null);
   const locationButtonRef = useRef<HTMLButtonElement>(null);
   const watchPickupCustom = watch('startLocation');
@@ -54,8 +53,7 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   const loc = useLocations().locations;
 
   // Derive selected location from form value — persists across Back navigation
-  const pickupLocation =
-    loc.find((l) => l.id === watchStartLocation) ?? null;
+  const pickupLocation = loc.find((l) => l.id === watchStartLocation) ?? null;
 
   // Close dropdown when clicking outside
   useEffect(() => {
@@ -172,25 +170,6 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
     }
   };
 
-  const handleTouchStart = (e: React.TouchEvent) => {
-    setDragStartY(e.touches[0].clientY);
-  };
-
-  const handleTouchMove = (e: React.TouchEvent) => {
-    if (dragStartY !== null) {
-      const currentY = e.touches[0].clientY;
-      const diff = currentY - dragStartY;
-      if (diff > 100 && onClose) {
-        onClose();
-        setDragStartY(null);
-      }
-    }
-  };
-
-  const handleTouchEnd = () => {
-    setDragStartY(null);
-  };
-
   // Get selected location name for display
   const getSelectedLocationName = () => {
     if (watchStartLocation && watchStartLocation !== '') {
@@ -206,14 +185,11 @@ const PickupLocationStep: React.FC<PickupLocationStepProps> = ({
   return (
     <div className={styles.stepPage}>
       <div className={styles.topContent}>
-        {/* Drag handle at the top */}
-        <div
-          className={styles.dragHandle}
-          onClick={onClose}
-          onTouchStart={handleTouchStart}
-          onTouchMove={handleTouchMove}
-          onTouchEnd={handleTouchEnd}
-        />
+        <button className={styles.closeButton} onClick={onClose} aria-label="Close">
+          <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+            <path d="M15 5L5 15M5 5L15 15" stroke="#ABABAB" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
+          </svg>
+        </button>
 
         {/* Top frame with pickup location selection */}
         <div className={styles.pickupLocationFrame}>
diff --git a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
index 700e4d72e..4d85f5b8d 100644
--- a/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
+++ b/frontend/src/components/RequestRideModal/steps/RequestSummaryStep.tsx
@@ -48,7 +48,6 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
   onNext,
   onBack,
 }) => {
-  const [dragStartY, setDragStartY] = useState<number | null>(null);
   const [editingSection, setEditingSection] = useState<EditingSection>(null);
   const [showPickupDropdown, setShowPickupDropdown] = useState(false);
   const [showDropoffDropdown, setShowDropoffDropdown] = useState(false);
@@ -103,25 +102,6 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
     return loc ? loc.name : endLocation;
   };
 
-  const handleTouchStart = (e: React.TouchEvent) => {
-    setDragStartY(e.touches[0].clientY);
-  };
-
-  const handleTouchMove = (e: React.TouchEvent) => {
-    if (dragStartY !== null) {
-      const currentY = e.touches[0].clientY;
-      const diff = currentY - dragStartY;
-      if (diff > 100 && onClose) {
-        onClose();
-        setDragStartY(null);
-      }
-    }
-  };
-
-  const handleTouchEnd = () => {
-    setDragStartY(null);
-  };
-
   const toggleCustomDay = (day: CustomDayValue) => {
     const current = watch(day);
     setValue(day, !current);
@@ -140,13 +120,11 @@ const RequestSummaryStep: React.FC<RequestSummaryStepProps> = ({
 
   return (
     <div className={styles.summaryStepPage}>
-      <div
-        className={styles.dragHandle}
-        onClick={onClose}
-        onTouchStart={handleTouchStart}
-        onTouchMove={handleTouchMove}
-        onTouchEnd={handleTouchEnd}
-      />
+      <button className={styles.closeButton} onClick={onClose} aria-label="Close">
+        <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
+          <path d="M15 5L5 15M5 5L15 15" stroke="#ABABAB" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round"/>
+        </svg>
+      </button>
 
       <h2 className={styles.summaryTitle}>Request Summary</h2>
 
diff --git a/frontend/src/components/RequestRideModal/steps/datestep.module.css b/frontend/src/components/RequestRideModal/steps/datestep.module.css
index 029c84865..600cc618d 100644
--- a/frontend/src/components/RequestRideModal/steps/datestep.module.css
+++ b/frontend/src/components/RequestRideModal/steps/datestep.module.css
@@ -4,7 +4,7 @@
   align-items: stretch;
   gap: 16px;
   align-self: stretch;
-  padding: 16px;
+  padding: 4px 16px 16px;
   position: relative;
 }
 
diff --git a/frontend/src/components/RequestRideModal/steps/locationstep.module.css b/frontend/src/components/RequestRideModal/steps/locationstep.module.css
index eb73e7f3a..72f256743 100644
--- a/frontend/src/components/RequestRideModal/steps/locationstep.module.css
+++ b/frontend/src/components/RequestRideModal/steps/locationstep.module.css
@@ -1,6 +1,6 @@
 .pickupLocationFrame {
   display: flex;
-  padding: 16px;
+  padding: 4px 16px 16px;
   flex-direction: column;
   align-items: center;
   gap: 12px;