Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-12 12:10:45 +00:00
4 changed files with 3 additions and 2 deletions

View File

@@ -6,6 +6,7 @@ import FooterBase from "@/components/sections/footer/FooterBase";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarLayoutFloatingOverlay from "@/components/navbar/NavbarLayoutFloatingOverlay/NavbarLayoutFloatingOverlay";
import { useBlogPosts } from "@/hooks/useBlogPosts";
import Link from 'next/link';
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();

View File

@@ -11,7 +11,6 @@ import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterBase from '@/components/sections/footer/FooterBase';
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { Zap, Shield, Sparkles, DollarSign, Star, HelpCircle, Mail } from 'lucide-react';
import Link from 'next/link';
export default function HomePage() {
return (
@@ -231,7 +230,6 @@ export default function HomePage() {
]}
animationType="smooth"
showCard={true}
faqsAnimation="fade-in"
/>
</div>

View File

@@ -11,6 +11,7 @@ import FooterBase from '@/components/sections/footer/FooterBase';
import { useProductDetail } from "@/hooks/useProductDetail";
import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout";
import Link from 'next/link';
interface ProductPageProps {
params: Promise<{ id: string }>;

View File

@@ -7,6 +7,7 @@ import ProductCatalog from "@/components/ecommerce/productCatalog/ProductCatalog
import FooterBase from '@/components/sections/footer/FooterBase';
import { useProductCatalog } from "@/hooks/useProductCatalog";
import { useState } from "react";
import Link from 'next/link';
export default function ShopPage() {
const {