Merge version_7 into main

Merge version_7 into main

src/app/contact/page.tsx

@@ -0,0 +1,101 @@
+"use client";
+
+import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
+import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
+import { useState } from "react";
+
+interface Project {
+  id: string;
+  title: string;
+  description: string;
+  image: string;
+}
+
+const projects: Project[] = [
+  {
+    id: "1",    title: "Brand Identity",    description: "Complete visual identity system with logo, colors, and typography guidelines",    image: "/placeholders/placeholder1.jpg"},
+  {
+    id: "2",    title: "Website Redesign",    description: "Modern responsive website with improved user experience and conversion rates",    image: "/placeholders/placeholder2.jpg"},
+  {
+    id: "3",    title: "Marketing Campaign",    description: "Integrated digital marketing strategy across social media and email channels",    image: "/placeholders/placeholder3.jpg"},
+  {
+    id: "4",    title: "Product Launch",    description: "End-to-end product launch campaign with positioning and messaging strategy",    image: "/placeholders/placeholder4.jpg"},
+  {
+    id: "5",    title: "UI Design System",    description: "Comprehensive design system with components, patterns, and documentation",    image: "/placeholders/placeholder5.jpg"},
+  {
+    id: "6",    title: "Social Media Strategy",    description: "Content strategy and calendar for consistent brand presence across platforms",    image: "/placeholders/placeholder6.jpg"},
+];
+
+export default function ContactPage() {
+  const [hoveredId, setHoveredId] = useState<string | null>(null);
+
+  return (
+    <ThemeProvider
+      defaultButtonVariant="hover-magnetic"
+      defaultTextAnimation="entrance-slide"
+      borderRadius="rounded"
+      contentWidth="medium"
+      sizing="medium"
+      background="none"
+      cardStyle="solid"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="glass"
+      headingFontWeight="bold"
+    >
+      <div id="nav" data-section="nav">
+        <NavbarStyleApple
+          navItems={[
+            { name: "Home", id: "/" },
+            { name: "Contact", id: "/contact" },
+          ]}
+          brandName="Vortex"
+        />
+      </div>
+
+      <div id="contact" data-section="contact" className="min-h-screen bg-background py-20 px-4">
+        <div className="max-w-7xl mx-auto">
+          <div className="mb-16">
+            <h1 className="text-4xl md:text-5xl font-bold mb-4 text-foreground">Our Work</h1>
+            <p className="text-lg text-foreground/70">Explore our portfolio of projects and mockups</p>
+          </div>
+
+          <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+            {projects.map((project) => (
+              <div
+                key={project.id}
+                className="group cursor-pointer overflow-hidden rounded-lg"
+                onMouseEnter={() => setHoveredId(project.id)}
+                onMouseLeave={() => setHoveredId(null)}
+              >
+                {/* Image container */}
+                <div className="relative h-64 md:h-72 overflow-hidden rounded-lg bg-card">
+                  <img
+                    src={project.image}
+                    alt={project.title}
+                    className="w-full h-full object-cover group-hover:scale-105 transition-transform duration-300"
+                  />
+                  {/* Overlay on hover */}
+                  <div
+                    className={`absolute inset-0 bg-background/90 flex items-center justify-center rounded-lg transition-opacity duration-300 ${
+                      hoveredId === project.id ? "opacity-100" : "opacity-0"
+                    }`}
+                  >
+                    <div className="text-center px-4">
+                      <p className="text-foreground text-sm leading-relaxed">{project.description}</p>
+                    </div>
+                  </div>
+                </div>
+
+                {/* Title underneath */}
+                <div className="mt-4">
+                  <h3 className="text-lg font-semibold text-foreground">{project.title}</h3>
+                  <p className="text-sm text-foreground/60 mt-1">{project.description}</p>
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
+      </div>
+    </ThemeProvider>
+  );
+}

src/app/page.tsx

@@ -1,216 +1,42 @@
 "use client";
 
 import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
-import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
-import HeroLogoBillboardSplit from '@/components/sections/hero/HeroLogoBillboardSplit';
-import MediaAbout from '@/components/sections/about/MediaAbout';
-import FeatureCardTen from '@/components/sections/feature/FeatureCardTen';
-import TestimonialCardSixteen from '@/components/sections/testimonial/TestimonialCardSixteen';
-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";
+import NavbarStyleApple from "@/components/navbar/NavbarStyleApple/NavbarStyleApple";
+import HeroLogo from "@/components/sections/hero/HeroLogo";
 
-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"};
-
-function getAssetUrl(assetId: string): string {
-  return assetMap[assetId] || "/placeholders/placeholder1.webp";
-}
-
-export default function LandingPage() {
+export default function Home() {
   return (
     <ThemeProvider
-      defaultButtonVariant="expand-hover"
+      defaultButtonVariant="hover-magnetic"
       defaultTextAnimation="entrance-slide"
       borderRadius="rounded"
       contentWidth="medium"
-      sizing="mediumLargeSizeLargeTitles"
-      background="grid"
-      cardStyle="subtle-shadow"
-      primaryButtonStyle="diagonal-gradient"
-      secondaryButtonStyle="layered"
-      headingFontWeight="semibold"
+      sizing="medium"
+      background="none"
+      cardStyle="solid"
+      primaryButtonStyle="gradient"
+      secondaryButtonStyle="glass"
+      headingFontWeight="bold"
     >
       <div id="nav" data-section="nav">
-        <NavbarStyleFullscreen
+        <NavbarStyleApple
           navItems={[
-            { name: "About", id: "about" },
-            { name: "Services", id: "services" },
-            { name: "Work", id: "testimonials" },
-            { name: "Contact", id: "contact" },
-            { name: "Studio", id: "hero" }
+            { name: "Home", id: "/" },
+            { name: "Contact", id: "/contact" },
           ]}
-          brandName="Joshua Chavez Co"
-          bottomLeftText="Innovative Design Studio"
-          bottomRightText="hello@joshuachavez.co"
+          brandName="Vortex"
         />
       </div>
-
       <div id="hero" data-section="hero">
-        <HeroLogoBillboardSplit
-          logoText="      Vortex Web"
-          description="Innovative solutions, effortless experience."
-          background={{ variant: "gradient-bars" }}
+        <HeroLogo
+          logoText="Vortex"
+          description="Innovative design and marketing solutions for modern brands"
           buttons={[
-            { text: "Work With Me", href: "#contact" }
+            { text: "Get Started", href: "https://github.com" },
+            { text: "Learn More", href: "/contact" },
           ]}
-          layoutOrder="default"
-          imageSrc={getAssetUrl("hero-gradient")}
-          imageAlt="Gradient background charcoal to slate"
-          mediaAnimation="opacity"
-          frameStyle="card"
-          buttonAnimation="opacity"
-          ariaLabel="Hero section for Joshua Chavez Co design and marketing services"
-        />
-      </div>
-
-      <div id="about" data-section="about">
-        <MediaAbout
-          title="About Vortex Web"
-          description="We craft modern, streamlined design and marketing solutions that elevate brands and engage audiences. With a focus on clarity, sophistication, and refined aesthetics, we deliver work that stands out for its elegance and purposeful innovation."
-          tag="About Us"
-          imageSrc={getAssetUrl("about-image")}
-          imageAlt="Modern design studio workspace"
-          useInvertedBackground={false}
-          buttons={[
-            { text: "Discover Our Approach", href: "#services" }
-          ]}
-          tagAnimation="slide-up"
-        />
-      </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="Our Services"
-          description="We deliver comprehensive design and marketing solutions tailored to your brand's unique vision and business goals."
-          tag="Services"
-          textboxLayout="default"
-          animationType="slide-up"
-          useInvertedBackground={false}
-          tagAnimation="slide-up"
-        />
-      </div>
-
-      <div id="testimonials" data-section="testimonials">
-        <TestimonialCardSixteen
-          testimonials={[
-            {
-              id: "1",              name: "Sarah Mitchell",              role: "Founder",              company: "TechStart Ventures",              rating: 5,
-              imageSrc: getAssetUrl("testimonial-1"),
-              imageAlt: "Sarah Mitchell, Founder of TechStart Ventures"
-            },
-            {
-              id: "2",              name: "Marcus Chen",              role: "CEO",              company: "Innovation Labs",              rating: 5,
-              imageSrc: getAssetUrl("testimonial-2"),
-              imageAlt: "Marcus Chen, CEO of Innovation Labs"
-            },
-            {
-              id: "3",              name: "Elena Rodriguez",              role: "Marketing Director",              company: "Global Design Co",              rating: 5,
-              imageSrc: getAssetUrl("testimonial-3"),
-              imageAlt: "Elena Rodriguez, Marketing Director at Global Design Co"
-            },
-            {
-              id: "4",              name: "James Thompson",              role: "Creative Director",              company: "Brand Alliance",              rating: 5,
-              imageSrc: getAssetUrl("testimonial-4"),
-              imageAlt: "James Thompson, Creative Director at Brand Alliance"
-            }
-          ]}
-          kpiItems={[
-            { value: "150+", label: "Projects Completed" },
-            { value: "", label: "" },
-            { value: "", label: "" }
-          ]}
-          animationType="slide-up"
-          title="What Our Clients Say"
-          description="Trusted by innovative brands and forward-thinking businesses who value design excellence and strategic marketing."
-          tag="Testimonials"
-          textboxLayout="default"
-          useInvertedBackground={false}
-          tagAnimation="slide-up"
-        />
-      </div>
-
-      <div id="contact" data-section="contact">
-        <ContactSplitForm
-          title="Let's Create Something Amazing"
-          description="Ready to transform your vision into reality? Get in touch and let's discuss how we can elevate your brand with innovative design and strategic marketing."
-          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="Modern creative workspace"
-          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: "#about" },
-                { 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."
+          imageSrc="/placeholders/placeholder5.jpg"
+          imageAlt="Hero background"
         />
       </div>
     </ThemeProvider>

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>
+  );
+}