- {% block content %}{% endblock %} + +
+ {% block content %} +
+

Try a Sample Request

+

Use the form below to test an API POST request.

+
+ + +
+
+
+ {% endblock %}
- - - - - + + + + + {% block script %}{% endblock %} diff --git a/backend/server/users/migrations/0005_customuser_measurement_system.py b/backend/server/users/migrations/0005_customuser_measurement_system.py new file mode 100644 index 00000000..1a45c6a1 --- /dev/null +++ b/backend/server/users/migrations/0005_customuser_measurement_system.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.2 on 2025-08-05 15:45 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0004_customuser_disable_password'), + ] + + operations = [ + migrations.AddField( + model_name='customuser', + name='measurement_system', + field=models.CharField(choices=[('metric', 'Metric'), ('imperial', 'Imperial')], default='metric', max_length=10), + ), + ] diff --git a/backend/server/users/models.py b/backend/server/users/models.py index bec028f7..dbc540de 100644 --- a/backend/server/users/models.py +++ b/backend/server/users/models.py @@ -9,6 +9,7 @@ class CustomUser(AbstractUser): uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True) public_profile = models.BooleanField(default=False) disable_password = models.BooleanField(default=False) + measurement_system = models.CharField(max_length=10, choices=[('metric', 'Metric'), ('imperial', 'Imperial')], default='metric') def __str__(self): return self.username \ No newline at end of file diff --git a/backend/server/users/serializers.py b/backend/server/users/serializers.py index 9d9bd33c..758d3d11 100644 --- a/backend/server/users/serializers.py +++ b/backend/server/users/serializers.py @@ -50,7 +50,7 @@ class UserDetailsSerializer(serializers.ModelSerializer): class Meta: model = CustomUser - extra_fields = ['profile_pic', 'uuid', 'public_profile'] + extra_fields = ['profile_pic', 'uuid', 'public_profile', 'measurement_system'] if hasattr(UserModel, 'USERNAME_FIELD'): extra_fields.append(UserModel.USERNAME_FIELD) @@ -66,6 +66,8 @@ class UserDetailsSerializer(serializers.ModelSerializer): extra_fields.append('is_staff') if hasattr(UserModel, 'disable_password'): extra_fields.append('disable_password') + if hasattr(UserModel, 'measurement_system'): + extra_fields.append('measurement_system') fields = ['pk', *extra_fields] read_only_fields = ('email', 'date_joined', 'is_staff', 'is_superuser', 'is_active', 'pk', 'disable_password') @@ -96,7 +98,7 @@ class CustomUserDetailsSerializer(UserDetailsSerializer): class Meta(UserDetailsSerializer.Meta): model = CustomUser - fields = UserDetailsSerializer.Meta.fields + ['profile_pic', 'uuid', 'public_profile', 'has_password', 'disable_password'] + fields = UserDetailsSerializer.Meta.fields + ['profile_pic', 'uuid', 'public_profile', 'has_password', 'disable_password', 'measurement_system'] read_only_fields = UserDetailsSerializer.Meta.read_only_fields + ('uuid', 'has_password', 'disable_password') @staticmethod diff --git a/backend/server/users/views.py b/backend/server/users/views.py index d5a5a413..5fb7d2a2 100644 --- a/backend/server/users/views.py +++ b/backend/server/users/views.py @@ -11,8 +11,8 @@ from django.shortcuts import get_object_or_404 from django.contrib.auth import get_user_model from .serializers import CustomUserDetailsSerializer as PublicUserSerializer from allauth.socialaccount.models import SocialApp -from adventures.serializers import AdventureSerializer, CollectionSerializer -from adventures.models import Adventure, Collection +from adventures.serializers import LocationSerializer, CollectionSerializer +from adventures.models import Location, Collection from allauth.socialaccount.models import SocialAccount User = get_user_model() @@ -99,9 +99,9 @@ class PublicUserDetailView(APIView): user.email = None # Get the users adventures and collections to include in the response - adventures = Adventure.objects.filter(user_id=user, is_public=True) - collections = Collection.objects.filter(user_id=user, is_public=True) - adventure_serializer = AdventureSerializer(adventures, many=True) + adventures = Location.objects.filter(user=user, is_public=True) + collections = Collection.objects.filter(user=user, is_public=True) + adventure_serializer = LocationSerializer(adventures, many=True) collection_serializer = CollectionSerializer(collections, many=True) return Response({ diff --git a/backend/server/worldtravel/management/commands/bulk-adventure-geocode.py b/backend/server/worldtravel/management/commands/bulk-adventure-geocode.py index 1a5d7a54..fff255ec 100644 --- a/backend/server/worldtravel/management/commands/bulk-adventure-geocode.py +++ b/backend/server/worldtravel/management/commands/bulk-adventure-geocode.py @@ -1,12 +1,12 @@ from django.core.management.base import BaseCommand -from adventures.models import Adventure +from adventures.models import Location import time class Command(BaseCommand): help = 'Bulk geocode all adventures by triggering save on each one' def handle(self, *args, **options): - adventures = Adventure.objects.all() + adventures = Location.objects.all() total = adventures.count() self.stdout.write(self.style.SUCCESS(f'Starting bulk geocoding of {total} adventures')) diff --git a/backend/server/worldtravel/migrations/0017_rename_user_id_visitedregion_user.py b/backend/server/worldtravel/migrations/0017_rename_user_id_visitedregion_user.py new file mode 100644 index 00000000..6614c77e --- /dev/null +++ b/backend/server/worldtravel/migrations/0017_rename_user_id_visitedregion_user.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.1 on 2025-06-19 20:24 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('worldtravel', '0016_remove_city_insert_id_remove_country_insert_id_and_more'), + ] + + operations = [ + migrations.RenameField( + model_name='visitedregion', + old_name='user_id', + new_name='user', + ), + ] diff --git a/backend/server/worldtravel/migrations/0018_rename_user_id_visitedcity_user.py b/backend/server/worldtravel/migrations/0018_rename_user_id_visitedcity_user.py new file mode 100644 index 00000000..43cac9db --- /dev/null +++ b/backend/server/worldtravel/migrations/0018_rename_user_id_visitedcity_user.py @@ -0,0 +1,18 @@ +# Generated by Django 5.2.1 on 2025-06-19 20:24 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('worldtravel', '0017_rename_user_id_visitedregion_user'), + ] + + operations = [ + migrations.RenameField( + model_name='visitedcity', + old_name='user_id', + new_name='user', + ), + ] diff --git a/backend/server/worldtravel/models.py b/backend/server/worldtravel/models.py index 9e83f591..e4f69e6d 100644 --- a/backend/server/worldtravel/models.py +++ b/backend/server/worldtravel/models.py @@ -6,7 +6,7 @@ from django.contrib.gis.db import models as gis_models User = get_user_model() -default_user_id = 1 # Replace with an actual user ID +default_user = 1 # Replace with an actual user ID class Country(models.Model): @@ -50,29 +50,29 @@ class City(models.Model): class VisitedRegion(models.Model): id = models.AutoField(primary_key=True) - user_id = models.ForeignKey( - User, on_delete=models.CASCADE, default=default_user_id) + user = models.ForeignKey( + User, on_delete=models.CASCADE, default=default_user) region = models.ForeignKey(Region, on_delete=models.CASCADE) def __str__(self): - return f'{self.region.name} ({self.region.country.country_code}) visited by: {self.user_id.username}' + return f'{self.region.name} ({self.region.country.country_code}) visited by: {self.user.username}' def save(self, *args, **kwargs): - if VisitedRegion.objects.filter(user_id=self.user_id, region=self.region).exists(): + if VisitedRegion.objects.filter(user=self.user, region=self.region).exists(): raise ValidationError("Region already visited by user.") super().save(*args, **kwargs) class VisitedCity(models.Model): id = models.AutoField(primary_key=True) - user_id = models.ForeignKey( - User, on_delete=models.CASCADE, default=default_user_id) + user = models.ForeignKey( + User, on_delete=models.CASCADE, default=default_user) city = models.ForeignKey(City, on_delete=models.CASCADE) def __str__(self): - return f'{self.city.name} ({self.city.region.name}) visited by: {self.user_id.username}' + return f'{self.city.name} ({self.city.region.name}) visited by: {self.user.username}' def save(self, *args, **kwargs): - if VisitedCity.objects.filter(user_id=self.user_id, city=self.city).exists(): + if VisitedCity.objects.filter(user=self.user, city=self.city).exists(): raise ValidationError("City already visited by user.") super().save(*args, **kwargs) diff --git a/backend/server/worldtravel/serializers.py b/backend/server/worldtravel/serializers.py index 962914bf..a325abde 100644 --- a/backend/server/worldtravel/serializers.py +++ b/backend/server/worldtravel/serializers.py @@ -25,7 +25,7 @@ class CountrySerializer(serializers.ModelSerializer): user = getattr(request, 'user', None) if user and user.is_authenticated: - return VisitedRegion.objects.filter(region__country=obj, user_id=user).count() + return VisitedRegion.objects.filter(region__country=obj, user=user).count() return 0 @@ -62,8 +62,8 @@ class VisitedRegionSerializer(CustomModelSerializer): class Meta: model = VisitedRegion - fields = ['id', 'user_id', 'region', 'longitude', 'latitude', 'name'] - read_only_fields = ['user_id', 'id', 'longitude', 'latitude', 'name'] + 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) @@ -72,5 +72,5 @@ class VisitedCitySerializer(CustomModelSerializer): class Meta: model = VisitedCity - fields = ['id', 'user_id', 'city', 'longitude', 'latitude', 'name'] - read_only_fields = ['user_id', 'id', 'longitude', 'latitude', 'name'] \ No newline at end of file + fields = ['id', 'user', 'city', 'longitude', 'latitude', 'name'] + read_only_fields = ['user', 'id', 'longitude', 'latitude', 'name'] \ No newline at end of file diff --git a/backend/server/worldtravel/views.py b/backend/server/worldtravel/views.py index c77309d2..c418bf34 100644 --- a/backend/server/worldtravel/views.py +++ b/backend/server/worldtravel/views.py @@ -13,7 +13,7 @@ from django.contrib.gis.geos import Point from django.conf import settings from rest_framework.decorators import action from django.contrib.staticfiles import finders -from adventures.models import Adventure +from adventures.models import Location @api_view(['GET']) @permission_classes([IsAuthenticated]) @@ -28,7 +28,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, user_id=request.user.id) + visits = VisitedRegion.objects.filter(region__country=country, user=request.user.id) serializer = VisitedRegionSerializer(visits, many=True) return Response(serializer.data) @@ -45,7 +45,7 @@ def cities_by_region(request, region_id): @permission_classes([IsAuthenticated]) def visits_by_region(request, region_id): region = get_object_or_404(Region, id=region_id) - visits = VisitedCity.objects.filter(city__region=region, user_id=request.user.id) + visits = VisitedCity.objects.filter(city__region=region, user=request.user.id) serializer = VisitedCitySerializer(visits, many=True) return Response(serializer.data) @@ -71,7 +71,7 @@ class CountryViewSet(viewsets.ReadOnlyModelViewSet): # make a post action that will get all of the users adventures and check if the point is in any of the regions if so make a visited region object for that user if it does not already exist @action(detail=False, methods=['post']) def region_check_all_adventures(self, request): - adventures = Adventure.objects.filter(user_id=request.user.id, type='visited') + adventures = Location.objects.filter(user=request.user.id, type='visited') count = 0 for adventure in adventures: if adventure.latitude is not None and adventure.longitude is not None: @@ -79,8 +79,8 @@ class CountryViewSet(viewsets.ReadOnlyModelViewSet): point = Point(float(adventure.longitude), float(adventure.latitude), srid=4326) region = Region.objects.filter(geometry__contains=point).first() if region: - if not VisitedRegion.objects.filter(user_id=request.user.id, region=region).exists(): - VisitedRegion.objects.create(user_id=request.user, region=region) + if not VisitedRegion.objects.filter(user=request.user.id, region=region).exists(): + VisitedRegion.objects.create(user=request.user, region=region) count += 1 except Exception as e: print(f"Error processing adventure {adventure.id}: {e}") @@ -97,14 +97,14 @@ class VisitedRegionViewSet(viewsets.ModelViewSet): permission_classes = [IsAuthenticated] def get_queryset(self): - return VisitedRegion.objects.filter(user_id=self.request.user.id) + return VisitedRegion.objects.filter(user=self.request.user.id) def perform_create(self, serializer): - serializer.save(user_id=self.request.user) + serializer.save(user=self.request.user) def create(self, request, *args, **kwargs): - request.data['user_id'] = request.user - if VisitedRegion.objects.filter(user_id=request.user.id, region=request.data['region']).exists(): + request.data['user'] = request.user + if VisitedRegion.objects.filter(user=request.user.id, region=request.data['region']).exists(): return Response({"error": "Region already visited by user."}, status=400) serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) @@ -115,7 +115,7 @@ class VisitedRegionViewSet(viewsets.ModelViewSet): def destroy(self, request, **kwargs): # delete by region id region = get_object_or_404(Region, id=kwargs['pk']) - visited_region = VisitedRegion.objects.filter(user_id=request.user.id, region=region) + visited_region = VisitedRegion.objects.filter(user=request.user.id, region=region) if visited_region.exists(): visited_region.delete() return Response(status=status.HTTP_204_NO_CONTENT) @@ -127,27 +127,27 @@ class VisitedCityViewSet(viewsets.ModelViewSet): permission_classes = [IsAuthenticated] def get_queryset(self): - return VisitedCity.objects.filter(user_id=self.request.user.id) + return VisitedCity.objects.filter(user=self.request.user.id) def perform_create(self, serializer): - serializer.save(user_id=self.request.user) + serializer.save(user=self.request.user) def create(self, request, *args, **kwargs): - request.data['user_id'] = request.user + request.data['user'] = request.user serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) self.perform_create(serializer) # if the region is not visited, visit it region = serializer.validated_data['city'].region - if not VisitedRegion.objects.filter(user_id=request.user.id, region=region).exists(): - VisitedRegion.objects.create(user_id=request.user, region=region) + if not VisitedRegion.objects.filter(user=request.user.id, region=region).exists(): + VisitedRegion.objects.create(user=request.user, region=region) headers = self.get_success_headers(serializer.data) return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers) def destroy(self, request, **kwargs): # delete by city id city = get_object_or_404(City, id=kwargs['pk']) - visited_city = VisitedCity.objects.filter(user_id=request.user.id, city=city) + visited_city = VisitedCity.objects.filter(user=request.user.id, city=city) if visited_city.exists(): visited_city.delete() return Response(status=status.HTTP_204_NO_CONTENT) diff --git a/backend/supervisord.conf b/backend/supervisord.conf index e7adec76..4b08f248 100644 --- a/backend/supervisord.conf +++ b/backend/supervisord.conf @@ -12,5 +12,13 @@ command=/code/entrypoint.sh autorestart=true stdout_logfile=/dev/stdout stderr_logfile=/dev/stderr -stdout_logfile_maxbytes = 0 -stderr_logfile_maxbytes = 0 +stdout_logfile_maxbytes=0 +stderr_logfile_maxbytes=0 + +[program:memcached] +command=memcached -u nobody -m 64 -p 11211 +autorestart=true +stdout_logfile=/dev/stdout +stderr_logfile=/dev/stderr +stdout_logfile_maxbytes=0 +stderr_logfile_maxbytes=0 diff --git a/brand/banner.png b/brand/banner.png index a0dd0ae7..f71e3c01 100644 Binary files a/brand/banner.png and b/brand/banner.png differ diff --git a/brand/screenshots/adventures.png b/brand/screenshots/adventures.png index 96204dfe..a4c20272 100644 Binary files a/brand/screenshots/adventures.png and b/brand/screenshots/adventures.png differ diff --git a/brand/screenshots/countries.png b/brand/screenshots/countries.png index 6eecc594..b8355c40 100644 Binary files a/brand/screenshots/countries.png and b/brand/screenshots/countries.png differ diff --git a/brand/screenshots/dashboard.png b/brand/screenshots/dashboard.png index 05ca9825..db137cde 100644 Binary files a/brand/screenshots/dashboard.png and b/brand/screenshots/dashboard.png differ diff --git a/brand/screenshots/details.png b/brand/screenshots/details.png index 47c99faa..349e0caf 100644 Binary files a/brand/screenshots/details.png and b/brand/screenshots/details.png differ diff --git a/brand/screenshots/edit.png b/brand/screenshots/edit.png index 1fce199d..9fd8aa27 100644 Binary files a/brand/screenshots/edit.png and b/brand/screenshots/edit.png differ diff --git a/brand/screenshots/itinerary.png b/brand/screenshots/itinerary.png index c11cf4e4..06d44f42 100644 Binary files a/brand/screenshots/itinerary.png and b/brand/screenshots/itinerary.png differ diff --git a/brand/screenshots/map-satellite.png b/brand/screenshots/map-satellite.png new file mode 100644 index 00000000..e6fd8a6a Binary files /dev/null and b/brand/screenshots/map-satellite.png differ diff --git a/brand/screenshots/map.png b/brand/screenshots/map.png index 081cb793..dc9d73a3 100644 Binary files a/brand/screenshots/map.png and b/brand/screenshots/map.png differ diff --git a/brand/screenshots/regions.png b/brand/screenshots/regions.png index 4aea537d..e6ae02cb 100644 Binary files a/brand/screenshots/regions.png and b/brand/screenshots/regions.png differ diff --git a/documentation/.vitepress/config.mts b/documentation/.vitepress/config.mts index 212eedb6..c7f96fdf 100644 --- a/documentation/.vitepress/config.mts +++ b/documentation/.vitepress/config.mts @@ -175,6 +175,14 @@ export default defineConfig({ text: "Google Maps Integration", link: "/docs/configuration/google_maps_integration", }, + { + text: "Strava Integration", + link: "/docs/configuration/strava_integration", + }, + { + text: "Wanderer Integration", + link: "/docs/configuration/wanderer_integration", + }, { text: "Social Auth and OIDC", link: "/docs/configuration/social_auth", diff --git a/documentation/docs/configuration/google_maps_integration.md b/documentation/docs/configuration/google_maps_integration.md index 2618d12a..7c2ec920 100644 --- a/documentation/docs/configuration/google_maps_integration.md +++ b/documentation/docs/configuration/google_maps_integration.md @@ -18,6 +18,12 @@ Follow the steps below to generate your own API key: 10. Click on **Create credentials** and select **API key**. 11. A dialog will appear with your new API key. Copy this key for later use. +> [!Note] +> When creating the API Key, you can choose which APIs it can use. +> For versions *v0.10.0* and _lower_, you need the *Geocoding* and *Places* APIs. +> For versions _higher_ than v0.10.0, You'll need *Geocoding* and *Places (New)*. +> Note that the latter isn't enabled by default! + + + + {/if} diff --git a/frontend/src/lib/components/CategoryFilterDropdown.svelte b/frontend/src/lib/components/CategoryFilterDropdown.svelte index 37e4db06..1eeaabea 100644 --- a/frontend/src/lib/components/CategoryFilterDropdown.svelte +++ b/frontend/src/lib/components/CategoryFilterDropdown.svelte @@ -8,7 +8,7 @@ let adventure_types: Category[] = []; onMount(async () => { - let categoryFetch = await fetch('/api/categories/categories'); + let categoryFetch = await fetch('/api/categories'); let categoryData = await categoryFetch.json(); adventure_types = categoryData; console.log(categoryData); @@ -60,7 +60,7 @@ /> {type.display_name} - {type.icon} ({type.num_adventures}) + {type.icon} ({type.num_locations}) diff --git a/frontend/src/lib/components/CategoryModal.svelte b/frontend/src/lib/components/CategoryModal.svelte index 96cf18af..ca9aed09 100644 --- a/frontend/src/lib/components/CategoryModal.svelte +++ b/frontend/src/lib/components/CategoryModal.svelte @@ -26,7 +26,7 @@ async function loadCategories() { try { - const res = await fetch('/api/categories/categories'); + const res = await fetch('/api/categories'); if (res.ok) { categories = await res.json(); } @@ -334,7 +334,7 @@ {#if isChanged}
- {$t('categories.update_after_refresh')} + {$t('categories.location_update_after_refresh')}
{/if} diff --git a/frontend/src/lib/components/ChecklistCard.svelte b/frontend/src/lib/components/ChecklistCard.svelte index cb30b453..9b60029e 100644 --- a/frontend/src/lib/components/ChecklistCard.svelte +++ b/frontend/src/lib/components/ChecklistCard.svelte @@ -99,7 +99,7 @@ {$t('notes.open')} - {#if checklist.user_id == user?.uuid || (collection && user && collection.shared_with?.includes(user.uuid))} + {#if checklist.user == user?.uuid || (collection && user && collection.shared_with?.includes(user.uuid))} +