diff --git a/src/lib/components/SEO.svelte b/src/lib/components/SEO.svelte index a2c88db..74ec8a7 100644 --- a/src/lib/components/SEO.svelte +++ b/src/lib/components/SEO.svelte @@ -9,12 +9,12 @@ siteUrl, }; - export let title: string; + export let title = defaultMetadata.defaultTitle; export let description = defaultMetadata.defaultDescription; export let image = defaultMetadata.defaultImage; export let location: string = ''; - const seo = { + $: seo = { title, description, image: `${siteUrl}${image}`, diff --git a/src/routes/articles/[page]/+page.server.ts b/src/routes/articles/[page]/+page.server.ts index 3d2724b..2440a62 100644 --- a/src/routes/articles/[page]/+page.server.ts +++ b/src/routes/articles/[page]/+page.server.ts @@ -1,22 +1,19 @@ import type { PageServerLoad } from './$types'; import type { Article } from '$root/lib/types/article'; +export type ArticlePageLoad = { + articles: Article[]; + currentPage: number; + totalPages: number; + limit: number; + totalArticles: number; +}; + export const load: PageServerLoad = async ({ fetch, params }) => { const { page } = params; const resp = await fetch(`/api/articles?page=${page}`); - const { - articles, - currentPage, - totalPages, - limit, - totalArticles - }: { - articles: Article[]; - currentPage: number; - totalPages: number; - limit: number; - totalArticles: number; - } = await resp.json(); + const { articles, currentPage, totalPages, limit, totalArticles }: ArticlePageLoad = + await resp.json(); return { articles, currentPage, diff --git a/src/routes/articles/[page]/+page.svelte b/src/routes/articles/[page]/+page.svelte index a59ef18..44052ad 100644 --- a/src/routes/articles/[page]/+page.svelte +++ b/src/routes/articles/[page]/+page.svelte @@ -1,7 +1,4 @@ - - {`Tech Articles - Page ${currentPage} | Bradley Shellnut`} - - +

Favorite Tech Articles

@@ -26,7 +22,7 @@ pageSize={limit} totalCount={totalArticles} currentPage={currentPage || 1} - skip={page} + skip={currentPage} base="/articles" />
@@ -61,7 +57,7 @@ pageSize={limit} totalCount={totalPages} currentPage={currentPage || 1} - skip={page} + skip={currentPage} base="/articles" />