Merge version_1 into main #6

Merged
bender merged 4 commits from version_1 into main 2026-02-23 12:27:00 +00:00
4 changed files with 36 additions and 37 deletions

View File

@@ -1,7 +1,6 @@
"use client";
import React from 'react';
import Link from 'next/link';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
@@ -18,14 +17,15 @@ export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
const navItems = [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
];
{ 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' },
];
return (
<ThemeProvider
@@ -59,7 +59,7 @@ export default function BlogPage() {
<main className="pt-24">
<div id="blog" data-section="blog">
<BlogCardTwo
blogPosts={posts}
posts={posts}
title="From Our Blog"
description="Explore the latest stories, tips, and insights from our team."
animationType="slide-up"

View File

@@ -1,7 +1,6 @@
"use client";
import React from 'react';
import Link from 'next/link';
import { Award, CheckCircle, Heart, HelpCircle, Mail, MessageSquare, Sparkles } from 'lucide-react';
import { ThemeProvider } from '@/providers/themeProvider/ThemeProvider';
@@ -17,13 +16,14 @@ import FooterMedia from '@/components/sections/footer/FooterMedia';
export default function LandingPage() {
const navItems = [
{ name: 'Home', id: '/' },
{ name: 'Shop', id: '/shop' },
{ name: 'About', id: '#about' },
{ name: 'Features', id: '#features' },
{ name: 'Testimonials', id: '#testimonials' },
{ name: 'FAQ', id: '#faq' },
{ name: 'Contact', id: '#contact' },
{ name: 'Blog', id: '/blog' },
{ name: 'About', id: '/#about' },
{ name: 'Features', id: '/#features' },
{ name: 'Testimonials', id: '/#testimonials' },
{ name: 'FAQ', id: '/#faq' },
{ name: 'Contact', id: '/#contact' },
];
return (
@@ -179,7 +179,7 @@ export default function LandingPage() {
textBoxClassName="text-foreground"
textBoxTitleClassName="text-foreground"
textBoxDescriptionClassName="text-foreground"
tagClassName="text-accent"
textBoxTagClassName="text-accent"
quoteCardClassName="bg-background/80 shadow-soft-shadow"
testimonialTitleClassName="text-foreground"
quoteClassName="text-foreground/90"
@@ -212,7 +212,7 @@ export default function LandingPage() {
textBoxClassName="text-foreground"
textBoxTitleClassName="text-foreground"
textBoxDescriptionClassName="text-foreground"
tagClassName="text-accent"
textBoxTagClassName="text-accent"
faqsContainerClassName="bg-card shadow-soft-shadow"
accordionTitleClassName="text-foreground"
accordionIconClassName="text-primary-cta"

View File

@@ -2,7 +2,6 @@
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
import Link from 'next/link';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import FooterMedia from '@/components/sections/footer/FooterMedia';
@@ -17,15 +16,15 @@ interface ProductPageProps {
}
const navItems = [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
];
{ 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' },
];
export default function ProductPage({ params }: ProductPageProps) {

View File

@@ -2,21 +2,21 @@
import { Suspense } from "react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import Link from 'next/link';
import NavbarLayoutFloatingOverlay from '@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay';
import FooterMedia from '@/components/sections/footer/FooterMedia';
import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog";
import { useProductCatalog } from "@/hooks/useProductCatalog";
const navItems = [
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
{ name: "Blog", id: "/blog" },
];
{ 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' },
];
function ShopPageContent() {
const {