Merge version_2 into main

2026-02-14 10:06:49 +00:00
parent 333a85564a 656755b19a
commit 92a445e3d0
6 changed files with 102 additions and 12 deletions
--- a/src/app/about/page.tsx
+++ b/src/app/about/page.tsx
@@ -0,0 +1,67 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
+import MediaAbout from '@/components/sections/about/MediaAbout';
+import FooterLogoReveal from '@/components/sections/footer/FooterLogoReveal';
+import ReactLenis from "lenis/react";
+
+export default function AboutPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="hover-bubble"
+      defaultTextAnimation="background-highlight"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="mediumLargeSizeLargeTitles"
+      background="grid"
+      cardStyle="glass-elevated"
+      primaryButtonStyle="inset-glow"
+      secondaryButtonStyle="layered"
+      headingFontWeight="semibold"
+    >
+      <ReactLenis root>
+        <div id="nav" data-section="nav">
+          <NavbarStyleApple
+            brandName="Luxe Haven"
+            navItems={[
+              { name: "Home", id: "/" },
+              { name: "Rooms", id: "rooms" },
+              { name: "Amenities", id: "amenities" },
+              { name: "Pricing", id: "pricing" },
+              { name: "Reviews", id: "testimonials" },
+              { name: "About", id: "/about" },
+              { name: "Contact", id: "contact" }
+            ]}
+          />
+        </div>
+
+        <div id="about" data-section="about">
+          <MediaAbout
+            title="About Luxe Haven"
+            description="Nestled in the heart of the city, Luxe Haven stands as a beacon of luxury and hospitality. Since our founding, we have been dedicated to providing exceptional experiences to travelers from around the world. Our commitment to excellence is evident in every aspect of our service, from our meticulously designed rooms to our world-class dining experiences.
+
+With 150 beautifully appointed rooms and suites, state-of-the-art facilities, and a team of dedicated professionals, Luxe Haven has earned its reputation as one of the most sought-after luxury destinations. We believe that true luxury is not just about opulent surroundings, but about creating memorable moments and ensuring every guest feels valued and cherished.
+
+Our philosophy centers on personalized service, attention to detail, and a genuine passion for hospitality. Whether you're visiting for business or leisure, we are committed to making your stay unforgettable."
+            tag="Our Story"
+            imageSrc="https://img.b2bpic.net/free-photo/elegant-hotel-reception-lobby_482257-76206.jpg"
+            imageAlt="Luxe Haven hotel exterior"
+            useInvertedBackground={false}
+            buttons={[
+              { text: "Book Your Stay", href: "/" }
+            ]}
+          />
+        </div>
+
+        <div id="footer" data-section="footer">
+          <FooterLogoReveal
+            logoText="Luxe Haven"
+            leftLink={{ text: "Privacy Policy", href: "#" }}
+            rightLink={{ text: "Terms of Service", href: "#" }}
+          />
+        </div>
+      </ReactLenis>
+    </ThemeProvider>
+  );
+}
--- a/src/app/blog/page.tsx
+++ b/src/app/blog/page.tsx
@@ -32,7 +32,8 @@ export default function BlogPage() {
                            { name: "Rooms", id: "rooms" },
                            { name: "Amenities", id: "amenities" },
                            { name: "Pricing", id: "pricing" },
-                            { name: "Reviews", id: "reviews" },
+                            { name: "Reviews", id: "testimonials" },
+                            { name: "About", id: "/about" },
                            { name: "Contact", id: "contact" }
                        ]}
                    />
