minhnhat/uldp.edu.vn
1
0
Fork 0
forked from UKSOURCE/hailearning.edu.vn
Code Pull Requests 1 Activity

Merge branch 'main' of https://gits.techvanguard.vn/UKSOURCE/hailearning.edu.vn into fea/thanh-02022026-news

Browse Source
This commit is contained in:
Wini_Fy
2026-02-05 16:01:26 +07:00
parent 11f435378f 774d531aa1
commit 9e6fc061a4
8 changed files with 213 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/blog/category/[slug]/page.tsx
View File

@@ -4,22 +4,21 @@ import Sidebar from "@/app/blog/components/Sidebar";
import { fetchBlogsByCategory, fetchCategoryDetail } from "@/api/blogsApi";
interface CategoryPageProps {
params:
| Promise<{
slug: string;
}>
| {
slug: string;
};
searchParams?: Promise<{ search?: string; page?: string }> | { search?: string; page?: string };
params:
| Promise<{
slug: string;
}>
| {
slug: string;
};
searchParams?: Promise<{ search?: string; page?: string }> | { search?: string; page?: string };
}
export default async function CategoryPage({ params, searchParams }: CategoryPageProps) {
// Handle both Promise and direct object
const resolvedParams = params instanceof Promise ? await params : params;
const slug = resolvedParams.slug;
const resolvedSearchParams =
searchParams instanceof Promise ? await searchParams : searchParams;
const resolvedSearchParams = searchParams instanceof Promise ? await searchParams : searchParams;
const searchQuery = resolvedSearchParams?.search?.toString() || "";
const pageParam = resolvedSearchParams?.page?.toString() || "1";
const currentPage = Number.parseInt(pageParam, 10) || 1;
@@ -30,9 +29,9 @@ export default async function CategoryPage({ params, searchParams }: CategoryPag
[categoryResponse, blogsResponse] = await Promise.all([
fetchCategoryDetail(slug),
fetchBlogsByCategory(slug, {
page: currentPage,
limit: 3,
...(searchQuery ? { search: searchQuery } : {}),
page: currentPage,
limit: 3,
...(searchQuery ? { search: searchQuery } : {}),
}),
]);
} catch {
@@ -64,12 +63,7 @@ export default async function CategoryPage({ params, searchParams }: CategoryPag
return (
<>
<Breadcrumb title={category.name} current="Blog Category" />
<NewsSection
blogs={blogs}
categorySlug={slug}
searchQuery={searchQuery}
pagination={pagination}
/>
<NewsSection blogs={blogs} categorySlug={slug} searchQuery={searchQuery} pagination={pagination} />
</>
);
}