Merge pull request #119 from seanmorley15/development

Development

backend/server/adventures/urls.py

@@ -1,11 +1,13 @@
 from django.urls import include, path
 from rest_framework.routers import DefaultRouter
-from .views import AdventureViewSet, TripViewSet, StatsViewSet
+from .views import AdventureViewSet, TripViewSet, StatsViewSet, GenerateDescription
 
 router = DefaultRouter()
 router.register(r'adventures', AdventureViewSet, basename='adventures')
 router.register(r'trips', TripViewSet, basename='trips')
 router.register(r'stats', StatsViewSet, basename='stats')
+router.register(r'generate', GenerateDescription, basename='generate')
+
 
 urlpatterns = [
     # Include the router under the 'api/' prefix

backend/server/adventures/views.py

@@ -1,5 +1,7 @@
+import requests
 from rest_framework.decorators import action
 from rest_framework import viewsets
+from django.db.models.functions import Lower
 from rest_framework.response import Response
 from .models import Adventure, Trip
 from worldtravel.models import VisitedRegion, Region, Country
@@ -7,38 +9,66 @@ from .serializers import AdventureSerializer, TripSerializer
 from rest_framework.permissions import IsAuthenticated
 from django.db.models import Q, Prefetch
 from .permissions import IsOwnerOrReadOnly, IsPublicReadOnly
+from rest_framework.pagination import PageNumberPagination
+
+class StandardResultsSetPagination(PageNumberPagination):
+    page_size = 10
+    page_size_query_param = 'page_size'
+    max_page_size = 1000
+
+from rest_framework.pagination import PageNumberPagination
+
+from rest_framework.decorators import action
+from rest_framework.response import Response
+from django.db.models import Q
 
 class AdventureViewSet(viewsets.ModelViewSet):
     serializer_class = AdventureSerializer
     permission_classes = [IsOwnerOrReadOnly, IsPublicReadOnly]
+    pagination_class = StandardResultsSetPagination
 
     def get_queryset(self):
-        return Adventure.objects.filter(
+        lower_name = Lower('name')
+        queryset = Adventure.objects.annotate(
+        ).filter(
             Q(is_public=True) | Q(user_id=self.request.user.id)
-        )
+        ).order_by(lower_name)  # Sort by the annotated lowercase name
-
+        return queryset
+    
     def perform_create(self, serializer):
         serializer.save(user_id=self.request.user)
 
     @action(detail=False, methods=['get'])
-    def visited(self, request):
+    def filtered(self, request):
-        visited_adventures = Adventure.objects.filter(
+        types = request.query_params.get('types', '').split(',')
-            type='visited', user_id=request.user.id, trip=None)
+        valid_types = ['visited', 'planned', 'featured']
-        serializer = self.get_serializer(visited_adventures, many=True)
+        types = [t for t in types if t in valid_types]
-        return Response(serializer.data)
 
-    @action(detail=False, methods=['get'])
+        if not types:
-    def planned(self, request):
+            return Response({"error": "No valid types provided"}, status=400)
-        planned_adventures = Adventure.objects.filter(
-            type='planned', user_id=request.user.id, trip=None)
-        serializer = self.get_serializer(planned_adventures, many=True)
-        return Response(serializer.data)
 
-    @action(detail=False, methods=['get'])
+        queryset = Adventure.objects.none()
-    def featured(self, request):
+
-        featured_adventures = Adventure.objects.filter(
+        for adventure_type in types:
-            type='featured', is_public=True, trip=None)
+            if adventure_type in ['visited', 'planned']:
-        serializer = self.get_serializer(featured_adventures, many=True)
+                queryset |= Adventure.objects.filter(
+                    type=adventure_type, user_id=request.user.id, trip=None)
+            elif adventure_type == 'featured':
+                queryset |= Adventure.objects.filter(
+                    type='featured', is_public=True, trip=None)
+
+        lower_name = Lower('name')
+        queryset = queryset.order_by(lower_name)
+        adventures = self.paginate_and_respond(queryset, request)
+        return adventures
+
+    def paginate_and_respond(self, queryset, request):
+        paginator = self.pagination_class()
+        page = paginator.paginate_queryset(queryset, request)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return paginator.get_paginated_response(serializer.data)
+        serializer = self.get_serializer(queryset, many=True)
         return Response(serializer.data)
 
 class TripViewSet(viewsets.ModelViewSet):
@@ -57,11 +87,12 @@ class TripViewSet(viewsets.ModelViewSet):
     def perform_create(self, serializer):
         serializer.save(user_id=self.request.user)
 
+    @action(detail=False, methods=['get'])
     @action(detail=False, methods=['get'])
     def visited(self, request):
-        trips = self.get_queryset().filter(type='visited', user_id=request.user.id)
+        visited_adventures = Adventure.objects.filter(
-        serializer = self.get_serializer(trips, many=True)
+            type='visited', user_id=request.user.id, trip=None)
-        return Response(serializer.data)
+        return self.get_paginated_response(visited_adventures)
 
     @action(detail=False, methods=['get'])
     def planned(self, request):
@@ -103,4 +134,37 @@ class StatsViewSet(viewsets.ViewSet):
             'total_regions': total_regions,
             'country_count': country_count,
             'total_countries': total_countries
-        })
+        })
+    
+class GenerateDescription(viewsets.ViewSet):
+    permission_classes = [IsAuthenticated]
+
+    @action(detail=False, methods=['get'],)
+    def desc(self, request):
+        name = self.request.query_params.get('name', '')
+        # un url encode the name
+        name = name.replace('%20', ' ')
+        print(name)
+        url = 'https://en.wikipedia.org/w/api.php?origin=*&action=query&prop=extracts&exintro&explaintext&format=json&titles=%s' % name
+        response = requests.get(url)
+        data = response.json()
+        data = response.json()
+        page_id = next(iter(data["query"]["pages"]))
+        extract = data["query"]["pages"][page_id]
+        if extract.get('extract') is None:
+            return Response({"error": "No description found"}, status=400)
+        return Response(extract)
+    @action(detail=False, methods=['get'],)
+    def img(self, request):
+        name = self.request.query_params.get('name', '')
+        # un url encode the name
+        name = name.replace('%20', ' ')
+        url = 'https://en.wikipedia.org/w/api.php?origin=*&action=query&prop=pageimages&format=json&piprop=original&titles=%s' % name
+        response = requests.get(url)
+        data = response.json()
+        page_id = next(iter(data["query"]["pages"]))
+        extract = data["query"]["pages"][page_id]
+        if extract.get('original') is None:
+            return Response({"error": "No image found"}, status=400)
+        return Response(extract["original"])
+        

