Merge version_2 into main

Merge version_2 into main
This commit was merged in pull request #2.
This commit is contained in:
2026-04-01 16:29:19 +00:00
3 changed files with 37 additions and 27 deletions

View File

@@ -9,17 +9,19 @@ import { Star } from "lucide-react";
export default function AboutPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-bubble" defaultTextAnimation="reveal-blur" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "contact" },
]}
brandName="Florista de Tires"
/>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
brandName="Florista de Tires"
/>
</div>
<div id="about" data-section="about" className="pt-32">
<TestimonialAboutCard
useInvertedBackground={false}
@@ -32,7 +34,9 @@ export default function AboutPage() {
icon={Star}
/>
</div>
<FooterCard logoText="Florista de Tires" />
<div id="footer" data-section="footer">
<FooterCard logoText="Florista de Tires" />
</div>
</ReactLenis>
</ThemeProvider>
);

View File

@@ -2,7 +2,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useState } from "react";
import { Input } from "@/components/form/Input";
import Input from "@/components/form/Input";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
export default function AdminDashboard() {
@@ -27,10 +27,12 @@ export default function AdminDashboard() {
secondaryButtonStyle="radial-glow"
headingFontWeight="bold"
>
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Dashboard", id: "/admin/dashboard" }]}
brandName="Florista de Tires Admin"
/>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[{ name: "Home", id: "/" }, { name: "Dashboard", id: "/admin/dashboard" }]}
brandName="Florista de Tires Admin"
/>
</div>
<div className="min-h-screen pt-32 px-6 max-w-4xl mx-auto">
<h1 className="text-4xl font-bold mb-8">Product Management</h1>
<form onSubmit={handleSubmit} className="space-y-6 bg-card p-8 rounded-lg shadow-sm border">

View File

@@ -8,17 +8,19 @@ import FooterCard from '@/components/sections/footer/FooterCard';
export default function ShopPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-bubble" defaultTextAnimation="reveal-blur" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "contact" },
]}
brandName="Florista de Tires"
/>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
]}
brandName="Florista de Tires"
/>
</div>
<div id="shop" data-section="shop" className="pt-32">
<ProductCardThree
animationType="slide-up"
@@ -34,7 +36,9 @@ export default function ShopPage() {
description="Browse our latest creations, crafted daily with seasonal wildflowers."
/>
</div>
<FooterCard logoText="Florista de Tires" />
<div id="footer" data-section="footer">
<FooterCard logoText="Florista de Tires" />
</div>
</ReactLenis>
</ThemeProvider>
);