Merge branch 'main' of https://github.com/aelassas/bookcars

aelassas · Feb 2, 2025 · 2f88873 · 2f88873
2 parents 9c5eb01 + 1d84323
commit 2f88873
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -1,6 +1,6 @@
 cff-version: 1.2.0
 message: "If you use BookCars in your research or projects, please cite it using the following metadata."
-title: "BookCars: A Car Rental Booking System"
+title: "BookCars: A Car Rental Booking Platform with Mobile App"
 authors:
   - name: "Akram El Assas"
 year: 2025

diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ Customers can sign up from the frontend or the mobile app, search for available
 * Multiple language support (English, French, Spanish)
 * [Multiple currencies support](https://github.com/aelassas/bookcars/wiki/Add-New-Currency)
 * Multiple pagination options (Classic pagination with next and previous buttons, infinite scroll)
-* [Multiple Payment Gateways supported](https://github.com/aelassas/bookcars/wiki/Supported-Payment-Gateways)
+* [Multiple Payment Gateways supported](https://github.com/aelassas/bookcars/wiki/Payment-Gateways)
 * Responsive admin dashboard and frontend
 * Native Mobile app for Android and iOS with single codebase
 * Push notifications
@@ -105,7 +105,7 @@ You can install the Android App by downloading the APK and installing it on any
 5. [Installing (Docker)](https://github.com/aelassas/bookcars/wiki/Installing-(Docker))
    1. [Docker Image](https://github.com/aelassas/bookcars/wiki/Installing-(Docker)#docker-image)
    2. [SSL](https://github.com/aelassas/bookcars/wiki/Installing-(Docker)#ssl)
-5. [Supported Payment Gateways](https://github.com/aelassas/bookcars/wiki/Supported-Payment-Gateways)
+5. [Payment Gateways](https://github.com/aelassas/bookcars/wiki/Payment-Gateways)
 6. [Setup Stripe](https://github.com/aelassas/bookcars/wiki/Setup-Stripe)
 7. [Build Mobile App](https://github.com/aelassas/bookcars/wiki/Build-Mobile-App)
 8. [Demo Database](https://github.com/aelassas/bookcars/wiki/Demo-Database)

diff --git a/backend/src/components/scheduler/README.md b/backend/src/components/scheduler/README.md
@@ -1,6 +1,6 @@
 # React Scheduler Component
 
-This component was forked from the following [project]()https://github.com/aldabil21/react-scheduler and was updated to fix bugs and meet specific needs.
+This component was forked from the following [project](https://github.com/aldabil21/react-scheduler) and was updated to fix bugs and meet specific needs.
 
 > :warning: **Notice**: This component uses `mui`/`emotion`/`date-fns`. if your project is not already using these libs, this component may not be suitable.
 

diff --git a/backend/src/lang/cars.ts b/backend/src/lang/cars.ts
@@ -67,7 +67,7 @@ const strings = new LocalizedStrings({
     AVAILABLE: 'Disponile',
     UNAVAILABLE: 'Indisponible',
     CAR_AVAILABLE: 'Répertoriée dans les résultats de recherche',
-    CAR_AVAILABLE_TOOLTIP: 'Cette voiture est eépertoriée dans les résultats de recherche.',
+    CAR_AVAILABLE_TOOLTIP: 'Cette voiture est répertoriée dans les résultats de recherche.',
     CAR_UNAVAILABLE: 'Non répertoriée dans les résultats de recherche',
     CAR_UNAVAILABLE_TOOLTIP: "Cette voiture n'est pas répertoriée dans les résultats de recherche.",
     VIEW_CAR: 'Voir cette voiture',

diff --git a/frontend/src/pages/Checkout.tsx b/frontend/src/pages/Checkout.tsx
@@ -561,7 +561,7 @@ const Checkout = () => {
                     {((pickupLocation.latitude && pickupLocation.longitude)
                       || (pickupLocation.parkingSpots && pickupLocation.parkingSpots.length > 0)) && (
                         <Map
-                          position={[pickupLocation.latitude || -37.840935, pickupLocation.longitude || 144.946457]}
+                          position={[pickupLocation.latitude || 34.0268755, pickupLocation.longitude || 1.6528399999999976]}
                           initialZoom={pickupLocation.latitude && pickupLocation.longitude ? 10 : 2.5}
                           parkingSpots={pickupLocation.parkingSpots}
                           locations={[pickupLocation]}

diff --git a/mobile/components/SearchForm.tsx b/mobile/components/SearchForm.tsx
@@ -254,9 +254,11 @@ const SearchForm = (
               const __minDate = new Date(date)
               __minDate.setDate(date.getDate() + 1)
               setMinDate(__minDate)
-              const _to = new Date(date)
-              _to.setDate(date.getDate() + 3)
-              setToDate(_to)
+              if (toDate!.getTime() - date.getTime() < 24 * 60 * 60 * 1000) {
+                const _to = new Date(date)
+                _to.setDate(_to.getDate() + 3)
+                setToDate(_to)
+              }
             } else {
               setMinDate(_minDate)
             }