Merge version_2 into main #4

Merged
bender merged 8 commits from version_2 into main 2026-04-20 10:06:08 +00:00
8 changed files with 20 additions and 42 deletions

View File

@@ -8,7 +8,7 @@ import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function ContactPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleCentered
navItems={[
@@ -24,6 +24,8 @@ export default function ContactPage() {
title="Get in touch"
description="Have questions or need assistance? We're here to help you."
imageSrc="http://img.b2bpic.net/free-photo/still-life-fashion-designer-s-office_23-2150543677.jpg?_wi=2"
background={{ variant: "plain" }}
useInvertedBackground={false}
/>
<FooterSimple
columns={[

View File

@@ -7,18 +7,7 @@ import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function FaqPage() {
return (
<ThemeProvider
defaultButtonVariant="hover-bubble"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="mediumLarge"
sizing="mediumLargeSizeLargeTitles"
background="grid"
cardStyle="gradient-mesh"
primaryButtonStyle="shadow"
secondaryButtonStyle="layered"
headingFontWeight="extrabold"
>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
@@ -32,17 +21,20 @@ export default function FaqPage() {
/>
<FaqSplitText
sideTitle="Frequently Asked Questions"
faqsAnimation="slide-up"
faqsAnimation="entrance-slide"
faqs={[
{ id: "1", title: "What is your shipping time?", content: "3-5 business days for standard shipping." },
{ id: "2", title: "Are your products sustainable?", content: "Yes, 100% of our materials are ethically sourced." }
]}
useInvertedBackground={false}
/>
<FooterSimple
columns={[
{ title: "Shop", items: [{ label: "All Products", href: "/collection" }, { label: "New Arrivals", href: "/collection" }] },
{ title: "Help", items: [{ label: "Returns & Exchanges", href: "/returns-exchanges" }, { label: "FAQs", href: "/faq" }, { label: "Terms of Service", href: "/terms-of-service" }, { label: "Contact Us", href: "/contact" }] },
]}
bottomLeftText="© 2024 NISHA. All rights reserved."
bottomRightText="Built with love."
/>
</ThemeProvider>
);

View File

@@ -5,7 +5,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function PrivacyPolicyPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered navItems={[{name: "Home", id: "/"}, {name: "Size Guide", id: "/size-guide"}, {name: "Shipping", id: "/shipping"}, {name: "Privacy", id: "/privacy"}]} brandName="NISHA" />
<LegalSection
layout="page"

View File

@@ -7,18 +7,7 @@ import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function ReturnsExchangesPage() {
return (
<ThemeProvider
defaultButtonVariant="hover-bubble"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="mediumLarge"
sizing="mediumLargeSizeLargeTitles"
background="grid"
cardStyle="gradient-mesh"
primaryButtonStyle="shadow"
secondaryButtonStyle="layered"
headingFontWeight="extrabold"
>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
@@ -43,6 +32,8 @@ export default function ReturnsExchangesPage() {
{ title: "Shop", items: [{ label: "All Products", href: "/collection" }, { label: "New Arrivals", href: "/collection" }] },
{ title: "Help", items: [{ label: "Returns & Exchanges", href: "/returns-exchanges" }, { label: "FAQs", href: "/faq" }, { label: "Terms of Service", href: "/terms-of-service" }, { label: "Contact Us", href: "/contact" }] },
]}
bottomLeftText="© 2024 NISHA. All rights reserved."
bottomRightText="Built with love."
/>
</ThemeProvider>
);

View File

@@ -5,7 +5,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function ShippingPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered navItems={[{name: "Home", id: "/"}, {name: "Size Guide", id: "/size-guide"}, {name: "Shipping", id: "/shipping"}, {name: "Privacy", id: "/privacy"}]} brandName="NISHA" />
<LegalSection
layout="page"

View File

@@ -5,7 +5,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function SizeGuidePage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered navItems={[{name: "Home", id: "/"}, {name: "Size Guide", id: "/size-guide"}, {name: "Shipping", id: "/shipping"}, {name: "Privacy", id: "/privacy"}]} brandName="NISHA" />
<LegalSection
layout="page"

View File

@@ -7,18 +7,7 @@ import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function TermsOfServicePage() {
return (
<ThemeProvider
defaultButtonVariant="hover-bubble"
defaultTextAnimation="entrance-slide"
borderRadius="rounded"
contentWidth="mediumLarge"
sizing="mediumLargeSizeLargeTitles"
background="grid"
cardStyle="gradient-mesh"
primaryButtonStyle="shadow"
secondaryButtonStyle="layered"
headingFontWeight="extrabold"
>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[
{ name: "Home", id: "/" },
@@ -43,6 +32,8 @@ export default function TermsOfServicePage() {
{ title: "Shop", items: [{ label: "All Products", href: "/collection" }, { label: "New Arrivals", href: "/collection" }] },
{ title: "Help", items: [{ label: "Returns & Exchanges", href: "/returns-exchanges" }, { label: "FAQs", href: "/faq" }, { label: "Terms of Service", href: "/terms-of-service" }, { label: "Contact Us", href: "/contact" }] },
]}
bottomLeftText="© 2024 NISHA. All rights reserved."
bottomRightText="Built with love."
/>
</ThemeProvider>
);

View File

@@ -8,7 +8,7 @@ import FooterSimple from '@/components/sections/footer/FooterSimple';
export default function TrackOrderPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ReactLenis root>
<NavbarStyleCentered
navItems={[
@@ -26,6 +26,8 @@ export default function TrackOrderPage() {
inputPlaceholder="Enter order number"
buttonText="Track Order"
imageSrc="http://img.b2bpic.net/free-photo/side-view-woman-sitting-chair-black-white_23-2149411360.jpg?_wi=2"
background={{ variant: "plain" }}
useInvertedBackground={false}
/>
<FooterSimple
columns={[