Merge version_4 into main

Update src/app/page.tsx
2026-05-14 10:54:54 +00:00 · 2026-05-14 10:54:51 +00:00 · 2026-05-14 10:51:13 +00:00 · 2026-05-14 10:51:10 +00:00 · 2026-05-14 10:51:09 +00:00 · 2026-05-14 10:51:09 +00:00
5 changed files with 117 additions and 215 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -4,8 +4,9 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FooterSimple from '@/components/sections/footer/FooterSimple';
 import LegalSection from '@/components/legal/LegalSection';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
+import { MessageCircle } from "lucide-react";

 export default function AboutPage() {
  return (
@@ -23,7 +24,7 @@ export default function AboutPage() {
    >
      <ReactLenis root>
        <div id="nav" data-section="nav">
-          <NavbarLayoutFloatingOverlay
+          <NavbarStyleApple
            navItems={[
              { name: "Home", id: "/" },
              { name: "Tours", id: "/tours" },
@@ -78,6 +79,16 @@ export default function AboutPage() {
            bottomRightText="Islamabad, Pakistan"
          />
        </div>
+
+        <a 
+          href="https://wa.me/923356442987"
+          target="_blank"
+          rel="noreferrer"
+          className="fixed bottom-8 right-8 z-50 p-4 rounded-full bg-green-500 text-white shadow-lg animate-pulse hover:scale-110 transition-transform"
+          aria-label="WhatsApp"
+        >
+          <MessageCircle size={24} />
+        </a>
      </ReactLenis>
    </ThemeProvider>
  );
--- a/src/app/contact/page.tsx
+++ b/src/app/contact/page.tsx
@@ -5,7 +5,8 @@ import ReactLenis from "lenis/react";
 import BlogCardOne from '@/components/sections/blog/BlogCardOne';
 import ContactText from '@/components/sections/contact/ContactText';
 import FooterSimple from '@/components/sections/footer/FooterSimple';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import { MessageCircle } from "lucide-react";

 export default function LandingPage() {
  return (
@@ -23,28 +24,13 @@ export default function LandingPage() {
    >
      <ReactLenis root>
  <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+      <NavbarStyleApple
      navItems={[
-        {
-          name: "Home",
-          id: "/",
-        },
-        {
-          name: "Tours",
-          id: "/tours",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
+        { name: "Home", id: "/" },
+        { name: "Tours", id: "/tours" },
+        { name: "About", id: "/about" },
+        { name: "Reviews", id: "/reviews" },
+        { name: "Contact", id: "/contact" },
      ]}
      brandName="Chalay Ao Travels"
    />
@@ -54,14 +40,11 @@ export default function LandingPage() {
      <ContactText
      useInvertedBackground={true}
      background={{
-        variant: "sparkles-gradient",
-      }}
+        variant: "sparkles-gradient"}}
      text="Plan your adventure today. Contact us at +92 335 6442987."
      buttons={[
        {
-          text: "WhatsApp Now",
-          href: "https://wa.me/923356442987",
-        },
+          text: "WhatsApp Now",          href: "https://wa.me/923356442987"},
      ]}
    />
  </div>
@@ -75,15 +58,7 @@ export default function LandingPage() {
      description="Read our latest advice for your next trip."
      blogs={[
        {
-          id: "b1",
-          category: "Guide",
-          title: "Pack Smart",
-          excerpt: "Essential items for northern climates.",
-          imageSrc: "http://img.b2bpic.net/free-photo/handsome-tourist-straw-hat-covering-face-from-sun-looking-distance-aside-smiling-pleased-t_1258-173882.jpg",
-          authorName: "Chalay Ao Admin",
-          authorAvatar: "http://img.b2bpic.net/free-photo/turning-up-big-city-is-easy_329181-8495.jpg",
-          date: "Oct 2024",
-        },
+          id: "b1",          category: "Guide",          title: "Pack Smart",          excerpt: "Essential items for northern climates.",          imageSrc: "http://img.b2bpic.net/free-photo/handsome-tourist-straw-hat-covering-face-from-sun-looking-distance-aside-smiling-pleased-t_1258-173882.jpg",          authorName: "Chalay Ao Admin",          authorAvatar: "http://img.b2bpic.net/free-photo/turning-up-big-city-is-easy_329181-8495.jpg",          date: "Oct 2024"},
      ]}
    />
  </div>
@@ -92,33 +67,16 @@ export default function LandingPage() {
      <FooterSimple
      columns={[
        {
-          title: "Quick Links",
-          items: [
-            {
-              label: "Tours",
-              href: "/tours",
-            },
-            {
-              label: "About",
-              href: "/about",
-            },
-            {
-              label: "Contact",
-              href: "/contact",
-            },
+          title: "Quick Links",          items: [
+            { label: "Tours", href: "/tours" },
+            { label: "About", href: "/about" },
+            { label: "Contact", href: "/contact" },
          ],
        },
        {
-          title: "Contact",
-          items: [
-            {
-              label: "+92 335 6442987",
-              href: "tel:+923356442987",
-            },
-            {
-              label: "WhatsApp Chat",
-              href: "https://wa.me/923356442987",
-            },
+          title: "Contact",          items: [
+            { label: "+92 335 6442987", href: "tel:+923356442987" },
+            { label: "WhatsApp Chat", href: "https://wa.me/923356442987" },
          ],
        },
      ]}
@@ -126,6 +84,16 @@ export default function LandingPage() {
      bottomRightText="Islamabad, Pakistan"
    />
  </div>
+
+  <a 
+    href="https://wa.me/923356442987"
+    target="_blank"
+    rel="noreferrer"
+    className="fixed bottom-8 right-8 z-50 p-4 rounded-full bg-green-500 text-white shadow-lg animate-pulse hover:scale-110 transition-transform"
+    aria-label="WhatsApp"
+  >
+    <MessageCircle size={24} />
+  </a>
      </ReactLenis>
    </ThemeProvider>
  );
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,8 +6,9 @@ import FooterSimple from '@/components/sections/footer/FooterSimple';
 import HeroBillboardRotatedCarousel from '@/components/sections/hero/HeroBillboardRotatedCarousel';
 import MetricCardEleven from '@/components/sections/metrics/MetricCardEleven';
 import MetricCardFourteen from '@/components/sections/metrics/MetricCardFourteen';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
+import { MessageCircle } from "lucide-react";

 export default function LandingPage() {
  return (
@@ -25,7 +26,8 @@ export default function LandingPage() {
    >
      <ReactLenis root>
  <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+      <NavbarStyleApple
+      brandName="Chalay Ao Travels"
      navItems={[
        { name: "Home", id: "/" },
        { name: "Tours", id: "/tours" },
@@ -33,7 +35,6 @@ export default function LandingPage() {
        { name: "Reviews", id: "/reviews" },
        { name: "Contact", id: "/contact" },
      ]}
-      brandName="Chalay Ao Travels"
    />
  </div>

@@ -45,7 +46,7 @@ export default function LandingPage() {
      tag="Premium Travel"
      buttons={[
        { text: "Discover Collections", href: "/tours" },
-        { text: "Concierge Support", href: "https://wa.me/923356442987" },
+        { text: "Whatsapp Support", href: "https://wa.me/923356442987" },
      ]}
      carouselItems={[
        { id: "c1", imageSrc: "http://img.b2bpic.net/free-photo/beautiful-vertical-shot-parco-naturale-di-fanes-sennes-braies-prags-italy_181624-21712.jpg?_wi=1", imageAlt: "Scenic view 1" },
@@ -124,7 +125,17 @@ export default function LandingPage() {
      bottomRightText="Islamabad, Pakistan"
    />
  </div>
+
+  <a 
+    href="https://wa.me/923356442987"
+    target="_blank"
+    rel="noreferrer"
+    className="fixed bottom-8 right-8 z-50 p-4 rounded-full bg-green-500 text-white shadow-lg animate-pulse hover:scale-110 transition-transform"
+    aria-label="WhatsApp"
+  >
+    <MessageCircle size={24} />
+  </a>
      </ReactLenis>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/reviews/page.tsx
+++ b/src/app/reviews/page.tsx
@@ -3,9 +3,10 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FooterSimple from '@/components/sections/footer/FooterSimple';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
 import TestimonialCardTwo from '@/components/sections/testimonial/TestimonialCardTwo';
+import { MessageCircle } from "lucide-react";

 export default function LandingPage() {
  return (
@@ -23,28 +24,13 @@ export default function LandingPage() {
    >
      <ReactLenis root>
  <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+      <NavbarStyleApple
      navItems={[
-        {
-          name: "Home",
-          id: "/",
-        },
-        {
-          name: "Tours",
-          id: "/tours",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
+        { name: "Home", id: "/" },
+        { name: "Tours", id: "/tours" },
+        { name: "About", id: "/about" },
+        { name: "Reviews", id: "/reviews" },
+        { name: "Contact", id: "/contact" },
      ]}
      brandName="Chalay Ao Travels"
    />
@@ -57,40 +43,15 @@ export default function LandingPage() {
      useInvertedBackground={false}
      testimonials={[
        {
-          id: "t1",
-          name: "Khan Mehwar",
-          role: "Tourist",
-          testimonial: "Absolutely amazing experience, very well organized.",
-          imageSrc: "http://img.b2bpic.net/free-photo/stylish-cool-man-with-ginger-beard-blue-eyes-green-swimming-glasses-printed-white-shirt-showing-peace-signs-orange-backdrop_197531-27686.jpg",
-        },
+          id: "t1",          name: "Khan Mehwar",          role: "Tourist",          testimonial: "Absolutely amazing experience, very well organized.",          imageSrc: "http://img.b2bpic.net/free-photo/stylish-cool-man-with-ginger-beard-blue-eyes-green-swimming-glasses-printed-white-shirt-showing-peace-signs-orange-backdrop_197531-27686.jpg"},
        {
-          id: "t2",
-          name: "Munazza Muskan",
-          role: "Tourist",
-          testimonial: "Outstanding experience, Furqan bhai is great.",
-          imageSrc: "http://img.b2bpic.net/free-photo/couple-with-backpack-sitting-bridge_23-2148926910.jpg",
-        },
+          id: "t2",          name: "Munazza Muskan",          role: "Tourist",          testimonial: "Outstanding experience, Furqan bhai is great.",          imageSrc: "http://img.b2bpic.net/free-photo/couple-with-backpack-sitting-bridge_23-2148926910.jpg"},
        {
-          id: "t3",
-          name: "Basit Nadeem",
-          role: "Tourist",
-          testimonial: "Beautifully managed trip.",
-          imageSrc: "http://img.b2bpic.net/free-photo/young-hipster-beautiful-couple-hiking-river-forest_285396-2246.jpg",
-        },
+          id: "t3",          name: "Basit Nadeem",          role: "Tourist",          testimonial: "Beautifully managed trip.",          imageSrc: "http://img.b2bpic.net/free-photo/young-hipster-beautiful-couple-hiking-river-forest_285396-2246.jpg"},
        {
-          id: "t4",
-          name: "Anonymous",
-          role: "Tourist",
-          testimonial: "First snow experience was magical.",
-          imageSrc: "http://img.b2bpic.net/free-photo/friends-travelers-smiling-holding-map-giving-highfive-outside_176420-6900.jpg",
-        },
+          id: "t4",          name: "Anonymous",          role: "Tourist",          testimonial: "First snow experience was magical.",          imageSrc: "http://img.b2bpic.net/free-photo/friends-travelers-smiling-holding-map-giving-highfive-outside_176420-6900.jpg"},
        {
-          id: "t5",
-          name: "Customer",
-          role: "Tourist",
-          testimonial: "Great attention to detail.",
-          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-couple-hiking-trip_23-2150343045.jpg",
-        },
+          id: "t5",          name: "Customer",          role: "Tourist",          testimonial: "Great attention to detail.",          imageSrc: "http://img.b2bpic.net/free-photo/full-shot-couple-hiking-trip_23-2150343045.jpg"},
      ]}
      title="Customer Reviews"
      description="What our travellers have to say."
@@ -105,9 +66,7 @@ export default function LandingPage() {
      author="Sara"
      avatars={[
        {
-          src: "http://img.b2bpic.net/free-photo/portrait-inspired-elderly-woman-with-orange-backpack-sporty-woman-casual-clothes-looking-forward-with-smile-sport-adventure-hobby-concept_74855-23347.jpg",
-          alt: "Happy traveller",
-        },
+          src: "http://img.b2bpic.net/free-photo/portrait-inspired-elderly-woman-with-orange-backpack-sporty-woman-casual-clothes-looking-forward-with-smile-sport-adventure-hobby-concept_74855-23347.jpg",          alt: "Happy traveller"},
      ]}
      ratingAnimation="slide-up"
      avatarsAnimation="slide-up"
@@ -118,33 +77,16 @@ export default function LandingPage() {
      <FooterSimple
      columns={[
        {
-          title: "Quick Links",
-          items: [
-            {
-              label: "Tours",
-              href: "/tours",
-            },
-            {
-              label: "About",
-              href: "/about",
-            },
-            {
-              label: "Contact",
-              href: "/contact",
-            },
+          title: "Quick Links",          items: [
+            { label: "Tours", href: "/tours" },
+            { label: "About", href: "/about" },
+            { label: "Contact", href: "/contact" },
          ],
        },
        {
-          title: "Contact",
-          items: [
-            {
-              label: "+92 335 6442987",
-              href: "tel:+923356442987",
-            },
-            {
-              label: "WhatsApp Chat",
-              href: "https://wa.me/923356442987",
-            },
+          title: "Contact",          items: [
+            { label: "+92 335 6442987", href: "tel:+923356442987" },
+            { label: "WhatsApp Chat", href: "https://wa.me/923356442987" },
          ],
        },
      ]}
@@ -152,6 +94,16 @@ export default function LandingPage() {
      bottomRightText="Islamabad, Pakistan"
    />
  </div>
+
+  <a 
+    href="https://wa.me/923356442987"
+    target="_blank"
+    rel="noreferrer"
+    className="fixed bottom-8 right-8 z-50 p-4 rounded-full bg-green-500 text-white shadow-lg animate-pulse hover:scale-110 transition-transform"
+    aria-label="WhatsApp"
+  >
+    <MessageCircle size={24} />
+  </a>
      </ReactLenis>
    </ThemeProvider>
  );
--- a/src/app/tours/page.tsx
+++ b/src/app/tours/page.tsx
@@ -3,9 +3,10 @@
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
 import ReactLenis from "lenis/react";
 import FooterSimple from '@/components/sections/footer/FooterSimple';
-import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
 import ProductCardFour from '@/components/sections/product/ProductCardFour';
 import TeamCardOne from '@/components/sections/team/TeamCardOne';
+import { MessageCircle } from "lucide-react";

 export default function LandingPage() {
  return (
@@ -23,28 +24,13 @@ export default function LandingPage() {
    >
      <ReactLenis root>
  <div id="nav" data-section="nav">
-      <NavbarLayoutFloatingOverlay
+      <NavbarStyleApple
      navItems={[
-        {
-          name: "Home",
-          id: "/",
-        },
-        {
-          name: "Tours",
-          id: "/tours",
-        },
-        {
-          name: "About",
-          id: "/about",
-        },
-        {
-          name: "Reviews",
-          id: "/reviews",
-        },
-        {
-          name: "Contact",
-          id: "/contact",
-        },
+        { name: "Home", id: "/" },
+        { name: "Tours", id: "/tours" },
+        { name: "About", id: "/about" },
+        { name: "Reviews", id: "/reviews" },
+        { name: "Contact", id: "/contact" },
      ]}
      brandName="Chalay Ao Travels"
    />
@@ -58,26 +44,11 @@ export default function LandingPage() {
      useInvertedBackground={false}
      products={[
        {
-          id: "t1",
-          name: "Ratti Gali & Kel",
-          price: "$48",
-          variant: "3 Days",
-          imageSrc: "http://img.b2bpic.net/free-photo/river-surrounded-by-rocks-sunlight-blue-sky-daytime_181624-22033.jpg",
-        },
+          id: "t1",          name: "Ratti Gali & Kel",          price: "$48",          variant: "3 Days",          imageSrc: "http://img.b2bpic.net/free-photo/river-surrounded-by-rocks-sunlight-blue-sky-daytime_181624-22033.jpg"},
        {
-          id: "t2",
-          name: "Swat & Kalam",
-          price: "$48",
-          variant: "3 Days",
-          imageSrc: "http://img.b2bpic.net/free-photo/mountains-stream_1398-2306.jpg",
-        },
+          id: "t2",          name: "Swat & Kalam",          price: "$48",          variant: "3 Days",          imageSrc: "http://img.b2bpic.net/free-photo/mountains-stream_1398-2306.jpg"},
        {
-          id: "t3",
-          name: "Naran Valley",
-          price: "$48",
-          variant: "3 Days",
-          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-view-rice-fields-lush-green-leepa-valley-kashmir-pakistan_505751-5817.jpg",
-        },
+          id: "t3",          name: "Naran Valley",          price: "$48",          variant: "3 Days",          imageSrc: "http://img.b2bpic.net/free-photo/beautiful-view-rice-fields-lush-green-leepa-valley-kashmir-pakistan_505751-5817.jpg"},
      ]}
      title="All Packages"
      description="Explore our full range of tours."
@@ -94,11 +65,7 @@ export default function LandingPage() {
      description="Our expert team is here to make your journey unforgettable."
      members={[
        {
-          id: "g1",
-          name: "Furqan",
-          role: "Head Guide",
-          imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-young-women-drinking-tea-mountains_74855-23449.jpg",
-        },
+          id: "g1",          name: "Furqan",          role: "Head Guide",          imageSrc: "http://img.b2bpic.net/free-photo/portrait-happy-young-women-drinking-tea-mountains_74855-23449.jpg"},
      ]}
    />
  </div>
@@ -107,33 +74,16 @@ export default function LandingPage() {
      <FooterSimple
      columns={[
        {
-          title: "Quick Links",
-          items: [
-            {
-              label: "Tours",
-              href: "/tours",
-            },
-            {
-              label: "About",
-              href: "/about",
-            },
-            {
-              label: "Contact",
-              href: "/contact",
-            },
+          title: "Quick Links",          items: [
+            { label: "Tours", href: "/tours" },
+            { label: "About", href: "/about" },
+            { label: "Contact", href: "/contact" },
          ],
        },
        {
-          title: "Contact",
-          items: [
-            {
-              label: "+92 335 6442987",
-              href: "tel:+923356442987",
-            },
-            {
-              label: "WhatsApp Chat",
-              href: "https://wa.me/923356442987",
-            },
+          title: "Contact",          items: [
+            { label: "+92 335 6442987", href: "tel:+923356442987" },
+            { label: "WhatsApp Chat", href: "https://wa.me/923356442987" },
          ],
        },
      ]}
@@ -141,6 +91,16 @@ export default function LandingPage() {
      bottomRightText="Islamabad, Pakistan"
    />
  </div>
+
+  <a 
+    href="https://wa.me/923356442987"
+    target="_blank"
+    rel="noreferrer"
+    className="fixed bottom-8 right-8 z-50 p-4 rounded-full bg-green-500 text-white shadow-lg animate-pulse hover:scale-110 transition-transform"
+    aria-label="WhatsApp"
+  >
+    <MessageCircle size={24} />
+  </a>
      </ReactLenis>
    </ThemeProvider>
  );
Author	SHA1	Message	Date
bender	712241bbef	Merge version_4 into main Merge version_4 into main	2026-05-14 10:54:54 +00:00
bender	8e298226c1	Update src/app/page.tsx	2026-05-14 10:54:51 +00:00
bender	0ca69a4537	Merge version_4 into main Merge version_4 into main	2026-05-14 10:51:13 +00:00
bender	9d23acc5a8	Update src/app/tours/page.tsx	2026-05-14 10:51:10 +00:00
bender	f669e13cf5	Update src/app/reviews/page.tsx	2026-05-14 10:51:09 +00:00
bender	ab1c17a302	Update src/app/page.tsx	2026-05-14 10:51:09 +00:00
bender	b057537c28	Update src/app/contact/page.tsx	2026-05-14 10:51:09 +00:00
bender	969b1755df	Update src/app/about/page.tsx	2026-05-14 10:51:08 +00:00
bender	4ce7e0a5f2	Merge version_3 into main Merge version_3 into main	2026-05-14 10:49:21 +00:00
bender	727ea6fd46	Update src/app/tours/page.tsx	2026-05-14 10:49:18 +00:00
bender	e1cec567fa	Update src/app/reviews/page.tsx	2026-05-14 10:49:18 +00:00
bender	d7446a5ea2	Update src/app/page.tsx	2026-05-14 10:49:17 +00:00
bender	76b0f4928d	Update src/app/contact/page.tsx	2026-05-14 10:49:17 +00:00
bender	e8d0b13fa0	Update src/app/about/page.tsx	2026-05-14 10:49:16 +00:00
bender	1e18bba2df	Merge version_2 into main Merge version_2 into main	2026-05-14 10:48:08 +00:00
bender	8773f0ca98	Merge version_2 into main Merge version_2 into main	2026-05-14 10:47:44 +00:00