bender/d82b86a8-4b1d-48a7-9f24-d5cd9ab0ef33
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_1 into main #2

Merged
bender merged 4 commits from version_1 into main 2026-02-22 00:53:47 +00:00
Conversation 0 Commits 4 Files Changed 4 +25 -19
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ export default function BlogPage() {
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="reveal-blur"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="small"
sizing="mediumLargeSizeLargeTitles"
@@ -28,10 +28,10 @@ export default function BlogPage() {
<NavbarLayoutFloatingOverlay
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "services" },
{ name: "About Us", id: "about" },
{ name: "Testimonials", id: "testimonials" },
{ name: "Contact", id: "contact" },
{ name: "Services", id: "/#services" },
{ name: "About Us", id: "/#about" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Josiah & Sons"
button={{ text: "Call Us Now", href: "tel:+1-713-555-1234" }}
@@ -61,8 +61,8 @@ export default function BlogPage() {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Home", href: "#hero" }, { label: "Services", href: "#services" }, { label: "About Us", href: "#about" }] },
{ items: [{ label: "Testimonials", href: "#testimonials" }, { label: "Contact", href: "#contact" }, { label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
{ items: [{ label: "Home", href: "/#hero" }, { label: "Services", href: "/#services" }, { label: "About Us", href: "/#about" }] },
{ items: [{ label: "Testimonials", href: "/#testimonials" }, { label: "Contact", href: "/#contact" }, { label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
logoText="Josiah & Sons Plumbers"
ariaLabel="Site footer with navigation and company information."

12
src/app/page.tsx
View File

@@ -15,7 +15,7 @@ export default function LandingPage() {
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="reveal-blur"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="small"
sizing="mediumLargeSizeLargeTitles"
@@ -52,7 +52,7 @@ export default function LandingPage() {
background={{ variant: "downward-rays-static-grid" }}
imageSrc="https://img.b2bpic.net/free-photo/portrait-attractive-hispanic-handyman-writing-work-estimate-before-fixing-kitchen-sink_662251-2690.jpg"
imageAlt="Professional plumber working on a pipe."
mediaAnimation="reveal-blur"
mediaAnimation="blur-reveal"
frameStyle="card"
ariaLabel="Hero section: Josiah & Sons Plumbers - Your trusted Houston plumbing experts."
descriptionClassName="text-lg md:text-xl lg:text-2xl"
@@ -136,10 +136,10 @@ export default function LandingPage() {
<div id="testimonials" data-section="testimonials">
<TestimonialCardThirteen
testimonials={[
{ id: "1", name: "Sarah Johnson", handle: "Homeowner", testimonial: "Josiah & Sons Plumbers saved us from a major pipe burst! Their response was incredibly fast, and the repair was done efficiently and professionally. Highly recommend their emergency service!", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=1", imageAlt: "Sarah Johnson, Homeowner" },
{ id: "2", name: "Michael Chen", handle: "Business Owner", testimonial: "We've used Josiah & Sons for all our commercial plumbing needs for years. Their team is reliable, knowledgeable, and always delivers top-notch service. Fantastic partners for any business.", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg?_wi=1", imageAlt: "Michael Chen, Business Owner" },
{ id: "3", name: "Emily Rodriguez", handle: "Property Manager", testimonial: "As a property manager, having a dependable plumbing service is crucial. Josiah & Sons Plumbers are always our first call. They handle everything from routine maintenance to complex installations flawlessly.", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg?_wi=2", imageAlt: "Emily Rodriguez, Property Manager" },
{ id: "4", name: "David Kim", handle: "Real Estate Agent", testimonial: "I confidently refer all my clients to Josiah & Sons Plumbers. Their professionalism and quality of work always exceed expectations. They truly are the best in Houston!", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg?_wi=2", imageAlt: "David Kim, Real Estate Agent" }
{ id: "1", name: "Sarah Johnson", handle: "Homeowner", testimonial: "Josiah & Sons Plumbers saved us from a major pipe burst! Their response was incredibly fast, and the repair was done efficiently and professionally. Highly recommend their emergency service!", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg", imageAlt: "Sarah Johnson, Homeowner" },
{ id: "2", name: "Michael Chen", handle: "Business Owner", testimonial: "We've used Josiah & Sons for all our commercial plumbing needs for years. Their team is reliable, knowledgeable, and always delivers top-notch service. Fantastic partners for any business.", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg", imageAlt: "Michael Chen, Business Owner" },
{ id: "3", name: "Emily Rodriguez", handle: "Property Manager", testimonial: "As a property manager, having a dependable plumbing service is crucial. Josiah & Sons Plumbers are always our first call. They handle everything from routine maintenance to complex installations flawlessly.", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/young-businesswoman-portrait-office_1262-1506.jpg", imageAlt: "Emily Rodriguez, Property Manager" },
{ id: "4", name: "David Kim", handle: "Real Estate Agent", testimonial: "I confidently refer all my clients to Josiah & Sons Plumbers. Their professionalism and quality of work always exceed expectations. They truly are the best in Houston!", rating: 5, imageSrc: "https://img.b2bpic.net/free-photo/smiling-man-sitting-cafe-table-gesturing_1262-1141.jpg", imageAlt: "David Kim, Real Estate Agent" }
]}
showRating={true}
carouselMode="auto"

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

@@ -77,7 +77,7 @@ function ProductPageContent({ params }: ProductPageProps) {
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="reveal-blur"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="small"
sizing="mediumLargeSizeLargeTitles"
@@ -88,7 +88,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Josiah & Sons"
@@ -159,7 +159,10 @@ function ProductPageContent({ params }: ProductPageProps) {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[{ "items": [{ "label": "Home", "href": "#hero" }, { "label": "Services", "href": "#services" }, { "label": "About Us", "href": "#about" }] }, { "items": [{ "label": "Testimonials", "href": "#testimonials" }, { "label": "Contact", "href": "#contact" }, { "label": "Privacy Policy", "href": "/privacy" }, { "label": "Terms of Service", "href": "/terms" }] }]}
columns={[
{ items: [{ label: "Home", href: "/#hero" }, { label: "Services", href: "/#services" }, { label: "About Us", href: "/#about" }] },
{ items: [{ label: "Testimonials", href: "/#testimonials" }, { label: "Contact", href: "/#contact" }, { label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
logoText="Josiah & Sons Plumbers"
ariaLabel="Site footer with navigation and company information."
className="bg-background-accent text-foreground py-12 md:py-16"

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

@@ -44,7 +44,7 @@ function ShopPageContent() {
return (
<ThemeProvider
defaultButtonVariant="text-stagger"
defaultTextAnimation="reveal-blur"
defaultTextAnimation="entrance-slide"
borderRadius="pill"
contentWidth="small"
sizing="mediumLargeSizeLargeTitles"
@@ -55,7 +55,7 @@ function ShopPageContent() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingOverlay
navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }]}
brandName="Josiah & Sons"
@@ -104,7 +104,10 @@ function ShopPageContent() {
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[{ "items": [{ "label": "Home", "href": "#hero" }, { "label": "Services", "href": "#services" }, { "label": "About Us", "href": "#about" }] }, { "items": [{ "label": "Testimonials", "href": "#testimonials" }, { "label": "Contact", "href": "#contact" }, { "label": "Privacy Policy", "href": "/privacy" }, { "label": "Terms of Service", "href": "/terms" }] }]}
columns={[
{ items: [{ label: "Home", href: "/#hero" }, { label: "Services", href: "/#services" }, { label: "About Us", href: "/#about" }] },
{ items: [{ label: "Testimonials", href: "/#testimonials" }, { label: "Contact", href: "/#contact" }, { label: "Privacy Policy", href: "/privacy" }, { label: "Terms of Service", href: "/terms" }] }
]}
logoText="Josiah & Sons Plumbers"
ariaLabel="Site footer with navigation and company information."
className="bg-background-accent text-foreground py-12 md:py-16"