development/1071b31b-faef-4018-b9bf-9a0fd7793b86
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
development merged 2 commits from version_1 into main 2026-02-06 16:40:44 +00:00
Conversation 0 Commits 2 Files Changed 2 +13 -13
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,13 +28,13 @@ export default function BlogPage() {
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "Products", id: "products" },
{ name: "Products", id: "/shop" },
{ name: "About", id: "about" },
{ name: "Collections", id: "collections" },
{ name: "Collections", id: "/shop" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
]}
button={{ text: "Shop Now", href: "products" }}
button={{ text: "Shop Now", href: "/shop" }}
brandName="Bee Cups"
/>
</div>
@@ -64,10 +64,10 @@ export default function BlogPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Products", href: "products" },
{ label: "Collections", href: "collections" },
{ label: "All Products", href: "/shop" },
{ label: "Collections", href: "/shop" },
{ label: "Custom Orders", href: "contact" },
{ label: "Sale Items", href: "products" }
{ label: "Sale Items", href: "/shop" }
]
},
{

14
src/app/page.tsx
View File

@@ -29,14 +29,14 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Products", id: "products" },
{ name: "Products", id: "/shop" },
{ name: "About", id: "about" },
{ name: "Collections", id: "collections" },
{ name: "Collections", id: "/shop" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
]}
button={{
text: "Shop Now", href: "products"
text: "Shop Now", href: "/shop"
}}
brandName="Bee Cups"
/>
@@ -53,7 +53,7 @@ export default function LandingPage() {
imageAlt="Colorful artisan bee cups collection"
imagePosition="right"
buttons={[
{ text: "Shop Collection", href: "products" },
{ text: "Shop Collection", href: "/shop" },
{ text: "Learn More", href: "about" }
]}
/>
@@ -211,10 +211,10 @@ export default function LandingPage() {
columns={[
{
title: "Shop", items: [
{ label: "All Products", href: "products" },
{ label: "Collections", href: "collections" },
{ label: "All Products", href: "/shop" },
{ label: "Collections", href: "/shop" },
{ label: "Custom Orders", href: "contact" },
{ label: "Sale Items", href: "products" }
{ label: "Sale Items", href: "/shop" }
]
},
{