docker-compose.yml

@@ -2,11 +2,11 @@ version: "3.9"
 
 services:
   web:
-    #build: ./frontend/
+    build: ./frontend/
-    image: ghcr.io/seanmorley15/adventurelog-frontend:latest
+    #image: ghcr.io/seanmorley15/adventurelog-frontend:latest
     environment:
       - PUBLIC_SERVER_URL=http://server:8000
-      - ORIGIN=http://localhost:8080
+      - ORIGIN=http://10.0.0.92:8080
       - BODY_SIZE_LIMIT=Infinity
     ports:
       - "8080:3000"
@@ -23,8 +23,8 @@ services:
       - postgres_data:/var/lib/postgresql/data/
 
   server:
-    #build: ./backend/
+    build: ./backend/
-    image: ghcr.io/seanmorley15/adventurelog-backend:latest
+    #image: ghcr.io/seanmorley15/adventurelog-backend:latest
     environment:
       - PGHOST=db
       - PGDATABASE=database
@@ -34,7 +34,7 @@ services:
       - DJANGO_ADMIN_USERNAME=admin
       - DJANGO_ADMIN_PASSWORD=admin
       - DJANGO_ADMIN_EMAIL=admin@example.com
-      - PUBLIC_URL='http://127.0.0.1:81'
+      - PUBLIC_URL='http://10.0.92:81'
       - CSRF_TRUSTED_ORIGINS=https://api.adventurelog.app,https://adventurelog.app
       - DEBUG=False
     ports:

frontend/src/routes/+page.server.ts

