Merge version_2 into main

2026-06-03 16:05:22 +00:00
parent dbe500fb44 abe7fb7877
commit 0a7d3133d6
3 changed files with 27 additions and 27 deletions
--- a/src/app/booking/page.tsx
+++ b/src/app/booking/page.tsx
@@ -6,7 +6,7 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
 import FooterBase from "@/components/sections/footer/FooterBase";
 import ContactSplitForm from "@/components/sections/contact/ContactSplitForm";
-import { Calendar, Truck, Package, Factory, Car, Tractor, MapPin, Oil } from "lucide-react";
+import { Calendar, Truck, Package, Factory, Car, Tractor, MapPin } from "lucide-react";

 export default function BookingPage() {
  const [formData, setFormData] = useState<Record<string, string>>({});
@@ -38,12 +38,12 @@ export default function BookingPage() {
        <NavbarLayoutFloatingOverlay
          brandName="الحسام للزيوت"
          navItems={[
-            { name: "الرئيسية", href: "/" },
-            { name: "منتجاتنا", href: "/#products" },
-            { name: "خدماتنا", href: "/#services" },
-            { name: "من نحن", href: "/#about" },
-            { name: "اتصل بنا", href: "/#contact" },
-            { name: "حجز", href: "/booking" }
+            { name: "الرئيسية", id: "/" },
+            { name: "منتجاتنا", id: "/#products" },
+            { name: "خدماتنا", id: "/#services" },
+            { name: "من نحن", id: "/#about" },
+            { name: "اتصل بنا", id: "/#contact" },
+            { name: "حجز", id: "/booking" }
          ]}
          button={{ text: "احجز الآن", href: "/booking" }}
        />
@@ -53,22 +53,22 @@ export default function BookingPage() {
            title="احجز زيوتك الآن"
            description="املأ النموذج لتحديد المنتجات، الكميات، وموعد التسليم أو الاستلام."
            inputs={[
-              { name: "name", type: "text", placeholder: "الاسم الكامل", required: true, value: formData.name || '', onChange: (val) => handleFormChange('name', val) },
-              { name: "phone", type: "tel", placeholder: "رقم الهاتف", required: true, value: formData.phone || '', onChange: (val) => handleFormChange('phone', val) },
-              { name: "email", type: "email", placeholder: "البريد الإلكتروني", required: false, value: formData.email || '', onChange: (val) => handleFormChange('email', val) },
-              { name: "deliveryDate", type: "date", placeholder: "تاريخ التسليم/الاستلام", required: true, value: formData.deliveryDate || '', onChange: (val) => handleFormChange('deliveryDate', val) },
-              { name: "deliveryTime", type: "time", placeholder: "وقت التسليم/الاستلام", required: true, value: formData.deliveryTime || '', onChange: (val) => handleFormChange('deliveryTime', val) },
-              { name: "address", type: "text", placeholder: "عنوان التسليم (إذا كان توصيل)", required: false, value: formData.address || '', onChange: (val) => handleFormChange('address', val) },
+              { name: "name", type: "text", placeholder: "الاسم الكامل", required: true },
+              { name: "phone", type: "tel", placeholder: "رقم الهاتف", required: true },
+              { name: "email", type: "email", placeholder: "البريد الإلكتروني", required: false },
+              { name: "deliveryDate", type: "date", placeholder: "تاريخ التسليم/الاستلام", required: true },
+              { name: "deliveryTime", type: "time", placeholder: "وقت التسليم/الاستلام", required: true },
+              { name: "address", type: "text", placeholder: "عنوان التسليم (إذا كان توصيل)", required: false },
            ]}
            multiSelect={{
              name: "oilProducts",              label: "اختر أنواع الزيوت",              options: [
                "زيت محركات اصطناعي",                "زيت ناقل حركة أوتوماتيكي",                "زيت هيدروليكي صناعي",                "زيت فرامل عالي الأداء",                "زيوت تشحيم معدات ثقيلة"],
-              onChange: (value: string) => handleFormChange('oilProducts', value)
+              
            }}
            textarea={{
              name: "specialRequests",              placeholder: "أدخل الكميات المطلوبة أو أي طلبات خاصة...",              rows: 5,
              required: false,
-              value: formData.specialRequests || '', onChange: (val) => handleFormChange('specialRequests', val)
+              
            }}
            useInvertedBackground={false}
            imageSrc="http://img.b2bpic.net/free-photo/e-commerce-online-shopping-plant-sale_53876-125021.jpg"
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -13,7 +13,7 @@ import FaqBase from "@/components/sections/faq/FaqBase";
 import ContactCTA from "@/components/sections/contact/ContactCTA";
 import FooterBase from "@/components/sections/footer/FooterBase";
 import TestimonialCardFifteen from "@/components/sections/testimonial/TestimonialCardFifteen";
-import { Sparkles, Search, ArrowUpRight, Monitor, Shield, Zap, Puzzle, TrendingUp, Lock, Phone, MessageCircle, BookOpen, Tv, Camera, Music, Settings, Award, Users, Oil, DollarSign, CheckCircle, Truck, MapPin, ShoppingCart, HelpCircle, Package, Bell, List, Car, Tractor, Factory, Ship, Smile, CalendarCheck } from "lucide-react";
+import { Sparkles, Search, ArrowUpRight, Monitor, Shield, Zap, Puzzle, TrendingUp, Lock, Phone, MessageCircle, BookOpen, Tv, Camera, Music, Settings, Award, Users, DollarSign, CheckCircle, Truck, MapPin, ShoppingCart, HelpCircle, Package, Bell, List, Car, Tractor, Factory, Ship, Smile, CalendarCheck, Droplet } from "lucide-react";

 export default function WebAgency2Page() {
  return (
@@ -186,7 +186,7 @@ export default function WebAgency2Page() {
          gridVariant="uniform-all-items-equal"
          animationType="slide-up"
          metrics={[
-            { id: "oils_offered", value: "50+", title: "نوع زيت", description: "تشكيلة واسعة تلبي كل الاحتياجات", icon: Oil },
+            { id: "oils_offered", value: "50+", title: "نوع زيت", description: "تشكيلة واسعة تلبي كل الاحتياجات", icon: Droplet },
            { id: "satisfied_customers", value: "1000+", title: "عميل راضٍ", description: "نفتخر بثقة عملائنا الكرام", icon: Smile },
            { id: "years_experience", value: "15+", title: "عام خبرة", description: "في سوق الزيوت بامتياز", icon: CalendarCheck },
          ]}
--- a/src/app/products/page.tsx
+++ b/src/app/products/page.tsx
@@ -25,10 +25,10 @@ export default function ProductsPage() {
        <NavbarLayoutFloatingOverlay
          brandName="الحسام للزيوت"
          navItems={[
-            { name: "منتجاتنا", id: "products", href: "/products" },
-            { name: "خدماتنا", id: "services", href: "/#services" },
-            { name: "من نحن", id: "about", href: "/#about" },
-            { name: "اتصل بنا", id: "contact", href: "/#contact" }
+            { name: "منتجاتنا", id: "/products" },
+            { name: "خدماتنا", id: "/#services" },
+            { name: "من نحن", id: "/#about" },
+            { name: "اتصل بنا", id: "/#contact" }
          ]}
          button={{ text: "احجز الآن", href: "/#contact" }}
        />
@@ -43,22 +43,22 @@ export default function ProductsPage() {
            gridVariant="three-columns-all-equal-width"
            products={[
              {
-                id: "oil_engine_synthetic",                name: "زيت محركات اصطناعي 5W-30",                price: "SAR 120.00",                imageSrc: "https://img.b2bpic.net/free-photo/synthetic-engine-oil-bottle_123456789.jpg",                imageAlt: "زيت محركات اصطناعي 5W-30",                priceButtonProps: { text: "تفاصيل المنتج", icon: ArrowUpRight, href: "#" }
+                id: "oil_engine_synthetic",                name: "زيت محركات اصطناعي 5W-30",                price: "SAR 120.00",                imageSrc: "https://img.b2bpic.net/free-photo/synthetic-engine-oil-bottle_123456789.jpg",                imageAlt: "زيت محركات اصطناعي 5W-30",                priceButtonProps: { text: "تفاصيل المنتج", href: "#" }
              },
              {
-                id: "oil_engine_conventional",                name: "زيت محركات تقليدي 10W-40",                price: "SAR 80.00",                imageSrc: "https://img.b2bpic.net/free-photo/conventional-engine-oil_987654321.jpg",                imageAlt: "زيت محركات تقليدي 10W-40",                priceButtonProps: { text: "تفاصيل المنتج", icon: ArrowUpRight, href: "#" }
+                id: "oil_engine_conventional",                name: "زيت محركات تقليدي 10W-40",                price: "SAR 80.00",                imageSrc: "https://img.b2bpic.net/free-photo/conventional-engine-oil_987654321.jpg",                imageAlt: "زيت محركات تقليدي 10W-40",                priceButtonProps: { text: "تفاصيل المنتج", href: "#" }
              },
              {
-                id: "oil_hydraulic_industrial",                name: "زيت هيدروليكي صناعي AW-68",                price: "SAR 150.00",                imageSrc: "https://img.b2bpic.net/free-photo/industrial-hydraulic-oil_112233445.jpg",                imageAlt: "زيت هيدروليكي صناعي AW-68",                priceButtonProps: { text: "تفاصيل المنتج", icon: ArrowUpRight, href: "#" }
+                id: "oil_hydraulic_industrial",                name: "زيت هيدروليكي صناعي AW-68",                price: "SAR 150.00",                imageSrc: "https://img.b2bpic.net/free-photo/industrial-hydraulic-oil_112233445.jpg",                imageAlt: "زيت هيدروليكي صناعي AW-68",                priceButtonProps: { text: "تفاصيل المنتج", href: "#" }
              },
              {
-                id: "oil_gear_automotive",                name: "زيت ناقل حركة (جير) GL-4",                price: "SAR 95.00",                imageSrc: "https://img.b2bpic.net/free-photo/automotive-gear-oil_556677889.jpg",                imageAlt: "زيت ناقل حركة (جير) GL-4",                priceButtonProps: { text: "تفاصيل المنتج", icon: ArrowUpRight, href: "#" }
+                id: "oil_gear_automotive",                name: "زيت ناقل حركة (جير) GL-4",                price: "SAR 95.00",                imageSrc: "https://img.b2bpic.net/free-photo/automotive-gear-oil_556677889.jpg",                imageAlt: "زيت ناقل حركة (جير) GL-4",                priceButtonProps: { text: "تفاصيل المنتج", href: "#" }
              },
              {
-                id: "oil_industrial_compressor",                name: "زيت ضواغط صناعية ISO VG 46",                price: "SAR 180.00",                imageSrc: "https://img.b2bpic.net/free-photo/industrial-compressor-oil_001122334.jpg",                imageAlt: "زيت ضواغط صناعية ISO VG 46",                priceButtonProps: { text: "تفاصيل المنتج", icon: ArrowUpRight, href: "#" }
+                id: "oil_industrial_compressor",                name: "زيت ضواغط صناعية ISO VG 46",                price: "SAR 180.00",                imageSrc: "https://img.b2bpic.net/free-photo/industrial-compressor-oil_001122334.jpg",                imageAlt: "زيت ضواغط صناعية ISO VG 46",                priceButtonProps: { text: "تفاصيل المنتج", href: "#" }
              },
              {
-                id: "oil_marine_engine",                name: "زيت محركات بحرية API CF-4",                price: "SAR 220.00",                imageSrc: "https://img.b2bpic.net/free-photo/marine-engine-oil_678901234.jpg",                imageAlt: "زيت محركات بحرية API CF-4",                priceButtonProps: { text: "تفاصيل المنتج", icon: ArrowUpRight, href: "#" }
+                id: "oil_marine_engine",                name: "زيت محركات بحرية API CF-4",                price: "SAR 220.00",                imageSrc: "https://img.b2bpic.net/free-photo/marine-engine-oil_678901234.jpg",                imageAlt: "زيت محركات بحرية API CF-4",                priceButtonProps: { text: "تفاصيل المنتج", href: "#" }
              }
            ]}
          />