Update src/app/layout.tsx

Merge version_3 into main

src/app/page.tsx

@@ -11,7 +11,8 @@ import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
 import { Award, CheckCircle, Shield, Sparkles, Star, Target, TrendingUp, Zap } from "lucide-react";
 
 const assetMap: Record<string, string> = {
-  "hero-gradient": "http://img.b2bpic.net/free-vector/northern-lights-landing-page-template_52683-21888.jpg",  "about-image": "http://img.b2bpic.net/free-photo/modern-shop-prepared-live-auction_23-2149947495.jpg",  "service-1": "http://img.b2bpic.net/free-vector/northern-sky-landing-page-template_23-2148265087.jpg",  "service-2": "http://img.b2bpic.net/free-vector/brand-manual-template-design_23-2149872595.jpg",  "service-3": "http://img.b2bpic.net/free-photo/business-manager-working-two-screen-setup-late-night-office_482257-32822.jpg",  "testimonial-1": "http://img.b2bpic.net/free-photo/high-angle-smiley-business-male_23-2148479546.jpg",  "testimonial-2": "http://img.b2bpic.net/free-photo/closeup-smiling-beautiful-adult-businesswoman_1262-1760.jpg",  "testimonial-3": "http://img.b2bpic.net/free-photo/close-up-serious-businessman-white-shirt-looking-camera-standing-confident_1258-26762.jpg",  "testimonial-4": "http://img.b2bpic.net/free-photo/portrait-confident-businessman_1098-21013.jpg",  "contact-image": "http://img.b2bpic.net/free-photo/women-working-desk-office-job_23-2149034611.jpg"};
+  "hero-gradient": "http://img.b2bpic.net/free-vector/northern-lights-landing-page-template_52683-21888.jpg",  "about-image": "http://img.b2bpic.net/free-photo/modern-shop-prepared-live-auction_23-2149947495.jpg",  "service-1": "http://img.b2bpic.net/free-vector/northern-sky-landing-page-template_23-2148265087.jpg",  "service-2": "http://img.b2bpic.net/free-vector/brand-manual-template-design_23-2149872595.jpg",  "service-3": "http://img.b2bpic.net/free-photo/business-manager-working-two-screen-setup-late-night-office_482257-32822.jpg",  "testimonial-1": "http://img.b2bpic.net/free-photo/high-angle-smiley-business-male_23-2148479546.jpg",  "testimonial-2": "http://img.b2bpic.net/free-photo/closeup-smiling-beautiful-adult-businesswoman_1262-1760.jpg",  "testimonial-3": "http://img.b2bpic.net/free-photo/close-up-serious-businessman-white-shirt-looking-camera-standing-confident_1258-26762.jpg",  "testimonial-4": "http://img.b2bpic.net/free-photo/portrait-confident-businessman_1098-21013.jpg",  "contact-image": "http://img.b2bpic.net/free-photo/women-working-desk-office-job_23-2149034611.jpg"
+};
 
 function getAssetUrl(assetId: string): string {
   return assetMap[assetId] || "/placeholders/placeholder1.webp";
@@ -35,12 +36,11 @@ export default function LandingPage() {
         <NavbarStyleFullscreen
           navItems={[
             { name: "About", id: "about" },
-            { name: "Services", id: "services" },
+            { name: "Services", id: "/services" },
             { name: "Work", id: "testimonials" },
-            { name: "Contact", id: "contact" },
-            { name: "Studio", id: "hero" }
+            { name: "Contact", id: "contact" }
           ]}
-          brandName="Joshua Chavez Co"
+          brandName="Vortex web"
           bottomLeftText="Innovative Design Studio"
           bottomRightText="hello@joshuachavez.co"
         />
@@ -73,7 +73,7 @@ export default function LandingPage() {
           imageAlt="Modern design studio workspace"
           useInvertedBackground={false}
           buttons={[
-            { text: "Discover Our Approach", href: "#services" }
+            { text: "Discover Our Approach", href: "/services" }
           ]}
           tagAnimation="slide-up"
         />
@@ -183,9 +183,9 @@ export default function LandingPage() {
           columns={[
             {
               title: "Services",              items: [
-                { label: "Web Design", href: "#services" },
-                { label: "Branding", href: "#services" },
-                { label: "Marketing", href: "#services" }
+                { label: "Web Design", href: "/services" },
+                { label: "Branding", href: "/services" },
+                { label: "Marketing", href: "/services" }
               ]
             },
             {

src/app/services/page.tsx

@@ -0,0 +1,162 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
+import HeroLogoBillboardSplit from '@/components/sections/hero/HeroLogoBillboardSplit';
+import FeatureCardTen from '@/components/sections/feature/FeatureCardTen';
+import ContactSplitForm from '@/components/sections/contact/ContactSplitForm';
+import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
+import { Award, CheckCircle, Shield, Sparkles, Star, Target, TrendingUp, Zap } from "lucide-react";
+
+const assetMap: Record<string, string> = {
+  "hero-gradient": "http://img.b2bpic.net/free-vector/northern-lights-landing-page-template_52683-21888.jpg",  "service-1": "http://img.b2bpic.net/free-vector/northern-sky-landing-page-template_23-2148265087.jpg",  "service-2": "http://img.b2bpic.net/free-vector/brand-manual-template-design_23-2149872595.jpg",  "service-3": "http://img.b2bpic.net/free-photo/business-manager-working-two-screen-setup-late-night-office_482257-32822.jpg",  "contact-image": "http://img.b2bpic.net/free-photo/women-working-desk-office-job_23-2149034611.jpg"
+};
+
+function getAssetUrl(assetId: string): string {
+  return assetMap[assetId] || "/placeholders/placeholder1.webp";
+}
+
+export default function ServicesPage() {
+  return (
+    <ThemeProvider
+      defaultButtonVariant="expand-hover"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="mediumLargeSizeLargeTitles"
+      background="grid"
+      cardStyle="subtle-shadow"
+      primaryButtonStyle="diagonal-gradient"
+      secondaryButtonStyle="layered"
+      headingFontWeight="semibold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleFullscreen
+          navItems={[
+            { name: "About", id: "/" },
+            { name: "Services", id: "/services" },
+            { name: "Work", id: "/#testimonials" },
+            { name: "Contact", id: "/#contact" }
+          ]}
+          brandName="Joshua Chavez Co"
+          bottomLeftText="Innovative Design Studio"
+          bottomRightText="hello@joshuachavez.co"
+        />
+      </div>
+
+      <div id="hero" data-section="hero">
+        <HeroLogoBillboardSplit
+          logoText="Services"
+          description="Comprehensive design and marketing solutions tailored to elevate your brand."
+          background={{ variant: "gradient-bars" }}
+          buttons={[
+            { text: "Get Started", href: "#contact" }
+          ]}
+          layoutOrder="default"
+          imageSrc={getAssetUrl("hero-gradient")}
+          imageAlt="Services hero background"
+          mediaAnimation="opacity"
+          frameStyle="card"
+          buttonAnimation="opacity"
+          ariaLabel="Services page hero section"
+        />
+      </div>
+
+      <div id="services" data-section="services">
+        <FeatureCardTen
+          features={[
+            {
+              id: "1",              title: "Web Design & Development",              description: "Custom websites that blend aesthetic excellence with seamless user experiences. From concept to launch, we build digital products that convert.",              media: { imageSrc: getAssetUrl("service-1") },
+              items: [
+                { icon: Sparkles, text: "Responsive & Modern Design" },
+                { icon: Zap, text: "Fast Performance Optimization" },
+                { icon: Shield, text: "Secure & Scalable Architecture" }
+              ],
+              reverse: false
+            },
+            {
+              id: "2",              title: "Brand Strategy & Identity",              description: "Strategic branding that defines your market position and creates lasting impressions. We craft cohesive visual identities that resonate with your audience.",              media: { imageSrc: getAssetUrl("service-2") },
+              items: [
+                { icon: Award, text: "Strategic Brand Positioning" },
+                { icon: CheckCircle, text: "Comprehensive Visual Systems" },
+                { icon: Star, text: "Consistent Brand Experience" }
+              ],
+              reverse: true
+            },
+            {
+              id: "3",              title: "Digital Marketing Solutions",              description: "Data-driven marketing campaigns that amplify your message and drive measurable results. We combine creativity with strategic insights.",              media: { imageSrc: getAssetUrl("service-3") },
+              items: [
+                { icon: TrendingUp, text: "Analytics & Performance Tracking" },
+                { icon: Target, text: "Targeted Campaign Strategy" },
+                { icon: Zap, text: "Conversion Optimization" }
+              ],
+              reverse: false
+            }
+          ]}
+          title="What We Offer"
+          description="Explore our full range of design and marketing services designed to drive results and build lasting brand value."
+          tag="Services"
+          textboxLayout="default"
+          animationType="slide-up"
+          useInvertedBackground={false}
+          tagAnimation="slide-up"
+        />
+      </div>
+
+      <div id="contact" data-section="contact">
+        <ContactSplitForm
+          title="Ready to Transform Your Brand?"
+          description="Let's discuss how our services can help you achieve your business goals. Reach out to schedule a consultation."
+          inputs={[
+            { name: "name", type: "text", placeholder: "Your Name", required: true },
+            { name: "email", type: "email", placeholder: "Your Email", required: true }
+          ]}
+          textarea={{ name: "message", placeholder: "Tell us about your project", rows: 5, required: true }}
+          useInvertedBackground={false}
+          imageSrc={getAssetUrl("contact-image")}
+          imageAlt="Services contact section"
+          mediaAnimation="opacity"
+          mediaPosition="right"
+          buttonText="Send Message"
+        />
+      </div>
+
+      <div id="footer" data-section="footer">
+        <FooterBaseCard
+          logoText="Joshua Chavez Co"
+          columns={[
+            {
+              title: "Services",              items: [
+                { label: "Web Design", href: "/services" },
+                { label: "Branding", href: "/services" },
+                { label: "Marketing", href: "/services" }
+              ]
+            },
+            {
+              title: "Company",              items: [
+                { label: "About", href: "/" },
+                { label: "Work", href: "/#testimonials" },
+                { label: "Contact", href: "/#contact" }
+              ]
+            },
+            {
+              title: "Connect",              items: [
+                { label: "LinkedIn", href: "https://linkedin.com" },
+                { label: "Instagram", href: "https://instagram.com" },
+                { label: "Twitter", href: "https://twitter.com" }
+              ]
+            },
+            {
+              title: "Legal",              items: [
+                { label: "Privacy Policy", href: "#" },
+                { label: "Terms of Service", href: "#" },
+                { label: "Cookie Policy", href: "#" }
+              ]
+            }
+          ]}
+          copyrightText="© 2025 Vortex Web . All rights reserved."
+        />
+      </div>
+    </ThemeProvider>
+  );
+}