development/f267d758-2c31-4ebd-a2fe-028f8c859a18
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:
development
2026-02-06 12:47:58 +00:00
parent b152dc3f11 977d604070
commit cdeeab1725
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,12 +29,12 @@ export default function BlogPage() {
brandName="Alisa" brandName="Alisa"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "products" }, { name: "Shop", id: "/shop" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" }, { name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ text: "Order Now", href: "products" }} button={{ text: "Order Now", href: "/shop" }}
/> />
</div> </div>
@@ -63,7 +63,7 @@ export default function BlogPage() {
columns={[ columns={[
{ {
items: [ items: [
{ label: "Shop Flowers", href: "products" }, { label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" }, { label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" } { label: "Testimonials", href: "testimonials" }
] ]

8
src/app/page.tsx
View File

@@ -29,13 +29,13 @@ export default function LandingPage() {
<NavbarLayoutFloatingInline <NavbarLayoutFloatingInline
brandName="Alisa" brandName="Alisa"
navItems={[ navItems={[
{ name: "Shop", id: "products" }, { name: "Shop", id: "/shop" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" }, { name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ button={{
text: "Order Now", href: "products" text: "Order Now", href: "/shop"
}} }}
/> />
</div> </div>
@@ -52,7 +52,7 @@ export default function LandingPage() {
showBlur={true} showBlur={true}
showDimOverlay={false} showDimOverlay={false}
buttons={[ buttons={[
{ text: "Shop Flowers", href: "products" }, { text: "Shop Flowers", href: "/shop" },
{ text: "Learn More", href: "about" } { text: "Learn More", href: "about" }
]} ]}
/> />
@@ -211,7 +211,7 @@ export default function LandingPage() {
columns={[ columns={[
{ {
items: [ items: [
{ label: "Shop Flowers", href: "products" }, { label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" }, { label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" } { label: "Testimonials", href: "testimonials" }
] ]

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

@@ -86,12 +86,12 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Alisa" brandName="Alisa"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "products" }, { name: "Shop", id: "/shop" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" }, { name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ text: "Order Now", href: "products" }} button={{ text: "Order Now", href: "/shop" }}
/> />
</div> </div>
<main className="min-h-screen flex items-center justify-center pt-20"> <main className="min-h-screen flex items-center justify-center pt-20">
@@ -102,7 +102,7 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[ columns={[
{ {
items: [ items: [
{ label: "Shop Flowers", href: "products" }, { label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" }, { label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" } { label: "Testimonials", href: "testimonials" }
] ]
@@ -148,12 +148,12 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Alisa" brandName="Alisa"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "products" }, { name: "Shop", id: "/shop" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" }, { name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ text: "Order Now", href: "products" }} button={{ text: "Order Now", href: "/shop" }}
/> />
</div> </div>
<main className="min-h-screen flex items-center justify-center pt-20"> <main className="min-h-screen flex items-center justify-center pt-20">
@@ -172,7 +172,7 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[ columns={[
{ {
items: [ items: [
{ label: "Shop Flowers", href: "products" }, { label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" }, { label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" } { label: "Testimonials", href: "testimonials" }
] ]
@@ -217,12 +217,12 @@ export default function ProductPage({ params }: ProductPageProps) {
brandName="Alisa" brandName="Alisa"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "products" }, { name: "Shop", id: "/shop" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" }, { name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ text: "Order Now", href: "products" }} button={{ text: "Order Now", href: "/shop" }}
/> />
</div> </div>
<div id="productDetailCard" data-section="productDetailCard"> <div id="productDetailCard" data-section="productDetailCard">
@@ -266,7 +266,7 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[ columns={[
{ {
items: [ items: [
{ label: "Shop Flowers", href: "products" }, { label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" }, { label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" } { label: "Testimonials", href: "testimonials" }
] ]

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

@@ -36,12 +36,12 @@ export default function ShopPage() {
brandName="Alisa" brandName="Alisa"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "products" }, { name: "Shop", id: "/shop" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" }, { name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ text: "Order Now", href: "products" }} button={{ text: "Order Now", href: "/shop" }}
/> />
</div> </div>
<main className="min-h-screen flex items-center justify-center pt-20"> <main className="min-h-screen flex items-center justify-center pt-20">
@@ -52,7 +52,7 @@ export default function ShopPage() {
columns={[ columns={[
{ {
items: [ items: [
{ label: "Shop Flowers", href: "products" }, { label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" }, { label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" } { label: "Testimonials", href: "testimonials" }
] ]
@@ -97,12 +97,12 @@ export default function ShopPage() {
brandName="Alisa" brandName="Alisa"
navItems={[ navItems={[
{ name: "Home", id: "/" }, { name: "Home", id: "/" },
{ name: "Shop", id: "products" }, { name: "Shop", id: "/shop" },
{ name: "About", id: "about" }, { name: "About", id: "about" },
{ name: "Testimonials", id: "testimonials" }, { name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" } { name: "Contact", id: "contact" }
]} ]}
button={{ text: "Order Now", href: "products" }} button={{ text: "Order Now", href: "/shop" }}
/> />
</div> </div>
<div id="productCatalog" data-section="productCatalog"> <div id="productCatalog" data-section="productCatalog">
@@ -121,7 +121,7 @@ export default function ShopPage() {
columns={[ columns={[
{ {
items: [ items: [
{ label: "Shop Flowers", href: "products" }, { label: "Shop Flowers", href: "/shop" },
{ label: "About Us", href: "about" }, { label: "About Us", href: "about" },
{ label: "Testimonials", href: "testimonials" } { label: "Testimonials", href: "testimonials" }
] ]