Merge version_4 into main #6

Merged
bender merged 5 commits from version_4 into main 2026-06-09 08:16:56 +00:00
5 changed files with 15 additions and 14 deletions

View File

@@ -11,11 +11,10 @@ import { Handshake } from 'lucide-react';
export default function AboutPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About Us", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" },
{ name: "Cart", id: "/cart" },
{ name: "Cart", id: "/cart" }
];
const footerColumns = [
@@ -54,8 +53,8 @@ export default function AboutPage() {
defaultTextAnimation="reveal-blur"
borderRadius="soft"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="circleGradient"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="glass-elevated"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
@@ -130,4 +129,4 @@ export default function AboutPage() {
</div>
</ThemeProvider>
);
}
}

View File

@@ -14,7 +14,7 @@ export default function AccountPage() {
];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="large" background="aurora" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleApple navItems={navItems} brandName="SoleCrafters" />
<main>
<div id="account-management" data-section="account-management">

View File

@@ -14,7 +14,7 @@ export default function AuthPage() {
];
return (
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="medium" background="circleGradient" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<ThemeProvider defaultButtonVariant="text-stagger" defaultTextAnimation="entrance-slide" borderRadius="rounded" contentWidth="medium" sizing="large" background="aurora" cardStyle="glass-elevated" primaryButtonStyle="gradient" secondaryButtonStyle="glass" headingFontWeight="normal">
<NavbarStyleApple navItems={navItems} brandName="SoleCrafters" />
<main>
<div id="authentication" data-section="authentication">

View File

@@ -8,8 +8,11 @@ import FooterMedia from "@/components/sections/footer/FooterMedia";
import Link from "next/link";
const navItems = [
{ name: "Home", id: "/" },
{ name: "About Us", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" }
{ name: "Contact", id: "/contact" },
{ name: "Cart", id: "/cart" }
];
const footerNavColumns = [
@@ -40,8 +43,8 @@ export default function BlogPage() {
defaultTextAnimation="reveal-blur"
borderRadius="soft"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="circleGradient"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="glass-elevated"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"

View File

@@ -10,7 +10,6 @@ import Link from "next/link";
export default function CartPage() {
const navItems = [
{ name: "Home", id: "/" },
{ name: "Shop", id: "/shop" },
{ name: "About Us", id: "/about" },
{ name: "Blog", id: "/blog" },
{ name: "Contact", id: "/contact" },
@@ -53,8 +52,8 @@ export default function CartPage() {
defaultTextAnimation="reveal-blur"
borderRadius="soft"
contentWidth="mediumSmall"
sizing="mediumSizeLargeTitles"
background="circleGradient"
sizing="largeSizeMediumTitles"
background="aurora"
cardStyle="glass-elevated"
primaryButtonStyle="diagonal-gradient"
secondaryButtonStyle="layered"
@@ -128,4 +127,4 @@ export default function CartPage() {
/>
</ThemeProvider>
);
}
}