bender/610e592e-d782-43df-9b9b-adf3d92bffe3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: bender:version_2
Branches Tags
bender:main bender:version_2 bender:version_1
...
pull from: bender:main
Branches Tags
bender:main bender:version_2 bender:version_1

9 Commits
version_2 ... main

Author SHA1 Message Date
bender
9760f45483 Switch to version 1: remove src/app/products/page.tsx 2026-06-03 15:41:52 +00:00
bender
ace1ad17fe Switch to version 1: remove src/app/categories/page.tsx 2026-06-03 15:41:52 +00:00
bender
e1618c40e0 Switch to version 1: modified src/app/page.tsx 2026-06-03 15:41:51 +00:00
bender
66af326f33 Merge version_2 into main 
Merge version_2 into main
 2026-06-03 15:41:27 +00:00
bender
a2141e5225 Merge version_2 into main 
Merge version_2 into main
 2026-06-03 15:40:53 +00:00
bender
f49efd03a0 Merge version_2 into main 
Merge version_2 into main
 2026-06-03 15:40:20 +00:00
bender
1d5d8324dc Merge version_2 into main 
Merge version_2 into main
 2026-06-03 15:39:49 +00:00
bender
e0293dc8ad Merge version_2 into main 
Merge version_2 into main
 2026-06-03 15:39:18 +00:00
bender
fcdab4b449 Merge version_2 into main 
Merge version_2 into main
 2026-06-03 15:38:40 +00:00
3 changed files with 8 additions and 202 deletions
Expand all files Collapse all files

80
src/app/categories/page.tsx
View File

@@ -1,80 +0,0 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import { ThemeProviderProps } from "@/providers/themeProvider/config/types";
import ReactLenis from "lenis/react";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import FooterBase from '@/components/sections/footer/FooterBase';
import HeroBillboard from '@/components/sections/hero/HeroBillboard';
const themeProviderProps: ThemeProviderProps = {
defaultButtonVariant: "shift-hover", defaultTextAnimation: "reveal-blur", borderRadius: "soft", contentWidth: "small", sizing: "mediumLargeSizeMediumTitles", background: "grid", cardStyle: "inset", primaryButtonStyle: "radial-glow", secondaryButtonStyle: "glass", headingFontWeight: "bold"};
const navbarProps = {
navItems: [
{ name: "Bosh sahifa", id: "/" },
{ name: "Biz haqimizda", id: "/about" },
{ name: "Kategoriyalar", id: "/categories" },
{ name: "Mahsulotlar", id: "/products" },
{ name: "Bog'lanish", id: "/contact" },
],
logoSrc: "http://img.b2bpic.net/free-photo/cyber-monday-celebration_23-2151835475.jpg", logoAlt: "Opto Go logo", brandName: "Opto Go"};
const footerProps = {
columns: [
{
title: "Kompaniya", items: [
{ label: "Biz haqimizda", href: "/about" },
{ label: "Bog'lanish", href: "/contact" },
{ label: "Kategoriyalar", href: "/categories" },
{ label: "Mahsulotlar", href: "/products" },
],
},
{
title: "Yordam", items: [
{ label: "FAQ", href: "/faq" },
{ label: "Yetkazib berish", href: "#" },
{ label: "To'lov usullari", href: "#" },
],
},
{
title: "Qonuniy", items: [
{ label: "Maxfiylik siyosati", href: "#" },
{ label: "Xizmat ko'rsatish shartlari", href: "#" },
],
},
],
logoSrc: "http://img.b2bpic.net/free-photo/cyber-monday-celebration_23-2151835475.jpg", logoAlt: "Opto Go logo", logoText: "Opto Go", copyrightText: "© 2024 Opto Go. Barcha huquqlar himoyalangan."};
export default function CategoriesPage() {
return (
<ThemeProvider {...themeProviderProps}>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen {...navbarProps} />
</div>
<div id="hero" data-section="hero">
<HeroBillboard
background={{ variant: "plain" }}
title="Kategoriyalar"
description="Mahsulotlarimizning barcha kategoriyalarini bu yerdan toping. Biz har bir ehtiyoj uchun keng tanlovni taklif etamiz."
imageSrc="https://webuild-dev.s3.eu-north-1.amazonaws.com/users/user_3EPDqOTa7cUDnsssjhuE5lOe8kS/uploaded-1780497630876-tn0tvi1c.png"
imageAlt="Kategoriyalar sahifasi"
mediaAnimation="opacity"
/>
</div>
<div className="container mx-auto px-4 py-16 text-center" id="categories-content" data-section="categories-content">
<h2 className="text-3xl font-bold mb-4">Kategoriyalar tez orada to'ldiriladi!</h2>
<p className="text-lg text-gray-600">Yangi va qiziqarli kategoriyalar ustida ishlamoqdamiz.</p>
</div>
<div id="footer" data-section="footer">
<FooterBase {...footerProps} />
</div>
</ReactLenis>
</ThemeProvider>
);
}

