bender/e402734b-c2a2-4fc7-891e-df120c86f5e2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main

Browse Source 
Merge version_1 into main
This commit was merged in pull request #1.
This commit is contained in:
bender
2026-02-19 12:03:45 +00:00
parent b98a70988a e7bd3a5e79
commit bdc7cde9c3
4 changed files with 27 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,14 +34,9 @@ export default function BlogPage() {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Features", id: "features" },
{ name: "Products", id: "products" },
{ name: "Testimonials", id: "testimonials" },
{ name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" },
]}
brandName="Biorogo"
button={{ text: "Shop Now", href: "#products" }}
button={{ text: "Shop Now", href: "/shop" }}
className="py-4 px-6 md:px-8 lg:px-12"
navItemClassName="text-foreground hover:text-primary-cta"
buttonClassName=""
@@ -73,22 +68,22 @@ export default function BlogPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Cups", href: "#products" },
{ label: "Ceramic", href: "#products" },
{ label: "Glassware", href: "#products" },
{ label: "Travel Mugs", href: "#products" },
{ label: "All Cups", href: "/#products" },
{ label: "Ceramic", href: "/#products" },
{ label: "Glassware", href: "/#products" },
{ label: "Travel Mugs", href: "/#products" },
],
},
{
title: "Company", items: [
{ label: "About Us", href: "#features" },
{ label: "Testimonials", href: "#testimonials" },
{ label: "FAQ", href: "#faq" },
{ label: "About Us", href: "/#features" },
{ label: "Testimonials", href: "/#testimonials" },
{ label: "FAQ", href: "/#faq" },
],
},
{
title: "Support", items: [
{ label: "Contact Us", href: "#contact" },
{ label: "Contact Us", href: "/#contact" },
{ label: "Shipping", href: "/shipping" },
{ label: "Returns", href: "/returns" },
{ label: "Sitemap", href: "/sitemap" },
@@ -98,7 +93,6 @@ export default function BlogPage() {
copyrightText="© 2024 Biorogo. All rights reserved."
onPrivacyClick={() => console.log('Privacy policy clicked')}
ariaLabel="Site footer for Biorogo"
useInvertedBackground={false}
className="py-16 md:py-20"
cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
logoTextClassName="text-foreground text-3xl font-extrabold"

2
src/app/page.tsx
View File

@@ -1,4 +1,4 @@
"use client"
"use client";
import NavbarLayoutFloatingInline from '@/components/navbar/NavbarLayoutFloatingInline';
import ContactSplit from '@/components/sections/contact/ContactSplit';

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -85,7 +85,6 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
brandName="Biorogo"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -104,14 +103,13 @@ export default function ProductPage({ params }: ProductPageProps) {
<FooterBaseCard
logoText="Biorogo"
columns={[
{ title: "Shop", items: [{ label: "All Cups", href: "#products" }, { label: "Ceramic", href: "#products" }, { label: "Glassware", href: "#products" }, { label: "Travel Mugs", href: "#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "#features" }, { label: "Testimonials", href: "#testimonials" }, { label: "FAQ", href: "#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
{ title: "Shop", items: [{ label: "All Cups", href: "/#products" }, { label: "Ceramic", href: "/#products" }, { label: "Glassware", href: "/#products" }, { label: "Travel Mugs", href: "/#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#features" }, { label: "Testimonials", href: "/#testimonials" }, { label: "FAQ", href: "/#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "/#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
]}
copyrightText="© 2024 Biorogo. All rights reserved."
onPrivacyClick={() => console.log('Privacy policy clicked')}
ariaLabel="Site footer for Biorogo"
useInvertedBackground={false}
className="py-16 md:py-20"
cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
logoTextClassName="text-foreground text-3xl font-extrabold"
@@ -145,7 +143,6 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
brandName="Biorogo"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -172,14 +169,13 @@ export default function ProductPage({ params }: ProductPageProps) {
<FooterBaseCard
logoText="Biorogo"
columns={[
{ title: "Shop", items: [{ label: "All Cups", href: "#products" }, { label: "Ceramic", href: "#products" }, { label: "Glassware", href: "#products" }, { label: "Travel Mugs", href: "#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "#features" }, { label: "Testimonials", href: "#testimonials" }, { label: "FAQ", href: "#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
{ title: "Shop", items: [{ label: "All Cups", href: "/#products" }, { label: "Ceramic", href: "/#products" }, { label: "Glassware", href: "/#products" }, { label: "Travel Mugs", href: "/#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#features" }, { label: "Testimonials", href: "/#testimonials" }, { label: "FAQ", href: "/#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "/#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
]}
copyrightText="© 2024 Biorogo. All rights reserved."
onPrivacyClick={() => console.log('Privacy policy clicked')}
ariaLabel="Site footer for Biorogo"
useInvertedBackground={false}
className="py-16 md:py-20"
cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
logoTextClassName="text-foreground text-3xl font-extrabold"
@@ -212,7 +208,6 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
brandName="Biorogo"
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
@@ -262,14 +257,13 @@ export default function ProductPage({ params }: ProductPageProps) {
<FooterBaseCard
logoText="Biorogo"
columns={[
{ title: "Shop", items: [{ label: "All Cups", href: "#products" }, { label: "Ceramic", href: "#products" }, { label: "Glassware", href: "#products" }, { label: "Travel Mugs", href: "#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "#features" }, { label: "Testimonials", href: "#testimonials" }, { label: "FAQ", href: "#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
{ title: "Shop", items: [{ label: "All Cups", href: "/#products" }, { label: "Ceramic", href: "/#products" }, { label: "Glassware", href: "/#products" }, { label: "Travel Mugs", href: "/#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#features" }, { label: "Testimonials", href: "/#testimonials" }, { label: "FAQ", href: "/#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "/#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
]}
copyrightText="© 2024 Biorogo. All rights reserved."
onPrivacyClick={() => console.log('Privacy policy clicked')}
ariaLabel="Site footer for Biorogo"
useInvertedBackground={false}
className="py-16 md:py-20"
cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
logoTextClassName="text-foreground text-3xl font-extrabold"

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

@@ -1,4 +1,4 @@
use client";
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
@@ -35,7 +35,6 @@ export default function ShopPage() {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
brandName="Biorogo"
button={{ text: "Cart", onClick: () => {} }}
@@ -54,14 +53,13 @@ export default function ShopPage() {
<FooterBaseCard
logoText="Biorogo"
columns={[
{ title: "Shop", items: [{ label: "All Cups", href: "#products" }, { label: "Ceramic", href: "#products" }, { label: "Glassware", href: "#products" }, { label: "Travel Mugs", href: "#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "#features" }, { label: "Testimonials", href: "#testimonials" }, { label: "FAQ", href: "#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
{ title: "Shop", items: [{ label: "All Cups", href: "/#products" }, { label: "Ceramic", href: "/#products" }, { label: "Glassware", href: "/#products" }, { label: "Travel Mugs", href: "/#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#features" }, { label: "Testimonials", href: "/#testimonials" }, { label: "FAQ", href: "/#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "/#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
]}
copyrightText="© 2024 Biorogo. All rights reserved."
onPrivacyClick={() => console.log('Privacy policy clicked')}
ariaLabel="Site footer for Biorogo"
useInvertedBackground={false}
className="py-16 md:py-20"
cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
logoTextClassName="text-foreground text-3xl font-extrabold"
@@ -94,7 +92,6 @@ export default function ShopPage() {
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
]}
brandName="Biorogo"
button={{ text: "Cart", onClick: () => {} }}
@@ -119,14 +116,13 @@ export default function ShopPage() {
<FooterBaseCard
logoText="Biorogo"
columns={[
{ title: "Shop", items: [{ label: "All Cups", href: "#products" }, { label: "Ceramic", href: "#products" }, { label: "Glassware", href: "#products" }, { label: "Travel Mugs", href: "#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "#features" }, { label: "Testimonials", href: "#testimonials" }, { label: "FAQ", href: "#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
{ title: "Shop", items: [{ label: "All Cups", href: "/#products" }, { label: "Ceramic", href: "/#products" }, { label: "Glassware", href: "/#products" }, { label: "Travel Mugs", href: "/#products" }] },
{ title: "Company", items: [{ label: "About Us", href: "/#features" }, { label: "Testimonials", href: "/#testimonials" }, { label: "FAQ", href: "/#faq" }] },
{ title: "Support", items: [{ label: "Contact Us", href: "/#contact" }, { label: "Shipping", href: "/shipping" }, { label: "Returns", href: "/returns" }, { label: "Sitemap", href: "/sitemap" }] }
]}
copyrightText="© 2024 Biorogo. All rights reserved."
onPrivacyClick={() => console.log('Privacy policy clicked')}
ariaLabel="Site footer for Biorogo"
useInvertedBackground={false}
className="py-16 md:py-20"
cardClassName="bg-card rounded-t-3xl shadow-lg border-t border-l border-r border-accent/20"
logoTextClassName="text-foreground text-3xl font-extrabold"