+
+
{trip.name}
+ {#if trip.date && trip.date !== ''}
+
+ {/if}
+ {#if trip.location && trip.location !== ''}
+
+ {/if}
+
+
+
+
+
+
+
{#each adventures as adventure}
@@ -88,7 +93,19 @@
-
No planned adventures yet!
+
+
+
+
+
+
+ No planned adventures found
+
+
+ There are no adventures to display. Add some using the plus button at the bottom right!
+
+
{/if}
diff --git a/frontend/src/routes/profile/+page.server.ts b/frontend/src/routes/profile/+page.server.ts
index 7c8c5ae6..ee5e5cbb 100644
--- a/frontend/src/routes/profile/+page.server.ts
+++ b/frontend/src/routes/profile/+page.server.ts
@@ -1,11 +1,27 @@
import { redirect } from '@sveltejs/kit';
import type { PageServerLoad, RequestEvent } from '../$types';
-
+import { PUBLIC_SERVER_URL } from '$env/static/public';
+const endpoint = PUBLIC_SERVER_URL || 'http://localhost:8000';
export const load: PageServerLoad = async (event: RequestEvent) => {
- if (!event.locals.user) {
+ if (!event.locals.user || !event.cookies.get('auth')) {
return redirect(302, '/login');
}
+
+ let stats = null;
+
+ let res = await event.fetch(`${endpoint}/api/stats/counts/`, {
+ headers: {
+ Cookie: `${event.cookies.get('auth')}`
+ }
+ });
+ if (!res.ok) {
+ console.error('Failed to fetch user stats');
+ } else {
+ stats = await res.json();
+ }
+
return {
- user: event.locals.user
+ user: event.locals.user,
+ stats
};
};
diff --git a/frontend/src/routes/profile/+page.svelte b/frontend/src/routes/profile/+page.svelte
index d9bfa2da..79d3a287 100644
--- a/frontend/src/routes/profile/+page.svelte
+++ b/frontend/src/routes/profile/+page.svelte
@@ -1,5 +1,23 @@
+
+
+
User Stats
+
+
+
+
+
Completed Adventures
+
{stats.visited_count}
+
+
+
+
+
Planned Adventures
+
{stats.planned_count}
+
+
+
+
+
Trips
+
{stats.trips_count}
+
+
+
+
+
Visited Countries
+
+ {Math.round((stats.country_count / stats.total_countries) * 100)}%
+
+
+ {stats.country_count}/{stats.total_countries}
+
+
+
+
+
Visited Regions
+
+ {Math.round((stats.visited_region_count / stats.total_regions) * 100)}%
+
+
+ {stats.visited_region_count}/{stats.total_regions}
+
+
+
+
+{/if}
diff --git a/frontend/src/routes/trips/+page.server.ts b/frontend/src/routes/trips/+page.server.ts
new file mode 100644
index 00000000..f3116aa2
--- /dev/null
+++ b/frontend/src/routes/trips/+page.server.ts
@@ -0,0 +1,31 @@
+import { redirect } from '@sveltejs/kit';
+import type { PageServerLoad } from './$types';
+import { PUBLIC_SERVER_URL } from '$env/static/public';
+
+export const load = (async (event) => {
+ const endpoint = PUBLIC_SERVER_URL || 'http://localhost:8000';
+ if (!event.locals.user || !event.cookies.get('auth')) {
+ return redirect(302, '/login');
+ } else {
+ let res = await event.fetch(`${endpoint}/api/trips/`, {
+ headers: {
+ Cookie: `${event.cookies.get('auth')}`
+ }
+ });
+ if (res.ok) {
+ let data = await res.json();
+ console.log(data);
+ return {
+ props: {
+ trips: data
+ }
+ };
+ } else {
+ return {
+ status: res.status,
+ error: 'Failed to load trips'
+ };
+ }
+ }
+ return {};
+}) satisfies PageServerLoad;
diff --git a/frontend/src/routes/trips/+page.svelte b/frontend/src/routes/trips/+page.svelte
new file mode 100644
index 00000000..901e25f9
--- /dev/null
+++ b/frontend/src/routes/trips/+page.svelte
@@ -0,0 +1,74 @@
+
+
+{#if notFound}
+
+
+
+
+
+
+ Adventure not Found
+
+
+ The adventure you were looking for could not be found. Please try a different adventure or
+ check back later.
+
+
+
+
+
+
+{/if}
+
+{#if noTrips}
+
+
+
+
+
+
+ No Trips Found
+
+
+ There are no trips to display. Please try again later.
+
+
+
+{/if}
+
+{#if trips && !notFound}
+
+ {#each trips as trip (trip.id)}
+
+ {/each}
+
+{/if}
diff --git a/frontend/src/routes/visited/+page.svelte b/frontend/src/routes/visited/+page.svelte
index 89f37cbc..3e64a7bc 100644
--- a/frontend/src/routes/visited/+page.svelte
+++ b/frontend/src/routes/visited/+page.svelte
@@ -6,6 +6,8 @@
import type { PageData } from './$types';
import EditAdventure from '$lib/components/EditAdventure.svelte';
+ import Lost from '$lib/assets/undraw_lost.svg';
+
export let data: PageData;
console.log(data);
@@ -80,7 +82,10 @@
{#each adventures as adventure}
@@ -88,7 +93,19 @@
-
No visited adventures yet!
+
+
+
+
+
+
+ No visited adventures found
+
+
+ There are no adventures to display. Add some using the plus button at the bottom right!
+
+
{/if}
diff --git a/frontend/src/routes/worldtravel/+page.server.ts b/frontend/src/routes/worldtravel/+page.server.ts
index 2b9eb49c..4fea381e 100644
--- a/frontend/src/routes/worldtravel/+page.server.ts
+++ b/frontend/src/routes/worldtravel/+page.server.ts
@@ -67,8 +67,6 @@ export const actions: Actions = {
removeVisited: async (event) => {
const body = await event.request.json();
- console.log(body);
-
if (!body || !body.visitId) {
return {
status: 400
diff --git a/frontend/src/routes/worldtravel/[id]/+page.server.ts b/frontend/src/routes/worldtravel/[id]/+page.server.ts
index 182a6ae5..b13ad43b 100644
--- a/frontend/src/routes/worldtravel/[id]/+page.server.ts
+++ b/frontend/src/routes/worldtravel/[id]/+page.server.ts
@@ -1,5 +1,6 @@
const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL'];
-import type { Region, VisitedRegion } from '$lib/types';
+import type { Country, Region, VisitedRegion } from '$lib/types';
+import { redirect } from '@sveltejs/kit';
import type { PageServerLoad } from './$types';
const endpoint = PUBLIC_SERVER_URL || 'http://localhost:8000';
@@ -9,6 +10,7 @@ export const load = (async (event) => {
let regions: Region[] = [];
let visitedRegions: VisitedRegion[] = [];
+ let country: Country;
let res = await fetch(`${endpoint}/api/${id}/regions/`, {
method: 'GET',
@@ -18,7 +20,7 @@ export const load = (async (event) => {
});
if (!res.ok) {
console.error('Failed to fetch regions');
- return { status: 500 };
+ return redirect(302, '/404');
} else {
regions = (await res.json()) as Region[];
}
@@ -36,10 +38,24 @@ export const load = (async (event) => {
visitedRegions = (await res.json()) as VisitedRegion[];
}
+ res = await fetch(`${endpoint}/api/countries/${regions[0].country}/`, {
+ method: 'GET',
+ headers: {
+ Cookie: `${event.cookies.get('auth')}`
+ }
+ });
+ if (!res.ok) {
+ console.error('Failed to fetch country');
+ return { status: 500 };
+ } else {
+ country = (await res.json()) as Country;
+ }
+
return {
props: {
regions,
- visitedRegions
+ visitedRegions,
+ country
}
};
}) satisfies PageServerLoad;
diff --git a/frontend/src/routes/worldtravel/[id]/+page.svelte b/frontend/src/routes/worldtravel/[id]/+page.svelte
index 44030c3a..aaf243f6 100644
--- a/frontend/src/routes/worldtravel/[id]/+page.svelte
+++ b/frontend/src/routes/worldtravel/[id]/+page.svelte
@@ -5,11 +5,27 @@
export let data: PageData;
let regions: Region[] = data.props?.regions || [];
let visitedRegions: VisitedRegion[] = data.props?.visitedRegions || [];
-
+ const country = data.props?.country || null;
console.log(data);
+
+ let numRegions: number = regions.length;
+ let numVisitedRegions: number = visitedRegions.length;
-
Regions
+
Regions in {country?.name}
+
+
+
+
Region Stats
+
{numVisitedRegions}/{numRegions} Visited
+ {#if numRegions === numVisitedRegions}
+
You've visited all regions in {country?.name} 🎉!
+ {:else}
+
Keep exploring!
+ {/if}
+
+
+
{#each regions as region}
@@ -18,8 +34,10 @@
visited={visitedRegions.some((visitedRegion) => visitedRegion.region === region.id)}
on:visit={(e) => {
visitedRegions = [...visitedRegions, e.detail];
+ numVisitedRegions++;
}}
visit_id={visitedRegions.find((visitedRegion) => visitedRegion.region === region.id)?.id}
+ on:remove={() => numVisitedRegions--}
/>
{/each}