fix: show blog in hub page

This commit is contained in:
Sosokker 2025-04-04 21:14:52 +07:00
parent 3dc5f37436
commit a38ee0df35
6 changed files with 138 additions and 153 deletions

View File

@ -1,148 +1,103 @@
import axiosInstance from "./config"; import axiosInstance from "./config";
import type {
KnowledgeArticle as BackendArticle,
TableOfContent as BackendTOC,
RelatedArticle as BackendRelated,
} from "@/types";
import type { Blog } from "@/types"; import type { Blog } from "@/types";
// Dummy blog data used as a fallback. function mapBackendArticleToFrontendBlog(
const dummyBlogs: Blog[] = [ backendArticle: BackendArticle,
{ toc?: BackendTOC[],
id: 1, related?: BackendRelated[]
title: "Sustainable Farming Practices for Modern Agriculture", ): Blog {
description: return {
"Learn about eco-friendly farming techniques that can increase yield while preserving the environment.", id: backendArticle.UUID,
date: "2023-05-15", title: backendArticle.Title,
author: "Emma Johnson", description: backendArticle.Content.substring(0, 150) + "...",
topic: "Sustainability", date: backendArticle.PublishDate.toString(),
image: "/placeholder.svg?height=400&width=600", author: backendArticle.Author,
readTime: "5 min read", topic: backendArticle.Categories.length > 0 ? backendArticle.Categories[0] : "General",
featured: true, image: backendArticle.ImageURL || "/placeholder.svg",
content: `<p>Sustainable farming is not just a trend; it's a necessary evolution in agricultural practices. […]</p>`, readTime: backendArticle.ReadTime || "5 min read",
tableOfContents: [ featured: backendArticle.Categories.includes("Featured"),
{ id: "importance", title: "The Importance of Sustainable Agriculture", level: 1 }, content: backendArticle.Content,
{ id: "crop-rotation", title: "Crop Rotation and Diversification", level: 1 }, tableOfContents: toc
{ id: "ipm", title: "Integrated Pest Management (IPM)", level: 1 }, ? toc.map((item) => ({
{ id: "water-conservation", title: "Water Conservation Techniques", level: 1 }, id: item.UUID,
{ id: "soil-health", title: "Soil Health Management", level: 1 }, title: item.Title,
{ id: "renewable-energy", title: "Renewable Energy Integration", level: 1 }, level: item.Level,
{ id: "conclusion", title: "Conclusion", level: 1 }, }))
], : [],
relatedArticles: [ relatedArticles: related
{ ? related.map((item) => ({
id: 2, id: item.UUID,
title: "Optimizing Fertilizer Usage for Maximum Crop Yield", title: item.RelatedTitle,
topic: "Fertilizers", topic: item.RelatedTag,
image: "/placeholder.svg?height=200&width=300", image: "/placeholder.svg",
description: "", }))
date: "", : [],
author: "", };
readTime: "", }
featured: false,
},
{
id: 4,
title: "Water Conservation Techniques for Drought-Prone Areas",
topic: "Sustainability",
image: "/placeholder.svg?height=200&width=300",
description: "",
date: "",
author: "",
readTime: "",
featured: false,
},
{
id: 5,
title: "Organic Pest Control Methods That Actually Work",
topic: "Organic",
image: "/placeholder.svg?height=200&width=300",
description: "",
date: "",
author: "",
readTime: "",
featured: false,
},
],
},
{
id: 2,
title: "Optimizing Fertilizer Usage for Maximum Crop Yield",
description: "Discover the perfect balance of fertilizers to maximize your harvest without wasting resources.",
date: "2023-06-02",
author: "Michael Chen",
topic: "Fertilizers",
image: "/placeholder.svg?height=400&width=600",
readTime: "7 min read",
featured: false,
},
{
id: 3,
title: "Seasonal Planting Guide: What to Grow and When",
description:
"A comprehensive guide to help you plan your planting schedule throughout the year for optimal results.",
date: "2023-06-18",
author: "Sarah Williams",
topic: "Plantation",
image: "/placeholder.svg?height=400&width=600",
readTime: "8 min read",
featured: false,
},
{
id: 4,
title: "Water Conservation Techniques for Drought-Prone Areas",
description: "Essential strategies to maintain your crops during water shortages and drought conditions.",
date: "2023-07-05",
author: "David Rodriguez",
topic: "Sustainability",
image: "/placeholder.svg?height=400&width=600",
readTime: "6 min read",
featured: false,
},
{
id: 5,
title: "Organic Pest Control Methods That Actually Work",
description: "Natural and effective ways to keep pests at bay without resorting to harmful chemicals.",
date: "2023-07-22",
author: "Lisa Thompson",
topic: "Organic",
image: "/placeholder.svg?height=400&width=600",
readTime: "9 min read",
featured: false,
},
{
id: 6,
title: "The Future of Smart Farming: IoT and Agriculture",
description: "How Internet of Things technology is revolutionizing the way we monitor and manage farms.",
date: "2023-08-10",
author: "James Wilson",
topic: "Technology",
image: "/placeholder.svg?height=400&width=600",
readTime: "10 min read",
featured: true,
},
];
/**
* Fetches a list of blog posts.
* Simulates a network delay and returns dummy data when the API endpoint is unavailable.
*/
export async function fetchBlogs(): Promise<Blog[]> { export async function fetchBlogs(): Promise<Blog[]> {
await new Promise((resolve) => setTimeout(resolve, 1000));
try { try {
const response = await axiosInstance.get<Blog[]>("/api/blogs"); interface BackendResponse {
return response.data; articles: BackendArticle[];
}
const response = await axiosInstance.get<BackendResponse>("/knowledge-hub");
if (response.data && Array.isArray(response.data.articles)) {
return response.data.articles.map((article) => mapBackendArticleToFrontendBlog(article));
} else {
console.warn("Received unexpected data structure from /knowledge-hub:", response.data);
return [];
}
} catch (error) { } catch (error) {
return dummyBlogs; console.error("Error fetching knowledge articles:", error);
// Return empty array to avoid breaking the UI completely
return [];
} }
} }
/** export async function fetchBlogById(uuid: string): Promise<Blog | null> {
* Fetches a single blog post by its id.
* Returns the API result if available; otherwise falls back to dummy data.
*/
export async function fetchBlogById(id: string): Promise<Blog | null> {
await new Promise((resolve) => setTimeout(resolve, 500));
try { try {
const response = await axiosInstance.get<Blog>(`/api/blogs/${id}`); interface BackendSingleResponse {
return response.data; article: BackendArticle;
}
const articleResponse = await axiosInstance.get<BackendSingleResponse>(`/knowledge-hub/${uuid}`);
if (articleResponse.data && articleResponse.data.article) {
const article = articleResponse.data.article;
// --- Fetch TOC and Related separately ---
let tocItems: BackendTOC[] = [];
let relatedItems: BackendRelated[] = [];
try {
const tocResponse = await axiosInstance.get<{ table_of_contents: BackendTOC[] }>(`/knowledge-hub/${uuid}/toc`);
tocItems = tocResponse.data.table_of_contents || [];
} catch (tocError) {
console.warn(`Could not fetch TOC for article ${uuid}:`, tocError);
}
try {
const relatedResponse = await axiosInstance.get<{ related_articles: BackendRelated[] }>(
`/knowledge-hub/${uuid}/related`
);
relatedItems = relatedResponse.data.related_articles || [];
} catch (relatedError) {
console.warn(`Could not fetch related articles for ${uuid}:`, relatedError);
}
// --- End separate fetches ---
return mapBackendArticleToFrontendBlog(article, tocItems, relatedItems);
} else {
console.warn(`Received unexpected data structure from /knowledge-hub/${uuid}:`, articleResponse.data);
return null;
}
} catch (error) { } catch (error) {
const blog = dummyBlogs.find((blog) => blog.id === Number(id)); console.error(`Error fetching knowledge article by UUID ${uuid}:`, error);
return blog || null; return null;
} }
} }

