Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-07-24 23:39:37 +02:00
Code Issues Releases Activity

Merge pull request #161 from seanmorley15/development

Browse source 
Development
This commit is contained in:
Sean Morley 2024-08-05 10:01:13 -04:00 • committed by GitHub
commit b944c6e8e0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 111 additions and 268 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/server/adventures/views.py
View file

@ -15,7 +15,7 @@ from django.shortcuts import get_object_or_404
from rest_framework import status
class StandardResultsSetPagination(PageNumberPagination):
page_size = 10
page_size = 25
page_size_query_param = 'page_size'
max_page_size = 1000

230
frontend/src/routes/adventures/+page.server.ts
View file

@ -13,12 +13,33 @@ 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[] = [];
const visited = event.url.searchParams.get('visited');
const planned = event.url.searchParams.get('planned');
let typeString: string = '';
if (visited == 'on') {
typeString += 'visited';
}
if (planned == 'on') {
if (typeString) {
typeString += ',';
}
typeString += 'planned';
} else if (!visited && !planned) {
typeString = 'visited,planned';
}
const include_collections = event.url.searchParams.get('include_collections') || 'false';
const order_by = event.url.searchParams.get('order_by') || 'updated_at';
const order_direction = event.url.searchParams.get('order_direction') || 'asc';
const page = event.url.searchParams.get('page') || '1';
let initialFetch = await fetch(
`${serverEndpoint}/api/adventures/filtered?types=visited,planned&include_collections=false`,
`${serverEndpoint}/api/adventures/filtered?types=${typeString}&order_by=${order_by}&order_direction=${order_direction}&include_collections=${include_collections}&page=${page}`,
{
headers: {
Cookie: `${event.cookies.get('auth')}`
@ -31,8 +52,7 @@ export const load = (async (event) => {
} else {
let res = await initialFetch.json();
let visited = res.results as Adventure[];
next = res.next;
previous = res.previous;
count = res.count;
adventures = [...adventures, ...visited];
}
@ -40,8 +60,6 @@ export const load = (async (event) => {
return {
props: {
adventures,
next,
previous,
count
}
};
@ -384,203 +402,5 @@ export const actions: Actions = {
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 visited = formData.get('visited');
const planned = formData.get('planned');
let include_collections = formData.get('include_collections') as string;
if (include_collections) {
include_collections = 'true';
} else {
include_collections = 'false';
}
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 filterString = '';
if (visited) {
filterString += 'visited';
}
if (planned) {
if (filterString) {
filterString += ',';
}
filterString += 'planned';
}
if (!filterString) {
filterString = '';
}
let next = null;
let previous = null;
let count = 0;
console.log(filterString);
let visitedFetch = await fetch(
`${serverEndpoint}/api/adventures/filtered?types=${filterString}&order_by=${order_by}&order_direction=${order_direction}&include_collections=${include_collections}`,
{
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/adventures/filtered';
// Extract the path starting from '/api/adventures'
const apiIndex = url.indexOf('/api/adventures');
if (apiIndex !== -1) {
url = url.slice(apiIndex);
} else {
url = '/api/adventures/filtered';
}
// 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' }
};
}
},
all: async (event) => {
if (!event.locals.user) {
return {
status: 401,
body: { message: 'Unauthorized' }
};
}
const formData = await event.request.formData();
let include_collections = formData.get('include_collections') as string;
if (include_collections !== 'true' && include_collections !== 'false') {
include_collections = 'false';
}
let adventures: Adventure[] = [];
let visitedFetch = await fetch(
`${serverEndpoint}/api/adventures/all/?include_collections=${include_collections}`,
{
headers: {
Cookie: `${event.cookies.get('auth')}`,
'Content-Type': 'application/json'
}
}
);
if (!visitedFetch.ok) {
console.error('Failed to fetch all adventures');
return redirect(302, '/login');
} else {
console.log('Fetched all adventures');
let res = await visitedFetch.json();
console.log(res);
adventures = res as Adventure[];
}
return {
adventures
};
}
};

145
frontend/src/routes/adventures/+page.svelte
View file

@ -1,5 +1,7 @@
<script lang="ts">
import { enhance, deserialize } from '$app/forms';
import { goto } from '$app/navigation';
import { page } from '$app/stores';
import AdventureCard from '$lib/components/AdventureCard.svelte';
import EditAdventure from '$lib/components/EditAdventure.svelte';
import NewAdventure from '$lib/components/NewAdventure.svelte';
@ -13,64 +15,83 @@
let adventures: Adventure[] = data.props.adventures || [];
let currentSort = { attribute: 'name', order: 'asc' };
let currentSort = {
order_by: '',
order: '',
visited: true,
planned: true,
includeCollections: true
};
let isShowingCreateModal: boolean = false;
let newType: string = '';
let resultsPerPage: number = 10;
let resultsPerPage: number = 25;
let next: string | null = data.props.next || null;
let previous: string | null = data.props.previous || null;
let count = data.props.count || 0;
let totalPages = Math.ceil(count / resultsPerPage);
let currentPage: number = 1;
function handleChangePage() {
return async ({ result }: any) => {
if (result.type === 'success') {
console.log(result.data);
adventures = result.data.body.adventures as Adventure[];
next = result.data.body.next;
previous = result.data.body.previous;
count = result.data.body.count;
currentPage = result.data.body.page;
totalPages = Math.ceil(count / resultsPerPage);
}
};
function handleChangePage(pageNumber: number) {
// let query = new URLSearchParams($page.url.searchParams.toString());
// query.set('page', pageNumber.toString());
// console.log(query.toString());
currentPage = pageNumber;
let url = new URL(window.location.href);
url.searchParams.set('page', pageNumber.toString());
adventures = [];
adventures = data.props.adventures;
goto(url.toString(), { invalidateAll: true, replaceState: true });
// goto(`?${query.toString()}`, { invalidateAll: true });
}
function handleSubmit() {
return async ({ result, update }: any) => {
// First, call the update function with reset: false
update({ reset: false });
// Then, handle the result
if (result.type === 'success') {
if (result.data) {
// console.log(result.data);
adventures = result.data.adventures as Adventure[];
next = result.data.next;
previous = result.data.previous;
count = result.data.count;
totalPages = Math.ceil(count / resultsPerPage);
currentPage = 1;
console.log(next);
}
}
};
$: {
let url = new URL($page.url);
let page = url.searchParams.get('page');
if (page) {
currentPage = parseInt(page);
}
}
function sort({ attribute, order }: { attribute: string; order: string }) {
currentSort.attribute = attribute;
currentSort.order = order;
if (attribute === 'name') {
if (order === 'asc') {
adventures = adventures.sort((a, b) => b.name.localeCompare(a.name));
} else {
adventures = adventures.sort((a, b) => a.name.localeCompare(b.name));
}
$: {
if (data.props.adventures) {
adventures = data.props.adventures;
}
if (data.props.count) {
count = data.props.count;
totalPages = Math.ceil(count / resultsPerPage);
}
}
$: {
let url = new URL($page.url);
currentSort.order_by = url.searchParams.get('order_by') || 'updated_at';
currentSort.order = url.searchParams.get('order_direction') || 'asc';
if (url.searchParams.get('planned') === 'on') {
currentSort.planned = true;
} else {
currentSort.planned = false;
}
if (url.searchParams.get('visited') === 'on') {
currentSort.visited = true;
} else {
currentSort.visited = false;
}
if (url.searchParams.get('include_collections') === 'on') {
currentSort.includeCollections = true;
} else {
currentSort.includeCollections = false;
}
if (!currentSort.visited && !currentSort.planned) {
currentSort.visited = true;
currentSort.planned = true;
}
}
@ -193,19 +214,16 @@
</div>
<div class="join flex items-center justify-center mt-4">
{#if next || previous}
{#if totalPages > 1}
<div class="join">
{#each Array.from({ length: totalPages }, (_, i) => i + 1) as page}
<form action="?/changePage" method="POST" use:enhance={handleChangePage}>
<input type="hidden" name="page" value={page} />
<input type="hidden" name="next" value={next} />
<input type="hidden" name="previous" value={previous} />
{#if currentPage != page}
<button class="join-item btn btn-lg">{page}</button>
{:else}
<button class="join-item btn btn-lg btn-active">{page}</button>
{/if}
</form>
{#if currentPage != page}
<button class="join-item btn btn-lg" on:click={() => handleChangePage(page)}
>{page}</button
>
{:else}
<button class="join-item btn btn-lg btn-active">{page}</button>
{/if}
{/each}
</div>
{/if}
@ -219,7 +237,7 @@
<!-- Sidebar content here -->
<div class="form-control">
<h3 class="text-center font-bold text-lg mb-4">Adventure Types</h3>
<form action="?/get" method="post" use:enhance={handleSubmit}>
<form method="get">
<label class="label cursor-pointer">
<span class="label-text">Completed</span>
<input
@ -227,7 +245,7 @@
name="visited"
id="visited"
class="checkbox checkbox-primary"
checked
checked={currentSort.visited}
/>
</label>
<label class="label cursor-pointer">
@ -237,7 +255,7 @@
id="planned"
name="planned"
class="checkbox checkbox-primary"
checked
checked={currentSort.planned}
/>
</label>
<!-- <div class="divider"></div> -->
@ -251,7 +269,7 @@
id="asc"
value="asc"
aria-label="Ascending"
checked
checked={currentSort.order === 'asc'}
/>
<input
class="join-item btn btn-neutral"
@ -260,6 +278,7 @@
id="desc"
value="desc"
aria-label="Descending"
checked={currentSort.order === 'desc'}
/>
</div>
<br />
@ -272,7 +291,7 @@
id="updated_at"
value="updated_at"
aria-label="Updated"
checked
checked={currentSort.order_by === 'updated_at'}
/>
<input
class="join-item btn btn-neutral"
@ -281,6 +300,7 @@
id="name"
aria-label="Name"
value="name"
checked={currentSort.order_by === 'name'}
/>
<input
class="join-item btn btn-neutral"
@ -289,6 +309,7 @@
name="order_by"
id="date"
aria-label="Date"
checked={currentSort.order_by === 'date'}
/>
<input
class="join-item btn btn-neutral"
@ -297,6 +318,7 @@
id="rating"
aria-label="Rating"
value="rating"
checked={currentSort.order_by === 'rating'}
/>
</div>
@ -309,6 +331,7 @@
name="include_collections"
id="include_collections"
class="checkbox checkbox-primary"
checked={currentSort.includeCollections}
/>
</label>
<button type="submit" class="btn btn-success mt-4">Filter</button>

2
frontend/src/routes/collections/+page.svelte
View file

@ -21,7 +21,7 @@
let isShowingCreateModal: boolean = false;
let newType: string = '';
let resultsPerPage: number = 10;
let resultsPerPage: number = 25;
let currentView: string = 'cards';