@@ -72,4 +73,4 @@ export default function BlogPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -1266,4 +1266,4 @@ export default function RootLayout({
      </ServiceWrapper>
    </html>
  );
-}
+}
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -30,10 +30,12 @@ export default function LandingPage() {
        <NavbarStyleApple
          brandName="Luxe Haven"
          navItems={[
+            { name: "Home", id: "/" },
            { name: "Rooms", id: "rooms" },
            { name: "Amenities", id: "amenities" },
            { name: "Pricing", id: "pricing" },
            { name: "Reviews", id: "testimonials" },
+            { name: "About", id: "/about" },
            { name: "Contact", id: "contact" }
          ]}
        />
@@ -69,7 +71,7 @@ export default function LandingPage() {
          imageAlt="Luxe Haven hotel exterior"
          useInvertedBackground={false}
          buttons={[
-            { text: "Learn More", href: "amenities" }
+            { text: "Learn More", href: "/about" }
          ]}
        />
      </div>
@@ -186,4 +188,4 @@ export default function LandingPage() {
      </div>
    </ThemeProvider>
  );
-}
+}
--- a/src/app/shop/[id]/page.tsx
+++ b/src/app/shop/[id]/page.tsx
@@ -86,7 +86,11 @@ export default function ProductPage({ params }: ProductPageProps) {
                        brandName="Luxe Haven"
                        navItems={[
                            { name: "Home", id: "/" },
-                            { name: "Shop", id: "/shop" },
+                            { name: "Rooms", id: "rooms" },
+                            { name: "Amenities", id: "amenities" },
+                            { name: "Pricing", id: "pricing" },
+                            { name: "Reviews", id: "testimonials" },
+                            { name: "About", id: "/about" },
                            { name: "Contact", id: "contact" }
                        ]}
                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -127,7 +131,11 @@ export default function ProductPage({ params }: ProductPageProps) {
                            brandName="Luxe Haven"
                            navItems={[
                                { name: "Home", id: "/" },
-                                { name: "Shop", id: "/shop" },
+                                { name: "Rooms", id: "rooms" },
+                                { name: "Amenities", id: "amenities" },
+                                { name: "Pricing", id: "pricing" },
+                                { name: "Reviews", id: "testimonials" },
+                                { name: "About", id: "/about" },
                                { name: "Contact", id: "contact" }
                            ]}
                            button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -175,7 +183,11 @@ export default function ProductPage({ params }: ProductPageProps) {
                    brandName="Luxe Haven"
                    navItems={[
                        { name: "Home", id: "/" },
-                        { name: "Shop", id: "/shop" },
+                        { name: "Rooms", id: "rooms" },
+                        { name: "Amenities", id: "amenities" },
+                        { name: "Pricing", id: "pricing" },
+                        { name: "Reviews", id: "testimonials" },
+                        { name: "About", id: "/about" },
                        { name: "Contact", id: "contact" }
                    ]}
                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -227,4 +239,4 @@ export default function ProductPage({ params }: ProductPageProps) {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}
--- a/src/app/shop/page.tsx
+++ b/src/app/shop/page.tsx
@@ -38,7 +38,11 @@ export default function ShopPage() {
                        brandName="Luxe Haven"
                        navItems={[
                            { name: "Home", id: "/" },
-                            { name: "Shop", id: "/shop" },
+                            { name: "Rooms", id: "rooms" },
+                            { name: "Amenities", id: "amenities" },
+                            { name: "Pricing", id: "pricing" },
+                            { name: "Reviews", id: "testimonials" },
+                            { name: "About", id: "/about" },
                            { name: "Contact", id: "contact" }
                        ]}
                        button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -78,7 +82,11 @@ export default function ShopPage() {
                    brandName="Luxe Haven"
                    navItems={[
                        { name: "Home", id: "/" },
-                        { name: "Shop", id: "/shop" },
+                        { name: "Rooms", id: "rooms" },
+                        { name: "Amenities", id: "amenities" },
+                        { name: "Pricing", id: "pricing" },
+                        { name: "Reviews", id: "testimonials" },
+                        { name: "About", id: "/about" },
                        { name: "Contact", id: "contact" }
                    ]}
                    button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -105,4 +113,4 @@ export default function ShopPage() {
            </ReactLenis>
        </ThemeProvider>
    );
-}
+}