View File

@ -67,7 +67,7 @@ export default function BlogPage() {
{/* Header */} {/* Header */}
<header className="border-b sticky top-0 z-10 bg-background/95 backdrop-blur"> <header className="border-b sticky top-0 z-10 bg-background/95 backdrop-blur">
<div className="container flex items-center justify-between h-16 px-4"> <div className="container flex items-center justify-between h-16 px-4">
<Link href="/knowledge-hub"> <Link href="/hub">
<Button variant="ghost" size="sm" className="gap-1"> <Button variant="ghost" size="sm" className="gap-1">
<ArrowLeft className="h-4 w-4" /> Back to Knowledge Hub <ArrowLeft className="h-4 w-4" /> Back to Knowledge Hub
</Button> </Button>
@ -162,7 +162,7 @@ export default function BlogPage() {
<CardContent> <CardContent>
<div className="space-y-4"> <div className="space-y-4">
{blog.relatedArticles.map((article) => ( {blog.relatedArticles.map((article) => (
<Link href={`/blog/${article.id}`} key={article.id}> <Link href={`/hub/${article.id}`} key={article.id}>
<div className="flex gap-3 group"> <div className="flex gap-3 group">
<div className="relative w-16 h-16 rounded overflow-hidden flex-shrink-0"> <div className="relative w-16 h-16 rounded overflow-hidden flex-shrink-0">
<Image <Image

View File

@ -5,6 +5,14 @@ const nextConfig: NextConfig = {
devIndicators: { devIndicators: {
buildActivity: false, buildActivity: false,
}, },
images: {
remotePatterns: [
{
protocol: "https",
hostname: "**",
},
],
},
}; };
export default nextConfig; export default nextConfig;

View File

@ -168,7 +168,7 @@ export type UpdateInventoryItemInput = Partial<CreateInventoryItemInput> & {
}; };
export interface Blog { export interface Blog {
id: number; id: string;
title: string; title: string;
description: string; description: string;
date: string; date: string;
@ -180,7 +180,7 @@ export interface Blog {
content?: string; content?: string;
tableOfContents?: { id: string; title: string; level: number }[]; tableOfContents?: { id: string; title: string; level: number }[];
relatedArticles?: { relatedArticles?: {
id: number; id: string;
title: string; title: string;
topic: string; topic: string;
image: string; image: string;
@ -242,32 +242,54 @@ export interface SetOverlayAction {
export type Action = ActionWithTypeOnly | SetOverlayAction; export type Action = ActionWithTypeOnly | SetOverlayAction;
export function isCircle( export function isCircle(overlay: OverlayGeometry): overlay is google.maps.Circle {
overlay: OverlayGeometry
): overlay is google.maps.Circle {
return (overlay as google.maps.Circle).getCenter !== undefined; return (overlay as google.maps.Circle).getCenter !== undefined;
} }
export function isMarker( export function isMarker(overlay: OverlayGeometry): overlay is google.maps.Marker {
overlay: OverlayGeometry
): overlay is google.maps.Marker {
return (overlay as google.maps.Marker).getPosition !== undefined; return (overlay as google.maps.Marker).getPosition !== undefined;
} }
export function isPolygon( export function isPolygon(overlay: OverlayGeometry): overlay is google.maps.Polygon {
overlay: OverlayGeometry
): overlay is google.maps.Polygon {
return (overlay as google.maps.Polygon).getPath !== undefined; return (overlay as google.maps.Polygon).getPath !== undefined;
} }
export function isPolyline( export function isPolyline(overlay: OverlayGeometry): overlay is google.maps.Polyline {
overlay: OverlayGeometry
): overlay is google.maps.Polyline {
return (overlay as google.maps.Polyline).getPath !== undefined; return (overlay as google.maps.Polyline).getPath !== undefined;
} }
export function isRectangle( export function isRectangle(overlay: OverlayGeometry): overlay is google.maps.Rectangle {
overlay: OverlayGeometry
): overlay is google.maps.Rectangle {
return (overlay as google.maps.Rectangle).getBounds !== undefined; return (overlay as google.maps.Rectangle).getBounds !== undefined;
} }
export interface KnowledgeArticle {
UUID: string;
Title: string;
Content: string;
Author: string;
PublishDate: string;
ReadTime: string;
Categories: string[];
ImageURL: string;
CreatedAt: string;
UpdatedAt: string;
}
export interface TableOfContent {
UUID: string;
ArticleID: string;
Title: string;
Level: number;
Order: number;
CreatedAt: string;
UpdatedAt: string;
}
export interface RelatedArticle {
UUID: string;
ArticleID: string;
RelatedTitle: string;
RelatedTag: string;
CreatedAt: string;
UpdatedAt: string;
}