diff --git a/backend/server/adventures/models.py b/backend/server/adventures/models.py index b74c4ef..a7f41bf 100644 --- a/backend/server/adventures/models.py +++ b/backend/server/adventures/models.py @@ -42,6 +42,7 @@ class Adventure(models.Model): raise ValidationError('Adventures associated with a public collection must be public. Collection: ' + self.trip.name + ' Adventure: ' + self.name) if self.user_id != self.collection.user_id: raise ValidationError('Adventures must be associated with collections owned by the same user. Collection owner: ' + self.collection.user_id.username + ' Adventure owner: ' + self.user_id.username) + def __str__(self): return self.name diff --git a/backend/server/adventures/serializers.py b/backend/server/adventures/serializers.py index 7bc20e2..40f24bd 100644 --- a/backend/server/adventures/serializers.py +++ b/backend/server/adventures/serializers.py @@ -18,6 +18,11 @@ class AdventureSerializer(serializers.ModelSerializer): representation['image'] = f"{public_url}/media/{instance.image.name}" return representation + def validate_activity_types(self, value): + if value: + return [activity.lower() for activity in value] + return value + class CollectionSerializer(serializers.ModelSerializer): adventures = AdventureSerializer(many=True, read_only=True, source='adventure_set') diff --git a/frontend/src/lib/components/ActivityComplete.svelte b/frontend/src/lib/components/ActivityComplete.svelte index ac04ea6..6d76abf 100644 --- a/frontend/src/lib/components/ActivityComplete.svelte +++ b/frontend/src/lib/components/ActivityComplete.svelte @@ -20,7 +20,7 @@ function addActivity() { if (inputVal && activities) { - const trimmedInput = inputVal.trim(); + const trimmedInput = inputVal.trim().toLocaleLowerCase(); if (trimmedInput && !activities.includes(trimmedInput)) { activities = [...activities, trimmedInput]; inputVal = ''; diff --git a/frontend/src/lib/components/Navbar.svelte b/frontend/src/lib/components/Navbar.svelte index b54c292..aa0f64d 100644 --- a/frontend/src/lib/components/Navbar.svelte +++ b/frontend/src/lib/components/Navbar.svelte @@ -83,6 +83,25 @@