From 5b7aaa6aad93adc33c1fe17481f4a9f7e753444e Mon Sep 17 00:00:00 2001 From: Sean Morley Date: Wed, 9 Oct 2024 14:48:59 -0400 Subject: [PATCH] Fix profile stats --- backend/server/adventures/views.py | 9 +++------ frontend/src/routes/profile/+page.svelte | 24 +++--------------------- 2 files changed, 6 insertions(+), 27 deletions(-) diff --git a/backend/server/adventures/views.py b/backend/server/adventures/views.py index 7f90f73..5acb2a0 100644 --- a/backend/server/adventures/views.py +++ b/backend/server/adventures/views.py @@ -511,10 +511,8 @@ class StatsViewSet(viewsets.ViewSet): @action(detail=False, methods=['get']) def counts(self, request): - visited_count = Adventure.objects.filter( - type='visited', user_id=request.user.id).count() - planned_count = Adventure.objects.filter( - type='planned', user_id=request.user.id).count() + adventure_count = Adventure.objects.filter( + user_id=request.user.id).count() trips_count = Collection.objects.filter( user_id=request.user.id).count() visited_region_count = VisitedRegion.objects.filter( @@ -524,8 +522,7 @@ class StatsViewSet(viewsets.ViewSet): user_id=request.user.id).values('region__country').distinct().count() total_countries = Country.objects.count() return Response({ - 'visited_count': visited_count, - 'planned_count': planned_count, + 'adventure_count': adventure_count, 'trips_count': trips_count, 'visited_region_count': visited_region_count, 'total_regions': total_regions, diff --git a/frontend/src/routes/profile/+page.svelte b/frontend/src/routes/profile/+page.svelte index 4265d7f..8f3f5c5 100644 --- a/frontend/src/routes/profile/+page.svelte +++ b/frontend/src/routes/profile/+page.svelte @@ -3,10 +3,9 @@ let stats: { country_count: number; - planned_count: number; total_regions: number; trips_count: number; - visited_count: number; + adventure_count: number; visited_region_count: number; total_countries: number; } | null; @@ -19,16 +18,6 @@ console.log(stats); - - - - {#if data.user.profile_pic}
@@ -65,17 +54,10 @@
-
Completed Adventures
-
{stats.visited_count}
+
Adventures
+
{stats.adventure_count}
- -
-
Planned Adventures
-
{stats.planned_count}
- -
-
Collections
{stats.trips_count}