Merge version_2 into main #3

Merged
bender merged 2 commits from version_2 into main 2026-04-21 17:09:56 +00:00
2 changed files with 86 additions and 45 deletions

View File

@@ -1,27 +1,50 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
import FooterCard from '@/components/sections/footer/FooterCard';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import TextSplitAbout from '@/components/sections/about/TextSplitAbout';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
export default function AboutPage() {
return (
<ThemeProvider>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Shipping", id: "/shipping" },
{ name: "All Parrots", id: "/#products" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Feathered Friend"
/>
<InlineImageSplitTextAbout
heading={[{ type: "text", content: "About Our Ethical Mission" }, { type: "text", content: "We are dedicated to providing the highest standard of care for every bird in our sanctuary." }]}
/>
<FooterCard logoText="Feathered Friend" />
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="medium"
sizing="medium"
background="circleGradient"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="normal"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Shipping", id: "/shipping" },
]}
/>
</div>
<div id="about" data-section="about">
<TextSplitAbout
title="About Our Ethical Mission"
description={[
"We are dedicated to providing the highest standard of care for every bird in our sanctuary.", "Our commitment to avian welfare drives every decision we make."
]}
useInvertedBackground={false}
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseReveal
logoText="Feathered Friend"
columns={[
{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Shipping", href: "/shipping" }] }
]}
/>
</div>
</ThemeProvider>
);
}

View File

@@ -1,37 +1,55 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import FeatureBorderGlow from '@/components/sections/feature/featureBorderGlow/FeatureBorderGlow';
import FooterCard from '@/components/sections/footer/FooterCard';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
import FeatureCardSix from '@/components/sections/feature/FeatureCardSix';
import { Truck, Globe, ShieldCheck } from "lucide-react";
export default function ShippingPage() {
return (
<ThemeProvider>
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Shipping", id: "/shipping" },
{ name: "All Parrots", id: "/#products" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Feathered Friend"
/>
<FeatureBorderGlow
title="Ethical Transport & Delivery"
description="We ensure safe and ethical transport for birds across the UK and USA."
features={[
{ icon: Truck, title: "Climate Controlled Transport", description: "Our vehicles are optimized to keep our birds safe and stress-free throughout their entire journey." },
{ icon: Globe, title: "International Safety Protocols", description: "Strict adherence to global wildlife transit regulations to protect every species we ship." },
{ icon: ShieldCheck, title: "Care Commitment", description: "We work with specialized handlers to ensure a comfortable journey from our facility to your home." },
]}
animationType="slide-up"
textboxLayout="split"
useInvertedBackground={false}
/>
<FooterCard logoText="Feathered Friend" />
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="medium"
sizing="medium"
background="circleGradient"
cardStyle="glass-elevated"
primaryButtonStyle="gradient"
secondaryButtonStyle="glass"
headingFontWeight="normal"
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Shipping", id: "/shipping" },
]}
/>
</div>
<div id="shipping" data-section="shipping">
<FeatureCardSix
title="Ethical Transport & Delivery"
description="We ensure safe and ethical transport for birds across the UK and USA."
textboxLayout="split"
useInvertedBackground={false}
features={[
{ title: "Climate Controlled Transport", description: "Our vehicles are optimized to keep our birds safe and stress-free throughout their entire journey.", imageSrc: "https://images.unsplash.com/photo-1470071459604-3b5ec3a7fe05?q=80&w=600" },
{ title: "International Safety Protocols", description: "Strict adherence to global wildlife transit regulations to protect every species we ship.", imageSrc: "https://images.unsplash.com/photo-1470071459604-3b5ec3a7fe05?q=80&w=600" },
{ title: "Care Commitment", description: "We work with specialized handlers to ensure a comfortable journey from our facility to your home.", imageSrc: "https://images.unsplash.com/photo-1470071459604-3b5ec3a7fe05?q=80&w=600" }
]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseReveal
logoText="Feathered Friend"
columns={[
{ title: "Navigation", items: [{ label: "Home", href: "/" }, { label: "About", href: "/about" }, { label: "Shipping", href: "/shipping" }] }
]}
/>
</div>
</ThemeProvider>
);
}