Edit home

app/page.js

@@ -38,10 +38,15 @@ import AuthService from './services/AuthService';
 function mapApiProperty(item, index) {
   const info = item.propertyInformation || {};
 
-  const dailyPrice = item.dailyRent ?? item.monthlyRent ?? item.price ?? 0;
+  const dailyPrice = item.dailyRent ?? 0;
   const monthlyPrice = item.monthlyRent ?? 0;
+  const salePrice = item.price ?? 0;
+  const isRentListing = Boolean(item.dailyRent != null || item.monthlyRent != null);
 
-  const propType = BuildingTypeKeys[info.buildingType] ?? BuildingTypeKeys[item.type] ?? 'apartment';
+  const price = isRentListing ? (dailyPrice || monthlyPrice || 0) : salePrice;
+  const priceUnit = isRentListing ? (monthlyPrice ? 'monthly' : 'daily') : 'sale';
+
+  const propType = BuildingTypeKeys[info.buildingType] ?? BuildingTypeKeys[item.type] ?? (item.type || 'apartment');
   const status = PropertyStatusKeys[info.status] ?? PropertyStatusKeys[item.status] ?? 'available';
 
   const features = [];
@@ -58,14 +63,21 @@ function mapApiProperty(item, index) {
     ? rawImages.map(img => img.startsWith('http') ? img : `${apiBase}${img.startsWith('/') ? '' : '/Pictures/'}${img}`)
     : ['/property-placeholder.jpg'];
 
+  const ownerSource = info.ownerType == null && item.ownerType == null
+    ? 'all'
+    : [info.ownerType, item.ownerType].find((value) => value != null) === 1
+      ? 'agency'
+      : 'owner';
+
   return {
     id: item.id ?? index + 1,
     title: info.address || `عقار #${item.id || index + 1}`,
     description: info.description || '',
     type: propType,
-    price: dailyPrice,
-    priceUSD: dailyPrice,
-    priceUnit: 'daily',
+    price: price,
+    priceUSD: price,
+    priceUnit,
+    listingType: isRentListing ? 'rent' : 'sale',
     location: {
       city: extractCity(info.address) || 'دمشق',
       district: info.address || '',
@@ -85,7 +97,9 @@ function mapApiProperty(item, index) {
     priceDisplay: {
       daily: dailyPrice,
       monthly: monthlyPrice,
+      sale: salePrice,
     },
+    ownerSource,
     bookings: [],
     _raw: item,
   };
@@ -175,6 +189,16 @@ export default function HomePage() {
     setSearchFilters(filters);
 
     const filtered = allProperties.filter(property => {
+      if (filters.mode === 'rent' && property.listingType !== 'rent') {
+        return false;
+      }
+      if (filters.mode === 'sell' && property.listingType !== 'sale') {
+        return false;
+      }
+      if (filters.mode === 'buy' && property.listingType !== 'sale') {
+        return false;
+      }
+
       if (filters.city && filters.city !== 'all' && property.location.city !== filters.city) {
         return false;
       }
@@ -194,6 +218,20 @@ export default function HomePage() {
         }
       }
 
+      if (filters.ownerSource && filters.ownerSource !== 'all') {
+        if (filters.ownerSource === 'owner' && property.ownerSource !== 'owner') return false;
+        if (filters.ownerSource === 'agency' && property.ownerSource !== 'agency') return false;
+      }
+
+      if (filters.rentPeriod && filters.rentPeriod !== 'all' && property.listingType === 'rent') {
+        if (filters.rentPeriod === 'daily' && !property.priceDisplay.daily) return false;
+        if (filters.rentPeriod === 'monthly' && !property.priceDisplay.monthly) return false;
+      }
+
+      if (filters.availableToday) {
+        if (property.status !== 'available') return false;
+      }
+
       if (filters.identityType && property.allowedIdentities) {
         if (!property.allowedIdentities.includes(filters.identityType)) {
           return false;
@@ -312,7 +350,7 @@ export default function HomePage() {
               </motion.p>
             </motion.div>
 
-            {!isOwner && <HeroSearch onSearch={applyFilters} />}
+            {!isOwner && <HeroSearch onSearch={applyFilters} isAuthenticated={!!user} />}
 
             {isOwner && (
               <motion.div
@@ -477,6 +515,25 @@ export default function HomePage() {
                                 searchFilters.priceRange === '2000-3000' ? '200$ - 300$' : 'أكثر من 300$'}
                       </span>
                     </div>
+                    <div className="bg-white px-4 py-2 rounded-full shadow-sm border border-gray-200 text-sm">
+                      <span className="text-gray-600">مصدر العرض: </span>
+                      <span className="font-bold text-gray-900">
+                        {searchFilters.ownerSource === 'all' ? 'الكل' :
+                          searchFilters.ownerSource === 'owner' ? 'من المالك' : 'من مكتب عقاري'}
+                      </span>
+                    </div>
+                    <div className="bg-white px-4 py-2 rounded-full shadow-sm border border-gray-200 text-sm">
+                      <span className="text-gray-600">نوع الإيجار: </span>
+                      <span className="font-bold text-gray-900">
+                        {searchFilters.rentPeriod === 'all' ? 'الكل' :
+                          searchFilters.rentPeriod === 'daily' ? 'إيجار يومي' : 'إيجار شهري'}
+                      </span>
+                    </div>
+                    {searchFilters.availableToday && (
+                      <div className="bg-white px-4 py-2 rounded-full shadow-sm border border-gray-200 text-sm">
+                        <span className="font-bold text-gray-900">فقط المتاحة من اليوم</span>
+                      </div>
+                    )}
                   </motion.div>
                 )}
               </div>