22
src/app/page.tsx
View File

@@ -7,7 +7,7 @@ import FeatureBento from '@/components/sections/feature/FeatureBento';
import FooterBase from '@/components/sections/footer/FooterBase';
import HeroBillboard from '@/components/sections/hero/HeroBillboard';
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
import ProductCardThree from '@/components/sections/product/ProductCardThree';
import TestimonialCardFifteen from '@/components/sections/testimonial/TestimonialCardFifteen';
import { Home, Package, Smartphone, Star, Tag, Utensils } from "lucide-react";
@@ -120,30 +120,24 @@ export default function LandingPage() {
</div>
<div id="products-home" data-section="products-home">
<ProductCardTwo
<ProductCardThree
animationType="slide-up"
textboxLayout="default"
gridVariant="three-columns-all-equal-width"
useInvertedBackground={false}
products={[
{
id: "product-1", brand: "Samsung", name: "Smart TV 55 dyuym", price: "4,500,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/man-playing-space-shooter-game-tv_482257-76104.jpg", imageAlt: "Smart TV 55 dyuym", rating: 4.5, reviewCount: "123"
},
id: "product-1", name: "Smart TV 55 dyuym", price: "4,500,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/man-playing-space-shooter-game-tv_482257-76104.jpg", imageAlt: "Smart TV 55 dyuym"},
{
id: "product-2", brand: "Xiaomi", name: "Ko'p funksiyali multivarka", price: "980,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/view-modern-air-fryer-with-food_23-2151737031.jpg", imageAlt: "Ko'p funksiyali multivarka", rating: 4.0, reviewCount: "89"
},
id: "product-2", name: "Ko'p funksiyali multivarka", price: "980,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/view-modern-air-fryer-with-food_23-2151737031.jpg", imageAlt: "Ko'p funksiyali multivarka"},
{
id: "product-3", brand: "Artel", name: "Oshxona mebeli to'plami", price: "8,800,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/delicious-decorated-cake_23-2151931868.jpg", imageAlt: "Oshxona mebeli", rating: 3.8, reviewCount: "45"
},
id: "product-3", name: "Oshxona mebeli to'plami", price: "8,800,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/delicious-decorated-cake_23-2151931868.jpg", imageAlt: "Oshxona mebeli"},
{
id: "product-4", brand: "LG", name: "Smart TV 65 dyuym", price: "7,200,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/desk-with-chair-tv-hotel-room_23-2149304100.jpg", imageAlt: "Smart TV 65 dyuym", rating: 4.7, reviewCount: "201"
},
id: "product-4", name: "Smart TV 65 dyuym", price: "7,200,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/desk-with-chair-tv-hotel-room_23-2149304100.jpg", imageAlt: "Smart TV 65 dyuym"},
{
id: "product-5", brand: "JBL", name: "Simsiz quloqchinlar", price: "350,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/image-modern-woman-beautiful-girl-enjoys-listening-music-has-black-wireless-headphones-sits_1258-201807.jpg", imageAlt: "Simsiz quloqchinlar", rating: 4.2, reviewCount: "150"
},
id: "product-5", name: "Simsiz quloqchinlar", price: "350,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/image-modern-woman-beautiful-girl-enjoys-listening-music-has-black-wireless-headphones-sits_1258-201807.jpg", imageAlt: "Simsiz quloqchinlar"},
{
id: "product-6", brand: "Canon", name: "Professional kamera", price: "12,000,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/photographer-holding-professional-camera-looks-photos-outdoors_8353-6515.jpg", imageAlt: "Professional kamera", rating: 4.9, reviewCount: "78"
},
id: "product-6", name: "Professional kamera", price: "12,000,000 so'm", imageSrc: "http://img.b2bpic.net/free-photo/photographer-holding-professional-camera-looks-photos-outdoors_8353-6515.jpg", imageAlt: "Professional kamera"},
]}
title="Sotiladigan narsalar"
description="Opto Go'ning keng mahsulotlar assortimentida o'zingizga kerakli narsani toping. Bizda 50 dan ortiq turdagi mahsulotlar mavjud!"

