Merge version_1 into main #4

Merged
bender merged 4 commits from version_1 into main 2026-03-10 18:24:12 +00:00
4 changed files with 34 additions and 18 deletions

View File

@@ -7,8 +7,16 @@ import MetricCardTwo from "@/components/sections/metrics/MetricCardTwo";
import TeamCardTwo from "@/components/sections/team/TeamCardTwo";
import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
import { Briefcase, Users, TrendingUp, Shield, Linkedin } from "lucide-react";
import Link from "next/link";
export default function AboutPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
];
return (
<ThemeProvider
defaultButtonVariant="hover-magnetic"
@@ -25,13 +33,10 @@ export default function AboutPage() {
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="Ascent Wealth"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Team", id: "team" },
{ name: "Contact", id: "/contact" },
]}
navItems={navItems.map(item => ({
name: item.name,
id: item.id
}))}
button={{
text: "Schedule Consultation", href: "/contact"
}}

View File

@@ -5,8 +5,16 @@ import NavbarStyleCentered from "@/components/navbar/NavbarStyleCentered/NavbarS
import ContactCTA from "@/components/sections/contact/ContactCTA";
import FaqDouble from "@/components/sections/faq/FaqDouble";
import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
import Link from "next/link";
export default function ContactPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Contact", id: "/contact" },
];
return (
<ThemeProvider
defaultButtonVariant="hover-magnetic"
@@ -23,13 +31,10 @@ export default function ContactPage() {
<div id="nav" data-section="nav">
<NavbarStyleCentered
brandName="Ascent Wealth"
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Team", id: "team" },
{ name: "Contact", id: "/contact" },
]}
navItems={navItems.map(item => ({
name: item.name,
id: item.id
}))}
button={{
text: "Schedule Consultation", href: "/contact"
}}

View File

@@ -12,13 +12,13 @@ import FaqDouble from "@/components/sections/faq/FaqDouble";
import ContactCTA from "@/components/sections/contact/ContactCTA";
import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
import { Briefcase, Users, TrendingUp, Shield, Linkedin } from "lucide-react";
import Link from "next/link";
export default function HomePage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Team", id: "team" },
{ name: "Contact", id: "/contact" },
];
@@ -37,7 +37,10 @@ export default function HomePage() {
>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={navItems}
navItems={navItems.map(item => ({
name: item.name,
id: item.id
}))}
button={{ text: "Schedule Consultation", href: "/contact" }}
brandName="Ascent Wealth"
/>

View File

@@ -6,13 +6,13 @@ import FeatureCardNineteen from "@/components/sections/feature/FeatureCardNinete
import MetricCardTwo from "@/components/sections/metrics/MetricCardTwo";
import ContactCTA from "@/components/sections/contact/ContactCTA";
import FooterLogoReveal from "@/components/sections/footer/FooterLogoReveal";
import Link from "next/link";
export default function ServicesPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "About", id: "/about" },
{ name: "Team", id: "team" },
{ name: "Contact", id: "/contact" },
];
@@ -31,7 +31,10 @@ export default function ServicesPage() {
>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={navItems}
navItems={navItems.map(item => ({
name: item.name,
id: item.id
}))}
button={{ text: "Schedule Consultation", href: "/contact" }}
brandName="Ascent Wealth"
/>