Merge version_3 into main #7

Merged
bender merged 5 commits from version_3 into main 2026-02-20 21:44:44 +00:00
5 changed files with 26 additions and 46 deletions

View File

@@ -33,7 +33,7 @@ export default function BlogPage() {
{ name: "Home", id: "/" },
{ name: "About", id: "#about" },
{ name: "Services", id: "#features-detailed" },
{ name: "Clients", id: "/#clients" },
{ name: "Clients", id: "/" },
{ name: "Contact", id: "#contact" },
]}
brandName="Pro Studio"

View File

@@ -3,9 +3,6 @@ import { Mulish } from "next/font/google";
import "./globals.css";
import { ServiceWrapper } from "@/components/ServiceWrapper";
import Tag from "@/tag/Tag";
import { Libre_Baskerville } from "next/font/google";
import { Inter } from "next/font/google";
import { Raleway } from "next/font/google";
const mulish = Mulish({
variable: "--font-mulish", subsets: ["latin"],
@@ -27,21 +24,6 @@ export const metadata: Metadata = {
},
};
const libreBaskerville = Libre_Baskerville({
variable: "--font-libre-baskerville",
subsets: ["latin"],
weight: ["400", "700"],
});
const inter = Inter({
variable: "--font-inter",
subsets: ["latin"],
});
const raleway = Raleway({
variable: "--font-raleway",
subsets: ["latin"],
});
export default function RootLayout({
children,
}: Readonly<{
@@ -50,7 +32,7 @@ export default function RootLayout({
return (
<html lang="en" suppressHydrationWarning>
<ServiceWrapper>
<body className={`${raleway.variable} antialiased`}>
<body className={`${mulish.variable} antialiased`}>
<Tag />
{children}

View File

@@ -8,7 +8,7 @@ import FeatureCardNineteen from '@/components/sections/feature/FeatureCardNinete
import MetricCardOne from '@/components/sections/metrics/MetricCardOne';
import TestimonialCardFive from '@/components/sections/testimonial/TestimonialCardFive';
import FeatureCardTen from '@/components/sections/feature/FeatureCardTen';
import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
import ContactText from '@/components/sections/contact/ContactText';
import FooterCard from '@/components/sections/footer/FooterCard';
import {
@@ -50,7 +50,7 @@ export default function LandingPage() {
>
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[{ name: "Home", id: "/" }, { name: "About", id: "#about" }, { name: "Services", id: "#features-detailed" }, { name: "Clients", id: "#clients" }, { name: "Contact", id: "#contact" }]}
navItems={[{ name: "Home", id: "/" }, { name: "About", id: "#about" }, { name: "Services", id: "#features-detailed" }, { name: "Clients", id: "/" }, { name: "Contact", id: "#contact" }]}
brandName="Pro Studio"
button={{ text: "Get a Quote", href: "#contact" }}
className="bg-card/90 backdrop-blur-sm shadow-lg"
@@ -78,6 +78,22 @@ export default function LandingPage() {
tagClassName="text-sm font-semibold text-primary-cta"
buttonClassName="px-8 py-3 rounded-pill text-lg"
buttonTextClassName="font-semibold"
marqueeItems={[
{ type: "text", text: "Creative Minds Agency" },
{ type: "text", text: "GlobalTech Solutions" },
{ type: "text", text: "Apex Innovations" },
{ type: "text", text: "Nexus Games" },
{ type: "text", text: "Bloom Skincare" },
{ type: "text", text: "FutureForward Consulting" },
{ type: "text", text: "Digital Horizon Studios" },
{ type: "text", text: "Urban Living Magazine" },
{ type: "text", text: "Veridian Dynamics" },
{ type: "text", text: "Starlight Entertainment" }
]}
marqueeSpeed={40}
showMarqueeCard={true}
marqueeTextClassName="text-2xl font-semibold text-foreground/80"
marqueeCardClassName="bg-card/70 backdrop-blur-md"
/>
</div>
<div id="about" data-section="about">
@@ -175,25 +191,7 @@ export default function LandingPage() {
cardDateClassName="text-sm text-foreground/60"
/>
</div>
<div id="clients" data-section="clients">
<SocialProofOne
title="Our Valued Partners & Clients"
description="We've had the privilege to work with a diverse range of clients, helping them tell their stories and achieve their goals."
names={[
"Creative Minds Agency", "GlobalTech Solutions", "Apex Innovations", "Nexus Games", "Bloom Skincare", "FutureForward Consulting", "Digital Horizon Studios", "Urban Living Magazine", "Veridian Dynamics", "Starlight Entertainment"
]}
tag="Clients"
textboxLayout="default"
useInvertedBackground={false}
speed={40}
showCard={true}
className="py-20 md:py-28 lg:py-36 bg-background-accent"
textBoxTitleClassName="text-3xl md:text-5xl font-bold leading-tight"
textBoxDescriptionClassName="text-lg max-w-2xl mx-auto"
logoTextClassName="text-2xl font-semibold text-foreground/80"
logoCardClassName="bg-card/70 backdrop-blur-md"
/>
</div>
<div id="features-detailed" data-section="features-detailed">
<FeatureCardTen
features={[

View File

@@ -95,7 +95,7 @@ function ProductPageContent({ params }: ProductPageProps) {
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Clients", id: "/#clients" }
{ name: "Clients", id: "/" }
]}
brandName="Pro Studio"
className="bg-card/90 backdrop-blur-sm shadow-lg"
@@ -149,7 +149,7 @@ function ProductPageContent({ params }: ProductPageProps) {
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Clients", id: "/#clients" }
{ name: "Clients", id: "/" }
]}
brandName="Pro Studio"
className="bg-card/90 backdrop-blur-sm shadow-lg"
@@ -210,7 +210,7 @@ function ProductPageContent({ params }: ProductPageProps) {
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Clients", id: "/#clients" }
{ name: "Clients", id: "/" }
]}
brandName="Pro Studio"
className="bg-card/90 backdrop-blur-sm shadow-lg"

View File

@@ -62,7 +62,7 @@ export default function ShopPage() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Clients", id: "/#clients" }
{ name: "Clients", id: "/" }
]}
brandName="Pro Studio"
className="bg-card/90 backdrop-blur-sm shadow-lg"
@@ -115,7 +115,7 @@ export default function ShopPage() {
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Clients", id: "/#clients" }
{ name: "Clients", id: "/" }
]}
brandName="Pro Studio"
className="bg-card/90 backdrop-blur-sm shadow-lg"