From 4b26a6caee5d59d7a8d5afc3fd9e09300917bb1e Mon Sep 17 00:00:00 2001 From: James Wyndham Date: Mon, 25 Mar 2024 15:40:10 +0800 Subject: [PATCH] feature - updated fetching of blogs --- Frontend/app/(public)/blogs/[slug]/page.tsx | 12 ++++++++---- Frontend/app/(public)/blogs/page.tsx | 1 + Frontend/utils/getPostMetaData.ts | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Frontend/app/(public)/blogs/[slug]/page.tsx b/Frontend/app/(public)/blogs/[slug]/page.tsx index 6d740ca..dd52084 100644 --- a/Frontend/app/(public)/blogs/[slug]/page.tsx +++ b/Frontend/app/(public)/blogs/[slug]/page.tsx @@ -1,11 +1,13 @@ import BlogContent from "@/sections/BlogContent"; import getPostMetadata from "@/utils/getPostMetaData"; -import { headers } from "next/headers"; +import { cookies, headers } from "next/headers"; import React from "react"; import Spacer from "@/components/Utilities/Spacer"; import pb from "@/lib/pocketbase"; import Footer from "@/components/Footer"; import Background from "@/components/Utilities/Background"; +import { getUserFromCookie } from "@/lib/auth"; +import { User } from "@/types"; export async function generateMetadata({ params, @@ -32,16 +34,18 @@ export async function generateMetadata({ export const generateStaticParams = async () => { const posts = await getPostMetadata(); - return posts.map((post) => ({ + console.log("static posts", posts.length); + const mappedPosts = posts.map((post) => ({ slug: post.slug, - id: post.id, })); + return mappedPosts; }; const PostPage = async (props: any) => { + console.log("params", props.params); const post = await pb .collection("blog") - .getFirstListItem(`slug="${props.params.slug}"`, { + .getFirstListItem(`slug="` + props.params.slug + `"`, { requestKey: "post", }); return ( diff --git a/Frontend/app/(public)/blogs/page.tsx b/Frontend/app/(public)/blogs/page.tsx index 00067c9..b4ef42f 100644 --- a/Frontend/app/(public)/blogs/page.tsx +++ b/Frontend/app/(public)/blogs/page.tsx @@ -8,6 +8,7 @@ import Footer from "@/components/Footer"; export default async function BlogsPage() { const postMetadata = await getPostMetadata(); + console.log("blogs", postMetadata.length); const postPreviews = postMetadata .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime()) .map((post) => ); diff --git a/Frontend/utils/getPostMetaData.ts b/Frontend/utils/getPostMetaData.ts index 6098605..7580bff 100644 --- a/Frontend/utils/getPostMetaData.ts +++ b/Frontend/utils/getPostMetaData.ts @@ -2,7 +2,7 @@ import pb from '@/lib/pocketbase'; const getPostMetadata = async () => { try { - return (await (pb.collection("blog").getList(1, 50))).items + return (await (pb.collection("blog").getFullList({requestKey:'blogs'}))) } catch (error) { return [] }