Merge version_3 into main #6

Merged
bender merged 8 commits from version_3 into main 2026-05-18 13:52:39 +00:00
8 changed files with 22 additions and 27 deletions

View File

@@ -6,7 +6,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function AccessoriesPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="reveal-blur" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="solid" primaryButtonStyle="gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[
{ name: "Главная", id: "/" },
@@ -25,6 +25,7 @@ export default function AccessoriesPage() {
gridVariant="uniform-all-items-equal"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
products={[]}
/>
</div>

View File

@@ -6,7 +6,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function ClothesPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="reveal-blur" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="solid" primaryButtonStyle="gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[
{ name: "Главная", id: "/" },
@@ -25,6 +25,7 @@ export default function ClothesPage() {
gridVariant="uniform-all-items-equal"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
products={[]}
/>
</div>

View File

@@ -6,7 +6,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function NewArrivalsPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="reveal-blur" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="solid" primaryButtonStyle="gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[
{ name: "Главная", id: "/" },
@@ -25,6 +25,7 @@ export default function NewArrivalsPage() {
gridVariant="uniform-all-items-equal"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
products={[]}
/>
</div>

View File

@@ -6,7 +6,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function CatalogPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="reveal-blur" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="solid" primaryButtonStyle="gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[
{ name: "Главная", id: "/" },
@@ -25,6 +25,7 @@ export default function CatalogPage() {
gridVariant="uniform-all-items-equal"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
products={[]}
/>
</div>

View File

@@ -6,7 +6,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function SalePage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="reveal-blur" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="solid" primaryButtonStyle="gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[
{ name: "Главная", id: "/" },
@@ -25,6 +25,7 @@ export default function SalePage() {
gridVariant="uniform-all-items-equal"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
products={[]}
/>
</div>

View File

@@ -6,7 +6,7 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
export default function SneakersPage() {
return (
<ThemeProvider>
<ThemeProvider defaultButtonVariant="hover-magnetic" defaultTextAnimation="reveal-blur" borderRadius="pill" contentWidth="medium" sizing="medium" background="none" cardStyle="solid" primaryButtonStyle="gradient" secondaryButtonStyle="solid" headingFontWeight="normal">
<NavbarStyleCentered
navItems={[
{ name: "Главная", id: "/" },
@@ -25,6 +25,7 @@ export default function SneakersPage() {
gridVariant="uniform-all-items-equal"
animationType="slide-up"
textboxLayout="default"
useInvertedBackground={false}
products={[]}
/>
</div>

View File

@@ -24,7 +24,7 @@ export default function ContactsPage() {
<NavbarStyleCentered
navItems={[
{ name: "Главная", id: "/" },
{ name: "Каталог", id: "/" },
{ name: "Каталог", id: "/catalog" },
{ name: "Контакты", id: "/contacts" },
]}
brandName="DARK BOX"
@@ -34,6 +34,8 @@ export default function ContactsPage() {
tag="Связь"
title="Наши контакты"
description="Свяжитесь с нами через Telegram или посетите шоурум в Краснодаре."
background={{ variant: "plain" }}
useInvertedBackground={false}
/>
<FooterLogoEmphasis

View File

@@ -12,7 +12,6 @@ import NavbarStyleCentered from '@/components/navbar/NavbarStyleCentered/NavbarS
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
import SocialProofOne from '@/components/sections/socialProof/SocialProofOne';
import { Briefcase, Watch, Zap } from "lucide-react";
import Link from "next/link";
export default function LandingPage() {
return (
@@ -32,12 +31,12 @@ export default function LandingPage() {
<div id="nav" data-section="nav">
<NavbarStyleCentered
navItems={[
{ name: "Главная", href: "/" },
{ name: "Каталог", href: "/catalog" },
{ name: "Новинки", href: "/new" },
{ name: "Кроссовки", href: "/sneakers" },
{ name: "Одежда", href: "/clothes" },
{ name: "Аксессуары", href: "/accessories" },
{ name: "Главная", id: "/" },
{ name: "Каталог", id: "/catalog" },
{ name: "Новинки", id: "/catalog/new" },
{ name: "Кроссовки", id: "/catalog/sneakers" },
{ name: "Одежда", id: "/catalog/clothes" },
{ name: "Аксессуары", id: "/catalog/accessories" },
]}
brandName="DARK BOX"
/>
@@ -103,18 +102,6 @@ export default function LandingPage() {
/>
</div>
<div id="new" data-section="new">
</div>
<div id="sneakers" data-section="sneakers">
</div>
<div id="clothes" data-section="clothes">
</div>
<div id="accessories" data-section="accessories">
</div>
<div id="catalog" data-section="catalog">
<ProductCardTwo
animationType="slide-up"
@@ -187,7 +174,7 @@ export default function LandingPage() {
<FooterLogoEmphasis
columns={[
{ items: [{ label: "Telegram Канал", href: "https://t.me/darkbox" }, { label: "Администратор", href: "https://t.me/darkbox_admin" }] },
{ items: [{ label: "Адрес: ул. Мира, 44", href: "/contact" }, { label: "Часы работы: 11-21", href: "/contact" }] },
{ items: [{ label: "Адрес: ул. Мира, 44" }, { label: "Часы работы: 11-21" }] },
]}
logoText="DARK BOX"
/>