From 43c392963e203452dbd26598c336b9dec57b0d0f Mon Sep 17 00:00:00 2001
From: Sean Morley
Date: Mon, 22 Jul 2024 11:06:48 -0400
Subject: [PATCH 1/3] chore: Add Open Source Attributions to AboutModal.svelte
---
frontend/src/lib/components/AboutModal.svelte | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/frontend/src/lib/components/AboutModal.svelte b/frontend/src/lib/components/AboutModal.svelte
index f7eecb6..2670c73 100644
--- a/frontend/src/lib/components/AboutModal.svelte
+++ b/frontend/src/lib/components/AboutModal.svelte
@@ -55,10 +55,17 @@
>
Made with ❤️ in the United States.
-
+
+ Open Source Attributions
+
+ Location Search and Geocoding is provided by OpenStreepMap. Their data is liscensed under the ODbL liscense.
+
+
From 70615a6a1629da6bfab5edf91215d3c216d95a9b Mon Sep 17 00:00:00 2001
From: Sean Morley
Date: Tue, 23 Jul 2024 11:56:33 -0400
Subject: [PATCH 2/3] chore: Update router registration in urls.py
---
backend/server/worldtravel/urls.py | 6 +++---
backend/server/worldtravel/views.py | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/backend/server/worldtravel/urls.py b/backend/server/worldtravel/urls.py
index f3e8651..8f0610f 100644
--- a/backend/server/worldtravel/urls.py
+++ b/backend/server/worldtravel/urls.py
@@ -5,9 +5,9 @@ from rest_framework.routers import DefaultRouter
from .views import CountryViewSet, RegionViewSet, VisitedRegionViewSet, regions_by_country, visits_by_country
router = DefaultRouter()
-router.register(r'countries', CountryViewSet)
-router.register(r'regions', RegionViewSet)
-router.register(r'visitedregion', VisitedRegionViewSet)
+router.register(r'countries', CountryViewSet, basename='countries')
+router.register(r'regions', RegionViewSet, basename='regions')
+router.register(r'visitedregion', VisitedRegionViewSet, basename='visitedregion')
urlpatterns = [
path('', include(router.urls)),
diff --git a/backend/server/worldtravel/views.py b/backend/server/worldtravel/views.py
index 0d320ff..276c58f 100644
--- a/backend/server/worldtravel/views.py
+++ b/backend/server/worldtravel/views.py
@@ -37,7 +37,10 @@ class RegionViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = RegionSerializer
permission_classes = [IsAuthenticated]
+
class VisitedRegionViewSet(viewsets.ModelViewSet):
- queryset = VisitedRegion.objects.all()
serializer_class = VisitedRegionSerializer
- permission_classes = [IsAuthenticated]
\ No newline at end of file
+ permission_classes = [IsAuthenticated]
+
+ def get_queryset(self):
+ return VisitedRegion.objects.filter(user_id=self.request.user.id)
\ No newline at end of file
From b9c90216270b12c53e9e3f04e4d65af33074ec3f Mon Sep 17 00:00:00 2001
From: Sean Morley
Date: Tue, 23 Jul 2024 12:00:15 -0400
Subject: [PATCH 3/3] feat: Filter visits by user in visits_by_country view
---
backend/server/worldtravel/views.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/server/worldtravel/views.py b/backend/server/worldtravel/views.py
index 276c58f..0e257a0 100644
--- a/backend/server/worldtravel/views.py
+++ b/backend/server/worldtravel/views.py
@@ -21,7 +21,7 @@ def regions_by_country(request, country_code):
@permission_classes([IsAuthenticated])
def visits_by_country(request, country_code):
country = get_object_or_404(Country, country_code=country_code)
- visits = VisitedRegion.objects.filter(region__country=country)
+ visits = VisitedRegion.objects.filter(region__country=country, user_id=request.user.id)
serializer = VisitedRegionSerializer(visits, many=True)
return Response(serializer.data)