bender/2ffb71d6-ebc5-4a20-b055-b2c8bea1eaaa
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-21 16:36:41 +00:00
Conversation 0 Commits 4 Files Changed 4 +12 -17
4 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,11 +28,11 @@ export default function BlogPage() {
<NavbarStyleApple
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "#about" },
{ name: "Services", id: "#services" },
{ name: "Testimonials", id: "#testimonials" },
{ name: "FAQ", id: "#faq" },
{ name: "Contact", id: "#contact" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#features" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "FAQ", id: "/#faq" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Rick's Roofing"
/>
@@ -61,7 +61,6 @@ export default function BlogPage() {
{ icon: Twitter, href: "https://twitter.com/ricksroofing", ariaLabel: "Twitter" },
{ icon: Instagram, href: "https://instagram.com/ricksroofing", ariaLabel: "Instagram" }
]}
useInvertedBackground={false}
/>
</ReactLenis>
</ThemeProvider>

6
src/app/page.tsx
View File

@@ -27,7 +27,7 @@ export default function LandingPage() {
>
<div id="nav" data-section="nav">
<NavbarStyleApple
navItems={[{'name': 'Home', 'id': '#home'}, {'name': 'About', 'id': '#about'}, {'name': 'Services', 'id': '#services'}, {'name': 'Testimonials', 'id': '#testimonials'}, {'name': 'FAQ', 'id': '#faq'}, {'name': 'Contact', 'id': '#contact'}]}
navItems={[{'name': 'Home', 'id': '#hero'}, {'name': 'About', 'id': '#about'}, {'name': 'Services', 'id': '#features'}, {'name': 'Testimonials', 'id': '#testimonials'}, {'name': 'FAQ', 'id': '#faq'}, {'name': 'Contact', 'id': '#contact'}]}
brandName="Rick's Roofing"
/>
</div>
@@ -36,8 +36,8 @@ export default function LandingPage() {
<HeroSplit
title="Rick's Roofing and Repairs Inc."
description="Your trusted partner for all roofing solutions, delivering quality craftsmanship and lasting protection for your home or business."
background={{'variant': 'noiseDiagonalGradient'}}
buttons={[{'text': 'Get a Free Estimate', 'href': '#contact'}, {'text': 'Our Services', 'href': '#services'}]}
background={{'variant': 'plain'}}
buttons={[{'text': 'Get a Free Estimate', 'href': '#contact'}, {'text': 'Our Services', 'href': '#features'}]}
mediaAnimation="blur-reveal"
imageSrc="https://img.b2bpic.net/free-photo/man-sitting-roof_23-2148748778.jpg"
imageAlt="Professional roofer working on a residential roof"

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, use, useCallback } from "react";
import { useRouter } from "next/navigation";
@@ -84,8 +84,7 @@ function ProductPageContent({ params }: ProductPageProps) {
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
],
brandName: "Rick's Roofing", button: { text: "Cart", onClick: () => setCartOpen(true) },
};
brandName: "Rick's Roofing"};
const footerProps = {
logoText: "Rick's Roofing", copyrightText: "© 2024 Rick's Roofing and Repairs Inc. All rights reserved.", socialLinks: [
@@ -93,7 +92,6 @@ function ProductPageContent({ params }: ProductPageProps) {
{ icon: Twitter, href: "https://twitter.com/ricksroofing", ariaLabel: "Twitter" },
{ icon: Instagram, href: "https://instagram.com/ricksroofing", ariaLabel: "Instagram" }
],
useInvertedBackground: false
};
if (isLoading) {

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

@@ -1,4 +1,4 @@
use client";
"use client";
import { Suspense, useCallback } from "react";
import ReactLenis from "lenis/react";
@@ -51,8 +51,7 @@ function ShopPageContent() {
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" }
],
brandName: "Rick's Roofing", button: { text: "Cart", onClick: () => setCartOpen(true) },
};
brandName: "Rick's Roofing"};
const footerProps = {
logoText: "Rick's Roofing", copyrightText: "© 2024 Rick's Roofing and Repairs Inc. All rights reserved.", socialLinks: [
@@ -60,7 +59,6 @@ function ShopPageContent() {
{ icon: Twitter, href: "https://twitter.com/ricksroofing", ariaLabel: "Twitter" },
{ icon: Instagram, href: "https://instagram.com/ricksroofing", ariaLabel: "Instagram" }
],
useInvertedBackground: false
};
if (isLoading) {