alex/voyage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix profile stats

Browse Source
This commit is contained in:
Sean Morley
2024-10-09 14:48:59 -04:00
parent 7621c55896
commit 5b7aaa6aad
2 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/server/adventures/views.py
View File

@@ -511,10 +511,8 @@ class StatsViewSet(viewsets.ViewSet):
@action(detail=False, methods=['get']) @action(detail=False, methods=['get'])
def counts(self, request): def counts(self, request):
visited_count = Adventure.objects.filter( adventure_count = Adventure.objects.filter(
type='visited', user_id=request.user.id).count() user_id=request.user.id).count()
planned_count = Adventure.objects.filter(
type='planned', user_id=request.user.id).count()
trips_count = Collection.objects.filter( trips_count = Collection.objects.filter(
user_id=request.user.id).count() user_id=request.user.id).count()
visited_region_count = VisitedRegion.objects.filter( visited_region_count = VisitedRegion.objects.filter(
@@ -524,8 +522,7 @@ class StatsViewSet(viewsets.ViewSet):
user_id=request.user.id).values('region__country').distinct().count() user_id=request.user.id).values('region__country').distinct().count()
total_countries = Country.objects.count() total_countries = Country.objects.count()
return Response({ return Response({
'visited_count': visited_count, 'adventure_count': adventure_count,
'planned_count': planned_count,
'trips_count': trips_count, 'trips_count': trips_count,
'visited_region_count': visited_region_count, 'visited_region_count': visited_region_count,
'total_regions': total_regions, 'total_regions': total_regions,

24
frontend/src/routes/profile/+page.svelte
View File

@@ -3,10 +3,9 @@
let stats: { let stats: {
country_count: number; country_count: number;
planned_count: number;
total_regions: number; total_regions: number;
trips_count: number; trips_count: number;
visited_count: number; adventure_count: number;
visited_region_count: number; visited_region_count: number;
total_countries: number; total_countries: number;
} | null; } | null;
@@ -19,16 +18,6 @@
console.log(stats); console.log(stats);
</script> </script>
<!--
// v0 by Vercel.
// https://v0.dev/t/EtPnDdQYcbn
-->
<!--
// v0 by Vercel.
// https://v0.dev/t/DYwTru570WN
-->
{#if data.user.profile_pic} {#if data.user.profile_pic}
<div class="avatar flex items-center justify-center"> <div class="avatar flex items-center justify-center">
<div class="w-24 rounded"> <div class="w-24 rounded">
@@ -65,17 +54,10 @@
<div class="flex justify-center items-center"> <div class="flex justify-center items-center">
<div class="stats stats-vertical lg:stats-horizontal shadow bg-base-200"> <div class="stats stats-vertical lg:stats-horizontal shadow bg-base-200">
<div class="stat"> <div class="stat">
<div class="stat-title">Completed Adventures</div> <div class="stat-title">Adventures</div>
<div class="stat-value text-center">{stats.visited_count}</div> <div class="stat-value text-center">{stats.adventure_count}</div>
<!-- <div class="stat-desc">Jan 1st - Feb 1st</div> --> <!-- <div class="stat-desc">Jan 1st - Feb 1st</div> -->
</div> </div>
<div class="stat">
<div class="stat-title">Planned Adventures</div>
<div class="stat-value text-center">{stats.planned_count}</div>
<!-- <div class="stat-desc">↗︎ 400 (22%)</div> -->
</div>
<div class="stat"> <div class="stat">
<div class="stat-title">Collections</div> <div class="stat-title">Collections</div>
<div class="stat-value text-center">{stats.trips_count}</div> <div class="stat-value text-center">{stats.trips_count}</div>