bender/5cc20eaa-35f8-4eff-a4ce-8f9a520eb91b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_5 into main #6

Merged
bender merged 5 commits from version_5 into main 2026-02-16 09:16:40 +00:00
Conversation 0 Commits 5 Files Changed 5 +126 -25
5 changed files with 126 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,12 +28,11 @@ export default function BlogPage() {
<NavbarStyleFullscreen
brandName="Beauty and the Beast"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "products" },
{ name: "About", id: "about" },
{ name: "Collection", id: "features" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "/contact" }
]}
bottomLeftText="Enchanted Drinkware"
bottomRightText="hello@beautyandthebeast.com"
@@ -82,7 +81,7 @@ export default function BlogPage() {
{
items: [
{ label: "Customer Reviews", href: "testimonials" },
{ label: "Contact Us", href: "contact" },
{ label: "Contact Us", href: "/contact" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns Policy", href: "#" }
]

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

@@ -0,0 +1,107 @@
"use client";
import ReactLenis from "lenis/react";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import ContactSplit from '@/components/sections/contact/ContactSplit';
import FooterLogoEmphasis from '@/components/sections/footer/FooterLogoEmphasis';
export default function ContactPage() {
return (
<ThemeProvider
defaultButtonVariant="elastic-effect"
defaultTextAnimation="background-highlight"
borderRadius="pill"
contentWidth="smallMedium"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="glass-elevated"
primaryButtonStyle="double-inset"
secondaryButtonStyle="layered"
headingFontWeight="extrabold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
brandName="Beauty and the Beast"
navItems={[
{ name: "Shop", id: "products" },
{ name: "About", id: "about" },
{ name: "Collection", id: "features" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "/contact" }
]}
bottomLeftText="Enchanted Drinkware"
bottomRightText="hello@beautyandthebeast.com"
/>
</div>
<div id="contact" data-section="contact">
<ContactSplit
tag="Get in Touch"
title="We'd Love to Hear From You"
description="Have questions about our enchanted drinkware? Reach out to us and our team will get back to you as soon as possible."
background={{ variant: "sparkles-gradient" }}
useInvertedBackground={false}
imageSrc="https://img.b2bpic.net/free-photo/hands-working-pottery-wheel_181624-57055.jpg"
imageAlt="Artisan crafting"
mediaAnimation="slide-up"
mediaPosition="right"
inputPlaceholder="Enter your email"
buttonText="Send Message"
termsText="We'll respond to your inquiry within 24 business hours."
onSubmit={(email) => console.log('Contact inquiry from:', email)}
/>
</div>
<div id="footer" data-section="footer">
<FooterLogoEmphasis
logoText="Beauty and the Beast"
columns={[
{
items: [
{ label: "Shop Collections", href: "products" },
{ label: "Best Sellers", href: "products" },
{ label: "New Arrivals", href: "products" },
{ label: "Gift Sets", href: "products" }
]
},
{
items: [
{ label: "About Us", href: "about" },
{ label: "Craftsmanship", href: "features" },
{ label: "Our Story", href: "about" },
{ label: "Sustainability", href: "about" }
]
},
{
items: [
{ label: "Customer Reviews", href: "testimonials" },
{ label: "Contact Us", href: "/contact" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns Policy", href: "#" }
]
},
{
items: [
{ label: "Privacy Policy", href: "#" },
{ label: "Terms of Service", href: "#" },
{ label: "Cookie Policy", href: "#" },
{ label: "Accessibility", href: "#" }
]
},
{
items: [
{ label: "Instagram", href: "https://instagram.com" },
{ label: "Facebook", href: "https://facebook.com" },
{ label: "Pinterest", href: "https://pinterest.com" },
{ label: "Newsletter", href: "#" }
]
}
]}
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}

4
src/app/page.tsx
View File

@@ -33,7 +33,7 @@ export default function LandingPage() {
{ name: "About", id: "about" },
{ name: "Collection", id: "features" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "/contact" }
]}
bottomLeftText="Enchanted Drinkware"
bottomRightText="hello@beautyandthebeast.com"
@@ -203,7 +203,7 @@ export default function LandingPage() {
{
items: [
{ label: "Customer Reviews", href: "testimonials" },
{ label: "Contact Us", href: "contact" },
{ label: "Contact Us", href: "/contact" },
{ label: "Shipping Info", href: "#" },
{ label: "Returns Policy", href: "#" }
]

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

@@ -85,12 +85,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleFullscreen
brandName="Beauty and the Beast"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Shop", id: "products" },
{ name: "About", id: "about" },
{ name: "Collection", id: "features" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "/contact" }
]}
bottomLeftText="Enchanted Drinkware"
bottomRightText="hello@beautyandthebeast.com"
@@ -123,7 +122,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{
items: [
{ label: "Customer Reviews", href: "testimonials" },
{ label: "Contact Us", href: "contact" }
{ label: "Contact Us", href: "/contact" }
]
},
{
@@ -163,12 +162,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleFullscreen
brandName="Beauty and the Beast"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Shop", id: "products" },
{ name: "About", id: "about" },
{ name: "Collection", id: "features" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "/contact" }
]}
bottomLeftText="Enchanted Drinkware"
bottomRightText="hello@beautyandthebeast.com"
@@ -209,7 +207,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{
items: [
{ label: "Customer Reviews", href: "testimonials" },
{ label: "Contact Us", href: "contact" }
{ label: "Contact Us", href: "/contact" }
]
},
{
@@ -248,12 +246,11 @@ export default function ProductPage({ params }: ProductPageProps) {
<NavbarStyleFullscreen
brandName="Beauty and the Beast"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Shop", id: "products" },
{ name: "About", id: "about" },
{ name: "Collection", id: "features" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "/contact" }
]}
bottomLeftText="Enchanted Drinkware"
bottomRightText="hello@beautyandthebeast.com"
@@ -319,7 +316,7 @@ export default function ProductPage({ params }: ProductPageProps) {
{
items: [
{ label: "Customer Reviews", href: "testimonials" },
{ label: "Contact Us", href: "contact" }
{ label: "Contact Us", href: "/contact" }
]
},
{

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

@@ -37,12 +37,11 @@ export default function ShopPage() {
<NavbarStyleFullscreen
brandName="Beauty and the Beast"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Shop", id: "products" },
{ name: "About", id: "about" },
{ name: "Collection", id: "features" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "/contact" }
]}
bottomLeftText="Enchanted Drinkware"
bottomRightText="hello@beautyandthebeast.com"
@@ -75,7 +74,7 @@ export default function ShopPage() {
{
items: [
{ label: "Customer Reviews", href: "testimonials" },
{ label: "Contact Us", href: "contact" }
{ label: "Contact Us", href: "/contact" }
]
},
{
@@ -114,12 +113,11 @@ export default function ShopPage() {
<NavbarStyleFullscreen
brandName="Beauty and the Beast"
navItems={[
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "Shop", id: "products" },
{ name: "About", id: "about" },
{ name: "Collection", id: "features" },
{ name: "Reviews", id: "testimonials" },
{ name: "Contact", id: "contact" }
{ name: "Contact", id: "/contact" }
]}
bottomLeftText="Enchanted Drinkware"
bottomRightText="hello@beautyandthebeast.com"
@@ -160,7 +158,7 @@ export default function ShopPage() {
{
items: [
{ label: "Customer Reviews", href: "testimonials" },
{ label: "Contact Us", href: "contact" }
{ label: "Contact Us", href: "/contact" }
]
},
{