Merge version_2 into main #3

Merged
bender merged 3 commits from version_2 into main 2026-06-07 21:03:44 +00:00
3 changed files with 16 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
'use client';
import { ThemeProvider } from '@/components/themeProvider/ThemeProvider';
import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import CardStack from '@/components/cardStack/CardStack';

View File

@@ -1,6 +1,6 @@
"use client";
import { ThemeProvider } from "@/components/theme-provider";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import HeroLogo from '@/components/sections/hero/HeroLogo';
import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
@@ -167,6 +167,7 @@ export default function Home() {
description="Enter your email to get started or reach out to us directly."
tagIcon={Sparkles}
background={{ variant: 'radial-gradient' }}
useInvertedBackground={false}
inputPlaceholder="Your email address"
buttonText="Join the waitlist"
termsText="By clicking Join the waitlist you're confirming that you agree with our Terms and Conditions."

View File

@@ -1,6 +1,6 @@
"use client";
import { ThemeProvider } from "next-themes";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { Sparkles, ShoppingCart, Heart, Share2, Scale } from "lucide-react"; // Example icons
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -29,7 +29,18 @@ export default function ProductDetailPage() {
];
return (
<ThemeProvider attribute="class" enableSystem>
<ThemeProvider
defaultButtonVariant="hover-magnetic"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="medium"
sizing="medium"
background="none"
cardStyle="solid"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<NavbarStyleApple navItems={navItems} brandName="Hara Minimalist Living" />
<main className="min-h-screen bg-background text-foreground">
<div className="container mx-auto px-4 py-8">