bender/824cf8f5-0059-4563-9475-3ce8e82fae5b
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge version_2 into main #2

Merged
bender merged 3 commits from version_2 into main 2026-04-18 14:08:35 +00:00
Conversation 0 Commits 3 Files Changed 3 +39 -19
3 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/about-us/page.tsx
View File

@@ -8,11 +8,17 @@ import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
export default function AboutUsPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" 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: "Shop", id: "/shop" }, { name: "About Us", id: "/about-us" }, { name: "Contact", id: "/contact" }]} brandName="WatchHub" />
<SplitAbout title="About Us" description="Learn about our journey and passion for watchmaking." textboxLayout="default" />
<FooterBaseCard logoText="WatchHub" columns={[]} />
<div id="nav" data-section="nav">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "About Us", id: "/about-us" }, { name: "Contact", id: "/contact" }]} />
</div>
<div id="about" data-section="about">
<SplitAbout title="About Us" description="Learn about our journey and passion for watchmaking." textboxLayout="default" bulletPoints={[]} useInvertedBackground={false} />
</div>
<div id="footer" data-section="footer">
<FooterBaseCard logoText="WatchHub" columns={[]} />
</div>
</ReactLenis>
</ThemeProvider>
);

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

@@ -8,11 +8,17 @@ import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
export default function ContactPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" 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: "Shop", id: "/shop" }, { name: "About Us", id: "/about-us" }, { name: "Contact", id: "/contact" }]} brandName="WatchHub" />
<ContactText text="Get in touch with our team." background={{ variant: "plain" }} />
<FooterBaseCard logoText="WatchHub" columns={[]} />
<div id="nav" data-section="nav">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "About Us", id: "/about-us" }, { name: "Contact", id: "/contact" }]} />
</div>
<div id="contact" data-section="contact">
<ContactText text="Get in touch with our team." background={{ variant: "plain" }} useInvertedBackground={false} />
</div>
<div id="footer" data-section="footer">
<FooterBaseCard logoText="WatchHub" columns={[]} />
</div>
</ReactLenis>
</ThemeProvider>
);

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

@@ -3,22 +3,30 @@
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarStyleCentered';
import ProductCardOne from '@/components/sections/product/ProductCardOne';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
import FooterBaseCard from '@/components/sections/footer/FooterBaseCard';
export default function ShopPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" 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: "Shop", id: "/shop" }, { name: "About Us", id: "/about-us" }, { name: "Contact", id: "/contact" }]} brandName="WatchHub" />
<ProductCardOne
gridVariant="four-items-2x2-equal-grid"
animationType="slide-up"
textboxLayout="default"
title="Our Shop"
description="All collections available now."
/>
<FooterBaseCard logoText="WatchHub" columns={[]} />
<div id="nav" data-section="nav">
<NavbarStyleCentered navItems={[{ name: "Home", id: "/" }, { name: "Shop", id: "/shop" }, { name: "About Us", id: "/about-us" }, { name: "Contact", id: "/contact" }]} />
</div>
<div id="products" data-section="products">
<ProductCardTwo
gridVariant="four-items-2x2-equal-grid"
animationType="slide-up"
textboxLayout="default"
title="Our Shop"
description="All collections available now."
useInvertedBackground={false}
products={[]}
/>
</div>
<div id="footer" data-section="footer">
<FooterBaseCard logoText="WatchHub" columns={[]} />
</div>
</ReactLenis>
</ThemeProvider>
);