Shellnut_Public/personal-website-sveltekit
1
0
Fork 0
mirror of https://github.com/BradNut/personal-website-sveltekit synced 2025-09-08 23:20:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix import max pages and error name conflict.

Browse source
This commit is contained in:
Bradley Shellnut 2023-02-14 17:56:07 -08:00
parent 381dd1697f
commit b92de5c112
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/routes/api/articles/+server.ts
View file

@ -1,14 +1,16 @@
import { json, error } from '@sveltejs/kit'; import { json, error } from '@sveltejs/kit';
import { WALLABAG_MAX_PAGES } from '$env/static/private';
import type { RequestHandler, RequestEvent } from './$types'; import type { RequestHandler, RequestEvent } from './$types';
import { fetchArticlesApi } from '$root/routes/api'; import { fetchArticlesApi } from '$root/routes/api';
export const GET: RequestHandler = async ({ url, setHeaders }: RequestEvent) => { export const GET: RequestHandler = async ({ url, setHeaders }: RequestEvent) => {
try { try {
if (+url?.searchParams?.get('page') > WALLABAG_MAX_PAGES) { const page = url?.searchParams?.get('page') || '1';
if (+page > +WALLABAG_MAX_PAGES) {
throw new Error('Page does not exist'); throw new Error('Page does not exist');
} }
const response = await fetchArticlesApi('get', `fetchArticles`, { const response = await fetchArticlesApi('get', `fetchArticles`, {
page: url?.searchParams?.get('page') || '1' page
}); });
if (response?.articles) { if (response?.articles) {
@ -26,8 +28,8 @@ export const GET: RequestHandler = async ({ url, setHeaders }: RequestEvent) =>
return json(response); return json(response);
} }
} catch (error) { } catch (e) {
console.error(error); console.error(e);
throw error(error); throw error(404, 'Page does not exist');
} }
}; };

2
src/routes/articles/[page]/+page.server.ts
View file

@ -13,7 +13,7 @@ export type ArticlePageLoad = {
export const load: PageServerLoad = async ({ fetch, params }) => { export const load: PageServerLoad = async ({ fetch, params }) => {
const { page } = params; const { page } = params;
if (+page > WALLABAG_MAX_PAGES) { if (+page > +WALLABAG_MAX_PAGES) {
throw error(404, { throw error(404, {
message: 'Not found' message: 'Not found'
}); });