bender/01b700d6-b422-4404-bff6-416fcf782a60
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-25 11:13:55 +00:00
Conversation 0 Commits 4 Files Changed 4 +55 -36
4 changed files with 55 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/blog/page.tsx
View File

@@ -17,6 +17,15 @@ export default function BlogPage() {
// Preserved posts fetching logic
const { posts, isLoading } = useBlogPosts();
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
];
return (
<ThemeProvider
defaultButtonVariant="expand-hover"
@@ -31,17 +40,12 @@ export default function BlogPage() {
headingFontWeight="light"
>
<ReactLenis root>
{/* Navbar from NAVBAR_INFO */}
<NavbarStyleApple
brandName="Olla"
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "about" },
{ name: "Shop", id: "shop" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
]}
/>
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={navItems}
/>
</div>
{/* Preserved loading state and posts logic */}
{isLoading ? (
@@ -90,7 +94,6 @@ export default function BlogPage() {
]}
logoText="Olla"
copyrightText="© 2024 Olla Flowers Studio. All rights reserved."
useInvertedBackground={false}
ariaLabel="Site footer"
/>
</div>

21
src/app/page.tsx
View File

@@ -11,6 +11,15 @@ import ContactCTA from '@/components/sections/contact/ContactCTA';
import FooterBase from '@/components/sections/footer/FooterBase';
export default function SitePage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
];
return (
<ThemeProvider
defaultButtonVariant="expand-hover"
@@ -28,13 +37,7 @@ export default function SitePage() {
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Shop", id: "shop" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
]}
navItems={navItems}
/>
</div>
<div id="hero" data-section="hero">
@@ -43,8 +46,8 @@ export default function SitePage() {
description="Crafting exquisite floral arrangements for every occasion. Discover the beauty of nature, artfully designed."
tag="Welcome to Olla"
buttons={[
{ text: "Shop Now", href: "shop" },
{ text: "Learn More", href: "about" },
{ text: "Shop Now", href: "/shop" },
{ text: "Learn More", href: "/#about" },
]}
imageSrc="http://img.b2bpic.net/free-photo/woman-holds-festive-flower-arrangement-with-bright-chrysanthemum-flowers_169016-51483.jpg"
imageAlt="Elegant floral arrangement for Olla Flowers Studio"

24
src/app/shop/[id]/page.tsx
View File

@@ -74,6 +74,15 @@ function ProductPageContent({ params }: ProductPageProps) {
await checkout(getCheckoutItems(), { successUrl: currentUrl.toString() });
}, [cartItems, checkout, getCheckoutItems]);
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
];
if (isLoading) {
return (
<ThemeProvider
@@ -89,10 +98,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -108,7 +117,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
logoText="Olla"
copyrightText="© 2024 Olla Flowers Studio. All rights reserved."
useInvertedBackground={false}
ariaLabel="Site footer"
/>
</div>
@@ -132,10 +140,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -159,7 +167,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
logoText="Olla"
copyrightText="© 2024 Olla Flowers Studio. All rights reserved."
useInvertedBackground={false}
ariaLabel="Site footer"
/>
</div>
@@ -182,10 +189,10 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
@@ -234,7 +241,6 @@ function ProductPageContent({ params }: ProductPageProps) {
]}
logoText="Olla"
copyrightText="© 2024 Olla Flowers Studio. All rights reserved."
useInvertedBackground={false}
ariaLabel="Site footer"
/>
</div>

19
src/app/shop/page.tsx
View File

@@ -17,6 +17,15 @@ function ShopPageContent() {
filters,
} = useProductCatalog({ basePath: "/shop" });
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Shop", id: "/shop" },
{ name: "Blog", id: "/blog" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
];
if (isLoading) {
return (
<ThemeProvider
@@ -32,10 +41,10 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => {} }}
/>
</div>
@@ -51,7 +60,6 @@ function ShopPageContent() {
]}
logoText="Olla"
copyrightText="© 2024 Olla Flowers Studio. All rights reserved."
useInvertedBackground={false}
ariaLabel="Site footer"
/>
</div>
@@ -74,10 +82,10 @@ function ShopPageContent() {
headingFontWeight="light"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleApple
brandName="Olla"
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "Contact", id: "/contact" }]}
navItems={navItems}
button={{ text: "Cart", onClick: () => {} }}
/>
</div>
@@ -101,7 +109,6 @@ function ShopPageContent() {
]}
logoText="Olla"
copyrightText="© 2024 Olla Flowers Studio. All rights reserved."
useInvertedBackground={false}
ariaLabel="Site footer"
/>
</div>