bender/9b3d198a-9e69-4f57-808d-dac06450c592
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_5 into main #10

Merged
bender merged 4 commits from version_5 into main 2026-02-20 21:54:06 +00:00
Conversation 0 Commits 4 Files Changed 4 +55 -48
4 changed files with 55 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/app/blog/page.tsx
View File

@@ -28,50 +28,56 @@ export default function BlogPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "#about" },
{ name: "Services", id: "#features-detailed" },
{ name: "Contact", id: "#contact" },
]}
brandName="Pro Studio"
button={{ text: "Get a Quote", href: "/#contact" }}
className="bg-card/90 backdrop-blur-sm shadow-lg"
navItemClassName="text-foreground hover:text-primary-cta transition-colors duration-300"
buttonClassName="bg-primary-cta text-secondary-cta px-6 py-2 rounded-pill hover:bg-accent hover:text-primary-cta transition-all duration-300"
buttonTextClassName="font-medium text-base"
/>
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardThree
blogs={posts}
title="Featured Articles"
description="Explore our latest insights"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/#about" },
{ name: "Services", id: "/#features-detailed" },
{ name: "Contact", id: "/#contact" },
]}
brandName="Pro Studio"
button={{ text: "Get a Quote", href: "/#contact" }}
className="bg-card/90 backdrop-blur-sm shadow-lg"
navItemClassName="text-foreground hover:text-primary-cta transition-colors duration-300"
buttonClassName="bg-primary-cta text-secondary-cta px-6 py-2 rounded-pill hover:bg-accent hover:text-primary-cta transition-all duration-300"
buttonTextClassName="font-medium text-base"
/>
)}
</div>
<FooterCard
logoText="Pro Studio"
copyrightText="© 2023 Pro Studio. All rights reserved."
socialLinks={[
{ icon: Twitter, href: "https://twitter.com/prostudio", ariaLabel: "Twitter" },
{ icon: Linkedin, href: "https://linkedin.com/company/prostudio", ariaLabel: "LinkedIn" },
{ icon: Instagram, href: "https://instagram.com/prostudio", ariaLabel: "Instagram" },
]}
className="py-16 md:py-24 bg-background-accent"
cardClassName="bg-card/70 backdrop-blur-md"
logoClassName="text-2xl font-bold text-foreground"
copyrightTextClassName="text-sm text-foreground/70"
socialIconClassName="text-foreground/80 hover:text-primary-cta transition-colors duration-300"
/>
<div id="blog" data-section="blog">
{isLoading ? (
<div className="w-content-width mx-auto py-20 text-center">
<p className="text-foreground">Loading posts...</p>
</div>
) : (
<BlogCardThree
blogs={posts}
title="Featured Articles"
description="Explore our latest insights"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
/>
)}
</div>
<div id="footer" data-section="footer">
<FooterCard
logoText="Pro Studio"
copyrightText="© 2023 Pro Studio. All rights reserved."
socialLinks={[
{ icon: Twitter, href: "https://twitter.com/prostudio", ariaLabel: "Twitter" },
{ icon: Linkedin, href: "https://linkedin.com/company/prostudio", ariaLabel: "LinkedIn" },
{ icon: Instagram, href: "https://instagram.com/prostudio", ariaLabel: "Instagram" },
]}
className="py-16 md:py-24 bg-background-accent"
cardClassName="bg-card/70 backdrop-blur-md"
logoClassName="text-2xl font-bold text-foreground"
copyrightTextClassName="text-sm text-foreground/70"
socialIconClassName="text-foreground/80 hover:text-primary-cta transition-colors duration-300"
/>
</div>
</ReactLenis>
</ThemeProvider>
);

3
src/app/page.tsx
View File

@@ -22,6 +22,7 @@ import {
Headphones,
Instagram,
LifeBuoy,
Lightbulb,
Linkedin,
Mic,
Music,
@@ -251,7 +252,7 @@ export default function LandingPage() {
<FooterCard
logoText="Pro Studio"
copyrightText="© 2023 Pro Studio. All rights reserved."
socialLinks={[{ icon: Twitter, href: "https://twitter.com/prostudio", ariaLabel: "Twitter" }, { icon: Linkedin, href: "https://linkedin.com/company/prostudio", ariaLabel: "LinkedIn" }, { icon: Instagram, href: "https://instagram.com/prostudio", ariaLabel: "Instagram" }]}}
socialLinks={[{ icon: Twitter, href: "https://twitter.com/prostudio", ariaLabel: "Twitter" }, { icon: Linkedin, href: "https://linkedin.com/company/prostudio", ariaLabel: "LinkedIn" }, { icon: Instagram, href: "https://instagram.com/prostudio", ariaLabel: "Instagram" }]}
className="py-16 md:py-24 bg-background-accent"
cardClassName="bg-card/70 backdrop-blur-md"
logoClassName="text-2xl font-bold text-foreground"

6
src/app/shop/[id]/page.tsx
View File

@@ -90,7 +90,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
@@ -143,7 +143,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
@@ -203,7 +203,7 @@ function ProductPageContent({ params }: ProductPageProps) {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },

4
src/app/shop/page.tsx
View File

@@ -57,7 +57,7 @@ export default function ShopPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },
@@ -109,7 +109,7 @@ export default function ShopPage() {
headingFontWeight="medium"
>
<ReactLenis root>
<div id="navbar" data-section="navbar">
<div id="nav" data-section="nav">
<NavbarLayoutFloatingInline
navItems={[
{ name: "Home", id: "/" },