diff --git a/app/components/home/HeroSearch.js b/app/components/home/HeroSearch.js index 0d9f997..7f21093 100644 --- a/app/components/home/HeroSearch.js +++ b/app/components/home/HeroSearch.js @@ -1,19 +1,24 @@ 'use client'; import { useState } from 'react'; +import Link from 'next/link'; import { motion } from 'framer-motion'; import { useTranslation } from 'react-i18next'; -import { Search, MapPin, Home, DollarSign } from 'lucide-react'; +import { Search, MapPin, Home, DollarSign, ShieldCheck } from 'lucide-react'; -export default function HeroSearch({ onSearch }) { +export default function HeroSearch({ onSearch, isAuthenticated }) { const { t } = useTranslation(); - const [activeTab, setActiveTab] = useState('rent'); + const [activeTab, setActiveTab] = useState('buy'); const [filters, setFilters] = useState({ - city: '', - propertyType: '', - priceRange: '', - identityType: 'syrian' + city: 'all', + propertyType: 'all', + priceRange: 'all', + identityType: 'syrian', + ownerSource: 'all', + rentPeriod: 'all', + availableToday: false }); + const [showLoginDialog, setShowLoginDialog] = useState(false); const cities = [ { id: 'all', label: 'جميع المدن' }, @@ -26,10 +31,10 @@ export default function HeroSearch({ onSearch }) { const propertyTypes = [ { id: 'all', label: 'الكل' }, - { id: 'apartment', label: 'شقة' }, - { id: 'villa', label: 'فيلا' }, - { id: 'house', label: 'بيت' }, - { id: 'studio', label: 'استوديو' } + { id: 'apartment', label: 'شقق سكنية' }, + { id: 'studio', label: 'استوديو' }, + { id: 'commercial', label: 'عقار تجاري' }, + { id: 'villa', label: 'فيلا / مزرعة' } ]; const priceRanges = [ @@ -46,17 +51,45 @@ export default function HeroSearch({ onSearch }) { { id: 'passport', label: 'جواز سفر' } ]; + const ownerSources = [ + { id: 'all', label: 'الكل' }, + { id: 'owner', label: 'من المالك' }, + { id: 'agency', label: 'من مكتب عقاري' } + ]; + + const rentPeriods = [ + { id: 'all', label: 'الكل' }, + { id: 'daily', label: 'إيجار يومي' }, + { id: 'monthly', label: 'إيجار شهري' } + ]; + + const handleTabClick = (tab) => { + setActiveTab(tab); + if ((tab === 'rent' || tab === 'sell') && !isAuthenticated) { + setShowLoginDialog(true); + } + }; + const handleSearch = () => { + if ((activeTab === 'rent' || activeTab === 'sell') && !isAuthenticated) { + setShowLoginDialog(true); + return; + } + onSearch({ ...filters, - propertyType: filters.propertyType || 'all', + mode: activeTab, city: filters.city || 'all', - priceRange: filters.priceRange || 'all' + propertyType: filters.propertyType || 'all', + priceRange: filters.priceRange || 'all', + ownerSource: filters.ownerSource || 'all', + rentPeriod: filters.rentPeriod || 'all' }); }; return ( - + ( setActiveTab(tab)} + onClick={() => handleTabClick(tab)} className={`px-4 py-2 rounded-lg font-medium text-sm transition-all ${ activeTab === tab ? 'bg-amber-500 text-white' @@ -176,6 +209,63 @@ export default function HeroSearch({ onSearch }) { +
+
+ + +
+ +
+ + +
+ +
+ +
+
+ + {showLoginDialog && !isAuthenticated && ( +
+
+
+ +
+

يرجى تسجيل الدخول

+

للوصول إلى خيارات التأجير والبيع، يجب أن تكون مسجلاً.

+
+
+
+
+

اضغط على تسجيل الدخول لاستكمال البحث أو إدارة عقاراتك.

+
+
+ + + تسجيل الدخول + +
+
+
+
+ )} + ); } \ No newline at end of file diff --git a/app/page.js b/app/page.js index 6659a53..67b3065 100644 --- a/app/page.js +++ b/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() { - {!isOwner && } + {!isOwner && } {isOwner && ( +
+ مصدر العرض: + + {searchFilters.ownerSource === 'all' ? 'الكل' : + searchFilters.ownerSource === 'owner' ? 'من المالك' : 'من مكتب عقاري'} + +
+
+ نوع الإيجار: + + {searchFilters.rentPeriod === 'all' ? 'الكل' : + searchFilters.rentPeriod === 'daily' ? 'إيجار يومي' : 'إيجار شهري'} + +
+ {searchFilters.availableToday && ( +
+ فقط المتاحة من اليوم +
+ )} )}