From ce5d9057dc37073a95827b9804f90e3d9d0b3801 Mon Sep 17 00:00:00 2001 From: Kaibanda Date: Thu, 12 Sep 2024 15:29:50 -0400 Subject: [PATCH 1/4] Issue #392 fix: message banner evenly spaced between back and next buttons --- .../routes/booking/components/BookingStatusBar.tsx | 2 +- booking-app/package-lock.json | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/booking-app/components/src/client/routes/booking/components/BookingStatusBar.tsx b/booking-app/components/src/client/routes/booking/components/BookingStatusBar.tsx index e2a2916b..8a9f88de 100644 --- a/booking-app/components/src/client/routes/booking/components/BookingStatusBar.tsx +++ b/booking-app/components/src/client/routes/booking/components/BookingStatusBar.tsx @@ -142,7 +142,7 @@ export default function BookingStatusBar(props: Props) { )} - + {!props.hideNextButton && ( diff --git a/booking-app/package-lock.json b/booking-app/package-lock.json index dd3815aa..01a0388c 100644 --- a/booking-app/package-lock.json +++ b/booking-app/package-lock.json @@ -4863,9 +4863,10 @@ } }, "node_modules/axios": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", - "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz", + "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -8496,9 +8497,10 @@ } }, "node_modules/micromatch": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", - "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "license": "MIT", "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" From 907bada32b0a3880afeadd97b558d58fd532b6bb Mon Sep 17 00:00:00 2001 From: Kaibanda Date: Tue, 1 Oct 2024 15:21:44 -0400 Subject: [PATCH 2/4] Language Changes --- .../src/client/routes/booking/components/FormInput.tsx | 3 ++- .../client/routes/components/bookingTable/BookMoreButton.tsx | 2 +- booking-app/components/src/client/routes/components/navBar.tsx | 2 +- .../components/src/client/routes/myBookings/myBookingsPage.tsx | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/booking-app/components/src/client/routes/booking/components/FormInput.tsx b/booking-app/components/src/client/routes/booking/components/FormInput.tsx index 28edc4e6..8d0b5e32 100644 --- a/booking-app/components/src/client/routes/booking/components/FormInput.tsx +++ b/booking-app/components/src/client/routes/booking/components/FormInput.tsx @@ -268,7 +268,8 @@ export default function FormInput({ - Book More + Request a Reservation diff --git a/booking-app/components/src/client/routes/components/navBar.tsx b/booking-app/components/src/client/routes/components/navBar.tsx index d5e44e6c..5bc5f44c 100644 --- a/booking-app/components/src/client/routes/components/navBar.tsx +++ b/booking-app/components/src/client/routes/components/navBar.tsx @@ -169,7 +169,7 @@ export default function NavBar() {