Docker/AdventureLog
Docker/AdventureLog
1
0
Fork 0
mirror of https://github.com/seanmorley15/AdventureLog.git synced 2025-08-04 04:35:19 +02:00
Code Issues Releases Activity

Merge pull request #138 from seanmorley15/development

Browse source 
Development
This commit is contained in:
Sean Morley 2024-07-23 12:00:33 -04:00 • committed by GitHub
commit dd18837358
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/server/worldtravel/urls.py
View file

@ -5,9 +5,9 @@ from rest_framework.routers import DefaultRouter
from .views import CountryViewSet, RegionViewSet, VisitedRegionViewSet, regions_by_country, visits_by_country from .views import CountryViewSet, RegionViewSet, VisitedRegionViewSet, regions_by_country, visits_by_country
router = DefaultRouter() router = DefaultRouter()
router.register(r'countries', CountryViewSet) router.register(r'countries', CountryViewSet, basename='countries')
router.register(r'regions', RegionViewSet) router.register(r'regions', RegionViewSet, basename='regions')
router.register(r'visitedregion', VisitedRegionViewSet) router.register(r'visitedregion', VisitedRegionViewSet, basename='visitedregion')
urlpatterns = [ urlpatterns = [
path('', include(router.urls)), path('', include(router.urls)),

7
backend/server/worldtravel/views.py
View file

@ -21,7 +21,7 @@ def regions_by_country(request, country_code):
@permission_classes([IsAuthenticated]) @permission_classes([IsAuthenticated])
def visits_by_country(request, country_code): def visits_by_country(request, country_code):
country = get_object_or_404(Country, country_code=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) serializer = VisitedRegionSerializer(visits, many=True)
return Response(serializer.data) return Response(serializer.data)
@ -37,7 +37,10 @@ class RegionViewSet(viewsets.ReadOnlyModelViewSet):
serializer_class = RegionSerializer serializer_class = RegionSerializer
permission_classes = [IsAuthenticated] permission_classes = [IsAuthenticated]
class VisitedRegionViewSet(viewsets.ModelViewSet): class VisitedRegionViewSet(viewsets.ModelViewSet):
queryset = VisitedRegion.objects.all()
serializer_class = VisitedRegionSerializer serializer_class = VisitedRegionSerializer
permission_classes = [IsAuthenticated] permission_classes = [IsAuthenticated]
def get_queryset(self):
return VisitedRegion.objects.filter(user_id=self.request.user.id)

15
frontend/src/lib/components/AboutModal.svelte
View file

@ -55,10 +55,17 @@
> >
</p> </p>
<p class="py-1">Made with ❤️ in the United States.</p> <p class="py-1">Made with ❤️ in the United States.</p>
<div <div class="divider"></div>
class="modal-action items-center" <h3 class="font-bold text-md">Open Source Attributions</h3>
style="display: flex; flex-direction: column; align-items: center; width: 100%;" <p class="py-1 mb-4">
></div> 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> <button class="btn btn-primary" on:click={close}>Close</button>
</div> </div>
</dialog> </dialog>