mirror of
https://github.com/seanmorley15/AdventureLog.git
synced 2025-07-24 07:19:36 +02:00
493a13995c
* Refactor user_id to user in adventures and related models, views, and components - Updated all instances of user_id to user in the adventures app, including models, serializers, views, and frontend components. - Adjusted queries and filters to reflect the new user field naming convention. - Ensured consistency across the codebase for user identification in adventures, collections, notes, and transportation entities. - Modified frontend components to align with the updated data structure, ensuring proper access control and rendering based on user ownership. * Refactor adventure-related views and components to use "Location" terminology - Updated GlobalSearchView to replace AdventureSerializer with LocationSerializer. - Modified IcsCalendarGeneratorViewSet to use LocationSerializer instead of AdventureSerializer. - Created new LocationImageViewSet for managing location images, including primary image toggling and image deletion. - Introduced LocationViewSet for managing locations with enhanced filtering, sorting, and sharing capabilities. - Updated ReverseGeocodeViewSet to utilize LocationSerializer. - Added ActivityTypesView to retrieve distinct activity types from locations. - Refactored user views to replace AdventureSerializer with LocationSerializer. - Updated frontend components to reflect changes from "adventure" to "location", including AdventureCard, AdventureLink, AdventureModal, and others. - Adjusted API endpoints in frontend routes to align with new location-based structure. - Ensured all references to adventures are replaced with locations across the codebase. * refactor: rename adventures to locations across the application - Updated localization files to replace adventure-related terms with location-related terms. - Refactored TypeScript types and variables from Adventure to Location in various routes and components. - Adjusted UI elements and labels to reflect the change from adventures to locations. - Ensured all references to adventures in the codebase are consistent with the new location terminology. * Refactor code structure for improved readability and maintainability * feat: Implement location details page with server-side loading and deletion functionality - Added +page.server.ts to handle server-side loading of additional location info. - Created +page.svelte for displaying location details, including images, visits, and maps. - Integrated GPX file handling and rendering on the map. - Updated map route to link to locations instead of adventures. - Refactored profile and search routes to use LocationCard instead of AdventureCard. * docs: Update terminology from "Adventure" to "Location" and enhance project overview * docs: Clarify collection examples in usage documentation * feat: Enable credentials for GPX file fetch and add CORS_ALLOW_CREDENTIALS setting * Refactor adventure references to locations across the backend and frontend - Updated CategoryViewSet to reflect location context instead of adventures. - Modified ChecklistViewSet to include locations in retrieval logic. - Changed GlobalSearchView to search for locations instead of adventures. - Adjusted IcsCalendarGeneratorViewSet to handle locations instead of adventures. - Refactored LocationImageViewSet to remove unused import. - Updated LocationViewSet to clarify public access for locations. - Changed LodgingViewSet to reference locations instead of adventures. - Modified NoteViewSet to prevent listing all locations. - Updated RecommendationsViewSet to handle locations in parsing and response. - Adjusted ReverseGeocodeViewSet to search through user locations. - Updated StatsViewSet to count locations instead of adventures. - Changed TagsView to reflect activity types for locations. - Updated TransportationViewSet to reference locations instead of adventures. - Added new translations for search results related to locations in multiple languages. - Updated dashboard and profile pages to reflect location counts instead of adventure counts. - Adjusted search routes to handle locations instead of adventures. * Update banner image * style: Update stats component background and border for improved visibility * refactor: Rename AdventureCard and AdventureModal to LocationCard and LocationModal for consistency
76 lines
No EOL
3.2 KiB
Python
76 lines
No EOL
3.2 KiB
Python
import os
|
|
from .models import Country, Region, VisitedRegion, City, VisitedCity
|
|
from rest_framework import serializers
|
|
from main.utils import CustomModelSerializer
|
|
|
|
|
|
class CountrySerializer(serializers.ModelSerializer):
|
|
def get_public_url(self, obj):
|
|
return os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/').replace("'", "")
|
|
|
|
flag_url = serializers.SerializerMethodField()
|
|
num_regions = serializers.SerializerMethodField()
|
|
num_visits = serializers.SerializerMethodField()
|
|
|
|
def get_flag_url(self, obj):
|
|
public_url = self.get_public_url(obj)
|
|
return public_url + '/media/' + 'flags/' + obj.country_code.lower() + '.png'
|
|
|
|
def get_num_regions(self, obj):
|
|
# get the number of regions in the country
|
|
return Region.objects.filter(country=obj).count()
|
|
|
|
def get_num_visits(self, obj):
|
|
request = self.context.get('request')
|
|
user = getattr(request, 'user', None)
|
|
|
|
if user and user.is_authenticated:
|
|
return VisitedRegion.objects.filter(region__country=obj, user=user).count()
|
|
|
|
return 0
|
|
|
|
class Meta:
|
|
model = Country
|
|
fields = '__all__'
|
|
read_only_fields = ['id', 'name', 'country_code', 'subregion', 'flag_url', 'num_regions', 'num_visits', 'longitude', 'latitude', 'capital']
|
|
|
|
|
|
class RegionSerializer(serializers.ModelSerializer):
|
|
num_cities = serializers.SerializerMethodField()
|
|
country_name = serializers.CharField(source='country.name', read_only=True)
|
|
class Meta:
|
|
model = Region
|
|
fields = '__all__'
|
|
read_only_fields = ['id', 'name', 'country', 'longitude', 'latitude', 'num_cities', 'country_name']
|
|
|
|
def get_num_cities(self, obj):
|
|
return City.objects.filter(region=obj).count()
|
|
|
|
class CitySerializer(serializers.ModelSerializer):
|
|
region_name = serializers.CharField(source='region.name', read_only=True)
|
|
country_name = serializers.CharField(source='region.country.name', read_only=True
|
|
)
|
|
class Meta:
|
|
model = City
|
|
fields = '__all__'
|
|
read_only_fields = ['id', 'name', 'region', 'longitude', 'latitude', 'region_name', 'country_name']
|
|
|
|
class VisitedRegionSerializer(CustomModelSerializer):
|
|
longitude = serializers.DecimalField(source='region.longitude', max_digits=9, decimal_places=6, read_only=True)
|
|
latitude = serializers.DecimalField(source='region.latitude', max_digits=9, decimal_places=6, read_only=True)
|
|
name = serializers.CharField(source='region.name', read_only=True)
|
|
|
|
class Meta:
|
|
model = VisitedRegion
|
|
fields = ['id', 'user', 'region', 'longitude', 'latitude', 'name']
|
|
read_only_fields = ['user', 'id', 'longitude', 'latitude', 'name']
|
|
|
|
class VisitedCitySerializer(CustomModelSerializer):
|
|
longitude = serializers.DecimalField(source='city.longitude', max_digits=9, decimal_places=6, read_only=True)
|
|
latitude = serializers.DecimalField(source='city.latitude', max_digits=9, decimal_places=6, read_only=True)
|
|
name = serializers.CharField(source='city.name', read_only=True)
|
|
|
|
class Meta:
|
|
model = VisitedCity
|
|
fields = ['id', 'user', 'city', 'longitude', 'latitude', 'name']
|
|
read_only_fields = ['user', 'id', 'longitude', 'latitude', 'name'] |