diff --git a/frontend/src/lib/components/ActivityComplete.svelte b/frontend/src/lib/components/ActivityComplete.svelte index 58a1437..9415fc4 100644 --- a/frontend/src/lib/components/ActivityComplete.svelte +++ b/frontend/src/lib/components/ActivityComplete.svelte @@ -11,16 +11,16 @@ } onMount(async () => { - let res = await fetch('/api/activity-types/types/', { - method: 'GET', + let res = await fetch('/activities', { + method: 'POST', headers: { 'Content-Type': 'application/json' } }); let data = await res.json(); - console.log('ACTIVITIES' + data); - if (data) { - allActivities = data; + console.log('ACTIVITIES' + data.activities); + if (data && data.activities) { + allActivities = data.activities; } }); diff --git a/frontend/src/routes/activities/+page.server.ts b/frontend/src/routes/activities/+page.server.ts index 106df86..4407eda 100644 --- a/frontend/src/routes/activities/+page.server.ts +++ b/frontend/src/routes/activities/+page.server.ts @@ -1,4 +1,4 @@ -import { redirect } from '@sveltejs/kit'; +import { redirect, type Actions } from '@sveltejs/kit'; import type { PageServerLoad } from './$types'; const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL']; const endpoint = PUBLIC_SERVER_URL || 'http://localhost:8000'; @@ -24,3 +24,20 @@ export const load = (async (event) => { } }; }) satisfies PageServerLoad; + +export const actions: Actions = { + getActivities: async (event) => { + let allActivities: string[] = []; + let res = await fetch(`${endpoint}/api/activity-types/types/`, { + headers: { + 'Content-Type': 'application/json', + Cookie: `${event.cookies.get('auth')}` + } + }); + let data = await res.json(); + if (data) { + allActivities = data; + } + return { activities: allActivities }; + } +}; diff --git a/frontend/src/routes/activities/+server.ts b/frontend/src/routes/activities/+server.ts new file mode 100644 index 0000000..ebb4252 --- /dev/null +++ b/frontend/src/routes/activities/+server.ts @@ -0,0 +1,19 @@ +import { json } from '@sveltejs/kit'; +import type { RequestHandler } from '../data/$types'; +const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL']; +const endpoint = PUBLIC_SERVER_URL || 'http://localhost:8000'; + +export const POST: RequestHandler = async (event) => { + let allActivities: string[] = []; + let res = await fetch(`${endpoint}/api/activity-types/types/`, { + headers: { + 'Content-Type': 'application/json', + Cookie: `${event.cookies.get('auth')}` + } + }); + let data = await res.json(); + if (data) { + allActivities = data; + } + return json({ activities: allActivities }); +};