From c7c2ea60a2414f578757b596a3118bcee06d21cd Mon Sep 17 00:00:00 2001 From: matthieu42morin Date: Sun, 28 Apr 2024 01:30:30 +0200 Subject: [PATCH] blog server, page functions --- src/routes/+layout.ts | 2 +- src/routes/blog/+page.server.ts | 10 +++++----- src/routes/blog/rss.xml/+server.ts | 2 +- src/routes/projects/+page.server.ts | 10 +++++----- src/routes/projects/[slug]/+page.ts | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index a0a46f8..529e9eb 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -1,2 +1,2 @@ export const prerender = true; -export const trailingSlash = 'never'; \ No newline at end of file +export const trailingSlash = 'never'; diff --git a/src/routes/blog/+page.server.ts b/src/routes/blog/+page.server.ts index 8fca76d..ae83faa 100644 --- a/src/routes/blog/+page.server.ts +++ b/src/routes/blog/+page.server.ts @@ -1,7 +1,7 @@ -import { listPosts } from '$content/blog'; +import type { PageLoad } from './$types'; -export const load = async () => { - return { - posts: listPosts() - }; +export const load = async ({ fetch }) => { + const response = await fetch('api/posts'); + const posts: Post[] = await response.json(); + return { posts }; }; diff --git a/src/routes/blog/rss.xml/+server.ts b/src/routes/blog/rss.xml/+server.ts index 651a27f..388e3e4 100644 --- a/src/routes/blog/rss.xml/+server.ts +++ b/src/routes/blog/rss.xml/+server.ts @@ -1,4 +1,4 @@ -import { listPosts } from '$content/blog'; +import { listPosts } from '$lib/utils/blog'; import RSS from 'rss'; import type { Post } from '$lib/types/post'; diff --git a/src/routes/projects/+page.server.ts b/src/routes/projects/+page.server.ts index b9caa36..4957f23 100644 --- a/src/routes/projects/+page.server.ts +++ b/src/routes/projects/+page.server.ts @@ -1,7 +1,7 @@ -import { listProjects } from '$content/projects'; +import type { PageLoad } from './$types'; -export const load = () => { - return { - projects: listProjects() - }; +export const load = async ({ fetch }) => { + const response = await fetch('api/posts'); + const projects: Projects[] = await response.json(); + return { projects }; }; diff --git a/src/routes/projects/[slug]/+page.ts b/src/routes/projects/[slug]/+page.ts index 69e72fc..59c43ff 100644 --- a/src/routes/projects/[slug]/+page.ts +++ b/src/routes/projects/[slug]/+page.ts @@ -1,4 +1,4 @@ -import { getProject, listProjects } from '$content/projects'; +import { getProject, listProjects } from '$lib/utils/projects'; import type { PageLoad } from './$types'; export const entries = () => listProjects().map((post) => ({ slug: post.slug }));