bender/3f4d9d98-628f-4255-ae2c-7c88c333a72a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #1

Merged
bender merged 4 commits from version_2 into main 2026-02-17 16:54:04 +00:00
Conversation 0 Commits 4 Files Changed 4 +21 -23
4 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
brandName="Fia"
navItems={[
{ name: "Home", id: "/" },
{ name: "Home", id: "hero" },
{ name: "About", id: "about" },
{ name: "Menu", id: "features" },
{ name: "Stories", id: "testimonial" },

17
src/app/page.tsx
View File

@@ -2,7 +2,7 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import HeroOverlay from '@/components/sections/hero/HeroOverlay';
import HeroSplitDualMedia from '@/components/sections/hero/HeroSplitDualMedia';
import AboutMetric from '@/components/sections/about/AboutMetric';
import FeatureCardTen from '@/components/sections/feature/FeatureCardTen';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
@@ -42,20 +42,23 @@ export default function LandingPage() {
</div>
<div id="hero" data-section="hero">
<HeroOverlay
<HeroSplitDualMedia
title="Welcome to Fia"
description="Discover exceptional coffee, warm hospitality, and a community where every cup tells a story. Your perfect coffeeshop escape awaits."
tag="Artisanal Coffee Experience"
tagIcon={Coffee}
imageSrc="https://img.b2bpic.net/free-photo/cozy-cafe_1098-13854.jpg"
imageAlt="Fia Coffeeshop Interior"
textPosition="bottom-left"
showBlur={true}
showDimOverlay={false}
background={{ variant: "plain" }}
mediaItems={[
{ imageSrc: "https://img.b2bpic.net/free-photo/cozy-cafe_1098-13854.jpg", imageAlt: "Fia Coffeeshop Interior" },
{ imageSrc: "https://img.b2bpic.net/free-photo/cafe-interior-with-orange-sofa-three-tables-three-black-chairs_181624-8624.jpg", imageAlt: "Fia Seating Area" }
]}
rating={5}
ratingText="Rated by loving Customers"
buttons={[
{ text: "Explore Menu", href: "#features" },
{ text: "Reserve Now", href: "#contact" }
]}
mediaAnimation="slide-up"
/>
</div>

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

@@ -85,12 +85,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Fia"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"features"},
{"name":"Stories","id":"testimonial"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -133,12 +132,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Fia"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"features"},
{"name":"Stories","id":"testimonial"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -188,12 +186,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarLayoutFloatingOverlay
brandName="Fia"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"features"},
{"name":"Stories","id":"testimonial"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>

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

@@ -37,12 +37,11 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="Fia"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"features"},
{"name":"Stories","id":"testimonial"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
@@ -84,12 +83,11 @@ export default function ShopPage() {
<NavbarLayoutFloatingOverlay
brandName="Fia"
navItems={[
{"name":"Home","id":"/"},
{"name":"Home","id":"hero"},
{"name":"About","id":"about"},
{"name":"Menu","id":"features"},
{"name":"Stories","id":"testimonial"},
{"name":"Contact","id":"contact"},
{"name":"Shop","id":"/shop"}
{"name":"Contact","id":"contact"}
]}
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>