bender/1dbe8073-c580-4bd3-9c6c-c530216bc216
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 8 commits from version_1 into main 2026-02-17 16:37:58 +00:00
Conversation 0 Commits 8 Files Changed 8 +37 -37
8 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
"use client";
import Link from "next/link";
import { MapPin, Compass, Trees, Home } from "lucide-react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -26,6 +25,7 @@ export default function AboutPage() {
<NavbarStyleApple
brandName="Catamount Tree Service"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Reviews", id: "/reviews" },

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

@@ -29,10 +29,10 @@ export default function BlogPage() {
brandName="Catamount Tree Service"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "services" },
{ name: "Why Us", id: "why-us" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Reviews", id: "/reviews" },
{ name: "Contact", id: "/contact" }
]}
/>
</div>
@@ -60,25 +60,25 @@ export default function BlogPage() {
columns={[
{
title: "Services", items: [
{ label: "Tree Removal", href: "tree-removal" },
{ label: "Tree Trimming", href: "tree-trimming" },
{ label: "Emergency Service", href: "emergency-service" },
{ label: "Storm Cleanup", href: "tree-removal" }
{ label: "Tree Removal", href: "/services" },
{ label: "Tree Trimming", href: "/services" },
{ label: "Emergency Service", href: "/services" },
{ label: "Storm Cleanup", href: "/services" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "about" },
{ label: "Reviews", href: "reviews" },
{ label: "Service Area", href: "services" },
{ label: "Contact", href: "contact" }
{ label: "About Us", href: "/about" },
{ label: "Reviews", href: "/reviews" },
{ label: "Service Area", href: "/services" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Contact", items: [
{ label: "📞 (802) 473-2606", href: "tel:(802)4732606" },
{ label: "1774 Baptist St, Williamstown, VT 05679", href: "https://maps.google.com/?q=1774+Baptist+St+Williamstown+VT+05679" },
{ label: "Available 24/7", href: "contact" }
{ label: "Available 24/7", href: "/contact" }
]
}
]}

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

@@ -1,6 +1,5 @@
"use client";
import Link from "next/link";
import { Phone } from "lucide-react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -25,6 +24,7 @@ export default function ContactPage() {
<NavbarStyleApple
brandName="Catamount Tree Service"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Reviews", id: "/reviews" },

4
src/app/page.tsx
View File

@@ -1,7 +1,6 @@
"use client";
import Link from "next/link";
import { Shield, Award, Star, DollarSign, AlertCircle, Wrench, CheckCircle, MapPin, Phone, Compass, Trees, Home, MessageSquare } from "lucide-react";
import { Shield, Award, Star, DollarSign, AlertCircle, Wrench, CheckCircle, MapPin, Phone, MessageSquare } from "lucide-react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import HeroBillboardCarousel from '@/components/sections/hero/HeroBillboardCarousel';
@@ -30,6 +29,7 @@ export default function HomePage() {
<NavbarStyleApple
brandName="Catamount Tree Service"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Reviews", id: "/reviews" },

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

@@ -1,6 +1,5 @@
"use client";
import Link from "next/link";
import { MessageSquare } from "lucide-react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
@@ -26,6 +25,7 @@ export default function ReviewsPage() {
<NavbarStyleApple
brandName="Catamount Tree Service"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Reviews", id: "/reviews" },

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

@@ -1,6 +1,5 @@
"use client";
import Link from "next/link";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleApple from '@/components/navbar/NavbarStyleApple/NavbarStyleApple';
import FeatureCardSixteen from '@/components/sections/feature/FeatureCardSixteen';
@@ -26,6 +25,7 @@ export default function ServicesPage() {
<NavbarStyleApple
brandName="Catamount Tree Service"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Reviews", id: "/reviews" },

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

@@ -205,25 +205,25 @@ export default function ProductPage({ params }: ProductPageProps) {
columns={[
{
title: "Services", items: [
{ label: "Tree Removal", href: "tree-removal" },
{ label: "Tree Trimming", href: "tree-trimming" },
{ label: "Emergency Service", href: "emergency-service" },
{ label: "Storm Cleanup", href: "tree-removal" }
{ label: "Tree Removal", href: "/services" },
{ label: "Tree Trimming", href: "/services" },
{ label: "Emergency Service", href: "/services" },
{ label: "Storm Cleanup", href: "/services" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "about" },
{ label: "Reviews", href: "reviews" },
{ label: "Service Area", href: "services" },
{ label: "Contact", href: "contact" }
{ label: "About Us", href: "/about" },
{ label: "Reviews", href: "/reviews" },
{ label: "Service Area", href: "/services" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Contact", items: [
{ label: "📞 (802) 473-2606", href: "tel:(802)4732606" },
{ label: "1774 Baptist St, Williamstown, VT 05679", href: "https://maps.google.com/?q=1774+Baptist+St+Williamstown+VT+05679" },
{ label: "Available 24/7", href: "contact" }
{ label: "Available 24/7", href: "/contact" }
]
}
]}

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

@@ -89,25 +89,25 @@ export default function ShopPage() {
columns={[
{
title: "Services", items: [
{ label: "Tree Removal", href: "tree-removal" },
{ label: "Tree Trimming", href: "tree-trimming" },
{ label: "Emergency Service", href: "emergency-service" },
{ label: "Storm Cleanup", href: "tree-removal" }
{ label: "Tree Removal", href: "/services" },
{ label: "Tree Trimming", href: "/services" },
{ label: "Emergency Service", href: "/services" },
{ label: "Storm Cleanup", href: "/services" }
]
},
{
title: "Company", items: [
{ label: "About Us", href: "about" },
{ label: "Reviews", href: "reviews" },
{ label: "Service Area", href: "services" },
{ label: "Contact", href: "contact" }
{ label: "About Us", href: "/about" },
{ label: "Reviews", href: "/reviews" },
{ label: "Service Area", href: "/services" },
{ label: "Contact", href: "/contact" }
]
},
{
title: "Contact", items: [
{ label: "📞 (802) 473-2606", href: "tel:(802)4732606" },
{ label: "1774 Baptist St, Williamstown, VT 05679", href: "https://maps.google.com/?q=1774+Baptist+St+Williamstown+VT+05679" },
{ label: "Available 24/7", href: "contact" }
{ label: "Available 24/7", href: "/contact" }
]
}
]}