Merge version_4 into main #3

Merged
bender merged 5 commits from version_4 into main 2026-02-27 05:02:35 +00:00
5 changed files with 34 additions and 23 deletions

View File

@@ -17,7 +17,7 @@ export default function BlogPage() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -61,7 +61,7 @@ export default function BlogPage() {
columns={[
{
title: "Navigate", items: [
{ label: "Home", href: "#home" },
{ label: "Home", href: "/" },
{ label: "Menu", href: "#product" },
{ label: "About", href: "#about" },
{ label: "Contact", href: "#contact" }
@@ -91,4 +91,4 @@ export default function BlogPage() {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -1413,4 +1413,4 @@ export default function RootLayout({
</ServiceWrapper>
</html>
);
}
}

View File

@@ -11,6 +11,7 @@ import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCa
import MetricCardThree from '@/components/sections/metrics/MetricCardThree';
import ContactCTA from '@/components/sections/contact/ContactCTA';
import FooterSimple from '@/components/sections/footer/FooterSimple';
import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
import { Coffee, Flame, Heart, Star, Users, ThumbsUp, TrendingUp, Mail, Award } from 'lucide-react';
export default function LandingPage() {
@@ -21,7 +22,7 @@ export default function LandingPage() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -77,6 +78,21 @@ export default function LandingPage() {
/>
</div>
<div id="brands" data-section="brands">
<SocialProofOne
title="Trusted by Premium Brands"
description="We partner with the finest coffee suppliers and artisan producers from around the world"
tag="Our Partners"
names={[
"Ethiopian Highlands Coffee", "Colombian Fair Trade Co.", "Indonesian Sumatra Estates", "Kenyan AA Beans", "Brazilian Santos Roasters", "Peruvian Organic Farms"
]}
textboxLayout="default"
useInvertedBackground={false}
speed={40}
showCard={true}
/>
</div>
<div id="product" data-section="product">
<ProductCardFour
title="Featured Menu"
@@ -309,4 +325,4 @@ export default function LandingPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -82,7 +82,7 @@ function ProductPageContent({ params }: ProductPageProps) {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -97,8 +97,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -151,7 +150,7 @@ function ProductPageContent({ params }: ProductPageProps) {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -166,8 +165,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -227,7 +225,7 @@ function ProductPageContent({ params }: ProductPageProps) {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -242,8 +240,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -319,4 +316,4 @@ function ProductPageContent({ params }: ProductPageProps) {
</ReactLenis>
</ThemeProvider>
);
}
}

View File

@@ -25,7 +25,7 @@ function ShopPageContent() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -40,8 +40,7 @@ function ShopPageContent() {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -93,7 +92,7 @@ function ShopPageContent() {
borderRadius="pill"
contentWidth="mediumSmall"
sizing="mediumLarge"
background="none"
background="floatingGradient"
cardStyle="glass-elevated"
primaryButtonStyle="primary-glow"
secondaryButtonStyle="radial-glow"
@@ -108,8 +107,7 @@ function ShopPageContent() {
{ name: "Menu", id: "product" },
{ name: "About", id: "about" },
{ name: "Features", id: "feature" },
{ name: "Contact", id: "contact" },
{ name: "Shop", id: "/shop" }
{ name: "Contact", id: "contact" }
]}
button={{ text: "Cart", onClick: () => console.log("cart") }}
/>
@@ -168,4 +166,4 @@ export default function ShopPage() {
<ShopPageContent />
</Suspense>
);
}
}