diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index 125a291..ca1df8f 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -1,15 +1,10 @@ - -
Benvenuti a Pianello Val Tidone
diff --git a/frontend/src/routes/+page.ts b/frontend/src/routes/+page.ts index a2271f8..0a476d7 100644 --- a/frontend/src/routes/+page.ts +++ b/frontend/src/routes/+page.ts @@ -1,11 +1,14 @@ -import { getRouteCategories } from '$lib/repo.js'; import { error } from '@sveltejs/kit'; +import {PUBLIC_BACKEND_URL} from '$env/static/public'; -export async function load() { +const API_URL = `${PUBLIC_BACKEND_URL}/api`; + +export async function load({ fetch }) { let categories = []; try { - categories = await getRouteCategories(); + const response = await fetch(`${API_URL}/route-categories`); + categories = await response.json(); } catch (ex) { error(500); } diff --git a/frontend/src/routes/paths/[slug]/+page.ts b/frontend/src/routes/paths/[slug]/+page.ts index acb0966..cb7b2d3 100644 --- a/frontend/src/routes/paths/[slug]/+page.ts +++ b/frontend/src/routes/paths/[slug]/+page.ts @@ -1,8 +1,12 @@ import { getRouteByCategory, getRouteCategories } from '$lib/repo.js'; import { error } from '@sveltejs/kit'; +import {PUBLIC_BACKEND_URL} from '$env/static/public'; -export async function load({ params }) { - const categories: App.Category[] = await getRouteCategories(); +const API_URL = `${PUBLIC_BACKEND_URL}/api`; + +export async function load({ params, fetch }) { + const response = await fetch(`${API_URL}/route-categories`); + const categories: App.Category[] = await response.json(); const categoryId = Number(params.slug); const category: App.Category = categories.find(c => c.id === categoryId) as App.Category; @@ -11,9 +15,12 @@ export async function load({ params }) { error(404); } + const response2 = await fetch(`${API_URL}/route-by-category/${categoryId}`); + const routes = await response2.json(); + const toReturn = { category: category.name_it, - routes: await getRouteByCategory(categoryId), + routes, } return toReturn; diff --git a/frontend/src/routes/routes/[slug]/+page.ts b/frontend/src/routes/routes/[slug]/+page.ts index bc240e2..1d4f02d 100644 --- a/frontend/src/routes/routes/[slug]/+page.ts +++ b/frontend/src/routes/routes/[slug]/+page.ts @@ -1,9 +1,12 @@ -import { getRoute } from '$lib/repo.js'; import { error } from '@sveltejs/kit'; +import {PUBLIC_BACKEND_URL} from '$env/static/public' -export async function load({ params }) { +const API_URL = `${PUBLIC_BACKEND_URL}/api` + +export async function load({ params, fetch }) { const routeId = Number(params.slug); - const route = await getRoute(routeId); + const response = await fetch(`${API_URL}/route/${routeId}`); + const route = await response.json(); if (!route) { error(404);