Merge pull request #132 from seanmorley15/development

Development

backend/server/adventures/migrations/0009_alter_adventure_image.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.6 on 2024-07-18 15:06
+
+import django_resized.forms
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0008_collection_description'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='adventure',
+            name='image',
+            field=django_resized.forms.ResizedImageField(blank=True, crop=None, force_format='WEBP', keep_meta=True, null=True, quality=75, scale=None, size=[1920, 1080], upload_to='images/'),
+        ),
+    ]

backend/server/adventures/models.py

@@ -3,6 +3,7 @@ from django.db import models
 from django.contrib.auth import get_user_model
 from django.contrib.postgres.fields import ArrayField
 from django.forms import ValidationError
+from django_resized import ResizedImageField
 
 ADVENTURE_TYPES = [
     ('visited', 'Visited'),
@@ -28,7 +29,7 @@ class Adventure(models.Model):
     description = models.TextField(blank=True, null=True)
     rating = models.FloatField(blank=True, null=True)
     link = models.URLField(blank=True, null=True)
-    image = models.ImageField(null=True, blank=True, upload_to='images/')
+    image = ResizedImageField(force_format="WEBP", quality=75, null=True, blank=True, upload_to='images/')
     date = models.DateField(blank=True, null=True)
     is_public = models.BooleanField(default=False)
     longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
@@ -41,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
 

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

backend/server/requirements.txt

@@ -9,4 +9,5 @@ coreapi==2.3.3
 python-dotenv
 psycopg2-binary
 Pillow
-whitenoise
+whitenoise
+django-resized

backend/server/users/migrations/0002_alter_customuser_profile_pic.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.6 on 2024-07-18 15:06
+
+import django_resized.forms
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customuser',
+            name='profile_pic',
+            field=django_resized.forms.ResizedImageField(blank=True, crop=None, force_format='WEBP', keep_meta=True, null=True, quality=75, scale=None, size=[1920, 1080], upload_to='profile-pics/'),
+        ),
+    ]

backend/server/users/models.py

@@ -1,8 +1,9 @@
 from django.contrib.auth.models import AbstractUser
 from django.db import models
+from django_resized import ResizedImageField
 
 class CustomUser(AbstractUser):
-    profile_pic = models.ImageField(null=True, blank=True, upload_to='profile-pics/')
+    profile_pic = ResizedImageField(force_format="WEBP", quality=75, null=True, blank=True, upload_to='profile-pics/')
 
     def __str__(self):
         return self.username

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 = '';

frontend/src/lib/components/Navbar.svelte

@@ -83,6 +83,25 @@
 					<li>
 						<button on:click={() => goto('/map')}>Map</button>
 					</li>
+					<form class="flex gap-2">
+						<label class="input input-bordered flex items-center gap-2">
+							<input type="text" bind:value={query} class="grow" placeholder="Search" />
+
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								viewBox="0 0 16 16"
+								fill="currentColor"
+								class="h-4 w-4 opacity-70"
+							>
+								<path
+									fill-rule="evenodd"
+									d="M9.965 11.026a5 5 0 1 1 1.06-1.06l2.755 2.754a.75.75 0 1 1-1.06 1.06l-2.755-2.754ZM10.5 7a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z"
+									clip-rule="evenodd"
+								/>
+							</svg>
+						</label>
+						<button on:click={searchGo} type="submit" class="btn btn-neutral">Search</button>
+					</form>
 				{/if}
 
 				{#if !data.user}
@@ -115,24 +134,25 @@
 				<li>
 					<button class="btn btn-neutral" on:click={() => goto('/map')}>Map</button>
 				</li>
-				<label class="input input-bordered flex items-center gap-2">
+				<form class="flex gap-2">
-					<form>
+					<label class="input input-bordered flex items-center gap-2">
 						<input type="text" bind:value={query} class="grow" placeholder="Search" />
-					</form>
+
-					<svg
+						<svg
-						xmlns="http://www.w3.org/2000/svg"
+							xmlns="http://www.w3.org/2000/svg"
-						viewBox="0 0 16 16"
+							viewBox="0 0 16 16"
-						fill="currentColor"
+							fill="currentColor"
-						class="h-4 w-4 opacity-70"
+							class="h-4 w-4 opacity-70"
-					>
+						>
-						<path
+							<path
-							fill-rule="evenodd"
+								fill-rule="evenodd"
-							d="M9.965 11.026a5 5 0 1 1 1.06-1.06l2.755 2.754a.75.75 0 1 1-1.06 1.06l-2.755-2.754ZM10.5 7a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z"
+								d="M9.965 11.026a5 5 0 1 1 1.06-1.06l2.755 2.754a.75.75 0 1 1-1.06 1.06l-2.755-2.754ZM10.5 7a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z"
-							clip-rule="evenodd"
+								clip-rule="evenodd"
-						/>
+							/>
-					</svg>
+						</svg>
-				</label>
+					</label>
-				<button on:click={searchGo} type="submit" class="btn btn-neutral">Search</button>
+					<button on:click={searchGo} type="submit" class="btn btn-neutral">Search</button>
+				</form>
 			{/if}
 
 			{#if !data.user}