Merge version_1 into main #7

Merged
bender merged 4 commits from version_1 into main 2026-02-23 12:30:08 +00:00
4 changed files with 17 additions and 14 deletions

View File

@@ -7,8 +7,8 @@ import { useBlogPosts } from "@/hooks/useBlogPosts";
// Navbar Import
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
// Blog Section Import
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
// Section Import
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
// Footer Import
import FooterMedia from '@/components/sections/footer/FooterMedia';
@@ -18,14 +18,23 @@ export default function BlogPage() {
const navItems = [
{ name: 'Home', id: '/' },
{ name: 'Shop', id: '/shop' },
{ name: 'Blog', id: '/blog' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Testimonials', id: '/#testimonials' },
{ name: 'FAQ', id: '/#faq' },
{ name: 'Contact', id: '/#contact' },
];
];
const blogProducts = posts?.map((post: any) => ({
id: post.id,
brand: post.author?.name || 'By Find Me',
name: post.title,
price: post.publishedAt ? new Date(post.publishedAt).toLocaleDateString('en-US', { month: 'long', day: 'numeric', year: 'numeric' }) : '',
rating: 5,
reviewCount: '',
imageSrc: post.coverImage?.url || '/placeholders/placeholder1.webp',
imageAlt: post.title,
})) || [];
return (
<ThemeProvider
@@ -58,14 +67,14 @@ export default function BlogPage() {
) : (
<main className="pt-24">
<div id="blog" data-section="blog">
<BlogCardTwo
posts={posts}
<ProductCardTwo
products={blogProducts}
title="From Our Blog"
description="Explore the latest stories, tips, and insights from our team."
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
carouselMode="buttons"
gridVariant='uniform-all-items-equal'
/>
</div>
</main>

View File

@@ -17,8 +17,6 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function LandingPage() {
const navItems = [
{ name: 'Home', id: '/' },
{ name: 'Shop', id: '/shop' },
{ name: 'Blog', id: '/blog' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Testimonials', id: '/#testimonials' },

View File

@@ -17,8 +17,6 @@ interface ProductPageProps {
const navItems = [
{ name: 'Home', id: '/' },
{ name: 'Shop', id: '/shop' },
{ name: 'Blog', id: '/blog' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Testimonials', id: '/#testimonials' },

View File

@@ -9,8 +9,6 @@ import { useProductCatalog } from "@/hooks/useProductCatalog";
const navItems = [
{ name: 'Home', id: '/' },
{ name: 'Shop', id: '/shop' },
{ name: 'Blog', id: '/blog' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Testimonials', id: '/#testimonials' },