bender/325a415c-0fa4-41f8-89ed-98e0b99ac29e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 2 commits from version_2 into main 2026-03-05 02:10:37 +00:00
Conversation 0 Commits 2 Files Changed 2 +33 -29
2 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/app/layout.tsx
View File

@@ -1,16 +1,10 @@
import type { Metadata } from "next";
import { Halant } from "next/font/google";
import { Inter } from "next/font/google";
import { Open_Sans } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
const halant = Halant({
variable: "--font-halant", subsets: ["latin"],
weight: ["300", "400", "500", "600", "700"],
});
const inter = Inter({
variable: "--font-inter", subsets: ["latin"],
});
@@ -20,13 +14,15 @@ const openSans = Open_Sans({
});
export const metadata: Metadata = {
title: "Fellsway Gas & Service Inc | Expert Auto Repair & Maintenance", description: "Professional auto repair and gas services from trusted mechanics. Oil changes, diagnostics, tire service, and more. Visit us today for expert vehicle care.", keywords: "auto repair, mechanic, oil change, car maintenance, tire service, gas services, automotive, vehicle care", metadataBase: new URL("https://fellsway-gas-service.com"),
title: "Fellsway Gas & Service Inc | Expert Auto Repair & Maintenance", description: "Professional auto repair and gas services from trusted mechanics. Oil changes, diagnostics, tire service, and more. Visit us today for expert vehicle care. Located at 285 Fellsway W, Medford, MA 02155.", keywords: "auto repair, mechanic, oil change, car maintenance, tire service, gas services, automotive, vehicle care, Medford MA", metadataBase: new URL("https://fellsway-gas-service.com"),
alternates: {
canonical: "https://fellsway-gas-service.com"},
canonical: "https://fellsway-gas-service.com"
},
openGraph: {
title: "Fellsway Gas & Service Inc | Expert Auto Repair", description: "Professional auto repair and maintenance services you can trust", url: "https://fellsway-gas-service.com", siteName: "Fellsway Gas & Service Inc", type: "website", images: [
{
url: "http://img.b2bpic.net/free-photo/young-auto-mechanic-using-compressor-while-maintaining-ac-unit-car-workshop_637285-4285.jpg", alt: "Professional mechanic at work"},
url: "http://img.b2bpic.net/free-photo/young-auto-mechanic-using-compressor-while-maintaining-ac-unit-car-workshop_637285-4285.jpg", alt: "Professional mechanic at work"
},
],
},
twitter: {
@@ -47,7 +43,7 @@ export default function RootLayout({
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body
className={`${halant.variable} ${inter.variable} ${openSans.variable} antialiased`}
className={`${inter.variable} ${openSans.variable} antialiased`}
>
<Tag />
{children}

46
src/app/page.tsx
View File

@@ -8,7 +8,7 @@ import ProductCardTwo from "@/components/sections/product/ProductCardTwo";
import TestimonialCardTwelve from "@/components/sections/testimonial/TestimonialCardTwelve";
import ContactSplit from "@/components/sections/contact/ContactSplit";
import FooterSimple from "@/components/sections/footer/FooterSimple";
import { Wrench, Shield, Settings, Star, Phone } from "lucide-react";
import { Wrench, Shield, Settings, Star, Phone, MapPin } from "lucide-react";
export default function LandingPage() {
return (
@@ -28,12 +28,12 @@ export default function LandingPage() {
<NavbarLayoutFloatingInline
brandName="Fellsway Gas & Service"
navItems={[
{ name: "Home", id: "home" },
{ name: "Home", id: "/" },
{ name: "Services", id: "services" },
{ name: "About", id: "about" },
{ name: "Contact", id: "contact" },
]}
button={{ text: "Call Now", href: "https://maps.app.goo.gl/Lgar1CgpohKP1P3M9" }}
button={{ text: "Call Now", href: "tel:+16175551234" }}
animateOnLoad={true}
/>
</div>
@@ -41,7 +41,7 @@ export default function LandingPage() {
<div id="hero" data-section="hero">
<HeroBillboardScroll
title="Expert Auto Repair & Gas Services"
description="Trusted mechanic serving your community with professional car maintenance, repairs, and gas services. Your vehicle deserves the best care."
description="Trusted mechanic serving your community with professional car maintenance, repairs, and gas services. Your vehicle deserves the best care. Located at 285 Fellsway W, Medford, MA 02155."
tag="Quality Service Since Day One"
tagIcon={Wrench}
tagAnimation="slide-up"
@@ -62,7 +62,7 @@ export default function LandingPage() {
tag="About Fellsway"
tagIcon={Shield}
tagAnimation="slide-up"
title="Dedicated to Excellence in Auto Service. We treat every vehicle like our own."
title="Dedicated to Excellence in Auto Service. We treat every vehicle like our own. Serving Medford and surrounding areas with 5-star rated service."
useInvertedBackground={false}
buttons={[
{ text: "Visit Location", href: "https://maps.app.goo.gl/Lgar1CgpohKP1P3M9" },
@@ -76,7 +76,7 @@ export default function LandingPage() {
<div id="services" data-section="services">
<ProductCardTwo
title="Our Services"
description="Comprehensive automotive solutions tailored to keep your vehicle running smoothly and safely"
description="Comprehensive automotive solutions tailored to keep your vehicle running smoothly and safely. All services backed by our 5-star reputation."
tag="Professional Care"
tagIcon={Settings}
tagAnimation="slide-up"
@@ -87,13 +87,16 @@ export default function LandingPage() {
products={[
{
id: "oil-change", brand: "Maintenance", name: "Oil Change & Filters", price: "From $35", rating: 5,
reviewCount: "120+", imageSrc: "http://img.b2bpic.net/free-photo/auto-mechanic-checking-oil-car-engine-while-working-auto-repair-workshop_637285-4299.jpg", imageAlt: "Professional oil change service"},
reviewCount: "120+", imageSrc: "http://img.b2bpic.net/free-photo/auto-mechanic-checking-oil-car-engine-while-working-auto-repair-workshop_637285-4299.jpg", imageAlt: "Professional oil change service"
},
{
id: "diagnostic", brand: "Diagnostics", name: "Computer Diagnostics", price: "From $65", rating: 5,
reviewCount: "95+", imageSrc: "http://img.b2bpic.net/free-photo/hands-mechanic-using-diagnostic-tool_1170-1188.jpg", imageAlt: "Engine diagnostic testing"},
reviewCount: "95+", imageSrc: "http://img.b2bpic.net/free-photo/hands-mechanic-using-diagnostic-tool_1170-1188.jpg", imageAlt: "Engine diagnostic testing"
},
{
id: "tire-service", brand: "Tires", name: "Tire Service & Alignment", price: "From $80", rating: 5,
reviewCount: "110+", imageSrc: "http://img.b2bpic.net/free-photo/muscular-man-is-fixing-car-s-wheel-with-special-tool-auto-service_613910-17086.jpg", imageAlt: "Professional tire alignment service"},
reviewCount: "110+", imageSrc: "http://img.b2bpic.net/free-photo/muscular-man-is-fixing-car-s-wheel-with-special-tool-auto-service_613910-17086.jpg", imageAlt: "Professional tire alignment service"
},
]}
carouselMode="buttons"
ariaLabel="Services section"
@@ -104,15 +107,19 @@ export default function LandingPage() {
<TestimonialCardTwelve
testimonials={[
{
id: "1", name: "John Miller", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=1", imageAlt: "John Miller"},
id: "1", name: "John Miller", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=1", imageAlt: "John Miller"
},
{
id: "2", name: "Sarah Johnson", imageSrc: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg", imageAlt: "Sarah Johnson"},
id: "2", name: "Sarah Johnson", imageSrc: "http://img.b2bpic.net/free-photo/casual-smile-street-style-background-spring_1139-777.jpg", imageAlt: "Sarah Johnson"
},
{
id: "3", name: "David Chen", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=2", imageAlt: "David Chen"},
id: "3", name: "David Chen", imageSrc: "http://img.b2bpic.net/free-photo/close-up-portrait-young-handsome-successful-man_1163-5475.jpg?_wi=2", imageAlt: "David Chen"
},
{
id: "4", name: "Emily Rodriguez", imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-blonde-businesswoman-formal-dressed-isolated-dark-textured-background_613910-5399.jpg", imageAlt: "Emily Rodriguez"},
id: "4", name: "Emily Rodriguez", imageSrc: "http://img.b2bpic.net/free-photo/portrait-smiling-blonde-businesswoman-formal-dressed-isolated-dark-textured-background_613910-5399.jpg", imageAlt: "Emily Rodriguez"
},
]}
cardTitle="Trusted by hundreds of satisfied customers. Expert service you can rely on."
cardTitle="Trusted by hundreds of satisfied customers. Expert service you can rely on. All with 5-star ratings."
cardTag="Customer Testimonials"
cardTagIcon={Star}
cardAnimation="slide-up"
@@ -127,7 +134,7 @@ export default function LandingPage() {
tagIcon={Phone}
tagAnimation="slide-up"
title="Ready to Service Your Vehicle?"
description="Contact us today to schedule an appointment or get a quote. Our experienced team is ready to help keep your vehicle running smoothly."
description="Contact us today to schedule an appointment or get a quote. Visit us at 285 Fellsway W, Medford, MA 02155. Our experienced team is ready to help keep your vehicle running smoothly."
background={{ variant: "plain" }}
useInvertedBackground={false}
imageSrc="http://img.b2bpic.net/free-photo/close-up-shot-screw-cutting-machine-factory-that-makes-metal-details_645730-52.jpg"
@@ -146,7 +153,7 @@ export default function LandingPage() {
columns={[
{
title: "Navigate", items: [
{ label: "Home", href: "#home" },
{ label: "Home", href: "/" },
{ label: "Services", href: "#services" },
{ label: "About", href: "#about" },
{ label: "Contact", href: "#contact" },
@@ -161,14 +168,15 @@ export default function LandingPage() {
],
},
{
title: "Location", items: [
{ label: "Visit Us", href: "https://maps.app.goo.gl/Lgar1CgpohKP1P3M9" },
title: "Location & Contact", items: [
{ label: "285 Fellsway W, Medford, MA 02155", href: "https://maps.app.goo.gl/Lgar1CgpohKP1P3M9" },
{ label: "Phone: (617) 555-1234", href: "tel:+16175551234" },
{ label: "Get Directions", href: "https://maps.app.goo.gl/Lgar1CgpohKP1P3M9" },
],
},
]}
bottomLeftText="© 2025 Fellsway Gas & Service Inc. All rights reserved."
bottomRightText="Professional Auto Care"
bottomRightText="Professional Auto Care | 5-Star Rated Service"
ariaLabel="Site footer"
/>
</div>