Merge version_4 into main

Merge version_4 into main
This commit was merged in pull request #4.
This commit is contained in:
2026-05-13 16:38:43 +00:00
2 changed files with 18 additions and 10 deletions

View File

@@ -2,19 +2,22 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import TextAbout from '@/components/sections/about/TextAbout';
import InlineImageSplitTextAbout from '@/components/sections/about/InlineImageSplitTextAbout';
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
export default function AboutPage() {
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={[{ name: "Home", id: "/" }, { name: "About Us", id: "about" }, { name: "Contact", id: "/contact" }]} brandName="Niffer Cosmetics" />
<div id="nav" data-section="nav">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "About Us", id: "/about" }, { name: "Contact", id: "/contact" }]} />
</div>
<div id="about" data-section="about">
<TextAbout
title="Our Mission: Redefining Beauty in Tanzania"
<InlineImageSplitTextAbout
heading={[{ type: 'text', content: "Our Mission: Redefining Beauty in Tanzania" }]}
buttons={[{ text: "Back Home", href: "/" }]}
useInvertedBackground={false}
/>
</div>
<FooterBaseReveal logoText="Niffer Cosmetics" columns={[]} />

View File

@@ -2,24 +2,29 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import ContactText from '@/components/sections/contact/ContactText';
import ContactCTA from '@/components/sections/contact/ContactCTA';
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import FooterBaseReveal from '@/components/sections/footer/FooterBaseReveal';
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={[{ name: "Home", id: "/" }, { name: "About Us", id: "/about" }, { name: "Contact", id: "contact" }]} brandName="Niffer Cosmetics" />
<div id="nav" data-section="nav">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "About Us", id: "/about" }, { name: "Contact", id: "/contact" }]} />
</div>
<div id="contact" data-section="contact">
<ContactText
<ContactCTA
tag="Contact Us"
title="Let's Connect!"
description="Reach out via WhatsApp, Instagram, or Email. Find us on the map for your next store visit."
background={{ variant: "gradient-bars" }}
text="Let's Connect! Reach out via WhatsApp, Instagram, or Email. Find us on the map for your next store visit."
buttons={[
{ text: "WhatsApp", href: "https://wa.me/255..." },
{ text: "Instagram", href: "https://instagram.com/niffer" },
{ text: "Email Us", href: "mailto:hello@niffercosmetics.co.tz" }
]}
useInvertedBackground={false}
/>
</div>
<FooterBaseReveal logoText="Niffer Cosmetics" columns={[]} />