Skip to content

Commit

Permalink
Merge pull request #122 from seanmorley15/development
Browse files Browse the repository at this point in the history
refactor: Simplify URL handling in adventures page server code
  • Loading branch information
seanmorley15 authored Jul 12, 2024
2 parents 0494b3f + 22b2cb3 commit 9084406
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions frontend/src/routes/adventures/+page.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ export const actions: Actions = {
const previous = formData.get('previous') as string;
const page = formData.get('page') as string;

if (!event.locals.user) {
if (!event.locals.user || !event.cookies.get('auth')) {
return {
status: 401,
body: { message: 'Unauthorized' }
Expand All @@ -446,14 +446,8 @@ export const actions: Actions = {
};
}

// Start with the provided URL or default to the filtered adventures endpoint
let url: string = next || previous || `${serverEndpoint}/api/adventures/filtered`;

// Extract the path and query parameters
const urlParts = url.split('/api');
if (urlParts.length > 1) {
url = `${serverEndpoint}/api${urlParts[1]}`;
}
// Start with the current URL if next and previous are not provided
let url: string = next || previous || event.url.toString();

// Replace or add the page number in the URL
if (url.includes('page=')) {
Expand All @@ -464,6 +458,8 @@ export const actions: Actions = {
url += `page=${page}`;
}

console.log('CHANGE PAGE' + url);

try {
const response = await fetch(url, {
headers: {
Expand Down

0 comments on commit 9084406

Please sign in to comment.