108
src/app/products/page.tsx
View File

@@ -1,108 +0,0 @@
"use client";
import { ThemeProvider } from "@/providers/themeProvider/ThemeProvider";
import ReactLenis from "lenis/react";
import NavbarStyleFullscreen from '@/components/navbar/NavbarStyleFullscreen/NavbarStyleFullscreen';
import FooterBase from '@/components/sections/footer/FooterBase';
import ProductCardTwo from '@/components/sections/product/ProductCardTwo';
const generateProducts = (count: number) => {
const products = [];
for (let i = 1; i <= count; i++) {
products.push({
id: `product-${i}`,
brand: `Brand ${Math.ceil(i / 10)}`,
name: `Ajoyib Mahsulot ${i}`,
price: `${(Math.random() * 500 + 50).toFixed(0)},000 so'm`,
rating: Math.floor(Math.random() * 3) + 3, // Ratings between 3 and 5
reviewCount: `${Math.floor(Math.random() * 200) + 10} ta sharh`,
imageSrc: `http://img.b2bpic.net/free-photo/product-${(i % 10) + 1}.jpg`, // Cycle through 10 generic product images
imageAlt: `Ajoyib Mahsulot ${i} tasviri`,
});
}
return products;
};
const allProducts = generateProducts(55); // 50+ products
export default function ProductsPage() {
const navItems = [
{ name: "Bosh sahifa", id: "/" },
{ name: "Biz haqimizda", id: "/about" },
{ name: "Katalog", id: "/catalog" },
{ name: "Mahsulotlar", id: "/products" }, // Link to this page
{ name: "Bog'lanish", id: "/contact" },
];
const footerColumns = [
{
title: "Kompaniya", items: [
{ label: "Biz haqimizda", href: "/about" },
{ label: "Bog'lanish", href: "/contact" },
{ label: "Katalog", href: "/catalog" },
{ label: "Mahsulotlar", href: "/products" },
],
},
{
title: "Yordam", items: [
{ label: "FAQ", href: "/faq" },
{ label: "Yetkazib berish", href: "#" },
{ label: "To'lov usullari", href: "#" },
],
},
{
title: "Qonuniy", items: [
{ label: "Maxfiylik siyosati", href: "#" },
{ label: "Xizmat ko'rsatish shartlari", href: "#" },
],
},
];
return (
<ThemeProvider
defaultButtonVariant="shift-hover"
defaultTextAnimation="reveal-blur"
borderRadius="soft"
contentWidth="small"
sizing="mediumLargeSizeMediumTitles"
background="grid"
cardStyle="inset"
primaryButtonStyle="radial-glow"
secondaryButtonStyle="glass"
headingFontWeight="bold"
>
<ReactLenis root>
<div id="nav" data-section="nav">
<NavbarStyleFullscreen
navItems={navItems}
logoSrc="http://img.b2bpic.net/free-photo/cyber-monday-celebration_23-2151835475.jpg"
logoAlt="Opto Go logo"
brandName="Opto Go"
/>
</div>
<div id="products-catalog" data-section="products-catalog">
<ProductCardTwo
animationType="slide-up"
textboxLayout="default"
gridVariant="four-items-2x2-equal-grid"
useInvertedBackground={false}
title="Bizning Mahsulotlar Katalogimiz"
description="Opto Go'ning keng mahsulotlar assortimentida o'zingizga kerakli narsani toping. Bizda 50 dan ortiq turdagi mahsulotlar mavjud!"
products={allProducts}
/>
</div>
<div id="footer" data-section="footer">
<FooterBase
columns={footerColumns}
logoSrc="http://img.b2bpic.net/free-photo/cyber-monday-celebration_23-2151835475.jpg"
logoAlt="Opto Go logo"
logoText="Opto Go"
copyrightText="© 2024 Opto Go. Barcha huquqlar himoyalangan."
/>
</div>
</ReactLenis>
</ThemeProvider>
);
}