bender/d8b47c0a-ca21-4afb-84a9-5eeb66c9ecd0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_4 into main #4

Merged
bender merged 4 commits from version_4 into main 2026-05-02 08:08:25 +00:00
Conversation 0 Commits 4 Files Changed 4 +78 -17
4 changed files with 78 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ export default function AboutPage() {
{ name: "About", id: "/about" },
{ name: "Services", id: "/services" },
{ name: "Work", id: "/#portfolio" },
{ name: "Contact", id: "/#contact" },
{ name: "Contact", id: "/contact" },
]}
brandName="Faithful Story Studio"
/>
@@ -57,7 +57,7 @@ export default function AboutPage() {
},
{
items: [
{ label: "Contact", href: "/#contact" },
{ label: "Contact", href: "/contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Privacy", href: "#" },
],

72
src/app/contact/page.tsx Normal file
View File

@@ -0,0 +1,72 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function ContactPage() {
return (
<ThemeProvider
defaultButtonVariant="icon-arrow"
defaultTextAnimation="reveal-blur"
borderRadius="soft"
contentWidth="compact"
sizing="largeSmallSizeMediumTitles"
background="fluid"
cardStyle="layered-gradient"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="solid"
headingFontWeight="normal"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
{ name: "About", id: "/about" },
{ name: "Services", id: "/services" },
{ name: "Work", id: "/#portfolio" },
{ name: "Contact", id: "/contact" },
]}
brandName="Faithful Story Studio"
/>
</div>
<div id="contact" data-section="contact">
<ContactSplit
tag="Get in Touch"
title="Let's Tell Your Story"
description="Please share your details below so we can learn more about your vision, preferred dates, and budget. We'll be in touch soon to discuss how we can help."
background={{ variant: "plain" }}
useInvertedBackground={false}
/>
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
columns={[
{
items: [
{ label: "Home", href: "/" },
{ label: "About", href: "/about" },
{ label: "Services", href: "/services" },
{ label: "Work", href: "/#portfolio" },
],
},
{
items: [
{ label: "Contact", href: "/contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Privacy", href: "#" },
],
},
]}
logoText="Faithful Story Studio"
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}

10
src/app/page.tsx
View File

@@ -3,15 +3,9 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import AboutMetric from '@/components/sections/about/AboutMetric';
import ContactText from '@/components/sections/contact/ContactText';
import FaqSplitText from '@/components/sections/faq/FaqSplitText';
import FeatureCardTwentyOne from '@/components/sections/feature/FeatureCardTwentyOne';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
import HeroBillboardTestimonial from '@/components/sections/hero/HeroBillboardTestimonial';
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
import TestimonialCardTen from '@/components/sections/testimonial/TestimonialCardTen';
import { Camera, Heart, Video } from "lucide-react";
export default function LandingPage() {
@@ -36,7 +30,7 @@ export default function LandingPage() {
{ name: "About", id: "/about" },
{ name: "Services", id: "/services" },
{ name: "Work", id: "/#portfolio" },
{ name: "Contact", id: "/#contact" },
{ name: "Contact", id: "/contact" },
]}
brandName="Faithful Story Studio"
/>
@@ -84,7 +78,7 @@ export default function LandingPage() {
},
{
items: [
{ label: "Contact", href: "/#contact" },
{ label: "Contact", href: "/contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Privacy", href: "#" },
],

9
src/app/services/page.tsx
View File

@@ -5,11 +5,6 @@ import ReactLenis from "lenis/react";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
// FeatureCardTwentyOne is not in the allowed registry for services, and FeatureCardOne is the standard registry component.
// The error log refers to FeatureCardTwentyOneProps missing 'videoSrc'.
// Since this component is not in the registry provided, I will replace it with a compliant implementation or inline logic if necessary.
// For now, I must adhere to the registry. I will remove the broken component.
export default function ServicesPage() {
return (
<ThemeProvider
@@ -32,7 +27,7 @@ export default function ServicesPage() {
{ name: "About", id: "/about" },
{ name: "Services", id: "/services" },
{ name: "Work", id: "/#portfolio" },
{ name: "Contact", id: "/#contact" },
{ name: "Contact", id: "/contact" },
]}
brandName="Faithful Story Studio"
/>
@@ -51,7 +46,7 @@ export default function ServicesPage() {
},
{
items: [
{ label: "Contact", href: "/#contact" },
{ label: "Contact", href: "/contact" },
{ label: "FAQ", href: "/#faq" },
{ label: "Privacy", href: "#" },
],