Merge pull request #138 from seanmorley15/development

Development

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)),

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)
@@ -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]
+    permission_classes = [IsAuthenticated]
+
+    def get_queryset(self):
+        return VisitedRegion.objects.filter(user_id=self.request.user.id)

frontend/src/lib/components/AboutModal.svelte

@@ -55,10 +55,17 @@
 			>
 		</p>
 		<p class="py-1">Made with ❤️ in the United States.</p>
-		<div
-			class="modal-action items-center"
-			style="display: flex; flex-direction: column; align-items: center; width: 100%;"
-		></div>
+		<div class="divider"></div>
+		<h3 class="font-bold text-md">Open Source Attributions</h3>
+		<p class="py-1 mb-4">
+			Location Search and Geocoding is provided by <a
+				target="_blank"
+				rel="noopener noreferrer"
+				class="text-primary-500 underline"
+				href="https://operations.osmfoundation.org/policies/nominatim/">OpenStreepMap</a
+			>. Their data is liscensed under the ODbL liscense.
+		</p>
+
 		<button class="btn btn-primary" on:click={close}>Close</button>
 	</div>
 </dialog>