bender/4ba8f5bd-c48d-49cf-98dc-da914096ee62
1
0
Fork 0
Code Issues Pull Requests 7 Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-24 15:20:53 +00:00
Conversation 0 Commits 4 Files Changed 4 +21 -17
4 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,8 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import BlogCardOne from '@/components/sections/blog/BlogCardOne';
import FooterBase from "@/components/sections/footer/FooterBase";
import FooterCard from '@/components/sections/footer/FooterCard';
import { Facebook, Instagram, Twitter } from 'lucide-react';
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
@@ -28,12 +29,12 @@ export default function BlogPage() {
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "Hero", id: "hero-section" },
{ name: "About", id: "about-section" },
{ name: "Feature", id: "features-section" },
{ name: "Product", id: "products-section" },
{ name: "Testimonial", id: "testimonials-section" },
{ name: "Contact", id: "contact-section" },
{ name: "Hero", id: "/#hero-section" },
{ name: "About", id: "/#about-section" },
{ name: "Feature", id: "/#features-section" },
{ name: "Product", id: "/#products-section" },
{ name: "Testimonial", id: "/#testimonials-section" },
{ name: "Contact", id: "/#contact-section" },
]}
brandName="Klark"
bottomLeftText="Global Community"
@@ -61,7 +62,15 @@ export default function BlogPage() {
)}
<div id="footer" data-section="footer">
<FooterBase />
<FooterCard
logoText="Klark Floral Studio"
copyrightText="© 2025 | Klark Floral Studio"
socialLinks={[
{ icon: Instagram, href: "https://www.instagram.com/klarkfloralstudio", ariaLabel: "Follow us on Instagram" },
{ icon: Twitter, href: "https://twitter.com/klarkfloralstudio", ariaLabel: "Follow us on Twitter" },
{ icon: Facebook, href: "https://www.facebook.com/klarkfloralstudio", ariaLabel: "Like us on Facebook" },
]}
/>
</div>
</ReactLenis>
</ThemeProvider>

8
src/app/page.tsx
View File

@@ -2,7 +2,7 @@
import React from 'react';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { Facebook, Heart, Instagram, Pinterest, Sparkles, Star } from "lucide-react";
import { Facebook, Heart, Instagram, Twitter, Sparkles, Star } from "lucide-react";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import HeroBillboardRotatedCarousel from '@/components/sections/hero/HeroBillboardRotatedCarousel';
@@ -59,7 +59,7 @@ export default function LandingPage() {
buttonAnimation="slide-up"
carouselItems={[
{ id: "carousel-item-1", imageSrc: "https://img.b2bpic.net/free-photo/little-bouquet-peonies-stands-tall-vase-with-water_8353-762.jpg", imageAlt: "Elegant red rose arrangement" },
{ id: "carousel-item-2", imageSrc: "https://img.b2bpic.net/free-photo/spring-composition-with-bouquet-flowers-vase-closeup_169016-29760.jpg?_wi=1", imageAlt: "Soft pastel floral centerpiece" },
{ id: "carousel-item-2", imageSrc: "https://img.b2bpic.net/free-photo/spring-composition-with-bouquet-flowers-vase-closeup_169016-29760.jpg", imageAlt: "Soft pastel floral centerpiece" },
{ id: "carousel-item-3", imageSrc: "https://img.b2bpic.net/free-photo/view-delicate-white-roses-bouquet-vase_23-2150539964.jpg", imageAlt: "Vintage-style floral decor" },
{ id: "carousel-item-4", imageSrc: "https://img.b2bpic.net/free-photo/plant-nature-fresh-vase-color_1203-5016.jpg", imageAlt: "Modern minimalist bouquet" },
{ id: "carousel-item-5", imageSrc: "https://img.b2bpic.net/free-photo/view-flowers-transparent-glass-with-water-drops_23-2149478596.jpg", imageAlt: "Luxurious wedding floral setup" },
@@ -107,7 +107,7 @@ export default function LandingPage() {
<ProductCardFour
products={[
{ id: "product-1", name: "Elegant Rose Bouquet", price: "$89.99", variant: "Premium", imageSrc: "https://img.b2bpic.net/free-photo/festive-background-valentine-s-day-with-bouquet-red-roses-copy-space_169016-26129.jpg", imageAlt: "A stunning bouquet of red roses with greenery" },
{ id: "product-2", name: "Spring Garden Arrangement", price: "$75.50", variant: "Seasonal", imageSrc: "https://img.b2bpic.net/free-photo/spring-composition-with-bouquet-flowers-vase-closeup_169016-29760.jpg?_wi=2", imageAlt: "A vibrant mix of spring flowers including tulips and daffodils" },
{ id: "product-2", name: "Spring Garden Arrangement", price: "$75.50", variant: "Seasonal", imageSrc: "https://img.b2bpic.net/free-photo/spring-composition-with-bouquet-flowers-vase-closeup_169016-29760.jpg", imageAlt: "A vibrant mix of spring flowers including tulips and daffodils" },
{ id: "product-3", name: "Romantic Peony Centerpiece", price: "$120.00", variant: "Luxury", imageSrc: "https://img.b2bpic.net/free-photo/home-composition-with-bouquet-tulips-glass-vase-candles_169016-20724.jpg", imageAlt: "A luxurious peony centerpiece with soft pink petals" },
{ id: "product-4", name: "Minimalist Lily Design", price: "$65.00", variant: "Classic", imageSrc: "https://img.b2bpic.net/free-photo/top-view-beautiful-bouquet-colorful-flowers-with-leaves-wood_141793-17060.jpg", imageAlt: "A clean and elegant lily arrangement with white tones" },
]}
@@ -189,7 +189,7 @@ export default function LandingPage() {
copyrightText="© 2025 | Klark Floral Studio"
socialLinks={[
{ icon: Instagram, href: "https://www.instagram.com/klarkfloralstudio", ariaLabel: "Follow us on Instagram" },
{ icon: Pinterest, href: "https://www.pinterest.com/klarkfloralstudio", ariaLabel: "Follow us on Pinterest" },
{ icon: Twitter, href: "https://twitter.com/klarkfloralstudio", ariaLabel: "Follow us on Twitter" },
{ icon: Facebook, href: "https://www.facebook.com/klarkfloralstudio", ariaLabel: "Like us on Facebook" },
]}
/>

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

@@ -95,7 +95,6 @@ function ProductPageContent({ params }: ProductPageProps) {
bottomLeftText="Global Community"
bottomRightText="hello@example.com"
topBarClassName=""
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -128,7 +127,6 @@ function ProductPageContent({ params }: ProductPageProps) {
bottomLeftText="Global Community"
bottomRightText="hello@example.com"
topBarClassName=""
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -168,7 +166,6 @@ function ProductPageContent({ params }: ProductPageProps) {
bottomLeftText="Global Community"
bottomRightText="hello@example.com"
topBarClassName=""
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-detail-card" data-section="product-detail-card">

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

@@ -40,7 +40,6 @@ function ShopPageContent() {
bottomLeftText="Global Community"
bottomRightText="hello@example.com"
topBarClassName=""
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<main className="min-h-screen flex items-center justify-center pt-20">
@@ -72,7 +71,6 @@ function ShopPageContent() {
bottomLeftText="Global Community"
bottomRightText="hello@example.com"
topBarClassName=""
button={{ text: "Cart", onClick: () => setCartOpen(true) }}
/>
</div>
<div id="product-catalog" data-section="product-catalog">