+
onFilterChange({ ...filters, minArea: e.target.value })}
/>
onFilterChange({ ...filters, maxArea: e.target.value })}
/>
@@ -490,22 +563,25 @@ const FilterBar = ({ filters, onFilterChange }) => {
onClick={() => onFilterChange({
search: '',
propertyType: 'all',
+ buildingType: 'all',
city: 'all',
priceRange: 'all',
bedrooms: 'all',
+ bathrooms: 'all',
+ certificate: 'all',
minArea: '',
maxArea: '',
features: []
})}
- className="px-6 py-2 bg-gray-100 rounded-xl font-medium hover:bg-gray-200 transition-colors text-gray-700"
+ className="px-6 py-2 bg-gray-100 rounded-xl font-medium hover:bg-gray-200 transition-colors text-gray-700 text-sm"
>
- {t('reset')}
+ {t('reset', 'إعادة تعيين')}
@@ -526,9 +602,12 @@ export default function PropertiesPage() {
const [filters, setFilters] = useState({
search: '',
propertyType: 'all',
+ buildingType: 'all',
city: 'all',
priceRange: 'all',
bedrooms: 'all',
+ bathrooms: 'all',
+ certificate: 'all',
minArea: '',
maxArea: '',
features: []
@@ -536,13 +615,74 @@ export default function PropertiesPage() {
useEffect(() => {
async function fetchProperties() {
+ setLoading(true);
try {
- const [rentData, saleData] = await Promise.all([
- getRentProperties().catch(() => []),
+ const queryParams = new URLSearchParams();
+
+ if (filters.bedrooms !== 'all') {
+ queryParams.append('numberOfBedRooms', filters.bedrooms);
+ }
+
+ if (filters.bathrooms !== 'all') {
+ queryParams.append('numberOfBathRooms', filters.bathrooms);
+ }
+
+ if (filters.minArea) {
+ queryParams.append('space', filters.minArea);
+ }
+
+ const buildingTypeReverseMap = {
+ 'apartment': 'Apartment',
+ 'villa': 'Villa',
+ 'sweet': 'Sweet',
+ 'room': 'Room',
+ 'studio': 'Studio',
+ 'office': 'Office',
+ 'farms': 'Farms',
+ 'shop': 'Shop',
+ 'warehouse': 'Warehouse'
+ };
+ if (filters.buildingType !== 'all' && buildingTypeReverseMap[filters.buildingType] !== undefined) {
+ queryParams.append('buildingType', buildingTypeReverseMap[filters.buildingType]);
+ }
+
+ const propertyTypeReverseMap = {
+ 'residential': 'Residential',
+ 'commercial': 'Commercial',
+ 'agricultural': 'Agricultural'
+ };
+ if (filters.propertyType !== 'all' && propertyTypeReverseMap[filters.propertyType] !== undefined) {
+ queryParams.append('propertyType', propertyTypeReverseMap[filters.propertyType]);
+ }
+
+ const certificateReverseMap = {
+ 'realEstateTitle': 'RealEstateTitle',
+ 'courtRuling': 'CourtRuling',
+ 'notary': 'Notary',
+ 'shares': 'Shares'
+ };
+ if (filters.certificate !== 'all' && certificateReverseMap[filters.certificate] !== undefined) {
+ queryParams.append('certificate', certificateReverseMap[filters.certificate]);
+ }
+
+ if (filters.city !== 'all') {
+ const cityFormatted = filters.city.charAt(0).toUpperCase() + filters.city.slice(1);
+ queryParams.append('city', cityFormatted);
+ }
+
+ const baseUrl = process.env.NEXT_PUBLIC_API_URL || 'http://45.93.137.91/api';
+ const rentEndpoint = `${baseUrl}/RentProperties/FilterRentProperties?${queryParams.toString()}`;
+
+ const [rentRes, saleData] = await Promise.all([
+ fetch(rentEndpoint, {
+ headers: {
+ 'Accept': 'application/json',
+ }
+ }).then(res => res.json()).catch(() => ({ data: [], isSuccess: false })),
getSaleProperties().catch(() => []),
]);
- const rentList = Array.isArray(rentData) ? rentData : [];
+ const rentList = rentRes.isSuccess && Array.isArray(rentRes.data) ? rentRes.data : [];
const saleList = Array.isArray(saleData) ? saleData : [];
const mapped = [
@@ -550,9 +690,7 @@ export default function PropertiesPage() {
...saleList.map((p, i) => ({ ...mapApiProperty(t, p, rentList.length + i), purpose: 'sale' })),
];
- if (mapped.length > 0) {
- setProperties(mapped);
- }
+ setProperties(mapped);
} catch (err) {
console.error('[Properties] Failed to fetch properties:', err);
} finally {
@@ -561,7 +699,7 @@ export default function PropertiesPage() {
}
fetchProperties();
- }, []);
+ }, [filters, t]);
const filteredProperties = properties
.filter(p => p.purpose === purposeTab)
@@ -569,12 +707,6 @@ export default function PropertiesPage() {
if (filters.search && !property.title.includes(filters.search) && !property.description.includes(filters.search)) {
return false;
}
- if (filters.propertyType !== 'all' && property.type !== filters.propertyType) {
- return false;
- }
- if (filters.city !== 'all' && property.location.city !== filters.city) {
- return false;
- }
if (filters.priceRange !== 'all') {
const [min, max] = filters.priceRange.split('-');
if (max) {
@@ -584,11 +716,6 @@ export default function PropertiesPage() {
if (property.price < minVal) return false;
}
}
- if (filters.bedrooms !== 'all' && property.bedrooms < parseInt(filters.bedrooms)) {
- return false;
- }
- if (filters.minArea && property.area < parseInt(filters.minArea)) return false;
- if (filters.maxArea && property.area > parseInt(filters.maxArea)) return false;
return true;
})
.sort((a, b) => {
@@ -608,19 +735,18 @@ export default function PropertiesPage() {
animate={{ opacity: 1, y: 0 }}
className="text-center mb-8"
>
-
{purposeTab === 'rent' ? t('properties-for-rent') : t('properties-for-sale')}
-
{t('best-properties-in-syria')}
+
{purposeTab === 'rent' ? t('properties-for-rent', 'عقارات للإيجار') : t('properties-for-sale', 'عقارات للبيع')}
+
{t('best-properties-in-syria', 'أفضل العقارات المتاحة في سوريا مباشرة وبسهولة')}
- {/* Purpose Toggle */}
@@ -635,18 +761,18 @@ export default function PropertiesPage() {
- {filteredProperties.length} {t('property-available')}
+ {filteredProperties.length} {t('property-available', 'عقار متاح')}
-
{t('no-properties')}
-
{t('try-changing-search-criteria')}
+
{t('no-properties', 'لا يوجد نتائج تطابق بحثك')}
+
{t('try-changing-search-criteria', 'يرجى تجربة تعديل خيارات الفلترة والبحث')}
)}
@@ -700,20 +826,20 @@ export default function PropertiesPage() {
-
{t('login-required-title')}
-
{t('login-required-favorites-desc')}
+
{t('login-required-title', 'تسجيل الدخول مطلوب')}
+
{t('login-required-favorites-desc', 'يجب تسجيل الدخول لتتمكن من إضافة العقار للمفضلة')}
- {t('login')}
+ {t('login', 'دخول')}
@@ -721,4 +847,4 @@ export default function PropertiesPage() {
)}
);
-}
+}
\ No newline at end of file