Merge version_2 into main

Merge version_2 into main
This commit was merged in pull request #3.
This commit is contained in:
2026-03-28 08:57:09 +00:00
4 changed files with 43 additions and 40 deletions

View File

@@ -8,20 +8,19 @@ import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
export default function BlogPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Pricing", id: "/pricing" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Emerge Social"
/>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Pricing", id: "/pricing" },
{ name: "Blog", id: "/blog" }
]}
brandName="Emerge Social"
button={{ text: "Contact", href: "/#contact" }}
/>
</div>
<BlogCardOne
title="Latest Insights"
description="Expert perspectives on social media growth."

View File

@@ -8,16 +8,18 @@ import TeamCardOne from '@/components/sections/team/TeamCardOne';
export default function PortfolioPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingInline
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Case Studies", id: "/portfolio" },
{ name: "Contact", id: "contact" },
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Case Studies", id: "/portfolio" }
]}
/>
button={{ text: "Contact", href: "/#contact" }}
/>
</div>
<div className="pt-32 pb-20">
<TeamCardOne
title="Featured Case Studies"
@@ -25,6 +27,7 @@ export default function PortfolioPage() {
gridVariant="bento-grid"
animationType="blur-reveal"
textboxLayout="default"
useInvertedBackground={false}
members={[]}
/>
</div>

View File

@@ -8,20 +8,19 @@ import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
export default function PricingPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Features", id: "/#features" },
{ name: "Testimonials", id: "/#testimonials" },
{ name: "Pricing", id: "/pricing" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Emerge Social"
/>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Pricing", id: "/pricing" },
{ name: "Blog", id: "/blog" }
]}
brandName="Emerge Social"
button={{ text: "Get Started", href: "#" }}
/>
</div>
<PricingCardEight
title="Transparent Pricing"
description="Choose the plan that fits your growth ambitions."

View File

@@ -9,16 +9,18 @@ import { CheckCircle, Zap, TrendingUp, Camera } from "lucide-react";
export default function ServicesPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarLayoutFloatingInline
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Case Studies", id: "/portfolio" },
{ name: "Contact", id: "contact" },
{ name: "Home", id: "/" },
{ name: "Services", id: "/services" },
{ name: "Portfolio", id: "/portfolio" }
]}
/>
button={{ text: "Contact", href: "/contact" }}
/>
</div>
<div className="pt-32 pb-20">
<FeatureBorderGlow
title="Premium Services"