-
+
Bộ cấu hình
diff --git a/src/components/Cart/Home/ItemCart/index.tsx b/src/components/Cart/Home/ItemCart/index.tsx
index 47017d6..3041531 100644
--- a/src/components/Cart/Home/ItemCart/index.tsx
+++ b/src/components/Cart/Home/ItemCart/index.tsx
@@ -28,7 +28,7 @@ export const ItemCart: React.FC = ({ item, onUpdate, onDelete }) => {
return (
-
+
= ({ item, onUpdate, onDelete }) => {
width={100}
height={100}
/>
- {item.item_info.sale_rules?.type == 'deal' && (
+ {item.item_info.sale_rules?.type === 'deal' && (
= ({ item, onUpdate, onDelete }) => {
- {item.in_cart.price == '0' ? (
-
- 0 đ
-
- ) : (
-
- {formatCurrency(item.in_cart.total_price)} đ
-
- )}
+
+ {item.in_cart.price === '0' ? '0' : formatCurrency(item.in_cart.total_price)} đ
+
diff --git a/src/components/Product/BoxFilter/index.tsx b/src/components/Product/BoxFilter/index.tsx
index 59a7deb..68e6dd4 100644
--- a/src/components/Product/BoxFilter/index.tsx
+++ b/src/components/Product/BoxFilter/index.tsx
@@ -83,7 +83,9 @@ const BoxFilter: React.FC
= ({ filters }) => {
{primaryBrandFilter && (
diff --git a/src/features/Article/ArticleTopLeft/index.tsx b/src/features/Article/ArticleTopLeft/index.tsx
index 120776d..d38c5ab 100644
--- a/src/features/Article/ArticleTopLeft/index.tsx
+++ b/src/features/Article/ArticleTopLeft/index.tsx
@@ -15,12 +15,10 @@ export const ArticleTopLeft = () => {
return (
- {articles.slice(0, 1).map((item) => (
-
- ))}
+ {articles[0] && }
- {articles.slice(0, 4).map((item) => (
+ {articles.slice(1, 5).map((item) => (
))}
diff --git a/src/features/Article/CategoryPage/index.tsx b/src/features/Article/CategoryPage/index.tsx
index bf3318e..bf62633 100644
--- a/src/features/Article/CategoryPage/index.tsx
+++ b/src/features/Article/CategoryPage/index.tsx
@@ -1,7 +1,6 @@
'use client';
import Link from 'next/link';
-import Image from 'next/image';
import type { TypeArticleCatePage } from '@/types/article/TypeArticleCatePage';
@@ -96,29 +95,7 @@ const ArticleCategoryPage: React.FC
= ({ slug }) => {
Tin nổi bật
{articles.slice(0, 5).map((item) => (
-
-
-
-
-
-
-
-
-
-
{item.title}
-
-
-
- {item.createDate}
-
-
{item.summary}
-
-
+
))}
diff --git a/src/features/Article/DetailPage/TocBox/index.tsx b/src/features/Article/DetailPage/TocBox/index.tsx
index e5679df..dbabac7 100644
--- a/src/features/Article/DetailPage/TocBox/index.tsx
+++ b/src/features/Article/DetailPage/TocBox/index.tsx
@@ -11,9 +11,9 @@ type HeadingItem = {
function convertToSlug(text: string) {
return text
.toLowerCase()
+ .replace(/đ/g, 'd') // phải xử lý trước NFD vì NFD sẽ phân rã đ thành ký tự khác
.normalize('NFD')
.replace(/[\u0300-\u036f]/g, '')
- .replace(/đ/g, 'd')
.replace(/[^\w ]+/g, '')
.trim()
.replace(/\s+/g, '-');
diff --git a/src/features/Article/DetailPage/index.tsx b/src/features/Article/DetailPage/index.tsx
index b492e27..63efe73 100644
--- a/src/features/Article/DetailPage/index.tsx
+++ b/src/features/Article/DetailPage/index.tsx
@@ -57,7 +57,7 @@ const ArticleDetailPage: React.FC
= ({ slug }) => {
{item.title}
@@ -75,7 +75,7 @@ const ArticleDetailPage: React.FC = ({ slug }) => {
- {page.article_other_same_category && (
+ {combinedList.length > 0 && (
diff --git a/src/features/Article/HomeArticlePage/BoxArticleMid/index.tsx b/src/features/Article/HomeArticlePage/BoxArticleMid/index.tsx
index 2247c2c..e645b4f 100644
--- a/src/features/Article/HomeArticlePage/BoxArticleMid/index.tsx
+++ b/src/features/Article/HomeArticlePage/BoxArticleMid/index.tsx
@@ -2,7 +2,6 @@
import ItemArticle from '@/components/Common/ItemArticle';
import Link from 'next/link';
-import Image from 'next/image';
import { getArticles } from '@/lib/api/article';
import { useApiData } from '@/hooks/useApiData';
import type { ListArticle } from '@/types/article/TypeListArticle';
@@ -35,29 +34,7 @@ export const BoxArticleMid = () => {
Tin nổi bật
{articles.slice(0, 5).map((item) => (
-
-
-
-
-
-
-
-
-
-
{item.title}
-
-
-
- {item.createDate}
-
-
{item.summary}
-
-
+
))}
diff --git a/src/features/Article/HomeArticlePage/BoxArticleReview/index.tsx b/src/features/Article/HomeArticlePage/BoxArticleReview/index.tsx
index cf3d15f..4570485 100644
--- a/src/features/Article/HomeArticlePage/BoxArticleReview/index.tsx
+++ b/src/features/Article/HomeArticlePage/BoxArticleReview/index.tsx
@@ -29,11 +29,11 @@ export const BoxArticleReview = () => {
slidesPerView={3}
loop={true}
>
- {articles.map((item) => (
+ {articles.slice(0, 9).map((item) => (
-
+
diff --git a/src/lib/api/article.ts b/src/lib/api/article.ts
index 21565d9..4f5147d 100644
--- a/src/lib/api/article.ts
+++ b/src/lib/api/article.ts
@@ -8,17 +8,23 @@ function normalizeSlug(slug: string) {
return slug.replace(/^\/+/, '');
}
-export function getArticles() {
- return apiFetch('/articles');
+// Tạo hàm fetch có cache theo TTL — nhiều component gọi cùng lúc
+// sẽ share 1 request thay vì gửi nhiều request trùng lặp.
+function makeCache(fetcher: () => Promise, ttl = 30_000) {
+ let cache: Promise | null = null;
+ return () => {
+ if (!cache) {
+ cache = fetcher().finally(() => {
+ setTimeout(() => { cache = null; }, ttl);
+ });
+ }
+ return cache;
+ };
}
-export function getArticleVideos() {
- return apiFetch('/articles/videos');
-}
-
-export function getArticleCategories() {
- return apiFetch('/articles/categories');
-}
+export const getArticles = makeCache(() => apiFetch('/articles'));
+export const getArticleVideos = makeCache(() => apiFetch('/articles/videos'));
+export const getArticleCategories = makeCache(() => apiFetch('/articles/categories'));
export function getArticleCategoryDetail(slug: string) {
return apiFetch(`/articles/categories/${normalizeSlug(slug)}`);
diff --git a/src/lib/api/client.ts b/src/lib/api/client.ts
index e5a48b4..1d490e4 100644
--- a/src/lib/api/client.ts
+++ b/src/lib/api/client.ts
@@ -23,7 +23,6 @@ export async function apiFetch(
try {
const res = await fetch(`${API_URL}${path}`, {
...fetchOptions,
- cache: 'no-store',
signal: controller.signal,
});