@@ -203,83 +242,94 @@ const ProductDetail = () => {
{/* Product Info */}
- {product.name}
+ {data?.name}
{/* Rating */}
-
+ {/*
{[...Array(5)].map((_, i) => (
-
{product.rating}
-
+
{products.rating}
+
*/}
{/* Price */}
- {product.price.toLocaleString()} {"so'm"}
+ {data && formatPrice(data.price, true)}
- {product.oldPrice && (
+ {/* {products.oldPrice && (
- {product.oldPrice.toLocaleString()} {"so'm"}
+ {products.oldPrice.toLocaleString()} {"so'm"}
- )}
+ )} */}
{/* Description */}
-
{product.description}
+
{data?.description}
{/* Brand and Category */}
-
+ {/*
Brand:
-
{product.brand}
+
{products.brand}
Kategoriya:
-
{product.category}
+
{products.category}
-
+
*/}
{/* Quantity Selector */}
- Miqdor:
+ {t('Miqdor')}:
handleQuantityChange('decrease')}
- className="p-3 hover:bg-gray-100 transition"
+ className="p-3 hover:bg-gray-100 transition rounded-lg"
disabled={quantity <= 1}
>
-
- {quantity}
-
+
{
+ const v = e.target.value;
+
+ if (!/^\d*$/.test(v)) return;
+
+ const num = Number(v);
+
+ setQuantity(num);
+ }}
+ inputMode="numeric"
+ className="w-14 h-12 border-none text-center text-sm !p-0 focus-visible:ring-0"
+ />
handleQuantityChange('increase')}
- className="p-3 hover:bg-gray-100 transition"
+ className="p-3 hover:bg-gray-100 transition rounded-lg"
>
- Jami:{' '}
+ {t('Jami')}:{' '}
- {(product.price * quantity).toLocaleString()} {"so'm"}
+ {data && formatPrice(data.price * quantity, true)}
@@ -288,49 +338,74 @@ const ProductDetail = () => {
{/* Action Buttons */}
{
+ e.stopPropagation();
+ const cart = cartItems?.data.cart_item.find(
+ (e) => e.product_id === data?.id,
+ );
+ console.log(cart);
+
+ if (cart && data) {
+ updateCartItem({
+ body: {
+ quantity: quantity,
+ },
+ cart_item_id: cart.id,
+ });
+ } else if (!cart && data) {
+ mutate({
+ product: data.id,
+ cart: cart_id!,
+ quantity: quantity,
+ });
+ }
+ }}
+ className={`flex-1 py-4 rounded-lg cursor-pointer font-semibold text-white flex items-center justify-center gap-2 transition ${'bg-green-600 hover:bg-green-700'}`}
>
setLiked(!liked)}
+ onClick={() => {
+ if (product) {
+ favouriteMutation.mutate(product.toString());
+ }
+ }}
+ disabled={favouriteMutation.isPending}
className={`p-4 rounded-lg border-2 transition ${
- liked
+ data?.liked
? 'border-red-500 bg-red-50'
: 'border-gray-300 hover:border-red-500'
}`}
>
{/* Features */}
-
+
- Bepul yetkazib berish
+ {t('Bepul yetkazib berish')}
Kafolat
+ {t('Kafolat')}
-
+ {/*
14 kun qaytarish
-
+
*/}
@@ -338,37 +413,72 @@ const ProductDetail = () => {
{/* Specifications */}
-
Xususiyatlari
+
{t('Xususiyatlari')}
- {Object.entries(product.specifications).map(([key, value]) => (
-
-
{key}:
-
{value}
+
+ {t('Qadoq turi')}:
+
+ {data?.unity.name}
+
+
+ {data?.brand && (
+
+ {t('Brandi')}:
+ {data?.brand}
- ))}
+ )}
+ {data?.manufacturer && (
+
+
+ {t('Ishlab chiqaruvchi')}:
+
+
+ {data?.manufacturer}
+
+
+ )}
+ {data?.volume && (
+
+ {t('Hajmi')}:
+ {data?.volume}
+
+ )}
{/* Related Products */}
-
{"O'xshash mahsulotlar"}
+
+ {t("O'xshash mahsulotlar")}
+
- {relatedProducts.slice(0, 12).map((product) => (
-
-
- ))}
+ {proLoad &&
+ Array.from({ length: 6 }).map((__, index) => (
+
+
+
+
+ ))}
+ {recomendation &&
+ !proLoad &&
+ recomendation
+ .filter((product) => product.is_active)
+ .map((product) => (
+
+
+ ))}
> {
+ const res = await httpClient.get(API_URLS.OrderList, { params });
+ return res;
+ },
+};
diff --git a/src/features/profile/ui/History.tsx b/src/features/profile/ui/History.tsx
index 6d39577..9a1afc5 100644
--- a/src/features/profile/ui/History.tsx
+++ b/src/features/profile/ui/History.tsx
@@ -1,46 +1,29 @@
import { Button } from '@/shared/ui/button';
import { Card, CardContent } from '@/shared/ui/card';
-import { Tabs, TabsList, TabsTrigger } from '@/shared/ui/tabs';
+import { useQuery } from '@tanstack/react-query';
import { Calendar, CheckCircle, Clock, RefreshCw } from 'lucide-react';
+import { useTranslations } from 'next-intl';
import Image from 'next/image';
-import { useState } from 'react';
+import { order_api } from '../lib/api';
import { orders } from '../lib/data';
const HistoryTabs = () => {
- const [historyTab, setHistoryTab] = useState('all');
+ const t = useTranslations();
+
+ const { data } = useQuery({
+ queryKey: ['order_list'],
+ queryFn: () => order_api.list({ page: 1, page_size: 1 }),
+ });
+
+ console.log(data);
return (
<>
-
Tarix
+
+ {t('Tarix')}
+
-
-
-
- Barchasi
-
-
- Bu hafta
-
-
- Bu oy
-
-
-
-
{orders
.filter((o) => o.status === 'delivered')
@@ -100,7 +83,7 @@ const HistoryTabs = () => {
className="bg-transparent gap-1 md:gap-2 text-xs md:text-sm h-8 md:h-9 px-2 md:px-3"
>
diff --git a/src/features/profile/ui/Orders.tsx b/src/features/profile/ui/Orders.tsx
index 93e5c57..58f1dc5 100644
--- a/src/features/profile/ui/Orders.tsx
+++ b/src/features/profile/ui/Orders.tsx
@@ -2,12 +2,14 @@ import { Badge } from '@/shared/ui/badge';
import { Card, CardContent } from '@/shared/ui/card';
import { Tabs, TabsList, TabsTrigger } from '@/shared/ui/tabs';
import { CheckCircle, MapPin, Package, Truck } from 'lucide-react';
+import { useTranslations } from 'next-intl';
import Image from 'next/image';
import { useState } from 'react';
import { orders } from '../lib/data';
const Orders = () => {
const [ordersTab, setOrdersTab] = useState('active');
+ const t = useTranslations();
const getStatusInfo = (status: string) => {
const statusMap: Record<
@@ -61,7 +63,7 @@ const Orders = () => {
- Buyurtmalar
+ {t('Buyurtmalar')}
@@ -75,19 +77,21 @@ const Orders = () => {
value="active"
className="data-[state=active]:bg-white text-xs md:text-sm py-2"
>
- Faol ({orders.filter((o) => o.status !== 'delivered').length})
+ {t('Faol')} ({orders.filter((o) => o.status !== 'delivered').length}
+ )
- Tugadi ({orders.filter((o) => o.status === 'delivered').length})
+ {t('Tugadi')} (
+ {orders.filter((o) => o.status === 'delivered').length})
- Barcha ({orders.length})
+ {t('Barchasi')} ({orders.length})
@@ -128,7 +132,7 @@ const Orders = () => {
- {statusInfo.text}
+ {t(statusInfo.text)}
@@ -168,7 +172,8 @@ const Orders = () => {
{"so'm"}
- Yetkazish: {order.deliveryFee.toLocaleString()} {"so'm"}
+ {t('Yetkazish')}: {order.deliveryFee.toLocaleString()}{' '}
+ {"so'm"}
diff --git a/src/features/profile/ui/Profile.tsx b/src/features/profile/ui/Profile.tsx
index 2398082..d798134 100644
--- a/src/features/profile/ui/Profile.tsx
+++ b/src/features/profile/ui/Profile.tsx
@@ -1,264 +1,34 @@
'use client';
-import { PartnershipForm } from '@/features/about/ui/AboutPage';
-import Faq from '@/features/faq/ui/Faq';
-import Favourite from '@/features/favourite/ui/Favourite';
import { useRouter } from '@/shared/config/i18n/navigation';
+import { getMe, removeToken } from '@/shared/lib/token';
import { Avatar, AvatarFallback, AvatarImage } from '@/shared/ui/avatar';
-import { Badge } from '@/shared/ui/badge';
import { Button } from '@/shared/ui/button';
-import { Card, CardContent } from '@/shared/ui/card';
-import {
- CheckCircle,
- ChevronRight,
- History,
- Home,
- LogOut,
- MapPin,
- Package,
- RefreshCw,
- ShoppingBag,
- Truck,
-} from 'lucide-react';
+import { useQueryClient } from '@tanstack/react-query';
+import { Headset, Home, LogOut } from 'lucide-react';
+import { useTranslations } from 'next-intl';
import { useState } from 'react';
-import { orders, user } from '../lib/data';
import HistoryTabs from './History';
-import Orders from './Orders';
-import CustomerSupport from './Support';
const Profile = () => {
const [activeSection, setActiveSection] = useState('overview');
const router = useRouter();
-
- const getStatusInfo = (status: string) => {
- const statusMap: Record<
- string,
- { text: string; color: string; bgColor: string }
- > = {
- inTransit: {
- text: "Yo'lda",
- color: 'text-blue-600',
- bgColor: 'bg-blue-100',
- },
- atPickup: {
- text: 'Punktda',
- color: 'text-amber-600',
- bgColor: 'bg-amber-100',
- },
- delivered: {
- text: 'Yetkazildi',
- color: 'text-emerald-600',
- bgColor: 'bg-emerald-100',
- },
- cancelled: {
- text: 'Bekor qilindi',
- color: 'text-red-600',
- bgColor: 'bg-red-100',
- },
- };
- return (
- statusMap[status] || {
- text: status,
- color: 'text-muted-foreground',
- bgColor: 'bg-muted',
- }
- );
- };
-
- const getStatusIcon = (status: string) => {
- switch (status) {
- case 'inTransit':
- return
;
- case 'atPickup':
- return
;
- case 'delivered':
- return
;
- default:
- return
;
- }
- };
+ const t = useTranslations();
+ const queryClient = useQueryClient();
+ const user = getMe();
const menuItems = [
{ id: 'overview', label: 'Umumiy', icon: Home },
- { id: 'orders', label: 'Buyurtmalar', icon: ShoppingBag },
- { id: 'history', label: 'Tarix', icon: History },
+ { id: 'support', label: "Qo'llab-quvatlash", icon: Headset },
];
const renderContent = () => {
switch (activeSection) {
- case 'orders':
- return
;
-
- case 'history':
- return
;
-
- case 'favorites':
- return
;
-
- case 'agency':
- return
;
-
- case 'faq':
- return
;
case 'support':
- return
;
+ router.push('https://t.me/web_app_0515_bot');
default:
- return (
- <>
- {/* Active Orders Section */}
-
-
-
- Faol buyurtmalar
-
- setActiveSection('orders')}
- >
- Barchasi
-
-
-
-
- {orders
- .filter((o) => o.status !== 'delivered')
- .slice(0, 2)
- .map((order) => {
- const statusInfo = getStatusInfo(order.status);
- return (
-
-
-
-
-
-
- {getStatusIcon(order.status)}
-
-
-
-
- {order.id}
-
-
- {order.date} • {order.time}
-
-
-
-
- {statusInfo.text}
-
-
- {order.items.map((item, idx) => (
-
- {item.name} ×{item.quantity}
-
- ))}
-
-
-
-
- {order.address}
-
-
- {(
- order.total + order.deliveryFee
- ).toLocaleString()}{' '}
- {"so'm"}
-
-
-
- );
- })}
-
-
-
- {/* Order History */}
-
-
-
- Buyurtmalar tarixi
-
- setActiveSection('history')}
- >
- Barchasi{' '}
-
-
-
-
- {orders
- .filter((o) => o.status === 'delivered')
- .slice(0, 2)
- .map((order) => (
-
-
-
-
-
-
-
-
- {order.id}
-
-
- {order.items.map((i) => i.name).join(', ')}
-
-
-
-
-
- {(
- order.total + order.deliveryFee
- ).toLocaleString()}
-
-
- {order.date}
-
-
-
-
-
-
-
-
- ))}
-
-
-
- );
+ return
;
}
};
@@ -279,7 +49,7 @@ const Profile = () => {
}`}
>
- {item.label}
+ {t(item.label)}
);
})}
@@ -289,20 +59,18 @@ const Profile = () => {
{/* Desktop Sidebar - hidden on mobile */}
-
+
-
- U
+
+ {user?.slice(0, 1).toUpperCase()}
-
{user.phone}
+
+ {user && user.charAt(0).toUpperCase() + user.slice(1)}
+
@@ -319,7 +87,7 @@ const Profile = () => {
}`}
>
- {item.label}
+ {t(item.label)}
))}
@@ -328,13 +96,16 @@ const Profile = () => {
{
- localStorage.removeItem('user');
+ queryClient.refetchQueries({ queryKey: ['product_list'] });
+ queryClient.refetchQueries({ queryKey: ['favourite_product'] });
+ queryClient.refetchQueries({ queryKey: ['search'] });
+ removeToken();
router.push('/');
}}
className="w-full justify-start gap-3 text-red-500 hover:text-red-600 hover:bg-red-50 mt-4"
>
@@ -343,17 +114,14 @@ const Profile = () => {
-
- U
+
+ {user?.slice(0, 1).toUpperCase()}
-
- {user.phone}
+
+ {user && user.charAt(0).toUpperCase() + user.slice(1)}
@@ -361,7 +129,12 @@ const Profile = () => {
variant="ghost"
size="icon"
onClick={() => {
- localStorage.removeItem('user');
+ queryClient.refetchQueries({ queryKey: ['product_list'] });
+ queryClient.refetchQueries({
+ queryKey: ['favourite_product'],
+ });
+ queryClient.refetchQueries({ queryKey: ['search'] });
+ removeToken();
router.push('/');
}}
className="w-9 h-9 md:w-10 md:h-10"
diff --git a/src/features/profile/ui/Support.tsx b/src/features/profile/ui/Support.tsx
index d138932..1c3e5b2 100644
--- a/src/features/profile/ui/Support.tsx
+++ b/src/features/profile/ui/Support.tsx
@@ -41,7 +41,6 @@ export default function CustomerSupport() {
}
const category = categories.find((c) => c.id === selectedCategory);
-
if (!category) {
alert('Kategoriya topilmadi');
return;
@@ -49,19 +48,27 @@ export default function CustomerSupport() {
const telegramText = `🔔 Yangi murojaat\n\n📋 Kategoriya: ${category.title}\n\n💬 Xabar:\n${message}`;
- const telegramUsername = 'web_app_0515_bot';
- const telegramUrl = `https://t.me/${telegramUsername}?text=${encodeURIComponent(
+ // Foydalanuvchi ID sini oling (masalan, auth orqali)
+ const userId = '6487794662'; // <-- bu yerda dinamik ID bo'lishi kerak
+
+ // Telegram link bot orqali yuborish
+ const botToken = 'web_app_0515_bot';
+ const telegramUrl = `https://api.telegram.org/bot${botToken}/sendMessage?chat_id=${userId}&text=${encodeURIComponent(
telegramText,
)}`;
- window.open(telegramUrl, '_blank');
-
- setShowSuccess(true);
- setTimeout(() => {
- setShowSuccess(false);
- setSelectedCategory('');
- setMessage('');
- }, 3000);
+ fetch(telegramUrl)
+ .then(() => {
+ setShowSuccess(true);
+ setTimeout(() => {
+ setShowSuccess(false);
+ setSelectedCategory('');
+ setMessage('');
+ }, 3000);
+ })
+ .catch(() => {
+ alert('Xabar yuborishda xatolik yuz berdi');
+ });
};
return (
diff --git a/src/features/search/ui/Search.tsx b/src/features/search/ui/Search.tsx
index b81198e..828817b 100644
--- a/src/features/search/ui/Search.tsx
+++ b/src/features/search/ui/Search.tsx
@@ -1,110 +1,85 @@
'use client';
-import { Input } from '@/shared/ui/input';
+import { product_api } from '@/shared/config/api/product/api';
import {
- categories,
- Product,
- ProductDetail,
-} from '@/widgets/categories/lib/data';
+ ProductListResult,
+ SearchDataPro,
+} from '@/shared/config/api/product/type';
+import { useRouter } from '@/shared/config/i18n/navigation';
+import { Input } from '@/shared/ui/input';
import { ProductCard } from '@/widgets/categories/ui/product-card';
+import { useQuery } from '@tanstack/react-query';
import { Search, X } from 'lucide-react';
-import { useRouter, useSearchParams } from 'next/navigation';
-import { useEffect, useMemo, useState } from 'react';
+import { useTranslations } from 'next-intl';
+import { useSearchParams } from 'next/navigation';
+import { useEffect, useState } from 'react';
-const SearchResult: React.FC = () => {
+const SearchResult = () => {
const router = useRouter();
+ const t = useTranslations();
const searchParams = useSearchParams();
+ const query = searchParams.get('q') || '';
+ const [searchRes, setSearchRes] = useState<
+ ProductListResult[] | SearchDataPro[] | []
+ >([]);
- const queryFromUrl = searchParams.get('q') ?? '';
+ const { data: product } = useQuery({
+ queryKey: ['product_list'],
+ queryFn: () => product_api.list({ page: 1, page_size: 12 }),
+ select(data) {
+ return data.data.results;
+ },
+ });
- const [query, setQuery] = useState(queryFromUrl);
- const [loading, setLoading] = useState(false);
- const [results, setResults] = useState
([]);
-
- const allProducts = useMemo(() => {
- return categories.flatMap((category: Product) =>
- category.products.map((product) => ({
- ...product,
- categoryName: category.name,
- })),
- );
- }, []);
-
- const recommendedProducts = useMemo(() => {
- return allProducts.filter((product) => product.rating >= 4.5).slice(0, 8);
- }, [allProducts]);
-
- const handleSearch = (searchQuery: string) => {
- if (!searchQuery.trim()) return;
-
- setLoading(true);
- router.push(`/search?q=${encodeURIComponent(searchQuery)}`);
-
- setTimeout(() => {
- const filtered = allProducts.filter(
- (product) =>
- product.name.toLowerCase().includes(searchQuery.toLowerCase()) ||
- product.categoryName
- ?.toLowerCase()
- .includes(searchQuery.toLowerCase()),
- );
-
- setResults(filtered);
- setLoading(false);
- }, 300);
- };
+ const { data, isLoading } = useQuery({
+ queryKey: ['search', query],
+ queryFn: () => product_api.search({ search: query, page: 1, page_szie: 5 }),
+ select(data) {
+ return data.data.products;
+ },
+ enabled: !!query,
+ });
useEffect(() => {
- if (queryFromUrl) {
- handleSearch(queryFromUrl);
+ if (data) {
+ setSearchRes(data);
+ } else if (query.length === 0 && product && product.length > 0) {
+ setSearchRes(product);
+ } else {
+ setSearchRes([]);
}
- }, [queryFromUrl]);
+ }, [product, data]);
+
+ const handleSearch = (value: string) => {
+ if (!value.trim()) {
+ router.push('/search');
+ return;
+ }
+ router.push(`/search?q=${encodeURIComponent(value)}`);
+ };
const clearSearch = () => {
- setQuery('');
- setResults([]);
router.push('/search');
};
- const handleRemove = (id: number) => {
- setResults((prev) =>
- prev.map((product) =>
- product.id === id ? { ...product, liked: false } : product,
- ),
- );
- };
-
- const handleLiked = (id: number) => {
- setResults((prev) =>
- prev.map((product) =>
- product.id === id ? { ...product, liked: true } : product,
- ),
- );
- };
-
return (
-
-
+
+ {/* Search input (mobile) */}
+
-
- {loading ? (
-
Yuklanmoqda...
- ) : query ? (
- results.length ? (
-
- {results.map((product) => (
-
- ))}
-
- ) : (
-
Natija topilmadi
- )
- ) : (
-
-
- Tavsiya etilgan mahsulotlar
-
-
-
- {recommendedProducts.map((product) => (
-
- ))}
-
-
- )}
-
+ {isLoading ? (
+
{t('Yuklanmoqda')}
+ ) : searchRes && searchRes.length > 0 ? (
+
+ {searchRes
+ .filter((product) => product.is_active)
+ .map((product) => (
+
+ ))}
+
+ ) : (
+
{t('Natija topilmadi')}
+ )}
);
};
diff --git a/src/shared/config/api/URLs.ts b/src/shared/config/api/URLs.ts
index da7306a..81084cc 100644
--- a/src/shared/config/api/URLs.ts
+++ b/src/shared/config/api/URLs.ts
@@ -1,6 +1,24 @@
-const BASE_URL =
- process.env.NEXT_PUBLIC_API_URL || 'https://jsonplaceholder.typicode.com';
+export const BASE_URL =
+ process.env.NEXT_PUBLIC_API_URL || 'https://api.gastro.felixits.uz';
-const ENDP_POSTS = '/posts/';
+export const API_V = '/api/v1/';
-export { BASE_URL, ENDP_POSTS };
+export const API_URLS = {
+ Banner: `${API_V}shared/banner/list/`,
+ Category: `${API_V}products/category/list/`,
+ Product: `${API_V}products/product/`,
+ Login: `${API_V}accounts/login/`,
+ Search_Product: `${API_V}products/search/`,
+ Favourite: (product_id: string) => `${API_V}accounts/${product_id}/like/`,
+ FavouriteProduct: `${API_V}accounts/liked_products/`,
+ Partners: `${API_V}accounts/questionnaire/send/`,
+ Faq: `${API_V}shared/faq/list/`,
+ CartCrate: `${API_V}orders/cart/create/`,
+ CartItem: `${API_V}orders/cart-item/create/`,
+ CartClear: (id: number | string) => `${API_V}orders/cart/${id}/clear/`,
+ CartItemList: (id: string) => `${API_V}orders/cart/${id}/`,
+ CartItemUpdate: (id: string) => `${API_V}orders/cart-item/${id}/update/`,
+ CartItemDelete: (id: string) => `${API_V}orders/cart-item/${id}/delete/`,
+ CreateOrder: `${API_V}orders/order/create/`,
+ OrderList: `${API_V}orders/order/list/`,
+};
diff --git a/src/shared/config/api/category/api.ts b/src/shared/config/api/category/api.ts
new file mode 100644
index 0000000..ccebcda
--- /dev/null
+++ b/src/shared/config/api/category/api.ts
@@ -0,0 +1,14 @@
+import { AxiosResponse } from 'axios';
+import httpClient from '../httpClient';
+import { API_URLS } from '../URLs';
+import { Category } from './type';
+
+export const category_api = {
+ async getCategory(params: {
+ page: number;
+ page_size: number;
+ }): Promise
> {
+ const res = await httpClient.get(API_URLS.Category, { params });
+ return res;
+ },
+};
diff --git a/src/shared/config/api/category/type.ts b/src/shared/config/api/category/type.ts
new file mode 100644
index 0000000..45b1fa6
--- /dev/null
+++ b/src/shared/config/api/category/type.ts
@@ -0,0 +1,15 @@
+export interface Category {
+ total: number;
+ page: number;
+ page_size: number;
+ total_pages: number;
+ has_next: boolean;
+ has_previous: boolean;
+ results: CategoryResult[];
+}
+
+export interface CategoryResult {
+ id: string;
+ name: string;
+ image: string;
+}
diff --git a/src/shared/config/api/httpClient.ts b/src/shared/config/api/httpClient.ts
index f32e25e..1da7141 100644
--- a/src/shared/config/api/httpClient.ts
+++ b/src/shared/config/api/httpClient.ts
@@ -1,5 +1,6 @@
import getLocaleCS from '@/shared/lib/getLocaleCS';
-import axios from 'axios';
+import { getToken, removeToken } from '@/shared/lib/token';
+import axios, { AxiosError } from 'axios';
import { getLocale } from 'next-intl/server';
import { LanguageRoutes } from '../i18n/types';
import { BASE_URL } from './URLs';
@@ -20,10 +21,10 @@ httpClient.interceptors.request.use(
}
config.headers['Accept-Language'] = language;
- // const accessToken = localStorage.getItem('accessToken');
- // if (accessToken) {
- // config.headers['Authorization'] = `Bearer ${accessToken}`;
- // }
+ const accessToken = getToken();
+ if (accessToken) {
+ config.headers['Authorization'] = `Bearer ${accessToken}`;
+ }
return config;
},
@@ -34,6 +35,11 @@ httpClient.interceptors.response.use(
(response) => response,
(error) => {
console.error('API error:', error);
+ if ((error as AxiosError)?.status === 403) {
+ removeToken();
+ } else if ((error as AxiosError)?.status === 401) {
+ removeToken();
+ }
return Promise.reject(error);
},
);
diff --git a/src/shared/config/api/order/api.ts b/src/shared/config/api/order/api.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/shared/config/api/order/type.ts b/src/shared/config/api/order/type.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/shared/config/api/product/api.ts b/src/shared/config/api/product/api.ts
new file mode 100644
index 0000000..fd2abde
--- /dev/null
+++ b/src/shared/config/api/product/api.ts
@@ -0,0 +1,60 @@
+import httpClient from '@/shared/config/api/httpClient';
+import { API_URLS } from '@/shared/config/api/URLs';
+import { AxiosResponse } from 'axios';
+import {
+ FavouriteProduct,
+ ProductDetail,
+ ProductList,
+ SearchData,
+} from './type';
+
+export const product_api = {
+ async list(params: {
+ page: number;
+ page_size: number;
+ }): Promise> {
+ const res = await httpClient.get(`${API_URLS.Product}list/`, { params });
+ return res;
+ },
+
+ async listGetCategoryId({
+ params,
+ category_id,
+ }: {
+ params: {
+ page: number;
+ page_size: number;
+ };
+ category_id: string;
+ }): Promise> {
+ const res = await httpClient.get(
+ `${API_URLS.Product}${category_id}/list/`,
+ { params },
+ );
+ return res;
+ },
+
+ async detail(id: string): Promise> {
+ const res = await httpClient.get(`${API_URLS.Product}${id}`);
+ return res;
+ },
+
+ async search(params: {
+ search?: string;
+ page?: number;
+ page_szie?: number;
+ }): Promise> {
+ const res = await httpClient.get(`${API_URLS.Search_Product}`, { params });
+ return res;
+ },
+
+ async favourite(product_id: string) {
+ const res = await httpClient.get(API_URLS.Favourite(product_id));
+ return res;
+ },
+
+ async favouuriteProduct(): Promise> {
+ const res = await httpClient.get(API_URLS.FavouriteProduct);
+ return res;
+ },
+};
diff --git a/src/shared/config/api/product/type.ts b/src/shared/config/api/product/type.ts
new file mode 100644
index 0000000..d6af768
--- /dev/null
+++ b/src/shared/config/api/product/type.ts
@@ -0,0 +1,98 @@
+export interface ProductList {
+ total: number;
+ page: number;
+ page_size: number;
+ total_pages: number;
+ has_next: boolean;
+ has_previous: boolean;
+ results: ProductListResult[];
+}
+
+export interface ProductListResult {
+ id: string;
+ name: string;
+ image: string;
+ price: number;
+ description: string;
+ liked: boolean;
+ unity: {
+ id: string;
+ name: string;
+ };
+ min_quantity: number;
+ is_active: boolean;
+}
+
+export interface ProductDetail {
+ brand: string;
+ description: string;
+ expires_date: null | string;
+ id: string;
+ image: string;
+ images: {
+ id: string;
+ image: string;
+ }[];
+ is_active: boolean;
+ liked: boolean;
+ manufacturer: string;
+ min_quantity: number;
+ name: string;
+ price: number;
+ return_date: null | string;
+ volume: string;
+ unity: {
+ id: string;
+ name: string;
+ };
+}
+
+export interface SearchData {
+ products: SearchDataPro[];
+}
+
+export interface SearchDataPro {
+ id: string;
+ name: string;
+ image: string;
+ price: number;
+ description: string;
+ liked: boolean;
+ unity: {
+ id: string;
+ name: string;
+ };
+ min_quantity: number;
+ is_active: boolean;
+}
+
+export interface FavouriteProduct {
+ total: number;
+ page: number;
+ page_size: number;
+ total_pages: number;
+ has_next: boolean;
+ has_previous: boolean;
+ results: FavouriteProductRes[];
+}
+
+export interface FavouriteProductRes {
+ id: string;
+ name: string;
+ image: string;
+ price: number;
+ description: string;
+ unity: {
+ id: string;
+ name: string;
+ };
+ min_quantity: number;
+ is_active: boolean;
+ liked: boolean;
+ brand: null | string;
+ return_date: null | string;
+ expires_date: null | string;
+ manufacturer: null | string;
+ volume: null | string;
+ images: { id: string; image: string }[];
+}
diff --git a/src/shared/config/api/testApi.ts b/src/shared/config/api/testApi.ts
index 8cf23ad..e69de29 100644
--- a/src/shared/config/api/testApi.ts
+++ b/src/shared/config/api/testApi.ts
@@ -1,14 +0,0 @@
-import { ENDP_POSTS } from '@/shared/config/api/URLs';
-import { ReqWithPagination } from './types';
-import { AxiosResponse } from 'axios';
-import { TestApiType } from '@/shared/types/testApi';
-import httpClient from './httpClient';
-
-const getPosts = async (
- pagination?: ReqWithPagination,
-): Promise> => {
- const response = await httpClient.get(ENDP_POSTS, { params: pagination });
- return response;
-};
-
-export { getPosts };
diff --git a/src/shared/config/i18n/messages/ru.json b/src/shared/config/i18n/messages/ru.json
index aa28955..c956ef4 100644
--- a/src/shared/config/i18n/messages/ru.json
+++ b/src/shared/config/i18n/messages/ru.json
@@ -1,6 +1,196 @@
{
- "HomePage": {
- "title": "Hello world!",
- "about": "Go to the about page"
- }
+ "Biz haqimizda": "О нас",
+ "Maxfiylik siyosati": "Политика конфиденциальности",
+ "Savol-javob": "Вопросы и ответы",
+ "Sahifalar": "Страницы",
+ "Biz bilan bog'laning": "Свяжитесь с нами",
+ "Русский": "Русский",
+ "O'zbekcha": "Узбекский",
+ "Mahsulot nomi": "Название продукта",
+ "Tizimga kirilmagan": "Нет входа в систему",
+ "Mahsulotni yuklab bo‘lmadi": "Не удалось загрузить товар. Попробуйте ещё раз.",
+ "Savatga": "В корзину",
+ "Kategoriyalar": "Категории",
+ "Gastronomiya va kulinariya san'ati haqidagi yetakchi onlayn magazin": "Ведущий интернет-магазин по гастрономии и кулинарному искусству",
+ "Bizning maqsadimiz": "Наша цель",
+ "Sifatli Kontent": "Качественный контент",
+ "Jahon oshpazlik san'ati va zamonaviy gastronomiya tendentsiyalari haqida chuqur maqolalar va tahlillar": "Углубленные статьи и анализы о мировом кулинарном искусстве и современных гастрономических тенденциях.",
+ "Professional Jamoa": "Профессиональная команда",
+ "Tajribali kulinariya mutaxassislari va oshpazlar tomonidan tayyorlangan kontent": "Контент подготовлен опытными кулинарами и поварами.",
+ "Yangiliklar": "Новости",
+ "Gastronomiya sohasidagi so'nggi yangiliklar va eng yangi trendlar haqida xabarlar": "Новости о последних новостях и новейших тенденциях в сфере гастрономии",
+ "Innovatsiya, sifat va professionallik": "Инновации, качество и профессионализм",
+ "Gastro Market – bu gastronomiya dunyosidagi eng so'nggi yangiliklarni": "Gastro Market — онлайн-платформа, на которой представлены последние новости, рецепты и тенденции в мире гастрономии. Мы стремимся предоставить нашим читателям качественный и интересный контент.",
+ "Bizning jamoamiz tajribali kulinariya mutaxassislari": "Наша команда состоит из опытных кулинаров, поваров и экспертов в области гастрономии. В каждой статье мы уделяем особое внимание качеству и профессионализму.",
+ "Bizning dunyo": "Наш мир",
+ "Hamkor bo'ling": "Станьте партнером",
+ "Gastro Market bilan hamkorlik qilishni xohlaysizmi?": "Хотите сотрудничать с Gastro Market? Заполните форму ниже, и мы свяжемся с вами в ближайшее время.",
+ "Kompaniya nomi": "Название компании",
+ "Website": "Веб-сайт",
+ "Ism Familiya": "Имя и фамилия",
+ "Email": "Электронная почта",
+ "Telefon raqami": "Телефон",
+ "Kompaniya hujjati": "Документ компании",
+ "Faylni tanlang": "Выберите файл",
+ "Tanlangan fayl": "Выбранный файл",
+ "PDF yoki Word formatida (maksimal 5MB)": "В формате PDF или Word (макс. 5MB)",
+ "So'rov yuborish": "Отправить запрос",
+ "Kompaniya nomi kamida 2 ta belgidan iborat bo'lishi kerak": "Название компании должно содержать не менее 2 символов.",
+ "Ism kamida 2 ta belgidan iborat bo'lishi kerak": "Имя должно содержать не менее 2 символов",
+ "To'g'ri email manzilini kiriting": "Введите правильный адрес электронной почты",
+ "To'g'ri telefon raqamini kiriting": "Введите правильный номер телефона",
+ "File yuklash majburiy": "Загрузка файла обязательна",
+
+ "Maxfiylik Siyosati": "Политика конфиденциальности",
+ "Gastro Market sizning ma'lumotlaringiz xavfsizligini jiddiy qabul qiladi": "Gastro Market серьезно относится к безопасности ваших данных",
+ "Oxirgi yangilanish: 16 Dekabr 2025": "Последнее обновление: 16 декабря 2025",
+ "Ushbu Maxfiylik Siyosati Gastro Market online magazinida siz tomonidan taqdim etilgan shaxsiy ma'lumotlarni qanday to'playmiz": "Эта Политика конфиденциальности объясняет, как Gastro Market собирает, использует и защищает персональные данные, предоставленные вами в онлайн-магазине. Используя наши услуги, вы соглашаетесь с описанными практиками.",
+
+ "Biz To'playdigan Ma'lumotlar": "1. Сбор информации",
+ "Sizning tajribangizni yaxshilash uchun biz quyidagi ma'lumotlarni to'playmiz": "Имя, адрес электронной почты, номер телефона",
+ "Kompaniya nomi, website, hamkorlik so'rovlari": "Название компании, веб-сайт, запросы на сотрудничество",
+ "Hamkorlik uchun yuklangan hujjatlar": "Документы, загруженные для сотрудничества",
+ "IP manzil, brauzer turi, qurilma ma'lumotlari": "IP-адрес, тип браузера, данные устройства",
+ "Shaxsiy Ma'lumotlar": "Персональные данные",
+ "Kompaniya Ma'lumotlari": "Информация о компании",
+ "Fayllar:": "Файлы:",
+ "Texnik Ma'lumotlar": "Технические данные",
+
+ "Ma'lumotlardan Foydalanish": "2. Использование данных",
+ "To'plangan ma'lumotlaringizdan quyidagi maqsadlarda foydalanamiz:": "Мы будем использовать собранные вами данные для следующих целей:",
+ "Hamkorlik so'rovlarini qayta ishlash va javob berish": "Обработка и ответ на запросы на сотрудничество",
+ "Sizga xizmatlarimiz va yangiliklar haqida ma'lumot berish": "Предоставление информации о наших услугах и новостях",
+ "Sayt xavfsizligini ta'minlash va firibgarlikka qarshi kurashish": "Обеспечение безопасности сайта и предотвращение мошенничества",
+ "Foydalanuvchi tajribasini tahlil qilish va yaxshilash": "Анализ и улучшение пользовательского опыта",
+ "Qonuniy talablarni bajarish": "Соблюдение законных требований",
+
+ "Ma'lumotlar Xavfsizligi": "3. Безопасность данных",
+ "Biz sizning shaxsiy ma'lumotlaringizni himoya qilish uchun zamonaviy xavfsizlik choralarini qo'llaymiz:": "Мы применяем современные меры безопасности для защиты ваших персональных данных:",
+ "SSL/TLS shifrlash orqali ma'lumotlar uzatish": "Передача данных с шифрованием SSL/TLS",
+ "Xavfsiz serverlar va ma'lumotlar bazasida saqlash": "Хранение на безопасных серверах и в базе данных",
+ "Cheklangan kirish huquqlari va autentifikatsiya": "Ограниченный доступ и аутентификация",
+ "Doimiy xavfsizlik monitoringi va yangilanishlar": "Постоянный мониторинг безопасности и обновления",
+
+ "Ma'lumotlarni Ulashish": "4. Раскрытие данных",
+ "Biz sizning shaxsiy ma'lumotlaringizni uchinchi shaxslarga sotmaymiz": "Мы не будем продавать ваши персональные данные третьим лицам.",
+ "Sizning roziligingiz bilan": "С вашего согласия",
+ "Qonuniy talablar bo'yicha": "В соответствии с законом",
+ "Xizmat ko'rsatuvchi ishonchli hamkorlar bilan (maxfiylik shartnomalari ostida)": "С надежными партнерами (соглашения о конфиденциальности)",
+ "Kompaniya birlashuvi yoki sotilishi holatida": "В случае слияния или продажи компании",
+
+ "Biz Bilan Bog'lanish": "Связь с нами",
+ "Ushbu Maxfiylik Siyosati yoki shaxsiy ma'lumotlaringiz haqida savollaringiz bo'lsa, biz bilan bog'laning:": "Если у вас есть вопросы по данной Политике конфиденциальности или вашим данным, свяжитесь с нами:",
+ "Telefon": "Телефон",
+ "Toshkent, O'zbekiston": "Ташкент, Узбекистан",
+ "Manzil": "Адрес",
+
+ "Miqdor": "Количество",
+ "Jami": "Итого",
+ "Bepul yetkazib berish": "Бесплатная доставка",
+ "Kafolat": "Гарантия",
+ "Xususiyatlari": "Характеристики",
+ "Qadoq turi": "Тип упаковки",
+ "Brandi": "Бренд",
+ "Ishlab chiqaruvchi": "Производитель",
+ "Hajmi": "Объем",
+ "O'xshash mahsulotlar": "Похожие товары",
+
+ "Hech narsa topilmadi": "Не найдено",
+ "Qidiruv natijalari": "Результаты поиска",
+ "Tavsiya etiladi": "Рекомендуется",
+ "Yuklanmoqda": "Загрузка...",
+ "Natija topilmadi": "Нет результатов",
+
+ "Asosiy": "Основная",
+ "Katalog": "Каталог",
+ "Sevimli": "Избранное",
+ "Savatda": "В корзине",
+ "Profil": "Профиль",
+
+ "Username yoki parol xato kiritildi": "Неверное имя пользователя или пароль",
+ "Tizimga kirish": "Войти в систему",
+ "Username": "Имя пользователя",
+ "Parol": "Пароль",
+ "Kirish": "Вход",
+
+ "Savatingiz bo'sh": "Ваша корзина пуста",
+ "Mahsulotlar qo'shish uchun katalogga o'ting": "Перейти в каталог, чтобы добавить товары",
+ "Xarid qilishni boshlash": "Начать покупку",
+ "Savat": "Корзина",
+ "ta mahsulot": "товар(ов)",
+ "Buyurtma haqida": "О заказе",
+ "Mahsulotlar narxi": "Цена товаров",
+ "Chegirma": "Скидка",
+ "Yetkazib berish": "Доставка",
+ "Bepul": "Бесплатно",
+ "Buyurtmani rasmiylashtirish": "Оформить заказ",
+ "Xaridni davom ettirish": "Продолжить покупки",
+ "Tez yetkazib berish 1-2 kun ichida": "Быстрая доставка в течение 1-2 дней",
+ "Xavfsiz to'lov usullari": "Безопасные способы оплаты",
+ "Buyurtma qabul qilindi!": "Заказ принят!",
+ "Buyurtma raqami": "Номер заказа",
+ "Buyurtmangiz muvaffaqiyatli qabul qilindi": "Ваш заказ успешно принят.",
+ "Bosh sahifaga qaytish": "Вернуться на главную",
+ "Ma'lumotlaringizni to'ldiring": "Заполните ваши данные",
+ "Shaxsiy ma'lumotlar": "Личные данные",
+ "Ism": "Имя",
+ "Ismingiz": "Ваше имя",
+ "Familiya": "Фамилия",
+ "Familiyangiz": "Ваша фамилия",
+ "Telefon raqam": "Номер телефона",
+ "Izoh": "Комментарий",
+ "Yetkazib berish manzili": "Адрес доставки",
+ "Manzilni qidirish": "Поиск адреса",
+ "Toshkent": "Ташкент",
+ "Mening joylashuvim": "Моё местоположение",
+
+ "Yetkazib berish usuli": "Способ доставки",
+ "Standart yetkazib berish": "Стандартная доставка",
+ "2-3 kun ichida": "В течение 2–3 дней",
+ "Tez yetkazib berish": "Экспресс-доставка",
+ "1 kun ichida": "В течение 1 дня",
+
+ "To'lov usuli": "Способ оплаты",
+ "Naqd pul": "Наличные",
+ "Yetkazib berishda to'lash": "Оплата при доставке",
+ "Plastik karta": "Банковская карта",
+ "Online to'lov": "Онлайн-оплата",
+
+ "Mahsulotlar": "Товары",
+ "Buyurtmani tasdiqlash": "Подтвердить заказ",
+
+ "Majburiy maydon": "Обязательное поле",
+ "Xato raqam kiritildi": "Введен неверный номер",
+ "Orqaga": "Назад",
+
+ "Sevimlilar bo'sh": "Избранное пусто",
+ "Hali hech qanday mahsulotni sevimlilarga qo'shmadingiz": "Вы пока не добавили ни одного товара в избранное. Перейдите в каталог и сохраните понравившиеся товары.",
+ "Sevimli mahsulotlar": "Избранные товары",
+ "Ism email manzil telefon raqami": "Имя, адрес электронной почты, номер телефона",
+
+ "Faol buyurtmalar": "Активные заказы",
+ "Barchasi": "Все",
+ "Buyurtmalar tarixi": "История заказов",
+ "Qayta": "Повторить",
+ "Chiqish": "Выйти",
+ "Umumiy": "Общее",
+ "Buyurtmalar": "Заказы",
+ "Tarix": "История",
+
+ "Faol": "Активно",
+ "Tugadi": "Заканчивается",
+ "Yetkazish": "Доставка",
+ "Yo'lda": "В пути",
+ "Punktda": "В пункте",
+ "Yetkazildi": "Доставлено",
+ "Bekor qilindi": "Отменено",
+ "Bu hafta": "На этой неделе",
+ "Bu oy": "В этом месяце",
+ "Qo'llab-quvatlash": "Поддержка",
+ "Agarda sizda kirish uchun login va parol yo'q bolsa iltimos bizga murojat qiling": "Если у вас нет логина и пароля для входа, пожалуйста, свяжитесь с нами",
+ "Murojat qilish": "Заявление",
+ "So'rov yuborildi!": "Запрос успешно отправлен!",
+
+ "Tez-tez So'raladigan Savollar": "Часто задаваемые вопросы",
+ "Gastro Market haqida eng ko'p so'raladigan savollarga javoblar":"Ответы на самые часто задаваемые вопросы о Gastro Market"
}
diff --git a/src/shared/config/i18n/messages/uz.d.json.ts b/src/shared/config/i18n/messages/uz.d.json.ts
index 5d538a0..22fa21f 100644
--- a/src/shared/config/i18n/messages/uz.d.json.ts
+++ b/src/shared/config/i18n/messages/uz.d.json.ts
@@ -2,9 +2,196 @@
// See: https://next-intl.dev/docs/workflows/typescript#messages-arguments
declare const messages: {
- HomePage: {
- title: 'Salom dunyo!';
- about: 'Go to the about page';
- };
+ 'Biz haqimizda': 'Biz haqimizda';
+ 'Maxfiylik siyosati': 'Maxfiylik siyosati';
+ 'Savol-javob': 'Savol-javob';
+ Sahifalar: 'Sahifalar';
+ "Biz bilan bog'laning": "Biz bilan bog'laning";
+ Русский: 'Русский';
+ "O'zbekcha": "O'zbekcha";
+ 'Mahsulot nomi': 'Mahsulot nomi';
+ 'Tizimga kirilmagan': 'Tizimga kirilmagan';
+ 'Mahsulotni yuklab bo‘lmadi': 'Mahsulotni yuklab bo‘lmadi. Qayta urinib ko‘ring.';
+ Savatga: 'Savatga';
+ Kategoriyalar: 'Kategoriyalar';
+ "Gastronomiya va kulinariya san'ati haqidagi yetakchi onlayn magazin": "Gastronomiya va kulinariya san'ati haqidagi yetakchi onlayn magazin";
+ 'Bizning maqsadimiz': 'Bizning maqsadimiz';
+ 'Sifatli Kontent': 'Sifatli Kontent';
+ "Jahon oshpazlik san'ati va zamonaviy gastronomiya tendentsiyalari haqida chuqur maqolalar va tahlillar": "Jahon oshpazlik san'ati va zamonaviy gastronomiya tendentsiyalari haqida chuqur maqolalar va tahlillar";
+ 'Professional Jamoa': 'Professional Jamoa';
+ 'Tajribali kulinariya mutaxassislari va oshpazlar tomonidan tayyorlangan kontent': 'Tajribali kulinariya mutaxassislari va oshpazlar tomonidan tayyorlangan kontent';
+ Yangiliklar: 'Yangiliklar';
+ "Gastronomiya sohasidagi so'nggi yangiliklar va eng yangi trendlar haqida xabarlar": "Gastronomiya sohasidagi so'nggi yangiliklar va eng yangi trendlar haqida xabarlar";
+ 'Innovatsiya, sifat va professionallik': 'Innovatsiya, sifat va professionallik';
+ "Gastro Market – bu gastronomiya dunyosidagi eng so'nggi yangiliklarni": "Gastro Market – bu gastronomiya dunyosidagi eng so'nggi yangiliklarni, retseptlarni va tendentsiyalarni taqdim etuvchi onlayn platforma. Biz o'quvchilarimizga sifatli va qiziqarli kontent taqdim etishga intilamiz.";
+ 'Bizning jamoamiz tajribali kulinariya mutaxassislari': "Bizning jamoamiz tajribali kulinariya mutaxassislari, oshpazlar va gastronomiya sohasidagi ekspertlardan iborat. Biz har bir maqolada sifat va professionallikka e'tibor qaratamiz.";
+ 'Bizning dunyo': 'Bizning dunyo';
+ "Hamkor bo'ling": "Hamkor bo'ling";
+ 'Gastro Market bilan hamkorlik qilishni xohlaysizmi?': "Gastro Market bilan hamkorlik qilishni xohlaysizmi? Quyidagi formani to'ldiring va biz siz bilan tez orada bog'lanamiz.";
+ 'Kompaniya nomi': 'Kompaniya nomi';
+ Website: 'Website';
+ 'Ism Familiya': 'Ism Familiya';
+ Email: 'Email';
+ 'Telefon raqami': 'Telefon raqami';
+ 'Kompaniya hujjati': 'Kompaniya hujjati';
+ 'Faylni tanlang': 'Faylni tanlang';
+ 'Tanlangan fayl': 'Tanlangan fayl';
+ 'PDF yoki Word formatida (maksimal 5MB)': 'PDF yoki Word formatida (maksimal 5MB)';
+ "So'rov yuborish": "So'rov yuborish";
+ "Kompaniya nomi kamida 2 ta belgidan iborat bo'lishi kerak": "Kompaniya nomi kamida 2 ta belgidan iborat bo'lishi kerak";
+ "Ism kamida 2 ta belgidan iborat bo'lishi kerak": "Ism kamida 2 ta belgidan iborat bo'lishi kerak";
+ "To'g'ri email manzilini kiriting": "To'g'ri email manzilini kiriting";
+ "To'g'ri telefon raqamini kiriting": "To'g'ri telefon raqamini kiriting";
+ 'File yuklash majburiy': 'File yuklash majburiy';
+
+ 'Maxfiylik Siyosati': 'Maxfiylik Siyosati';
+ "Gastro Market sizning ma'lumotlaringiz xavfsizligini jiddiy qabul qiladi": "Gastro Market sizning ma'lumotlaringiz xavfsizligini jiddiy qabul qiladi";
+ 'Oxirgi yangilanish: 16 Dekabr 2025': 'Oxirgi yangilanish: 16 Dekabr 2025';
+ "Ushbu Maxfiylik Siyosati Gastro Market online magazinida siz tomonidan taqdim etilgan shaxsiy ma'lumotlarni qanday to'playmiz": "Ushbu Maxfiylik Siyosati Gastro Market online magazinida siz tomonidan taqdim etilgan shaxsiy ma'lumotlarni qanday to'playmiz, ishlatamiz va himoya qilishimizni tushuntiradi. Xizmatlarimizdan foydalanish orqali siz ushbu siyosatda tasvirlangan amaliyotlarga rozilik bildirasiz.";
+
+ "Biz To'playdigan Ma'lumotlar": "1. Biz To'playdigan Ma'lumotlar";
+ "Sizning tajribangizni yaxshilash uchun biz quyidagi ma'lumotlarni to'playmiz": "Sizning tajribangizni yaxshilash uchun biz quyidagi ma'lumotlarni to'playmiz:";
+ 'Ism email manzil telefon raqami': 'Ism, email manzil, telefon raqami';
+ "Kompaniya nomi, website, hamkorlik so'rovlari": "Kompaniya nomi, website, hamkorlik so'rovlari";
+ 'Hamkorlik uchun yuklangan hujjatlar': 'Hamkorlik uchun yuklangan hujjatlar';
+ "IP manzil, brauzer turi, qurilma ma'lumotlari": "IP manzil, brauzer turi, qurilma ma'lumotlari";
+ "Shaxsiy Ma'lumotlar": "Shaxsiy Ma'lumotlar";
+ "Kompaniya Ma'lumotlari": "Kompaniya Ma'lumotlari";
+ 'Fayllar:': 'Fayllar:';
+ "Texnik Ma'lumotlar": "Texnik Ma'lumotlar";
+
+ "Ma'lumotlardan Foydalanish": "2. Ma'lumotlardan Foydalanish";
+ "To'plangan ma'lumotlaringizdan quyidagi maqsadlarda foydalanamiz:": "To'plangan ma'lumotlaringizdan quyidagi maqsadlarda foydalanamiz:";
+ "Hamkorlik so'rovlarini qayta ishlash va javob berish": "Hamkorlik so'rovlarini qayta ishlash va javob berish";
+ "Sizga xizmatlarimiz va yangiliklar haqida ma'lumot berish": "Sizga xizmatlarimiz va yangiliklar haqida ma'lumot berish";
+ "Sayt xavfsizligini ta'minlash va firibgarlikka qarshi kurashish": "Sayt xavfsizligini ta'minlash va firibgarlikka qarshi kurashish";
+ 'Foydalanuvchi tajribasini tahlil qilish va yaxshilash': 'Foydalanuvchi tajribasini tahlil qilish va yaxshilash';
+ 'Qonuniy talablarni bajarish': 'Qonuniy talablarni bajarish';
+
+ "Ma'lumotlar Xavfsizligi": "3. Ma'lumotlar Xavfsizligi";
+ "Biz sizning shaxsiy ma'lumotlaringizni himoya qilish uchun zamonaviy xavfsizlik choralarini qo'llaymiz:": "Biz sizning shaxsiy ma'lumotlaringizni himoya qilish uchun zamonaviy xavfsizlik choralarini qo'llaymiz:";
+ "SSL/TLS shifrlash orqali ma'lumotlar uzatish": "SSL/TLS shifrlash orqali ma'lumotlar uzatish";
+ "Xavfsiz serverlar va ma'lumotlar bazasida saqlash": "Xavfsiz serverlar va ma'lumotlar bazasida saqlash";
+ 'Cheklangan kirish huquqlari va autentifikatsiya': 'Cheklangan kirish huquqlari va autentifikatsiya';
+ 'Doimiy xavfsizlik monitoringi va yangilanishlar': 'Doimiy xavfsizlik monitoringi va yangilanishlar';
+
+ "Ma'lumotlarni Ulashish": "4. Ma'lumotlarni Ulashish";
+ "Biz sizning shaxsiy ma'lumotlaringizni uchinchi shaxslarga sotmaymiz": "Biz sizning shaxsiy ma'lumotlaringizni uchinchi shaxslarga sotmaymiz";
+ 'Sizning roziligingiz bilan': 'Sizning roziligingiz bilan';
+ "Qonuniy talablar bo'yicha": "Qonuniy talablar bo'yicha";
+ "Xizmat ko'rsatuvchi ishonchli hamkorlar bilan (maxfiylik shartnomalari ostida)": "Xizmat ko'rsatuvchi ishonchli hamkorlar bilan (maxfiylik shartnomalari ostida)";
+ 'Kompaniya birlashuvi yoki sotilishi holatida': 'Kompaniya birlashuvi yoki sotilishi holatida';
+
+ "Biz Bilan Bog'lanish": "Biz Bilan Bog'lanish";
+ "Ushbu Maxfiylik Siyosati yoki shaxsiy ma'lumotlaringiz haqida savollaringiz bo'lsa, biz bilan bog'laning:": "Ushbu Maxfiylik Siyosati yoki shaxsiy ma'lumotlaringiz haqida savollaringiz bo'lsa, biz bilan bog'laning:";
+ Telefon: 'Telefon';
+ "Toshkent, O'zbekiston": "Toshkent, O'zbekiston";
+ Manzil: 'Manzil';
+
+ Miqdor: 'Miqdor';
+ Jami: 'Jami';
+ 'Bepul yetkazib berish': 'Bepul yetkazib berish';
+ Kafolat: 'Kafolat';
+ Xususiyatlari: 'Xususiyatlari';
+ 'Qadoq turi': 'Qadoq turi';
+ Brandi: 'Brend';
+ 'Ishlab chiqaruvchi': 'Ishlab chiqaruvchi';
+ Hajmi: 'Hajmi';
+ "O'xshash mahsulotlar": "O'xshash mahsulotlar";
+
+ 'Hech narsa topilmadi': 'Hech narsa topilmadi';
+ 'Qidiruv natijalari': 'Qidiruv natijalari';
+ 'Tavsiya etiladi': 'Tavsiya etiladi';
+ Yuklanmoqda: 'Yuklanmoqda....';
+ 'Natija topilmadi': 'Natija topilmadi';
+
+ Asosiy: 'Asosiy';
+ Katalog: 'Katalog';
+ Sevimli: 'Sevimli';
+ Savatda: 'Savatda';
+ Profil: 'Profil';
+
+ 'Username yoki parol xato kiritildi': 'Username yoki parol xato kiritildi';
+ 'Tizimga kirish': 'Tizimga kirish';
+ Username: 'Username';
+ Parol: 'Parol';
+ Kirish: 'Kirish';
+
+ "Savatingiz bo'sh": "Savatingiz bo'sh";
+ "Mahsulotlar qo'shish uchun katalogga o'ting": "Mahsulotlar qo'shish uchun katalogga o'ting";
+ 'Xarid qilishni boshlash': 'Xarid qilishni boshlash';
+ Savat: 'Savat';
+ 'ta mahsulot': 'ta mahsulot';
+ 'Buyurtma haqida': 'Buyurtma haqida';
+ 'Mahsulotlar narxi': 'Mahsulotlar narxi';
+ Chegirma: 'Chegirma';
+ 'Yetkazib berish': 'Yetkazib berish';
+ Bepul: 'Bepul';
+ 'Buyurtmani rasmiylashtirish': 'Buyurtmani rasmiylashtirish';
+ 'Xaridni davom ettirish': 'Xaridni davom ettirish';
+ 'Tez yetkazib berish 1-2 kun ichida': 'Tez yetkazib berish 1-2 kun ichida';
+ "Xavfsiz to'lov usullari": "Xavfsiz to'lov usullari";
+
+ 'Buyurtma qabul qilindi!': 'Buyurtma qabul qilindi!';
+ 'Buyurtma raqami': 'Buyurtma raqami';
+ 'Buyurtmangiz muvaffaqiyatli qabul qilindi': 'Buyurtmangiz muvaffaqiyatli qabul qilindi.';
+ 'Bosh sahifaga qaytish': 'Bosh sahifaga qaytish';
+ "Ma'lumotlaringizni to'ldiring": "Ma'lumotlaringizni to'ldiring";
+ "Shaxsiy ma'lumotlar": "Shaxsiy ma'lumotlar";
+ Ism: 'Ism';
+ Ismingiz: 'Ismingiz';
+ Familiya: 'Familiya';
+ Familiyangiz: 'Familiyangiz';
+ 'Telefon raqam': 'Telefon raqam';
+ Izoh: 'Izoh';
+ 'Yetkazib berish manzili': 'Yetkazib berish manzili';
+ 'Manzilni qidirish': 'Manzilni qidirish';
+ Toshkent: 'Toshkent';
+ 'Mening joylashuvim': 'Mening joylashuvim';
+ 'Yetkazib berish usuli': 'Yetkazib berish usuli';
+ 'Standart yetkazib berish': 'Standart yetkazib berish';
+ '2-3 kun ichida': '2-3 kun ichida';
+ 'Tez yetkazib berish': 'Tez yetkazib berish';
+ '1 kun ichida': '1 kun ichida';
+ "To'lov usuli": "To'lov usuli";
+ 'Naqd pul': 'Naqd pul';
+ "Yetkazib berishda to'lash": "Yetkazib berishda to'lash";
+ 'Plastik karta': 'Plastik karta';
+ "Online to'lov": "Online to'lov";
+ Mahsulotlar: 'Mahsulotlar';
+ 'Buyurtmani tasdiqlash': 'Buyurtmani tasdiqlash';
+ 'Majburiy maydon': 'Majburiy maydon';
+ 'Xato raqam kiritildi': 'Xato raqam kiritildi';
+ Orqaga: 'Orqaga';
+
+ "Sevimlilar bo'sh": "Sevimlilar bo'sh";
+ "Hali hech qanday mahsulotni sevimlilarga qo'shmadingiz": "Hali hech qanday mahsulotni sevimlilarga qo'shmadingiz. Mahsulotlar ro'yxatiga o'ting va yoqqan mahsulotlaringizni saqlang.";
+ 'Sevimli mahsulotlar': 'Sevimli mahsulotlar';
+
+ 'Faol buyurtmalar': 'Faol buyurtmalar';
+ Barchasi: 'Barchasi';
+ 'Buyurtmalar tarixi': 'Buyurtmalar tarixi';
+ Qayta: 'Qayta';
+ Chiqish: 'Chiqish';
+ Umumiy: 'Umumiy';
+ Buyurtmalar: 'Buyurtmalar';
+ Tarix: 'Tarix';
+
+ Faol: 'Faol';
+ Tugadi: 'Tugadi';
+ Yetkazish: 'Yetkazish';
+ "Yo'lda": "Yo'lda";
+ Punktda: 'Punktda';
+ Yetkazildi: 'Yetkazildi';
+ 'Bekor qilindi': 'Bekor qilindi';
+ 'Bu hafta': 'Bu hafta';
+ 'Bu oy': 'Bu oy';
+ "Qo'llab-quvatlash": "Qo'llab-quvatlash";
+ "Agarda sizda kirish uchun login va parol yo'q bolsa iltimos bizga murojat qiling": "Agarda sizda kirish uchun login va parol yo'q bolsa iltimos bizga murojat qiling";
+ 'Murojat qilish': 'Murojat qilish';
+ "So'rov yuborildi!": "So'rov yuborildi!";
+
+ "Tez-tez So'raladigan Savollar": "Tez-tez So'raladigan Savollar";
+ "Gastro Market haqida eng ko'p so'raladigan savollarga javoblar": "Gastro Market haqida eng ko'p so'raladigan savollarga javoblar";
};
export default messages;
diff --git a/src/shared/config/i18n/messages/uz.json b/src/shared/config/i18n/messages/uz.json
index c1f760b..7e3d06e 100644
--- a/src/shared/config/i18n/messages/uz.json
+++ b/src/shared/config/i18n/messages/uz.json
@@ -1,6 +1,193 @@
{
- "HomePage": {
- "title": "Salom dunyo!",
- "about": "Go to the about page"
- }
+ "Biz haqimizda": "Biz haqimizda",
+ "Maxfiylik siyosati": "Maxfiylik siyosati",
+ "Savol-javob": "Savol-javob",
+ "Sahifalar": "Sahifalar",
+ "Biz bilan bog'laning": "Biz bilan bog'laning",
+ "Русский": "Русский",
+ "O'zbekcha": "O'zbekcha",
+ "Mahsulot nomi": "Mahsulot nomi",
+ "Tizimga kirilmagan": "Tizimga kirilmagan",
+ "Mahsulotni yuklab bo‘lmadi": "Mahsulotni yuklab bo‘lmadi. Qayta urinib ko‘ring.",
+ "Savatga": "Savatga",
+ "Kategoriyalar": "Kategoriyalar",
+ "Gastronomiya va kulinariya san'ati haqidagi yetakchi onlayn magazin": "Gastronomiya va kulinariya san'ati haqidagi yetakchi onlayn magazin",
+ "Bizning maqsadimiz": "Bizning maqsadimiz",
+ "Sifatli Kontent": "Sifatli Kontent",
+ "Jahon oshpazlik san'ati va zamonaviy gastronomiya tendentsiyalari haqida chuqur maqolalar va tahlillar": "Jahon oshpazlik san'ati va zamonaviy gastronomiya tendentsiyalari haqida chuqur maqolalar va tahlillar",
+ "Professional Jamoa": "Professional Jamoa",
+ "Tajribali kulinariya mutaxassislari va oshpazlar tomonidan tayyorlangan kontent": "Tajribali kulinariya mutaxassislari va oshpazlar tomonidan tayyorlangan kontent",
+ "Yangiliklar": "Yangiliklar",
+ "Gastronomiya sohasidagi so'nggi yangiliklar va eng yangi trendlar haqida xabarlar": "Gastronomiya sohasidagi so'nggi yangiliklar va eng yangi trendlar haqida xabarlar",
+ "Innovatsiya, sifat va professionallik": "Innovatsiya, sifat va professionallik",
+ "Gastro Market – bu gastronomiya dunyosidagi eng so'nggi yangiliklarni": "Gastro Market – bu gastronomiya dunyosidagi eng so'nggi yangiliklarni, retseptlarni va tendentsiyalarni taqdim etuvchi onlayn platforma. Biz o'quvchilarimizga sifatli va qiziqarli kontent taqdim etishga intilamiz.",
+ "Bizning jamoamiz tajribali kulinariya mutaxassislari": "Bizning jamoamiz tajribali kulinariya mutaxassislari, oshpazlar va gastronomiya sohasidagi ekspertlardan iborat. Biz har bir maqolada sifat va professionallikka e'tibor qaratamiz.",
+ "Bizning dunyo": "Bizning dunyo",
+ "Hamkor bo'ling": "Hamkor bo'ling",
+ "Gastro Market bilan hamkorlik qilishni xohlaysizmi?": "Gastro Market bilan hamkorlik qilishni xohlaysizmi? Quyidagi formani to'ldiring va biz siz bilan tez orada bog'lanamiz.",
+ "Kompaniya nomi": "Kompaniya nomi",
+ "Website": "Website",
+ "Ism Familiya": "Ism Familiya",
+ "Email": "Email",
+ "Telefon raqami": "Telefon raqami",
+ "Kompaniya hujjati": "Kompaniya hujjati",
+ "Faylni tanlang": "Faylni tanlang",
+ "Tanlangan fayl": "Tanlangan fayl",
+ "PDF yoki Word formatida (maksimal 5MB)": "PDF yoki Word formatida (maksimal 5MB)",
+ "So'rov yuborish": "So'rov yuborish",
+ "Kompaniya nomi kamida 2 ta belgidan iborat bo'lishi kerak": "Kompaniya nomi kamida 2 ta belgidan iborat bo'lishi kerak",
+ "Ism kamida 2 ta belgidan iborat bo'lishi kerak": "Ism kamida 2 ta belgidan iborat bo'lishi kerak",
+ "To'g'ri email manzilini kiriting": "To'g'ri email manzilini kiriting",
+ "To'g'ri telefon raqamini kiriting": "To'g'ri telefon raqamini kiriting",
+ "File yuklash majburiy": "File yuklash majburiy",
+
+ "Maxfiylik Siyosati": "Maxfiylik Siyosati",
+ "Gastro Market sizning ma'lumotlaringiz xavfsizligini jiddiy qabul qiladi": "Gastro Market sizning ma'lumotlaringiz xavfsizligini jiddiy qabul qiladi",
+ "Oxirgi yangilanish: 16 Dekabr 2025": "Oxirgi yangilanish: 16 Dekabr 2025",
+ "Ushbu Maxfiylik Siyosati Gastro Market online magazinida siz tomonidan taqdim etilgan shaxsiy ma'lumotlarni qanday to'playmiz": "Ushbu Maxfiylik Siyosati Gastro Market online magazinida siz tomonidan taqdim etilgan shaxsiy ma'lumotlarni qanday to'playmiz, ishlatamiz va himoya qilishimizni tushuntiradi. Xizmatlarimizdan foydalanish orqali siz ushbu siyosatda tasvirlangan amaliyotlarga rozilik bildirasiz.",
+
+ "Biz To'playdigan Ma'lumotlar": "1. Biz To'playdigan Ma'lumotlar",
+ "Sizning tajribangizni yaxshilash uchun biz quyidagi ma'lumotlarni to'playmiz": "Sizning tajribangizni yaxshilash uchun biz quyidagi ma'lumotlarni to'playmiz:",
+ "Ism email manzil telefon raqami": "Ism, email manzil, telefon raqami",
+ "Kompaniya nomi, website, hamkorlik so'rovlari": "Kompaniya nomi, website, hamkorlik so'rovlari",
+ "Hamkorlik uchun yuklangan hujjatlar": "Hamkorlik uchun yuklangan hujjatlar",
+ "IP manzil, brauzer turi, qurilma ma'lumotlari": "IP manzil, brauzer turi, qurilma ma'lumotlari",
+ "Shaxsiy Ma'lumotlar": "Shaxsiy Ma'lumotlar",
+ "Kompaniya Ma'lumotlari": "Kompaniya Ma'lumotlari",
+ "Fayllar:": "Fayllar:",
+ "Texnik Ma'lumotlar": "Texnik Ma'lumotlar",
+
+ "Ma'lumotlardan Foydalanish": "2. Ma'lumotlardan Foydalanish",
+ "To'plangan ma'lumotlaringizdan quyidagi maqsadlarda foydalanamiz:": "To'plangan ma'lumotlaringizdan quyidagi maqsadlarda foydalanamiz:",
+ "Hamkorlik so'rovlarini qayta ishlash va javob berish": "Hamkorlik so'rovlarini qayta ishlash va javob berish",
+ "Sizga xizmatlarimiz va yangiliklar haqida ma'lumot berish": "Sizga xizmatlarimiz va yangiliklar haqida ma'lumot berish",
+ "Sayt xavfsizligini ta'minlash va firibgarlikka qarshi kurashish": "Sayt xavfsizligini ta'minlash va firibgarlikka qarshi kurashish",
+ "Foydalanuvchi tajribasini tahlil qilish va yaxshilash": "Foydalanuvchi tajribasini tahlil qilish va yaxshilash",
+ "Qonuniy talablarni bajarish": "Qonuniy talablarni bajarish",
+
+ "Ma'lumotlar Xavfsizligi": "3. Ma'lumotlar Xavfsizligi",
+ "Biz sizning shaxsiy ma'lumotlaringizni himoya qilish uchun zamonaviy xavfsizlik choralarini qo'llaymiz:": "Biz sizning shaxsiy ma'lumotlaringizni himoya qilish uchun zamonaviy xavfsizlik choralarini qo'llaymiz:",
+ "SSL/TLS shifrlash orqali ma'lumotlar uzatish": "SSL/TLS shifrlash orqali ma'lumotlar uzatish",
+ "Xavfsiz serverlar va ma'lumotlar bazasida saqlash": "Xavfsiz serverlar va ma'lumotlar bazasida saqlash",
+ "Cheklangan kirish huquqlari va autentifikatsiya": "Cheklangan kirish huquqlari va autentifikatsiya",
+ "Doimiy xavfsizlik monitoringi va yangilanishlar": "Doimiy xavfsizlik monitoringi va yangilanishlar",
+
+ "Ma'lumotlarni Ulashish": "4. Ma'lumotlarni Ulashish",
+ "Biz sizning shaxsiy ma'lumotlaringizni uchinchi shaxslarga sotmaymiz": "Biz sizning shaxsiy ma'lumotlaringizni uchinchi shaxslarga sotmaymiz",
+ "Sizning roziligingiz bilan": "Sizning roziligingiz bilan",
+ "Qonuniy talablar bo'yicha": "Qonuniy talablar bo'yicha",
+ "Xizmat ko'rsatuvchi ishonchli hamkorlar bilan (maxfiylik shartnomalari ostida)": "Xizmat ko'rsatuvchi ishonchli hamkorlar bilan (maxfiylik shartnomalari ostida)",
+ "Kompaniya birlashuvi yoki sotilishi holatida": "Kompaniya birlashuvi yoki sotilishi holatida",
+
+ "Biz Bilan Bog'lanish": "Biz Bilan Bog'lanish",
+ "Ushbu Maxfiylik Siyosati yoki shaxsiy ma'lumotlaringiz haqida savollaringiz bo'lsa, biz bilan bog'laning:": "Ushbu Maxfiylik Siyosati yoki shaxsiy ma'lumotlaringiz haqida savollaringiz bo'lsa, biz bilan bog'laning:",
+ "Telefon": "Telefon",
+ "Toshkent, O'zbekiston": "Toshkent, O'zbekiston",
+ "Manzil": "Manzil",
+
+ "Miqdor": "Miqdor",
+ "Jami": "Jami",
+ "Bepul yetkazib berish": "Bepul yetkazib berish",
+ "Kafolat": "Kafolat",
+ "Xususiyatlari": "Xususiyatlari",
+ "Qadoq turi": "Qadoq turi",
+ "Brandi": "Brend",
+ "Ishlab chiqaruvchi": "Ishlab chiqaruvchi",
+ "Hajmi": "Hajmi",
+ "O'xshash mahsulotlar": "O'xshash mahsulotlar",
+
+ "Hech narsa topilmadi": "Hech narsa topilmadi",
+ "Qidiruv natijalari": "Qidiruv natijalari",
+ "Tavsiya etiladi": "Tavsiya etiladi",
+ "Yuklanmoqda": "Yuklanmoqda....",
+ "Natija topilmadi": "Natija topilmadi",
+
+ "Asosiy": "Asosiy",
+ "Katalog": "Katalog",
+ "Sevimli": "Sevimli",
+ "Savatda": "Savatda",
+ "Profil": "Profil",
+
+ "Username yoki parol xato kiritildi": "Username yoki parol xato kiritildi",
+ "Tizimga kirish": "Tizimga kirish",
+ "Username": "Username",
+ "Parol": "Parol",
+ "Kirish": "Kirish",
+
+ "Savatingiz bo'sh": "Savatingiz bo'sh",
+ "Mahsulotlar qo'shish uchun katalogga o'ting": "Mahsulotlar qo'shish uchun katalogga o'ting",
+ "Xarid qilishni boshlash": "Xarid qilishni boshlash",
+ "Savat": "Savat",
+ "ta mahsulot": "ta mahsulot",
+ "Buyurtma haqida": "Buyurtma haqida",
+ "Mahsulotlar narxi": "Mahsulotlar narxi",
+ "Chegirma": "Chegirma",
+ "Yetkazib berish": "Yetkazib berish",
+ "Bepul": "Bepul",
+ "Buyurtmani rasmiylashtirish": "Buyurtmani rasmiylashtirish",
+ "Xaridni davom ettirish": "Xaridni davom ettirish",
+ "Tez yetkazib berish 1-2 kun ichida": "Tez yetkazib berish 1-2 kun ichida",
+ "Xavfsiz to'lov usullari": "Xavfsiz to'lov usullari",
+
+ "Buyurtma qabul qilindi!": "Buyurtma qabul qilindi!",
+ "Buyurtma raqami": "Buyurtma raqami",
+ "Buyurtmangiz muvaffaqiyatli qabul qilindi": "Buyurtmangiz muvaffaqiyatli qabul qilindi.",
+ "Bosh sahifaga qaytish": "Bosh sahifaga qaytish",
+ "Ma'lumotlaringizni to'ldiring": "Ma'lumotlaringizni to'ldiring",
+ "Shaxsiy ma'lumotlar": "Shaxsiy ma'lumotlar",
+ "Ism": "Ism",
+ "Ismingiz": "Ismingiz",
+ "Familiya": "Familiya",
+ "Familiyangiz": "Familiyangiz",
+ "Telefon raqam": "Telefon raqam",
+ "Izoh": "Izoh",
+ "Yetkazib berish manzili": "Yetkazib berish manzili",
+ "Manzilni qidirish": "Manzilni qidirish",
+ "Toshkent": "Toshkent",
+ "Mening joylashuvim": "Mening joylashuvim",
+ "Yetkazib berish usuli": "Yetkazib berish usuli",
+ "Standart yetkazib berish": "Standart yetkazib berish",
+ "2-3 kun ichida": "2-3 kun ichida",
+ "Tez yetkazib berish": "Tez yetkazib berish",
+ "1 kun ichida": "1 kun ichida",
+ "To'lov usuli": "To'lov usuli",
+ "Naqd pul": "Naqd pul",
+ "Yetkazib berishda to'lash": "Yetkazib berishda to'lash",
+ "Plastik karta": "Plastik karta",
+ "Online to'lov": "Online to'lov",
+ "Mahsulotlar": "Mahsulotlar",
+ "Buyurtmani tasdiqlash": "Buyurtmani tasdiqlash",
+ "Majburiy maydon": "Majburiy maydon",
+ "Xato raqam kiritildi": "Xato raqam kiritildi",
+ "Orqaga": "Orqaga",
+
+ "Sevimlilar bo'sh": "Sevimlilar bo'sh",
+ "Hali hech qanday mahsulotni sevimlilarga qo'shmadingiz": "Hali hech qanday mahsulotni sevimlilarga qo'shmadingiz. Mahsulotlar ro'yxatiga o'ting va yoqqan mahsulotlaringizni saqlang.",
+ "Sevimli mahsulotlar": "Sevimli mahsulotlar",
+
+ "Faol buyurtmalar": "Faol buyurtmalar",
+ "Barchasi": "Barchasi",
+ "Buyurtmalar tarixi": "Buyurtmalar tarixi",
+ "Qayta": "Qayta",
+ "Chiqish": "Chiqish",
+ "Umumiy": "Umumiy",
+ "Buyurtmalar": "Buyurtmalar",
+ "Tarix": "Tarix",
+
+ "Faol": "Faol",
+ "Tugadi": "Tugadi",
+ "Yetkazish": "Yetkazish",
+ "Yo'lda": "Yo'lda",
+ "Punktda": "Punktda",
+ "Yetkazildi": "Yetkazildi",
+ "Bekor qilindi": "Bekor qilindi",
+ "Bu hafta": "Bu hafta",
+ "Bu oy": "Bu oy",
+ "Qo'llab-quvatlash": "Qo'llab-quvatlash",
+ "Agarda sizda kirish uchun login va parol yo'q bolsa iltimos bizga murojat qiling": "Agarda sizda kirish uchun login va parol yo'q bolsa iltimos bizga murojat qiling",
+ "Murojat qilish": "Murojat qilish",
+ "So'rov yuborildi!": "So'rov yuborildi!",
+
+ "Tez-tez So'raladigan Savollar": "Tez-tez So'raladigan Savollar",
+ "Gastro Market haqida eng ko'p so'raladigan savollarga javoblar": "Gastro Market haqida eng ko'p so'raladigan savollarga javoblar"
}
diff --git a/src/shared/hooks/cartId.ts b/src/shared/hooks/cartId.ts
new file mode 100644
index 0000000..e2c6a98
--- /dev/null
+++ b/src/shared/hooks/cartId.ts
@@ -0,0 +1,14 @@
+import { create } from 'zustand';
+
+type State = {
+ cart_id: string | null;
+};
+
+type Actions = {
+ setCartId: (cartId: string | null) => void;
+};
+
+export const useCartId = create((set) => ({
+ cart_id: null,
+ setCartId: (cartId: string | null) => set(() => ({ cart_id: cartId })),
+}));
diff --git a/src/shared/lib/onlyNumber.ts b/src/shared/lib/onlyNumber.ts
new file mode 100644
index 0000000..037e63a
--- /dev/null
+++ b/src/shared/lib/onlyNumber.ts
@@ -0,0 +1,6 @@
+const onlyNumber = (digits: string | number) => {
+ const phone = digits.toString();
+ return phone.replace(/\D/g, '');
+};
+
+export default onlyNumber;
diff --git a/src/shared/lib/token.ts b/src/shared/lib/token.ts
new file mode 100644
index 0000000..1bc199d
--- /dev/null
+++ b/src/shared/lib/token.ts
@@ -0,0 +1,28 @@
+import cookie from 'js-cookie';
+
+const TOKEN = 'gastro-token';
+const USER = 'gastro-user';
+
+export const getToken = () => {
+ return cookie.get(TOKEN);
+};
+
+export const getMe = () => {
+ return cookie.get(USER);
+};
+
+export const removeToken = () => {
+ cookie.remove(TOKEN);
+};
+
+export const removeUser = () => {
+ cookie.remove(USER);
+};
+
+export const setToken = (value: string) => {
+ cookie.set(TOKEN, value);
+};
+
+export const setUser = (value: string) => {
+ cookie.set(USER, value);
+};
diff --git a/src/shared/ui/alert.tsx b/src/shared/ui/alert.tsx
new file mode 100644
index 0000000..7f6d1ab
--- /dev/null
+++ b/src/shared/ui/alert.tsx
@@ -0,0 +1,66 @@
+import * as React from 'react';
+import { cva, type VariantProps } from 'class-variance-authority';
+
+import { cn } from '@/shared/lib/utils';
+
+const alertVariants = cva(
+ 'relative w-full rounded-lg border px-4 py-3 text-sm grid has-[>svg]:grid-cols-[calc(var(--spacing)*4)_1fr] grid-cols-[0_1fr] has-[>svg]:gap-x-3 gap-y-0.5 items-start [&>svg]:size-4 [&>svg]:translate-y-0.5 [&>svg]:text-current',
+ {
+ variants: {
+ variant: {
+ default: 'bg-card text-card-foreground',
+ destructive:
+ 'text-destructive bg-card [&>svg]:text-current *:data-[slot=alert-description]:text-destructive/90',
+ },
+ },
+ defaultVariants: {
+ variant: 'default',
+ },
+ },
+);
+
+function Alert({
+ className,
+ variant,
+ ...props
+}: React.ComponentProps<'div'> & VariantProps) {
+ return (
+
+ );
+}
+
+function AlertTitle({ className, ...props }: React.ComponentProps<'div'>) {
+ return (
+
+ );
+}
+
+function AlertDescription({
+ className,
+ ...props
+}: React.ComponentProps<'div'>) {
+ return (
+
+ );
+}
+
+export { Alert, AlertTitle, AlertDescription };
diff --git a/src/shared/ui/form.tsx b/src/shared/ui/form.tsx
index f847b41..cc09358 100644
--- a/src/shared/ui/form.tsx
+++ b/src/shared/ui/form.tsx
@@ -1,8 +1,8 @@
'use client';
-import * as React from 'react';
import type * as LabelPrimitive from '@radix-ui/react-label';
import { Slot } from '@radix-ui/react-slot';
+import * as React from 'react';
import {
Controller,
FormProvider,
@@ -15,6 +15,7 @@ import {
import { cn } from '@/shared/lib/utils';
import { Label } from '@/shared/ui/label';
+import { useTranslations } from 'next-intl';
const Form = FormProvider;
@@ -137,6 +138,7 @@ function FormDescription({ className, ...props }: React.ComponentProps<'p'>) {
}
function FormMessage({ className, ...props }: React.ComponentProps<'p'>) {
+ const t = useTranslations();
const { error, formMessageId } = useFormField();
const body = error ? String(error?.message ?? '') : props.children;
@@ -151,18 +153,18 @@ function FormMessage({ className, ...props }: React.ComponentProps<'p'>) {
className={cn('text-destructive text-sm', className)}
{...props}
>
- {body}
+ {error && error.message ? t(error.message) : body}
);
}
export {
- useFormField,
Form,
- FormItem,
- FormLabel,
FormControl,
FormDescription,
- FormMessage,
FormField,
+ FormItem,
+ FormLabel,
+ FormMessage,
+ useFormField,
};
diff --git a/src/shared/ui/global-pagination.tsx b/src/shared/ui/global-pagination.tsx
new file mode 100644
index 0000000..2a95379
--- /dev/null
+++ b/src/shared/ui/global-pagination.tsx
@@ -0,0 +1,102 @@
+'use client';
+
+import { ChevronLeft, ChevronRight } from 'lucide-react';
+import { Button } from './button';
+
+type GlobalPaginationProps = {
+ page: number;
+ total: number;
+ pageSize?: number;
+ onChange: (page: number) => void;
+};
+
+const getPages = (current: number, total: number) => {
+ const pages: (number | 'dots')[] = [];
+
+ if (total <= 7) {
+ return Array.from({ length: total }, (_, i) => i + 1);
+ }
+
+ pages.push(1);
+
+ if (current > 4) {
+ pages.push('dots');
+ }
+
+ const start = Math.max(2, current - 1);
+ const end = Math.min(total - 1, current + 1);
+
+ for (let i = start; i <= end; i++) {
+ pages.push(i);
+ }
+
+ if (current < total - 3) {
+ pages.push('dots');
+ }
+
+ pages.push(total);
+
+ return pages;
+};
+
+export const GlobalPagination = ({
+ page,
+ total,
+ pageSize = 36,
+ onChange,
+}: GlobalPaginationProps) => {
+ const totalPages = Math.ceil(total / pageSize);
+ if (totalPages <= 1) return null;
+
+ const pages = getPages(page, totalPages);
+
+ return (
+
+
page > 1 && onChange(page - 1)}
+ disabled={page === 1}
+ className="flex items-center justify-center w-10 cursor-pointer h-10 rounded-lg transition-all duration-200 hover:bg-gray-100 disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent"
+ >
+
+
+ {/* Page Numbers */}
+
+ {pages.map((p, i) => (
+
+ {p === 'dots' ? (
+
+ ···
+
+ ) : (
+ onChange(p)}
+ className={`
+ flex items-center justify-center w-10 h-10 px-3 rounded-lg font-medium transition-all duration-200
+ ${
+ p === page
+ ? 'bg-blue-600 text-white shadow-md shadow-blue-200 scale-105'
+ : 'text-gray-700 hover:bg-gray-100 hover:scale-105'
+ }
+ `}
+ >
+ {p}
+
+ )}
+
+ ))}
+
+
+
page < totalPages && onChange(page + 1)}
+ disabled={page === totalPages}
+ variant={'outline'}
+ className="flex items-center justify-center w-10 cursor-pointer h-10 rounded-lg transition-all duration-200 hover:bg-gray-100 disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent"
+ >
+
+
, 'size'> &
+ React.ComponentProps<'a'>;
+
+function PaginationLink({
+ className,
+ isActive,
+ size = 'icon',
+ ...props
+}: PaginationLinkProps) {
+ return (
+ ) {
+ return (
+
+ Previous
+
+ );
+}
+
+function PaginationNext({
+ className,
+ ...props
+}: React.ComponentProps) {
+ return (
+
+
+ );
+}
+
+function PaginationEllipsis({
+ className,
+ ...props
+}: React.ComponentProps<'span'>) {
+ return (
+
+ More pages
+
+ );
+}
+
+export {
+ Pagination,
+ PaginationContent,
+ PaginationEllipsis,
+ PaginationItem,
+ PaginationLink,
+ PaginationNext,
+ PaginationPrevious,
+};
diff --git a/src/shared/ui/skeleton.tsx b/src/shared/ui/skeleton.tsx
new file mode 100644
index 0000000..6f0cd99
--- /dev/null
+++ b/src/shared/ui/skeleton.tsx
@@ -0,0 +1,13 @@
+import { cn } from '@/shared/lib/utils';
+
+function Skeleton({ className, ...props }: React.ComponentProps<'div'>) {
+ return (
+
+ );
+}
+
+export { Skeleton };
diff --git a/src/widgets/animation/FlyingAnimationPortal.tsx b/src/widgets/animation/FlyingAnimationPortal.tsx
new file mode 100644
index 0000000..8b79f4f
--- /dev/null
+++ b/src/widgets/animation/FlyingAnimationPortal.tsx
@@ -0,0 +1,42 @@
+'use client';
+
+import { ProductListResult } from '@/shared/config/api/product/type';
+import {
+ Dispatch,
+ RefObject,
+ SetStateAction,
+ useEffect,
+ useState,
+} from 'react';
+import { createPortal } from 'react-dom';
+import Animation from '../categories/ui/animation';
+
+export function FlyingAnimationPortal({
+ product,
+ animated,
+ imageRef,
+ setAnimated,
+}: {
+ product: ProductListResult;
+ animated: boolean;
+ imageRef: RefObject;
+ setAnimated: Dispatch>;
+}) {
+ const [mounted, setMounted] = useState(false);
+
+ useEffect(() => {
+ setMounted(true);
+ }, []);
+
+ if (!mounted) return null;
+
+ return createPortal(
+ ;
+ setAnimated: (value: boolean) => void;
+}
+
+const Animation: React.FC = ({
+ product,
+ animated,
+ imageRef,
+ setAnimated,
+}) => {
+ const flyingImageRef = useRef(null);
+
+ useEffect(() => {
+ if (
+ !animated ||
+ !imageRef.current ||
+ !flyingImageRef.current ||
+ window.innerWidth <= 1024
+ )
+ return;
+
+ const cartIcon = document.getElementById('cart-icon');
+ if (!cartIcon) {
+ setAnimated(false);
+ return;
+ }
+
+ const flyingImg = flyingImageRef.current;
+ const startRect = imageRef.current.getBoundingClientRect();
+ const endRect = cartIcon.getBoundingClientRect();
+
+ // Markaz nuqtalar
+ const startCenterX = startRect.left + startRect.width / 2;
+ const startCenterY = startRect.top + startRect.height / 2;
+ const endCenterX = endRect.left + endRect.width / 2;
+ const endCenterY = endRect.top + endRect.height / 2;
+
+ // Boshlang'ich holat — aniq markazda, fixed
+ Object.assign(flyingImg.style, {
+ position: 'fixed',
+ left: `${startCenterX}px`,
+ top: `${startCenterY}px`,
+ width: `${startRect.width}px`,
+ height: `${startRect.height}px`,
+ opacity: '1',
+ transform: 'translate(-50%, -50%) scale(1)',
+ transition: 'none',
+ pointerEvents: 'none',
+ zIndex: '9999',
+ });
+
+ // Keyingi frame'da animatsiya boshlanadi
+ requestAnimationFrame(() => {
+ Object.assign(flyingImg.style, {
+ transition: 'all 0.9s cubic-bezier(0.2, 0.8, 0.4, 1)',
+ left: `${endCenterX}px`,
+ top: `${endCenterY}px`,
+ width: '60px',
+ height: '60px',
+ transform: 'translate(-50%, -50%) scale(0.3)',
+ opacity: '0',
+ });
+ });
+
+ // Cart bounce — class emas, inline style bilan (ishonchliroq)
+ cartIcon.style.transform = 'scale(1.3)';
+ cartIcon.style.transition = 'transform 0.8s cubic-bezier(0.2, 0.8, 0.4, 1)';
+
+ setTimeout(() => {
+ cartIcon.style.transform = 'scale(1)';
+ }, 800);
+
+ // Tozalash
+ const timer = setTimeout(() => {
+ setAnimated(false);
+ }, 1000);
+
+ return () => {
+ clearTimeout(timer);
+ cartIcon.style.transform = '';
+ cartIcon.style.transition = '';
+ };
+ }, [animated, imageRef, setAnimated]);
+
+ useEffect(() => {
+ if (
+ !animated ||
+ !imageRef.current ||
+ !flyingImageRef.current ||
+ window.innerWidth >= 1024
+ )
+ return;
+
+ // Mobil va desktopdagi cart iconlarni izlash
+ const cartIconMobile = document.getElementById('cart-icon-mobile');
+
+ // Avval mobilni tekshir, chunki lg:hidden bo'lsa ham DOMda bo'lishi mumkin
+ const cartIcon = cartIconMobile;
+
+ if (!cartIcon) {
+ console.warn('Cart icon topilmadi (mobil yoki desktop)');
+ setAnimated(false);
+ return;
+ }
+
+ const flyingImg = flyingImageRef.current;
+ const startRect = imageRef.current.getBoundingClientRect();
+ const endRect = cartIcon.getBoundingClientRect();
+
+ // Markaz nuqtalar
+ const startCenterX = startRect.left + startRect.width / 2;
+ const startCenterY = startRect.top + startRect.height / 2;
+ const endCenterX = endRect.left + endRect.width / 2;
+ const endCenterY = endRect.top + endRect.height / 2;
+
+ // Boshlang'ich holat
+ Object.assign(flyingImg.style, {
+ position: 'fixed',
+ left: `${startCenterX}px`,
+ top: `${startCenterY}px`,
+ width: `${startRect.width}px`,
+ height: `${startRect.height}px`,
+ opacity: '1',
+ transform: 'translate(-50%, -50%) scale(1)',
+ transition: 'none',
+ pointerEvents: 'none',
+ zIndex: '9999',
+ });
+
+ // Animatsiya boshlanishi
+ requestAnimationFrame(() => {
+ Object.assign(flyingImg.style, {
+ transition: 'all 0.9s cubic-bezier(0.2, 0.8, 0.4, 1)',
+ left: `${endCenterX}px`,
+ top: `${endCenterY}px`,
+ width: '60px',
+ height: '60px',
+ transform: 'translate(-50%, -50%) scale(0.3)',
+ opacity: '0',
+ });
+ });
+
+ // Cart bounce effekti
+ cartIcon.style.transform = 'scale(1.4)';
+ cartIcon.style.transition = 'transform 0.6s cubic-bezier(0.2, 0.8, 0.4, 1)';
+
+ setTimeout(() => {
+ cartIcon.style.transform = 'scale(1)';
+ }, 600);
+
+ // Tozalash
+ const timer = setTimeout(() => {
+ setAnimated(false);
+ }, 1000);
+
+ return () => {
+ clearTimeout(timer);
+ if (cartIcon) {
+ cartIcon.style.transform = '';
+ cartIcon.style.transition = '';
+ }
+ };
+ }, [animated, imageRef, setAnimated]);
+
+ if (!animated) return null;
+
+ return (
+ <>
+
+
+
+
+
+
+
();
+ const [canScrollPrev, setCanScrollPrev] = useState(false);
+ const [canScrollNext, setCanScrollNext] = useState(false);
- const handleRemove = (id: number) => {
- setProducts((prev) =>
- prev.map((product) =>
- product.id === id ? { ...product, liked: false } : product,
- ),
- );
+ useEffect(() => {
+ if (!api) return;
+
+ const updateButtons = () => {
+ setCanScrollPrev(api.canScrollPrev());
+ setCanScrollNext(api.canScrollNext());
+ };
+
+ updateButtons();
+ api.on('select', updateButtons);
+ api.on('reInit', updateButtons);
+
+ return () => {
+ api.off('select', updateButtons);
+ api.off('reInit', updateButtons);
+ };
+ }, [api]);
+
+ const scrollPrev = () => {
+ if (api) {
+ api?.scrollPrev();
+ }
};
- const handleLiked = (id: number) => {
- setProducts((prev) =>
- prev.map((product) =>
- product.id === id ? { ...product, liked: true } : product,
- ),
- );
+ const scrollNext = () => {
+ if (api) {
+ api?.scrollNext();
+ }
};
+ const { data: product, isLoading } = useQuery({
+ queryKey: ['product_list', category],
+ queryFn: () =>
+ product_api.listGetCategoryId({
+ category_id: category.id,
+ params: { page: 1, page_size: 16 },
+ }),
+ select(data) {
+ return data.data;
+ },
+ });
+
+ if (product?.results.length === 0) {
+ return null;
+ }
+
return (
-
-
+
+
- router.push(`/category/${category.category}/${category.name}`)
- }
+ onClick={() => router.push(`/category/${category.id}/`)}
>
{category.name}
@@ -51,25 +86,62 @@ export function CategoryCarousel({ category }: { category: SubCategory }) {
-
+
- {products.slice(0, 12).map((product) => (
-
-
- ))}
+ {isLoading &&
+ Array.from({ length: 6 }).map((__, index) => (
+
+
+
+
+ ))}
+ {product &&
+ !isLoading &&
+ product.results
+ .filter((product) => product.is_active)
+ .map((product) => (
+
+
+ ))}
-
-
+
+
+
+
);
}
diff --git a/src/widgets/categories/ui/product-card.tsx b/src/widgets/categories/ui/product-card.tsx
index 84e7dca..42d13dc 100644
--- a/src/widgets/categories/ui/product-card.tsx
+++ b/src/widgets/categories/ui/product-card.tsx
@@ -1,170 +1,331 @@
'use client';
+import { cart_api } from '@/features/cart/lib/api';
+import { product_api } from '@/shared/config/api/product/api';
+import { ProductListResult } from '@/shared/config/api/product/type';
+import { BASE_URL } from '@/shared/config/api/URLs';
import { useRouter } from '@/shared/config/i18n/navigation';
+import { useCartId } from '@/shared/hooks/cartId';
import formatPrice from '@/shared/lib/formatPrice';
+import { Alert, AlertDescription, AlertTitle } from '@/shared/ui/alert';
import { Button } from '@/shared/ui/button';
import { Card, CardContent } from '@/shared/ui/card';
import { Input } from '@/shared/ui/input';
-import { Heart, Minus, Plus, ShoppingCart, Star } from 'lucide-react';
+import { FlyingAnimationPortal } from '@/widgets/animation/FlyingAnimationPortal';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { AxiosError } from 'axios';
+import { Heart, Minus, Plus, ShoppingCart } from 'lucide-react';
+import { useTranslations } from 'next-intl';
import Image from 'next/image';
-import { MouseEvent, useState } from 'react';
-
-interface Product {
- id: number;
- name: string;
- price: number;
- oldPrice: number;
- image: string;
- rating: number;
- reviews: number;
- discount: number;
- inStock: boolean;
- liked: boolean;
-}
+import { MouseEvent, useEffect, useRef, useState } from 'react';
+import { toast } from 'sonner';
export function ProductCard({
product,
- handleRemove,
- handleLiked,
+ error,
}: {
- product: Product;
- handleRemove: (id: number) => void;
- handleLiked?: (id: number) => void;
+ product: ProductListResult;
+ error?: boolean;
}) {
const [quantity, setQuantity] = useState
(0);
const router = useRouter();
+ const queryClient = useQueryClient();
+ const t = useTranslations();
+ const { cart_id } = useCartId();
+ const [animated, setAnimated] = useState(false);
+ const debounceRef = useRef(null);
+ const imageRef = useRef(null);
+
+ const { mutate } = useMutation({
+ mutationFn: (body: { product: string; quantity: number; cart: string }) =>
+ cart_api.cart_item(body),
+ onSuccess: () => {
+ queryClient.refetchQueries({ queryKey: ['cart_items'] });
+ setAnimated(true);
+ },
+ onError: (err: AxiosError) => {
+ const detail = (err.response?.data as { detail: string }).detail;
+ toast.error(detail || err.message, {
+ richColors: true,
+ position: 'top-center',
+ });
+ },
+ });
+
+ const { mutate: updateCartItem } = useMutation({
+ mutationFn: ({
+ body,
+ cart_item_id,
+ }: {
+ body: { quantity: number };
+ cart_item_id: string;
+ }) => cart_api.update_cart_item({ body, cart_item_id }),
+ onSuccess: () => {
+ queryClient.refetchQueries({ queryKey: ['cart_items'] });
+ setAnimated(true);
+ },
+ onError: (err: AxiosError) => {
+ toast.error(err.message, { richColors: true, position: 'top-center' });
+ },
+ });
+
+ const { mutate: deleteCartItem } = useMutation({
+ mutationFn: ({ cart_item_id }: { cart_item_id: string }) =>
+ cart_api.delete_cart_item(cart_item_id),
+ onSuccess: () => {
+ queryClient.refetchQueries({ queryKey: ['cart_items'] });
+ setAnimated(true);
+ },
+ onError: (err: AxiosError) => {
+ toast.error(err.message, { richColors: true, position: 'top-center' });
+ },
+ });
+
+ const { data: cartItems } = useQuery({
+ queryKey: ['cart_items', cart_id],
+ queryFn: () => cart_api.get_cart_items(cart_id!),
+ enabled: !!cart_id,
+ });
+
+ useEffect(() => {
+ const item = cartItems?.data?.cart_item?.find(
+ (item) => item.product_id === product.id,
+ );
+
+ setQuantity(item ? item.quantity : 0);
+ }, [cartItems, product.id]);
+
+ const favouriteMutation = useMutation({
+ mutationFn: (productId: string) => product_api.favourite(productId),
+
+ onSuccess: () => {
+ queryClient.refetchQueries({ queryKey: ['product_list'] });
+ queryClient.refetchQueries({ queryKey: ['favourite_product'] });
+ queryClient.refetchQueries({ queryKey: ['search'] });
+ queryClient.refetchQueries({ queryKey: ['product_detail', product] });
+ },
+
+ onError: () => {
+ toast.error(t('Tizimga kirilmagan'), {
+ richColors: true,
+ position: 'top-center',
+ });
+ },
+ });
const increase = (e: MouseEvent) => {
e.stopPropagation();
- setQuantity((q) => {
- if (q === '' || q < 1) return 1;
- return q >= 999 ? 999 : q + 1;
- });
+ const newQty = (quantity === '' ? 0 : quantity) + 1;
+ setQuantity(newQty);
+
+ if (newQty > 1) {
+ const cartItemId = cartItems?.data?.cart_item.find(
+ (item) => item.product_id === product.id,
+ )?.id;
+ if (cartItemId) {
+ updateCartItem({
+ body: { quantity: newQty },
+ cart_item_id: cartItemId,
+ });
+ }
+ }
};
const decrease = (e: MouseEvent) => {
e.stopPropagation();
- setQuantity((q) => {
- if (q === '' || q <= 1) return 0;
- return q - 1;
+
+ if (!cartItems) return;
+
+ const currentQty = quantity === '' ? 0 : quantity;
+ const newQty = currentQty - 1;
+
+ const cartItemId = cartItems.data.cart_item.find(
+ (item) => item.product_id === product.id,
+ )?.id;
+
+ if (!cartItemId) return;
+
+ if (newQty <= 0) {
+ setQuantity(0);
+ deleteCartItem({ cart_item_id: cartItemId });
+ return;
+ }
+
+ setQuantity(newQty);
+ updateCartItem({
+ body: { quantity: newQty },
+ cart_item_id: cartItemId,
});
};
+ if (error) {
+ return (
+
+
+ Xatolik
+ {t('Mahsulotni yuklab bo‘lmadi')}
+
+
+ );
+ }
+
return (
- router.push(`/product/${product.id}`)}
- className="group relative p-0 overflow-hidden border border-slate-200 bg-white shadow-sm hover:shadow-lg transition-all rounded-xl sm:rounded-2xl hover:border-green-400"
- >
-
-
- {product.discount > 0 && (
+ <>
+
{
+ e.stopPropagation();
+ router.push(`/product/${product.id}`);
+ }}
+ className="group relative p-0 h-full flex flex-col overflow-hidden border border-slate-200 bg-white shadow-sm hover:shadow-lg transition-all rounded-xl sm:rounded-2xl hover:border-green-400"
+ >
+
+
+ {/* {product. > 0 && (
-{product.discount}%
- )}
+ )} */}
-
{
- e.stopPropagation();
+ {
+ e.stopPropagation();
+ favouriteMutation.mutate(product.id);
+ }}
+ className="absolute top-2 right-2 z-10 bg-white hover:bg-gray-200 cursor-pointer rounded-full p-1.5 sm:p-2 shadow hover:scale-110"
+ >
+
- if (product.liked) {
- handleRemove(product.id);
- } else if (handleLiked) {
- handleLiked(product.id);
- }
- }}
- className="absolute top-2 right-2 z-10 bg-white hover:bg-gray-200 cursor-pointer rounded-full p-1.5 sm:p-2 shadow hover:scale-110"
- >
-
-
-
-
-
+
+ {/*
{product.rating}
-
+
*/}
-
- {product.name}
-
+
+ {product.name}
+
-
-
- {formatPrice(product.price, true)}
-
+
+
+ {formatPrice(product.price, true)}
+
- {product.oldPrice && (
+ {/* {product. && (
{formatPrice(product.oldPrice, true)}
+ )} */}
+
+
+
+ {quantity === 0 ? (
+
{
+ e.stopPropagation();
+ mutate({
+ product: product.id,
+ quantity: 1,
+ cart: cart_id!,
+ });
+ }}
+ className="w-full h-9 sm:h-11 text-sm bg-green-600 hover:bg-green-600/80"
+ >
+
+ ) : (
+
e.stopPropagation()}
+ className="flex items-center justify-between border border-green-500 rounded-lg h-9 sm:h-11"
+ >
+
+
+
+
{
+ const v = e.target.value;
+
+ // ❌ faqat raqam
+ if (!/^\d*$/.test(v)) return;
+
+ // ⛔ oldingi debounce'ni tozalaymiz
+ if (debounceRef.current) {
+ clearTimeout(debounceRef.current);
+ }
+
+ // bo‘sh input — faqat UI
+ if (v === '') {
+ setQuantity('');
+ return;
+ }
+
+ const num = Number(v);
+ setQuantity(num);
+
+ if (!cartItems) return;
+
+ const cartItemId = cartItems.data.cart_item.find(
+ (item) => item.product_id === product.id,
+ )?.id;
+
+ if (!cartItemId) return;
+
+ // ❗ 0 bo‘lsa — DELETE (darhol)
+ if (num === 0) {
+ deleteCartItem({ cart_item_id: cartItemId });
+ return;
+ }
+
+ // 🕒 debounce bilan UPDATE
+ debounceRef.current = setTimeout(() => {
+ updateCartItem({
+ body: { quantity: num },
+ cart_item_id: cartItemId,
+ });
+ }, 500);
+ }}
+ />
+
+
+
+
)}
-
- {quantity === 0 ? (
-
{
- e.stopPropagation();
- setQuantity(1);
- }}
- className="w-full h-9 sm:h-11 text-sm bg-green-600 hover:bg-green-600/80 cursor-pointer"
- >
-
- ) : (
-
e.stopPropagation()}
- className="flex items-center justify-between border border-green-500 rounded-lg h-9 sm:h-11"
- >
-
-
-
{
- const v = e.target.value;
-
- if (!/^\d*$/.test(v)) return;
-
- if (v === '') {
- setQuantity('');
- return;
- }
-
- const num = Number(v);
-
- setQuantity(num > 999 ? 999 : num);
- }}
- inputMode="numeric"
- className="w-full border-none text-center text-sm !p-0 focus-visible:ring-0"
- />
-
-
-
-
- )}
-
-
-
+
+
+
+
);
}
diff --git a/src/widgets/footer/ui/index.tsx b/src/widgets/footer/ui/index.tsx
index 0ac3c24..34c25f8 100644
--- a/src/widgets/footer/ui/index.tsx
+++ b/src/widgets/footer/ui/index.tsx
@@ -1,14 +1,25 @@
+import { category_api } from '@/shared/config/api/category/api';
import { Link } from '@/shared/config/i18n/navigation';
import { PRODUCT_INFO } from '@/shared/constants/data';
import formatPhone from '@/shared/lib/formatPhone';
-import { categoryList } from '@/widgets/welcome/lib/data';
+import { useQuery } from '@tanstack/react-query';
import { Facebook, Instagram, Mail, Phone, Send, Twitter } from 'lucide-react';
+import { useTranslations } from 'next-intl';
import Image from 'next/image';
import { Fragment } from 'react';
const Footer = () => {
+ const t = useTranslations();
+ const { data: category } = useQuery({
+ queryKey: ['category_list'],
+ queryFn: () => category_api.getCategory({ page: 1, page_size: 12 }),
+ select(data) {
+ return data.data.results;
+ },
+ });
+
return (
-
+
@@ -27,49 +38,52 @@ const Footer = () => {
{PRODUCT_INFO.name}
-
- Lorem ipsum dolor sit amet consectetur, adipisicing elit. Est,
- totam?
+
+ {t(
+ "Gastronomiya va kulinariya san'ati haqidagi yetakchi onlayn magazin",
+ )}
- Kategoriyalar
+ {t('Kategoriyalar')}
- {categoryList.slice(0, 3).map((link) => (
+ {category?.slice(0, 6)?.map((link) => (
- {link.subCategories.slice(0, 2).map((e, linkIdx) => (
-
-
- ))}
+
+
))}
-
Sahifalar
+
+ {t('Sahifalar')}
+
-
-
-
-
Aloqa
+
+ {t("Biz bilan bog'laning")}
+
diff --git a/src/widgets/navbar/ui/ChangeLang.tsx b/src/widgets/navbar/ui/ChangeLang.tsx
index f960fcd..036f905 100644
--- a/src/widgets/navbar/ui/ChangeLang.tsx
+++ b/src/widgets/navbar/ui/ChangeLang.tsx
@@ -8,6 +8,7 @@ import {
DropdownMenuItem,
DropdownMenuTrigger,
} from '@/shared/ui/dropdown-menu';
+import { useTranslations } from 'next-intl';
import Image from 'next/image';
import { useParams, usePathname, useRouter } from 'next/navigation';
import { languages } from '../lib/data';
@@ -16,6 +17,7 @@ export function ChangeLang() {
const { locale } = useParams();
const pathname = usePathname();
const router = useRouter();
+ const t = useTranslations();
const changeLocale = (locale: LanguageRoutes) => {
const segments = pathname.split('/');
@@ -51,7 +53,7 @@ export function ChangeLang() {
)}
- {languages.find((e) => e.key === locale)?.name}
+ {t(languages.find((e) => e.key === locale)?.name ?? "O'zbekcha")}
@@ -65,7 +67,7 @@ export function ChangeLang() {
onClick={() => changeLocale(e.key)}
className="hover:bg-blue-50 cursor-pointer text-slate-700 hover:text-blue-700 px-3 py-2"
>
- {e.name}
+ {t(e.name)}
))}
diff --git a/src/widgets/navbar/ui/NavbarMobile.tsx b/src/widgets/navbar/ui/NavbarMobile.tsx
index ba4f506..19bab6a 100644
--- a/src/widgets/navbar/ui/NavbarMobile.tsx
+++ b/src/widgets/navbar/ui/NavbarMobile.tsx
@@ -1,24 +1,27 @@
'use client';
+import { cart_api } from '@/features/cart/lib/api';
+import { Link } from '@/shared/config/i18n/navigation';
+import { useCartId } from '@/shared/hooks/cartId';
+import { getToken } from '@/shared/lib/token';
import { cn } from '@/shared/lib/utils';
+import { Badge } from '@/shared/ui/badge';
import { Button } from '@/shared/ui/button';
+import { useQuery } from '@tanstack/react-query';
import { Heart, Home, LayoutGrid, ShoppingCart, User } from 'lucide-react';
-import Link from 'next/link';
+import { useTranslations } from 'next-intl';
import { usePathname } from 'next/navigation';
import { useEffect, useState } from 'react';
const NavbarMobile = () => {
- const pathname = usePathname();
- const [profile, setProfile] = useState
(false);
- const user = localStorage.getItem('user');
-
+ const [mounted, setMounted] = useState(false);
+ const t = useTranslations();
useEffect(() => {
- if (user && user === 'true') {
- setProfile(true);
- } else {
- setProfile(false);
- }
- }, [user]);
+ setMounted(true);
+ }, []);
+
+ const pathname = usePathname();
+ const token = getToken();
const navItems = [
{ label: 'Asosiy', icon: Home, href: '/' },
@@ -28,9 +31,29 @@ const NavbarMobile = () => {
{
label: 'Profil',
icon: User,
- href: profile ? '/profile' : '/auth',
+ href: token ? '/profile' : '/auth',
},
];
+ const [cartQuenty, setCartQuenty] = useState(0);
+ const { cart_id } = useCartId();
+
+ const { data: cartItems } = useQuery({
+ queryKey: ['cart_items', cart_id],
+ queryFn: () => cart_api.get_cart_items(cart_id!),
+ enabled: !!cart_id,
+ select(data) {
+ return data.data.cart_item;
+ },
+ });
+
+ useEffect(() => {
+ if (cartItems) {
+ const total = cartItems.reduce((sum, item) => sum + item.quantity, 0);
+ setCartQuenty(total > 9 ? 9 : total);
+ }
+ }, [cartItems]);
+
+ if (!mounted) return null;
return (
@@ -44,25 +67,33 @@ const NavbarMobile = () => {
return (
-
+
+ {cartQuenty === 9 ? cartQuenty + '+' : cartQuenty}
+
)}
- />
+
- {item.label}
+ {t(item.label)}
diff --git a/src/widgets/navbar/ui/SearchResult.tsx b/src/widgets/navbar/ui/SearchResult.tsx
index 4479b75..0aef852 100644
--- a/src/widgets/navbar/ui/SearchResult.tsx
+++ b/src/widgets/navbar/ui/SearchResult.tsx
@@ -1,7 +1,15 @@
+import { product_api } from '@/shared/config/api/product/api';
+import {
+ ProductListResult,
+ SearchDataPro,
+} from '@/shared/config/api/product/type';
+import { BASE_URL } from '@/shared/config/api/URLs';
import { useRouter } from '@/shared/config/i18n/navigation';
import formatPrice from '@/shared/lib/formatPrice';
-import { categories, ProductDetail } from '@/widgets/categories/lib/data';
+import { Skeleton } from '@/shared/ui/skeleton';
+import { useQuery } from '@tanstack/react-query';
import { PackageOpen } from 'lucide-react';
+import { useTranslations } from 'next-intl';
import Image from 'next/image';
import { Fragment, useEffect, useState } from 'react';
@@ -10,62 +18,106 @@ type SearchResultProps = {
};
export const SearchResult = ({ query }: SearchResultProps) => {
- const [searchProduct, setSearchProduct] = useState
([]);
const router = useRouter();
+ const t = useTranslations();
+ const [searchRes, setSearchRes] = useState<
+ ProductListResult[] | SearchDataPro[] | []
+ >([]);
+
+ const { data: product } = useQuery({
+ queryKey: ['product_list'],
+ queryFn: () => product_api.list({ page: 1, page_size: 99 }),
+ select(data) {
+ return data.data.results;
+ },
+ });
+
+ const { data, isLoading } = useQuery({
+ queryKey: ['search', query],
+ queryFn: () => product_api.search({ search: query, page: 1, page_szie: 5 }),
+ select(data) {
+ return data.data.products;
+ },
+ enabled: !!query,
+ });
useEffect(() => {
- setSearchProduct(
- categories.flatMap((cat) =>
- cat.products.filter((pro) =>
- pro.name.toLowerCase().includes(query.toLowerCase()),
- ),
- ),
- );
- }, [query]);
+ if (data) {
+ setSearchRes(data);
+ } else if (product && product.length > 0) {
+ setSearchRes(product);
+ } else {
+ setSearchRes([]);
+ }
+ }, [product, data]);
- if (searchProduct.length === 0) {
+ if (searchRes && searchRes.length === 0) {
return (
- Hech narsa topilmadi
+ {t('Hech narsa topilmadi')}
);
}
+ if (isLoading) {
+ return (
+
+ {Array.from({ length: 5 }).map((_, i) => (
+
+ ))}
+
- {query.length > 0 ? 'Qidiruv natijalari' : 'Tavsiya etiladi'}
+ {query.length > 0 ? t('Qidiruv natijalari') : t('Tavsiya etiladi')}
- {searchProduct.slice(0, 5).map((product, index) => (
-
- router.push(`/product/${product.id}`)}
- >
-
+ {searchRes &&
+ searchRes
+ .filter((product) => product.is_active)
+ .slice(0, 5)
+ .map((product, index) => (
+
+ router.push(`/product/${product.id}`)}
+ >
+
-
-
- {product.name}
-
-
{product.rating}
-
- {formatPrice(product.price)}
-
-
-
- ))}
+
+
+ {product.name}
+
+
+ {formatPrice(product.price)}
+
+
+
+ ))}
);
};
diff --git a/src/widgets/navbar/ui/index.tsx b/src/widgets/navbar/ui/index.tsx
index 9f2fc4f..ec02e35 100644
--- a/src/widgets/navbar/ui/index.tsx
+++ b/src/widgets/navbar/ui/index.tsx
@@ -1,7 +1,11 @@
'use client';
+import { cart_api } from '@/features/cart/lib/api';
import { Link, useRouter } from '@/shared/config/i18n/navigation';
+import { useCartId } from '@/shared/hooks/cartId';
import formatPhone from '@/shared/lib/formatPhone';
+import { getToken } from '@/shared/lib/token';
+import { Badge } from '@/shared/ui/badge';
import { Button } from '@/shared/ui/button';
import { Input } from '@/shared/ui/input';
import { Popover, PopoverContent } from '@/shared/ui/popover';
@@ -15,12 +19,12 @@ import {
} from '@/shared/ui/sheet';
import { categoryList } from '@/widgets/welcome/lib/data';
import { PopoverTrigger } from '@radix-ui/react-popover';
+import { useMutation, useQuery } from '@tanstack/react-query';
import {
ChevronRight,
Facebook,
Heart,
Instagram,
- LayoutGrid,
Mail,
MenuIcon,
Phone,
@@ -29,8 +33,8 @@ import {
ShoppingCart,
Twitter,
User,
- XIcon,
} from 'lucide-react';
+import { useTranslations } from 'next-intl';
import Image from 'next/image';
import { useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';
@@ -44,19 +48,43 @@ const Navbar = () => {
const [isSticky, setIsSticky] = useState(false);
const [query, setQuery] = useState('');
const searchParams = useSearchParams();
- const [user, setUser] = useState(false);
- const users = localStorage.getItem('user');
+ const token = getToken();
+ const t = useTranslations();
+ const { cart_id } = useCartId();
+ const [cartQuenty, setCartQuenty] = useState(0);
+ const { setCartId } = useCartId();
+
+ const { mutate: cart } = useMutation({
+ mutationFn: () => cart_api.create(),
+ onSuccess: (data) => {
+ setCartId(data.data.cart_id);
+ },
+ });
useEffect(() => {
- if (users && users === 'true') {
- setUser(true);
- } else {
- setUser(false);
+ if (token) {
+ cart();
}
- }, [users]);
+ }, [token]);
const queryFromUrl = searchParams.get('q') ?? '';
+ const { data: cartItems } = useQuery({
+ queryKey: ['cart_items', cart_id],
+ queryFn: () => cart_api.get_cart_items(cart_id!),
+ enabled: !!cart_id,
+ select(data) {
+ return data.data.cart_item;
+ },
+ });
+
+ useEffect(() => {
+ if (cartItems) {
+ const total = cartItems.reduce((sum, item) => sum + item.quantity, 0);
+ setCartQuenty(total > 9 ? 9 : total);
+ }
+ }, [cartItems]);
+
useEffect(() => {
setQuery(queryFromUrl);
}, [queryFromUrl]);
@@ -89,7 +117,7 @@ const Navbar = () => {
href="/about"
className="flex items-center gap-1.5 font-medium"
>
- Biz haqimizda
+ {t('Biz haqimizda')}
@@ -97,7 +125,7 @@ const Navbar = () => {
href="/privacy-policy"
className="flex items-center gap-1.5 font-medium"
>
- Maxfiylik siyosati
+ {t('Maxfiylik siyosati')}
@@ -105,7 +133,7 @@ const Navbar = () => {
href="/faq"
className="flex items-center gap-1.5 font-medium"
>
- Savol-javob
+ {t('Savol-javob')}
@@ -205,7 +233,7 @@ const Navbar = () => {
{/* Asosiy Sahifalar */}
- Sahifalar
+ {t('Sahifalar')}
@@ -215,7 +243,7 @@ const Navbar = () => {
>
- Biz haqimizda
+ {t('Biz haqimizda')}
- Maxfiylik siyosati
+ {t('Maxfiylik siyosati')}
- Savol va javoblar
+ {t('Savol-javob')}
- {"Biz bilan bog'laning"}
+ {t("Biz bilan bog'laning")}
{
-
{
@@ -339,11 +367,11 @@ const Navbar = () => {
Kataloglar
-
+ */}
setSearchOpen(true)}
onBlur={() => setTimeout(() => setSearchOpen(false), 200)}
@@ -379,15 +407,19 @@ const Navbar = () => {
router.push('/cart')}
- className="h-10 max-lg:hidden cursor-pointer border border-slate-200"
+ className="h-10 relative max-lg:hidden cursor-pointer border border-slate-200"
>
+ {cartQuenty === 9 ? cartQuenty + '+' : cartQuenty}
+
{
- if (user) {
+ if (token) {
router.push('/profile');
} else {
router.push('/auth');
diff --git a/src/widgets/welcome/lib/api.ts b/src/widgets/welcome/lib/api.ts
new file mode 100644
index 0000000..79459bd
--- /dev/null
+++ b/src/widgets/welcome/lib/api.ts
@@ -0,0 +1,11 @@
+import httpClient from '@/shared/config/api/httpClient';
+import { API_URLS } from '@/shared/config/api/URLs';
+import { AxiosResponse } from 'axios';
+import { BannerRes } from './type';
+
+export const banner_api = {
+ async getBanner(): Promise> {
+ const res = await httpClient.get(API_URLS.Banner);
+ return res;
+ },
+};
diff --git a/src/widgets/welcome/lib/type.ts b/src/widgets/welcome/lib/type.ts
new file mode 100644
index 0000000..b03af6a
--- /dev/null
+++ b/src/widgets/welcome/lib/type.ts
@@ -0,0 +1,4 @@
+export interface BannerRes {
+ id: string;
+ banner: string;
+}
diff --git a/src/widgets/welcome/ui/index.tsx b/src/widgets/welcome/ui/index.tsx
index b256130..0c6844f 100644
--- a/src/widgets/welcome/ui/index.tsx
+++ b/src/widgets/welcome/ui/index.tsx
@@ -1,8 +1,8 @@
'use client';
-import Banner from '@/assets/gemma-c-stpjHJGqZyw-unsplash.jpg';
-import Banner_Two from '@/assets/photo-1506617420156-8e4536971650.jpg';
-import Banner_Three from '@/assets/pngtree-supermarket-aisle-with-empty-shopping-cart-at-grocery-store-retail-business-image_15646095.jpg';
+import { category_api } from '@/shared/config/api/category/api';
+import { BASE_URL } from '@/shared/config/api/URLs';
+import { Link } from '@/shared/config/i18n/navigation';
import { AspectRatio } from '@/shared/ui/aspect-ratio';
import { Button } from '@/shared/ui/button';
import {
@@ -11,19 +11,34 @@ import {
CarouselItem,
type CarouselApi,
} from '@/shared/ui/carousel';
-import useCategoryActive from '@/widgets/navbar/lib/openCategory';
-import { ChevronLeft, ChevronRight } from 'lucide-react';
+import { Skeleton } from '@/shared/ui/skeleton';
+import { CategoryCarousel } from '@/widgets/categories/ui/category-carousel';
+import { useQuery } from '@tanstack/react-query';
+import { AlertCircle, ChevronLeft, ChevronRight } from 'lucide-react';
import Image from 'next/image';
import { useState } from 'react';
import 'swiper/css';
-import { Swiper, SwiperSlide } from 'swiper/react';
-import { categoryList } from '../lib/data';
-
-const banner = [Banner, Banner_Two, Banner_Three];
+import { banner_api } from '../lib/api';
const Welcome = () => {
- const { setActive, setOpenToolbar } = useCategoryActive();
const [api, setApi] = useState();
+ const [apiCat, setApiCat] = useState();
+
+ const { data, isLoading, isError } = useQuery({
+ queryKey: ['banner_list'],
+ queryFn: () => banner_api.getBanner(),
+ select(data) {
+ return data.data;
+ },
+ });
+
+ const { data: category } = useQuery({
+ queryKey: ['category_list'],
+ queryFn: () => category_api.getCategory({ page: 1, page_size: 99 }),
+ select(data) {
+ return data.data.results;
+ },
+ });
const scrollPrev = () => {
if (api?.canScrollPrev()) {
@@ -33,6 +48,10 @@ const Welcome = () => {
}
};
+ const scrollPrevCar = () => {
+ apiCat?.scrollPrev();
+ };
+
const scrollNext = () => {
if (api?.canScrollNext()) {
api?.scrollNext();
@@ -41,78 +60,110 @@ const Welcome = () => {
}
};
- return (
-
-
-
- {banner.map((e, index) => (
-
-
-
-
-
-
-
-
-
-
- ))}
-
-
+ const scrollNextCat = () => {
+ apiCat?.scrollNext();
+ };
- {/* Category Slider */}
-
-
- {categoryList.map((item, index) => (
-
- {
- setOpenToolbar(true);
- setActive(item);
- }}
- >
-
-
- {item.name}
-
-
- ))}
-
+ return (
+ <>
+
+
+
+ {isLoading && (
+
+
+ )}
+ {isError && (
+
+ Banner yuklanmadi. Xatolik yuz
+
+ )}
+ {data &&
+ data.map((banner, index) => (
+
+
+
+
+
+
+
+
+ ))}
+
+
+
+
+
+ {category &&
+ category.map((banner, index) => (
+
+
+ ))}
+
+
+
+
+
+
-
+ {category &&
+ category
+ .slice(0, 6)
+ .map((e) =>
)}
+
);
};