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

This commit is contained in:
Wini_Fy
2026-02-05 16:01:26 +07:00
8 changed files with 213 additions and 119 deletions

62
api/footerApi.ts Normal file
View File

@@ -0,0 +1,62 @@
/**
* Footer API Functions
* Fetch footer data from external API
*/
const getApiUrl = (): string => {
return process.env.NEXT_PUBLIC_API_URL || "http://localhost:3001";
};
export interface FooterData {
top: {
bgImage: string;
phone: {
display: string;
href: string;
};
address: string;
logo: {
src: string;
alt: string;
href: string;
};
menuLinks: Array<{
label: string;
href: string;
}>;
socialLinks: Array<{
icon: string;
href: string;
}>;
};
bottom: {
copyright: {
text: string;
brand: string;
rights: string;
};
menuLinks: Array<{
label: string;
href: string;
}>;
};
}
export const footerApi = {
// Get footer data
getFooter: async (): Promise<FooterData> => {
try {
const apiUrl = getApiUrl();
const response = await fetch(`${apiUrl}/api/footer`);
if (!response.ok) {
throw new Error(`HTTP error! status: ${response.status}`);
}
return await response.json();
} catch (error) {
console.error("Error fetching footer data:", error);
// Fallback to static data if API fails
const fallbackData = await import("../app/components/layout/Footer/footer.json");
return fallbackData.default as FooterData;
}
},
};

View File

@@ -1,5 +1,6 @@
/**
* Export all API functions
*/
export * from './blogsApi';
export * from './homeApi';
export * from "./blogsApi";
export * from "./footerApi";
export * from "./servicesApi";

View File

@@ -20,9 +20,11 @@ export async function generateStaticParams() {
}
interface BlogDetailsPageProps {
params: Promise<{
params:
| Promise<{
slug: string;
}> | {
}>
| {
slug: string;
};
}

View File

@@ -18,8 +18,7 @@ export default async function CategoryPage({ params, searchParams }: CategoryPag
// 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;
@@ -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} />
</>
);
}

View File

@@ -7,8 +7,7 @@ interface NewsPageProps {
}
export default async function NewsPage({ searchParams }: NewsPageProps) {
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;
@@ -23,10 +22,7 @@ export default async function NewsPage({ searchParams }: NewsPageProps) {
return (
<>
<Breadcrumb
title={searchQuery ? `Search: ${searchQuery}` : "Blog Standard"}
current="Blog Standard"
/>
<Breadcrumb title={searchQuery ? `Search: ${searchQuery}` : "Blog Standard"} current="Blog Standard" />
<NewsSection blogs={blogs} searchQuery={searchQuery} pagination={pagination} />
</>
);

View File

@@ -18,8 +18,7 @@ export default async function TagPage({ params, searchParams }: TagPageProps) {
// 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;

View File

@@ -1,8 +1,28 @@
import Link from 'next/link';
import footerData from './footer.json';
"use client";
import Link from "next/link";
import { useEffect, useState } from "react";
import { footerApi, FooterData } from "../../../../api/footerApi";
import footerData from "./footer.json";
const FooterBottom = () => {
const { bottom } = footerData;
const [data, setData] = useState<FooterData>(footerData as FooterData);
useEffect(() => {
const loadFooterData = async () => {
try {
const apiData = await footerApi.getFooter();
setData(apiData);
} catch (error) {
console.error("Failed to load footer data from API, using static data:", error);
// Keep using static data as fallback
}
};
loadFooterData();
}, []);
const { bottom } = data;
return (
<div className="footer-bottom">

View File

@@ -1,8 +1,28 @@
import Link from 'next/link';
import footerData from './footer.json';
"use client";
import Link from "next/link";
import { useEffect, useState } from "react";
import { footerApi, FooterData } from "../../../../api/footerApi";
import footerData from "./footer.json";
const FooterTop = () => {
const { top } = footerData;
const [data, setData] = useState<FooterData>(footerData as FooterData);
useEffect(() => {
const loadFooterData = async () => {
try {
const apiData = await footerApi.getFooter();
setData(apiData);
} catch (error) {
console.error("Failed to load footer data from API, using static data:", error);
// Keep using static data as fallback
}
};
loadFooterData();
}, []);
const { top } = data;
return (
<footer className="footer-section fix bg-cover" style={{ backgroundImage: `url('${top.bgImage}')` }}>