Merge version_1 into main #14

Merged
bender merged 4 commits from version_1 into main 2026-02-22 03:38:52 +00:00
4 changed files with 2 additions and 6 deletions

View File

@@ -5,7 +5,6 @@ import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { useBlogPosts } from "@/hooks/useBlogPosts";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import BlogCardTwo from '@/components/sections/blog/BlogCardTwo';
import Link from 'next/link';
export default function BlogPage() {
const { posts, isLoading } = useBlogPosts();
@@ -60,7 +59,7 @@ export default function BlogPage() {
</div>
) : (
<BlogCardTwo
items={formattedPosts}
posts={formattedPosts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"

View File

@@ -10,7 +10,6 @@ import TestimonialCardTen from '@/components/sections/testimonial/TestimonialCar
import FaqBase from '@/components/sections/faq/FaqBase';
import ContactSplit from '@/components/sections/contact/ContactSplit';
import { Building, Shield, Sparkles, Wrench } from 'lucide-react';
import Link from 'next/link';
export default function LandingPage() {
const navItems = [
@@ -37,7 +36,7 @@ export default function LandingPage() {
>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={navItems.map(item => ({...item, href: item.id}))} // map id to href for internal Link components
navItems={navItems}
brandName="Roofing Repair Guy"
bottomLeftText="Aurora, IL"
bottomRightText="(630) 523-8819"

View File

@@ -10,7 +10,6 @@ import ProductCart from "@/components/ecommerce/cart/ProductCart";
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

@@ -9,7 +9,6 @@ import ProductCart from "@/components/ecommerce/cart/ProductCart";
import { useProductCatalog } from "@/hooks/useProductCatalog";
import { useCart } from "@/hooks/useCart";
import { useCheckout } from "@/hooks/useCheckout";
import Link from 'next/link';
function ShopPageContent() {
const {