diff --git a/Frontend/src/dataset/vehicles.json b/Frontend/src/dataset/vehicles.json index 1a31a1e..136e36a 100644 --- a/Frontend/src/dataset/vehicles.json +++ b/Frontend/src/dataset/vehicles.json @@ -4,7 +4,7 @@ "id": 1, "make": "Tesla", "model": "Model X", - "type": "Electric", + "type": "Luxury", "transmission": "Automatic", "price_per_day": 120, "description": "The Tesla Model X is an all-electric SUV that combines performance, safety, and utility. With falcon-wing doors and advanced autopilot features, it's a cutting-edge electric vehicle.", @@ -19,7 +19,7 @@ "id": 2, "make": "Nissan", "model": "Leaf", - "type": "Electric", + "type": "Luxury", "transmission": "Automatic", "price_per_day": 120, "description": "The Nissan Leaf is a popular electric hatchback with a focus on efficiency and sustainability. It's an ideal choice for those who prioritize eco-friendly driving.", @@ -49,7 +49,7 @@ "id": 4, "make": "Ford", "model": "Focus", - "type": "Hatchback", + "type": "Sedan", "transmission": "Automatic", "price_per_day": 70, "description": "The Ford Focus, known for its sharp handling and expressive design, offers an exciting driving experience. It's a versatile hatchback that's both efficient and fun to drive.", @@ -79,7 +79,7 @@ "id": 6, "make": "Honda", "model": "Odyssey", - "type": "MPV", + "type": "Sedan", "transmission": "Automatic", "price_per_day": 75, "description": "The Honda Odyssey is a family-friendly minivan with spacious interiors and advanced safety features. It provides comfort and convenience for long journeys with the family.", @@ -109,7 +109,7 @@ "id": 8, "make": "Jeep", "model": "Wrangler", - "type": "Off-road", + "type": "SUV", "transmission": "Manual", "price_per_day": 110, "description": "The Jeep Wrangler is an iconic off-road vehicle with rugged capabilities. It's designed for adventure seekers who want to explore challenging terrains and enjoy open-air driving.", @@ -124,7 +124,7 @@ "id": 9, "make": "Fiat", "model": "Fiorino", - "type": "MPV", + "type": "Sedan", "transmission": "Manual", "price_per_day": 50, "description": "Fiat Fiorino is a compact MPV that offers a practical and economical solution for city driving and small cargo transport. Its compact dimensions make it ideal for navigating narrow streets.", diff --git a/Frontend/src/screens/room/RoomDetails.js b/Frontend/src/screens/room/RoomDetails.js index 2b3a03b..4d863ed 100644 --- a/Frontend/src/screens/room/RoomDetails.js +++ b/Frontend/src/screens/room/RoomDetails.js @@ -22,7 +22,7 @@ import DateTimePicker from '@react-native-community/datetimepicker'; import MapComponent from '../../components/MapComponent'; const { width } = Dimensions.get('window'); const defaultImage = require('../../../assets/photo/pac1.jpg'); -const backend_url = "http://10.16.54.141:3000"||process.env.backend_url; +const backend_url = "http://192.168.137.1:3000"||process.env.backend_url; const RoomDetails = ({ route, navigation }) => { const { room } = route.params; diff --git a/Frontend/src/screens/room/RoomScreen.js b/Frontend/src/screens/room/RoomScreen.js index 19937cd..f748a0a 100644 --- a/Frontend/src/screens/room/RoomScreen.js +++ b/Frontend/src/screens/room/RoomScreen.js @@ -25,7 +25,7 @@ import { const { width } = Dimensions.get('window'); const defaultImage = require('../../../assets/photo/pac1.jpg'); -const backend_url="http://10.16.54.141:3000"; +const backend_url="http://192.168.137.1:3000"; const RoomCard = ({ room, onPress }) => { // Format location coordinates to a readable string diff --git a/Frontend/src/screens/tour/TourDetails.js b/Frontend/src/screens/tour/TourDetails.js index 2d59412..d0a516b 100644 --- a/Frontend/src/screens/tour/TourDetails.js +++ b/Frontend/src/screens/tour/TourDetails.js @@ -116,6 +116,11 @@ const TourDetails = ({ route, navigation }) => { • Lunch included + {/* Description Section */} + Description + + + {/* Gallery */} Gallery @@ -169,7 +174,7 @@ const TourDetails = ({ route, navigation }) => { {/* Bottom Bar */} - + {/* Price per person ₹{tour.price || '1500'}/person @@ -177,7 +182,7 @@ const TourDetails = ({ route, navigation }) => { Book Now - + */} ); }; diff --git a/Frontend/src/screens/vehicle/VehicleDetails.js b/Frontend/src/screens/vehicle/VehicleDetails.js index 452a9bc..d464ba7 100644 --- a/Frontend/src/screens/vehicle/VehicleDetails.js +++ b/Frontend/src/screens/vehicle/VehicleDetails.js @@ -17,7 +17,7 @@ import ReviewRating from '../room/ReviewRating'; import MapComponent from '../../components/MapComponent'; const { width } = Dimensions.get('window'); -const backend_url="http://10.16.54.141:3000"||process.env.backend_url; +const backend_url="http://192.168.137.1:3000"||process.env.backend_url; const defaultImage = require('../../../assets/photo/toyota-innova.jpg'); const FeatureItem = ({ icon, text }) => ( diff --git a/Frontend/src/screens/vehicle/VehicleScreen.js b/Frontend/src/screens/vehicle/VehicleScreen.js index 1fd0611..4450fc8 100644 --- a/Frontend/src/screens/vehicle/VehicleScreen.js +++ b/Frontend/src/screens/vehicle/VehicleScreen.js @@ -25,7 +25,7 @@ import { const { width } = Dimensions.get('window'); const defaultImage = require('../../../assets/photo/toyota-innova.jpg'); -const backend_url="http://10.16.54.141:3000"||process.env.backend_url; +const backend_url="http://192.168.137.1:3000"||process.env.backend_url; const VehicleCard = ({ vehicle, onPress }) => ( @@ -72,8 +72,8 @@ const VehicleScreen = ({ navigation }) => { const [locationLoading, setLocationLoading] = useState(false); const [distanceFilter, setDistanceFilter] = useState(null); const [sortByDistance, setSortByDistance] = useState(false); - const filters = ['All', 'SUV', 'Sedan', 'Luxury']; + const distanceFilters = [ { label: 'All', value: null }, { label: '5km', value: 5 }, @@ -137,9 +137,28 @@ const VehicleScreen = ({ navigation }) => { }; const filteredVehicles = vehicles.filter(vehicle => { - const matchesSearch = vehicle.title?.toLowerCase().includes(searchQuery.toLowerCase()) || - vehicle.location?.toLowerCase().includes(searchQuery.toLowerCase()); - const matchesFilter = selectedFilter === 'all' || vehicle.type?.toLowerCase() === selectedFilter.toLowerCase(); + const title = vehicle.title?.toLowerCase() || ''; + // Try address, then location.name, then fallback to empty string + const locationString = vehicle.address?.toLowerCase() || + vehicle.location?.name?.toLowerCase() || + ''; + const matchesSearch = title.includes(searchQuery.toLowerCase()) || + locationString.includes(searchQuery.toLowerCase()); + + // Filter logic for ALL, SUV, Sedan, Luxury + let matchesFilter = false; + if (selectedFilter === 'all') { + matchesFilter = true; // Show all vehicles + } else if (typeof vehicle.type === 'string') { + const vehicleType = vehicle.type.trim().toLowerCase(); + if (selectedFilter === 'suv' && vehicleType === 'suv') { + matchesFilter = true; + } else if (selectedFilter === 'sedan' && vehicleType === 'sedan') { + matchesFilter = true; + } else if (selectedFilter === 'luxury' && vehicleType === 'luxury') { + matchesFilter = true; + } + } // Apply distance filter if set let matchesDistance = true; diff --git a/backend/uploads/1750834058140-35678924.zip b/backend/uploads/1750834058140-35678924.zip new file mode 100644 index 0000000..5d9c818 Binary files /dev/null and b/backend/uploads/1750834058140-35678924.zip differ