@@ -34,8 +34,8 @@ export const actions: Actions = {
 			}
 		});
 		if (res.ok) {
-			cookies.delete('auth', { path: '/' });
+			cookies.delete('auth', { path: '/', secure: false });
-			cookies.delete('refresh', { path: '/' });
+			cookies.delete('refresh', { path: '/', secure: false });
 			return redirect(302, '/login');
 		} else {
 			return redirect(302, '/');

frontend/src/routes/adventures/+page.server.ts

@@ -3,7 +3,7 @@ import type { PageServerLoad } from './$types';
 const PUBLIC_SERVER_URL = process.env['PUBLIC_SERVER_URL'];
 import type { Adventure } from '$lib/types';
 
-import type { Actions } from '@sveltejs/kit';
+import type { Actions, RequestEvent } from '@sveltejs/kit';
 import { fetchCSRFToken, tryRefreshToken } from '$lib/index.server';
 import { checkLink } from '$lib';
 
@@ -13,32 +13,38 @@ 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 visitedFetch = await fetch(`${serverEndpoint}/api/adventures/visited/`, {
+		let initialFetch = await fetch(
-			headers: {
+			`${serverEndpoint}/api/adventures/filtered?types=visited,planned`,
-				Cookie: `${event.cookies.get('auth')}`
+			{
+				headers: {
+					Cookie: `${event.cookies.get('auth')}`
+				}
 			}
-		});
+		);
-		if (!visitedFetch.ok) {
+		if (!initialFetch.ok) {
 			console.error('Failed to fetch visited adventures');
 			return redirect(302, '/login');
 		} else {
-			let visited = (await visitedFetch.json()) as Adventure[];
+			let res = await initialFetch.json();
+			let visited = res.results as Adventure[];
+			next = res.next;
+			previous = res.previous;
+			count = res.count;
 			adventures = [...adventures, ...visited];
 		}
-		let plannedFetch = await fetch(`${serverEndpoint}/api/adventures/planned/`, {
+
-			headers: {
+		return {
-				Cookie: `${event.cookies.get('auth')}`
+			props: {
+				adventures,
+				next,
+				previous,
+				count
 			}
-		});
+		};
-		if (!plannedFetch.ok) {
-			console.error('Failed to fetch visited adventures');
-			return redirect(302, '/login');
-		} else {
-			let planned = (await plannedFetch.json()) as Adventure[];
-			adventures = [...adventures, ...planned];
-		}
-		return { adventures } as { adventures: Adventure[] };
 	}
 }) satisfies PageServerLoad;
 
@@ -366,49 +372,123 @@ export const actions: Actions = {
 			};
 		}
 
+		let filterString = '';
 		if (visited) {
-			let visitedFetch = await fetch(`${serverEndpoint}/api/adventures/visited/`, {
+			filterString += 'visited';
-				headers: {
-					Cookie: `${event.cookies.get('auth')}`
-				}
-			});
-			if (!visitedFetch.ok) {
-				console.error('Failed to fetch visited adventures');
-				return redirect(302, '/login');
-			} else {
-				let visited = (await visitedFetch.json()) as Adventure[];
-				adventures = [...adventures, ...visited];
-			}
 		}
 		if (planned) {
-			let plannedFetch = await fetch(`${serverEndpoint}/api/adventures/planned/`, {
+			if (filterString) {
-				headers: {
+				filterString += ',';
-					Cookie: `${event.cookies.get('auth')}`
-				}
-			});
-			if (!plannedFetch.ok) {
-				console.error('Failed to fetch visited adventures');
-				return redirect(302, '/login');
-			} else {
-				let planned = (await plannedFetch.json()) as Adventure[];
-				adventures = [...adventures, ...planned];
 			}
+			filterString += 'planned';
 		}
 		if (featured) {
-			let featuredFetch = await fetch(`${serverEndpoint}/api/adventures/featured/`, {
+			if (filterString) {
+				filterString += ',';
+			}
+			filterString += 'featured';
+		}
+		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}`,
+			{
 				headers: {
 					Cookie: `${event.cookies.get('auth')}`
 				}
-			});
-			if (!featuredFetch.ok) {
-				console.error('Failed to fetch visited adventures');
-				return redirect(302, '/login');
-			} else {
-				let featured = (await featuredFetch.json()) as Adventure[];
-				adventures = [...adventures, ...featured];
 			}
+		);
+		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 (!page) {
+			return {
+				status: 400,
+				body: { error: 'Missing required fields' }
+			};
+		}
+
+		// Start with the current URL if next and previous are not provided
+		let url: string = next || previous || event.url.toString();
+
+		let index = url.indexOf('/api');
+		let newUrl = url.substring(index);
+		console.log('NEW URL' + newUrl);
+		url = serverEndpoint + newUrl;
+		console.log('URL' + url);
+
+		// 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}`;
+		}
+
+		try {
+			const response = await fetch(url, {
+				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
+				}
+			};
+		} catch (error) {
+			console.error('Error fetching data:', error);
+			return {
+				status: 500,
+				body: { error: 'Failed to fetch data' }
+			};
 		}
-		// console.log(adventures);
-		return adventures as Adventure[];
 	}
 };

