{trip.name}
- {#if trip.date && trip.date !== ''} -
-
- {/if}
- {#if trip.location && trip.location !== ''}
- {trip.date}
-
-
- {/if}
-
+ {trip.location}
-{collection.name}
+{collection.adventures.length} Adventures
-
diff --git a/frontend/src/lib/components/Navbar.svelte b/frontend/src/lib/components/Navbar.svelte
index f8609ff..1d9da85 100644
--- a/frontend/src/lib/components/Navbar.svelte
+++ b/frontend/src/lib/components/Navbar.svelte
@@ -55,6 +55,9 @@
Sort
Order Direction
diff --git a/frontend/src/routes/collections/+page.server.ts b/frontend/src/routes/collections/+page.server.ts new file mode 100644 index 0000000..1606c0b --- /dev/null +++ b/frontend/src/routes/collections/+page.server.ts @@ -0,0 +1,421 @@ +import { redirect } from '@sveltejs/kit'; +import type { PageServerLoad } from './$types'; +const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL']; +import type { Adventure, Collection } from '$lib/types'; + +import type { Actions, RequestEvent } from '@sveltejs/kit'; +import { fetchCSRFToken, tryRefreshToken } from '$lib/index.server'; +import { checkLink } from '$lib'; + +const serverEndpoint = PUBLIC_SERVER_URL || 'http://localhost:8000'; + +export const load = (async (event) => { + if (!event.locals.user) { + return redirect(302, '/login'); + } else { + let next = null; + let previous = null; + let count = 0; + let adventures: Adventure[] = []; + let initialFetch = await fetch(`${serverEndpoint}/api/collections/`, { + headers: { + Cookie: `${event.cookies.get('auth')}` + } + }); + if (!initialFetch.ok) { + console.error('Failed to fetch visited adventures'); + return redirect(302, '/login'); + } else { + let res = await initialFetch.json(); + let visited = res.results as Adventure[]; + next = res.next; + previous = res.previous; + count = res.count; + adventures = [...adventures, ...visited]; + } + + return { + props: { + adventures, + next, + previous, + count + } + }; + } +}) satisfies PageServerLoad; + +export const actions: Actions = { + create: async (event) => { + const formData = await event.request.formData(); + + const name = formData.get('name') as string; + const description = formData.get('description') as string | null; + + if (!name) { + return { + status: 400, + body: { error: 'Missing required fields' } + }; + } + + const formDataToSend = new FormData(); + formDataToSend.append('name', name); + formDataToSend.append('description', description || ''); + let auth = event.cookies.get('auth'); + + if (!auth) { + const refresh = event.cookies.get('refresh'); + if (!refresh) { + return { + status: 401, + body: { message: 'Unauthorized' } + }; + } + let res = await tryRefreshToken(refresh); + if (res) { + auth = res; + event.cookies.set('auth', auth, { + httpOnly: true, + sameSite: 'lax', + expires: new Date(Date.now() + 60 * 60 * 1000), // 60 minutes + path: '/' + }); + } else { + return { + status: 401, + body: { message: 'Unauthorized' } + }; + } + } + + if (!auth) { + return { + status: 401, + body: { message: 'Unauthorized' } + }; + } + + const csrfToken = await fetchCSRFToken(); + + if (!csrfToken) { + return { + status: 500, + body: { message: 'Failed to fetch CSRF token' } + }; + } + + const res = await fetch(`${serverEndpoint}/api/collections/`, { + method: 'POST', + headers: { + 'X-CSRFToken': csrfToken, + Cookie: auth + }, + body: formDataToSend + }); + + let new_id = await res.json(); + + if (!res.ok) { + const errorBody = await res.json(); + return { + status: res.status, + body: { error: errorBody } + }; + } + + let id = new_id.id; + let user_id = new_id.user_id; + + return { id, user_id }; + }, + // edit: async (event) => { + // const formData = await event.request.formData(); + + // const adventureId = formData.get('adventureId') as string; + // const type = formData.get('type') as string; + // const name = formData.get('name') as string; + // const location = formData.get('location') as string | null; + // let date = (formData.get('date') as string | null) ?? null; + // const description = formData.get('description') as string | null; + // let activity_types = formData.get('activity_types') + // ? (formData.get('activity_types') as string).split(',') + // : null; + // const rating = formData.get('rating') ? Number(formData.get('rating')) : null; + // let link = formData.get('link') as string | null; + // let latitude = formData.get('latitude') as string | null; + // let longitude = formData.get('longitude') as string | null; + // let is_public = formData.get('is_public') as string | null | boolean; + + // if (is_public) { + // is_public = true; + // } else { + // is_public = false; + // } + + // // check if latitude and longitude are valid + // if (latitude && longitude) { + // if (isNaN(Number(latitude)) || isNaN(Number(longitude))) { + // return { + // status: 400, + // body: { error: 'Invalid latitude or longitude' } + // }; + // } + // } + + // // round latitude and longitude to 6 decimal places + // if (latitude) { + // latitude = Number(latitude).toFixed(6); + // } + // if (longitude) { + // longitude = Number(longitude).toFixed(6); + // } + + // const image = formData.get('image') as File; + + // // console.log(activity_types); + + // if (!type || !name) { + // return { + // status: 400, + // body: { error: 'Missing required fields' } + // }; + // } + + // if (date == null || date == '') { + // date = null; + // } + + // if (link) { + // link = checkLink(link); + // } + + // const formDataToSend = new FormData(); + // formDataToSend.append('type', type); + // formDataToSend.append('name', name); + // formDataToSend.append('location', location || ''); + // formDataToSend.append('date', date || ''); + // formDataToSend.append('description', description || ''); + // formDataToSend.append('latitude', latitude || ''); + // formDataToSend.append('longitude', longitude || ''); + // formDataToSend.append('is_public', is_public.toString()); + // if (activity_types) { + // // Filter out empty and duplicate activity types, then trim each activity type + // const cleanedActivityTypes = Array.from( + // new Set( + // activity_types + // .map((activity_type) => activity_type.trim()) + // .filter((activity_type) => activity_type !== '' && activity_type !== ',') + // ) + // ); + + // // Append each cleaned activity type to formDataToSend + // cleanedActivityTypes.forEach((activity_type) => { + // formDataToSend.append('activity_types', activity_type); + // }); + // } + // formDataToSend.append('rating', rating ? rating.toString() : ''); + // formDataToSend.append('link', link || ''); + + // if (image && image.size > 0) { + // formDataToSend.append('image', image); + // } + + // let auth = event.cookies.get('auth'); + + // if (!auth) { + // const refresh = event.cookies.get('refresh'); + // if (!refresh) { + // return { + // status: 401, + // body: { message: 'Unauthorized' } + // }; + // } + // let res = await tryRefreshToken(refresh); + // if (res) { + // auth = res; + // event.cookies.set('auth', auth, { + // httpOnly: true, + // sameSite: 'lax', + // expires: new Date(Date.now() + 60 * 60 * 1000), // 60 minutes + // path: '/' + // }); + // } else { + // return { + // status: 401, + // body: { message: 'Unauthorized' } + // }; + // } + // } + + // if (!auth) { + // return { + // status: 401, + // body: { message: 'Unauthorized' } + // }; + // } + + // const csrfToken = await fetchCSRFToken(); + + // if (!csrfToken) { + // return { + // status: 500, + // body: { message: 'Failed to fetch CSRF token' } + // }; + // } + + // const res = await fetch(`${serverEndpoint}/api/adventures/${adventureId}/`, { + // method: 'PATCH', + // headers: { + // 'X-CSRFToken': csrfToken, + // Cookie: auth + // }, + // body: formDataToSend + // }); + + // if (!res.ok) { + // const errorBody = await res.json(); + // return { + // status: res.status, + // body: { error: errorBody } + // }; + // } + + // let adventure = await res.json(); + + // let image_url = adventure.image; + // let link_url = adventure.link; + // return { image_url, link_url }; + // }, + get: async (event) => { + if (!event.locals.user) { + } + + const formData = await event.request.formData(); + + const order_direction = formData.get('order_direction') as string; + const order_by = formData.get('order_by') as string; + + console.log(order_direction, order_by); + + let adventures: Adventure[] = []; + + if (!event.locals.user) { + return { + status: 401, + body: { message: 'Unauthorized' } + }; + } + + let next = null; + let previous = null; + let count = 0; + + let visitedFetch = await fetch( + `${serverEndpoint}/api/collections/?order_by=${order_by}&order_direction=${order_direction}`, + { + headers: { + Cookie: `${event.cookies.get('auth')}` + } + } + ); + if (!visitedFetch.ok) { + console.error('Failed to fetch visited adventures'); + return redirect(302, '/login'); + } else { + let res = await visitedFetch.json(); + let visited = res.results as Adventure[]; + next = res.next; + previous = res.previous; + count = res.count; + adventures = [...adventures, ...visited]; + console.log(next, previous, count); + } + + return { + adventures, + next, + previous, + count + }; + }, + changePage: async (event) => { + const formData = await event.request.formData(); + const next = formData.get('next') as string; + const previous = formData.get('previous') as string; + const page = formData.get('page') as string; + + if (!event.locals.user) { + return { + status: 401, + body: { message: 'Unauthorized' } + }; + } + + if (!page) { + return { + status: 400, + body: { error: 'Missing required fields' } + }; + } + + // Start with the provided URL or default to the filtered adventures endpoint + let url: string = next || previous || '/api/collections/'; + + // Extract the path starting from '/api/adventures' + const apiIndex = url.indexOf('/api/collections'); + if (apiIndex !== -1) { + url = url.slice(apiIndex); + } else { + url = '/api/collections/'; + } + + // Replace or add the page number in the URL + if (url.includes('page=')) { + url = url.replace(/page=\d+/, `page=${page}`); + } else { + // If 'page=' is not in the URL, add it + url += url.includes('?') ? '&' : '?'; + url += `page=${page}`; + } + + const fullUrl = `${serverEndpoint}${url}`; + console.log(fullUrl); + console.log(serverEndpoint); + + try { + const response = await fetch(fullUrl, { + headers: { + 'Content-Type': 'application/json', + Cookie: `${event.cookies.get('auth')}` + } + }); + + if (!response.ok) { + throw new Error(`HTTP error! status: ${response.status}`); + } + const data = await response.json(); + let adventures = data.results as Adventure[]; + let next = data.next; + let previous = data.previous; + let count = data.count; + + return { + status: 200, + body: { + adventures, + next, + previous, + count, + page + } + }; + } catch (error) { + console.error('Error fetching data:', error); + return { + status: 500, + body: { error: 'Failed to fetch data' } + }; + } + } +}; diff --git a/frontend/src/routes/collections/+page.svelte b/frontend/src/routes/collections/+page.svelte new file mode 100644 index 0000000..c12177d --- /dev/null +++ b/frontend/src/routes/collections/+page.svelte @@ -0,0 +1,261 @@ + + +{#if isShowingCreateModal} +
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/routes/collections/[id]/+page.server.ts b/frontend/src/routes/collections/[id]/+page.server.ts
new file mode 100644
index 0000000..3a2de9d
--- /dev/null
+++ b/frontend/src/routes/collections/[id]/+page.server.ts
@@ -0,0 +1,93 @@
+import { redirect } from '@sveltejs/kit';
+import type { PageServerLoad } from './$types';
+const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL'];
+import type { Adventure } from '$lib/types';
+const endpoint = PUBLIC_SERVER_URL || 'http://localhost:8000';
+
+export const load = (async (event) => {
+ const id = event.params as { id: string };
+ let request = await fetch(`${endpoint}/api/collections/${id.id}/`, {
+ headers: {
+ Cookie: `${event.cookies.get('auth')}`
+ }
+ });
+ if (!request.ok) {
+ console.error('Failed to fetch adventure ' + id.id);
+ return {
+ props: {
+ adventure: null
+ }
+ };
+ } else {
+ let collection = (await request.json()) as Adventure;
+
+ return {
+ props: {
+ adventure: collection
+ }
+ };
+ }
+}) satisfies PageServerLoad;
+
+import type { Actions } from '@sveltejs/kit';
+import { tryRefreshToken } from '$lib/index.server';
+
+const serverEndpoint = PUBLIC_SERVER_URL || 'http://localhost:8000';
+
+export const actions: Actions = {
+ delete: async (event) => {
+ const id = event.params as { id: string };
+ const adventureId = id.id;
+
+ if (!event.locals.user) {
+ const refresh = event.cookies.get('refresh');
+ let auth = event.cookies.get('auth');
+ if (!refresh) {
+ return {
+ status: 401,
+ body: { message: 'Unauthorized' }
+ };
+ }
+ let res = await tryRefreshToken(refresh);
+ if (res) {
+ auth = res;
+ event.cookies.set('auth', auth, {
+ httpOnly: true,
+ sameSite: 'lax',
+ expires: new Date(Date.now() + 60 * 60 * 1000), // 60 minutes
+ path: '/'
+ });
+ } else {
+ return {
+ status: 401,
+ body: { message: 'Unauthorized' }
+ };
+ }
+ }
+ if (!adventureId) {
+ return {
+ status: 400,
+ error: new Error('Bad request')
+ };
+ }
+
+ let res = await fetch(`${serverEndpoint}/api/adventures/${event.params.id}`, {
+ method: 'DELETE',
+ headers: {
+ Cookie: `${event.cookies.get('auth')}`,
+ 'Content-Type': 'application/json'
+ }
+ });
+ console.log(res);
+ if (!res.ok) {
+ return {
+ status: res.status,
+ error: new Error('Failed to delete adventure')
+ };
+ } else {
+ return {
+ status: 204
+ };
+ }
+ }
+};
diff --git a/frontend/src/routes/collections/[id]/+page.svelte b/frontend/src/routes/collections/[id]/+page.svelte
new file mode 100644
index 0000000..ad938e9
--- /dev/null
+++ b/frontend/src/routes/collections/[id]/+page.svelte
@@ -0,0 +1,127 @@
+
+
+
+
+{#if notFound}
+
+
+
+ My Collections
+This search returned {count} results.
+ {#if collections.length === 0} +
+
+ {#if currentView == 'cards'}
+
+
+ {#each collections as collection}
+
+ {/if}
+
+ {#if next || previous}
+
+
+ {#each Array.from({ length: totalPages }, (_, i) => i + 1) as page}
+
+ {/each}
+
+ {/if}
+
+
+
+
+
+
+{/if}
+
+{#if !adventure && !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 adventure}
+ {#if adventure.name}
+ {adventure.name}
+ {/if} + {#if adventure.location} +
+
+ Visited on: {adventure.date} +
+ {/if} + {#if adventure.rating !== undefined && adventure.rating !== null} +
+
+
+ {/if}
+ {#if adventure.description}
+ {adventure.description}
+ {/if} + {#if adventure.link} + + {/if} + {#if adventure.activity_types && adventure.activity_types.length > 0} +
+
+ {/if}
+ {#if adventure.image}
+ Activities:
+-
+ {#each adventure.activity_types as activity}
+
+ {activity}
+
+ {/each}
+
+
+ 
+
+ {/if}
+{/if}
diff --git a/frontend/src/routes/profile/+page.svelte b/frontend/src/routes/profile/+page.svelte
index 79d3a28..d3ff303 100644
--- a/frontend/src/routes/profile/+page.svelte
+++ b/frontend/src/routes/profile/+page.svelte
@@ -3,7 +3,6 @@
let stats: {
country_count: number;
- featured_count: number;
planned_count: number;
total_regions: number;
trips_count: number;
diff --git a/frontend/src/routes/trips/+page.server.ts b/frontend/src/routes/trips/+page.server.ts
deleted file mode 100644
index 86c0f92..0000000
--- a/frontend/src/routes/trips/+page.server.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-import type { PageServerLoad } from './$types';
-const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL'];
-
-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
deleted file mode 100644
index 901e25f..0000000
--- a/frontend/src/routes/trips/+page.svelte
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-{#if notFound}
-
-
-{/if}
-
-{#if noTrips}
-
-
-
-
-
- - Adventure not Found -
-- The adventure you were looking for could not be found. Please try a different adventure or - check back later. -
-
-
-
-
-
-{/if}
-
-{#if trips && !notFound}
-
-
-
-
-
- - No Trips Found -
-- There are no trips to display. Please try again later. -
-
- {#each trips as trip (trip.id)}
-
-{/if}