development/4164af2a-c07e-4202-9f6d-0631dfe5e573
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-04 15:06:29 +00:00
Conversation 0 Commits 2 Files Changed 2 +6 -6
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,12 +29,12 @@ export default function BlogPage() {
brandName="Zayia" brandName="Zayia"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Products", id: "products" }, { name: "Products", id: "/shop" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "FAQ", id: "faq" }, { name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ text: "Order Now", href: "products" }} button={{ text: "Order Now", href: "/shop" }}
/> />
{isLoading ? ( {isLoading ? (

8
src/app/page.tsx
View File

@@ -32,13 +32,13 @@ export default function LandingPage() {
brandName="Zayia" brandName="Zayia"
navItems={[ navItems={[
{ name: "Home", id: "hero" }, { name: "Home", id: "hero" },
{ name: "Products", id: "products" }, { name: "Products", id: "/shop" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "FAQ", id: "faq" }, { name: "FAQ", id: "faq" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ button={{
text: "Order Now", href: "products" text: "Order Now", href: "/shop"
}} }}
/> />
</div> </div>
@@ -55,7 +55,7 @@ export default function LandingPage() {
]} ]}
avatarText="Trusted by 500+ happy customers" avatarText="Trusted by 500+ happy customers"
buttons={[ buttons={[
{ text: "Shop Now", href: "products" }, { text: "Shop Now", href: "/shop" },
{ text: "Learn More", href: "about" } { text: "Learn More", href: "about" }
]} ]}
/> />
@@ -230,7 +230,7 @@ export default function LandingPage() {
useInvertedBackground="invertDefault" useInvertedBackground="invertDefault"
buttons={[ buttons={[
{ text: "Contact Us", href: "#" }, { text: "Contact Us", href: "#" },
{ text: "Shop Now", href: "products" } { text: "Shop Now", href: "/shop" }
]} ]}
/> />
</div> </div>