frontend/src/routes/adventures/+page.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { enhance } from '$app/forms';
+	import { enhance, deserialize } from '$app/forms';
 	import AdventureCard from '$lib/components/AdventureCard.svelte';
 	import EditAdventure from '$lib/components/EditAdventure.svelte';
 	import NewAdventure from '$lib/components/NewAdventure.svelte';
@@ -11,13 +11,33 @@
 	export let data: any;
 	console.log(data);
 
-	let adventures: Adventure[] = data.adventures || [];
+	let adventures: Adventure[] = data.props.adventures || [];
 
 	let currentSort = { attribute: 'name', order: 'asc' };
 
 	let isShowingCreateModal: boolean = false;
 	let newType: string = '';
 
+	let resultsPerPage: number = 10;
+
+	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);
+
+	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;
+				totalPages = Math.ceil(count / resultsPerPage);
+			}
+		};
+	}
+
 	function handleSubmit() {
 		return async ({ result, update }: any) => {
 			// First, call the update function with reset: false
@@ -27,8 +47,12 @@
 			if (result.type === 'success') {
 				if (result.data) {
 					// console.log(result.data);
-					adventures = result.data as Adventure[];
+					adventures = result.data.adventures as Adventure[];
-					sort(currentSort);
+					next = result.data.next;
+					previous = result.data.previous;
+					count = result.data.count;
+					totalPages = Math.ceil(count / resultsPerPage);
+					console.log(next);
 				}
 			}
 		};
@@ -39,9 +63,9 @@
 		currentSort.order = order;
 		if (attribute === 'name') {
 			if (order === 'asc') {
-				adventures = adventures.sort((a, b) => a.name.localeCompare(b.name));
-			} else {
 				adventures = adventures.sort((a, b) => b.name.localeCompare(a.name));
+			} else {
+				adventures = adventures.sort((a, b) => a.name.localeCompare(b.name));
 			}
 		}
 	}
@@ -140,6 +164,7 @@
 	<div class="drawer-content">
 		<!-- Page content -->
 		<h1 class="text-center font-bold text-4xl mb-6">My Adventures</h1>
+		<p class="text-center">This search returned {count} results.</p>
 		{#if adventures.length === 0}
 			<NotFound />
 		{/if}
@@ -160,6 +185,22 @@
 					/>
 				{/each}
 			</div>
+			<div class="join grid grid-cols-2">
+				<div class="join grid grid-cols-2">
+					{#if next || previous}
+						<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} />
+									<button class="join-item btn">{page}</button>
+								</form>
+							{/each}
+						</div>
+					{/if}
+				</div>
+			</div>
 		</div>
 	</div>
 	<div class="drawer-side">

frontend/src/routes/login/+page.server.ts

@@ -60,13 +60,15 @@ export const actions: Actions = {
 				httpOnly: true,
 				sameSite: 'lax',
 				expires: new Date(Date.now() + 60 * 60 * 1000), // 60 minutes
-				path: '/'
+				path: '/',
+				secure: false
 			});
 			event.cookies.set('refresh', refreshToken, {
 				httpOnly: true,
 				sameSite: 'lax',
 				expires: new Date(Date.now() + 365 * 24 * 60 * 60 * 1000), // 1 year
-				path: '/'
+				path: '/',
+				secure: false
 			});
 
 			return redirect(302, '/');