bender/afdbe4c0-b958-4054-84bb-be6b141850a4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #1

Merged
bender merged 4 commits from version_1 into main 2026-02-22 03:08:04 +00:00
Conversation 0 Commits 4 Files Changed 4 +43 -41
4 changed files with 43 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,33 +23,37 @@ export default function BlogPage() {
headingFontWeight="semibold"
>
<ReactLenis root>
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "#about" },
{ name: "Services", id: "#services" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "Contact", id: "#contact" },
]}
brandName="Roofing Repair Guy"
bottomLeftText="Aurora, IL"
bottomRightText="(630) 523-8819"
/>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardTwo
posts={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#features" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Roofing Repair Guy"
bottomLeftText="Aurora, IL"
bottomRightText="(630) 523-8819"
/>
)}
</div>
<div id="blog-content" data-section="blog-content">
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardTwo
items={posts}
title="Latest Articles"
description="Insights and updates from our team"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/>
)}
</div>
</ReactLenis>
</ThemeProvider>
);

18
src/app/page.tsx
View File

@@ -28,11 +28,11 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[
{ name: 'Home', id: '#home' },
{ name: 'About', id: '#about' },
{ name: 'Services', id: '#services' },
{ name: 'Testimonials', id: '#testimonials' },
{ name: 'Contact', id: '#contact' },
{ name: 'Home', id: 'hero' },
{ name: 'About', id: 'about' },
{ name: 'Services', id: 'features' },
{ name: 'Testimonials', id: 'testimonials' },
{ name: 'Contact', id: 'contact' },
]}
brandName="Roofing Repair Guy"
bottomLeftText="Aurora, IL"
@@ -61,7 +61,7 @@ export default function LandingPage() {
<InlineImageSplitTextAbout
heading={[
{ type: 'text', content: 'Roofing Repair Guy: ' },
{ type: 'text', content: 'Aurora\'s ' },
{ type: 'text', content: "Aurora's " },
{
type: 'image',
src: 'https://img.b2bpic.net/free-photo/talk-constructors_1098-13757.jpg',
@@ -74,10 +74,9 @@ export default function LandingPage() {
{
text: 'Learn More About Us',
href: '#about',
props: { variant: 'primary' }
}
]}
buttonAnimation="elastic-effect"
buttonAnimation="slide-up"
/>
</div>
@@ -190,8 +189,7 @@ export default function LandingPage() {
id: '3',
title: 'What types of roofing materials do you work with?',
content:
'Our team is experienced with a wide range of roofing materials, including asphalt shingles, metal roofing, flat roofs, and more. We\'ll help you choose the best option for your property.',
},
"Our team is experienced with a wide range of roofing materials, including asphalt shingles, metal roofing, flat roofs, and more. We'll help you choose the best option for your property."},
{
id: '4',
title: 'Are you licensed and insured?',

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

@@ -88,7 +88,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Roofing Repair Guy"
@@ -120,7 +120,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Roofing Repair Guy"
@@ -161,7 +161,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Roofing Repair Guy"

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

@@ -55,7 +55,7 @@ function ShopPageContent() {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Roofing Repair Guy"
@@ -101,7 +101,7 @@ function ShopPageContent() {
headingFontWeight="semibold"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Roofing Repair Guy"