From 6dec37d3b972118519aa09b572e58517cce7c70d Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Sun, 22 Sep 2024 10:29:23 -0400
Subject: [PATCH 01/15] Add new adventure types to the model

---
 backend/server/adventures/models.py | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/backend/server/adventures/models.py b/backend/server/adventures/models.py
index 228b301..b9ecb72 100644
--- a/backend/server/adventures/models.py
+++ b/backend/server/adventures/models.py
@@ -7,10 +7,28 @@ from django.forms import ValidationError
 from django_resized import ResizedImageField
 
 ADVENTURE_TYPES = [
-    ('visited', 'Visited'),
-    ('planned', 'Planned'),
-    ('lodging', 'Lodging'),
-    ('dining', 'Dining')
+    ('general', 'General 🌍'),
+    ('Outdoor', 'Outdoor 🏞️'),
+    ('lodging', 'Lodging 🛌'),
+    ('dining', 'Dining 🍽️'),
+    ('activity', 'Activity 🏄'),
+    ('attraction', 'Attraction 🎢'),
+    ('shopping', 'Shopping 🛍️'),
+    ('nightlife', 'Nightlife 🌃'),
+    ('event', 'Event 🎉'),
+    ('transportation', 'Transportation 🚗'),
+    ('culture', 'Culture 🎭'),
+    ('water_sports', 'Water Sports 🚤'),
+    ('hiking', 'Hiking 🥾'),
+    ('wildlife', 'Wildlife 🦒'),
+    ('historical_sites', 'Historical Sites 🏛️'),
+    ('music_concerts', 'Music & Concerts 🎶'),
+    ('fitness', 'Fitness 🏋️'),
+    ('art_museums', 'Art & Museums 🎨'),
+    ('festivals', 'Festivals 🎪'),
+    ('spiritual_journeys', 'Spiritual Journeys 🧘‍♀️'),
+    ('volunteer_work', 'Volunteer Work 🤝'),
+    ('other', 'Other')
 ]
 
 TRANSPORTATION_TYPES = [
@@ -24,7 +42,6 @@ TRANSPORTATION_TYPES = [
     ('other', 'Other')
 ]
 
-
 # Assuming you have a default user ID you want to use
 default_user_id = 1  # Replace with an actual user ID
 

From 0911826501c4fba52087a9db4c8edd6ec6434fb8 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Sun, 22 Sep 2024 14:12:41 -0400
Subject: [PATCH 02/15] Migrate to visits

---
 backend/server/adventures/admin.py            | 12 +---
 .../migrations/0001_adventure_image.py        | 19 ------
 .../adventures/migrations/0001_initial.py     | 62 ++++++++++++-------
 .../migrations/0002_adventureimage.py         | 27 --------
 .../0002_alter_adventureimage_adventure.py    | 19 ------
 ...ure_end_date_and_more.py => 0002_visit.py} | 16 ++---
 .../migrations/0003_adventure_end_date.py     | 18 ------
 ...date_remove_adventure_end_date_and_more.py | 26 ++++++++
 .../0004_transportation_end_date.py           | 18 ------
 .../migrations/0005_collection_shared_with.py | 20 ------
 .../migrations/0006_alter_adventure_link.py   | 18 ------
 .../adventures/migrations/migrate_images.py   |  5 --
 .../migrate_visits_and_categories.py          | 31 ++++++++++
 backend/server/adventures/models.py           | 13 ++--
 14 files changed, 110 insertions(+), 194 deletions(-)
 delete mode 100644 backend/server/adventures/migrations/0001_adventure_image.py
 delete mode 100644 backend/server/adventures/migrations/0002_adventureimage.py
 delete mode 100644 backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py
 rename backend/server/adventures/migrations/{0007_remove_adventure_date_remove_adventure_end_date_and_more.py => 0002_visit.py} (64%)
 delete mode 100644 backend/server/adventures/migrations/0003_adventure_end_date.py
 create mode 100644 backend/server/adventures/migrations/0003_remove_adventure_date_remove_adventure_end_date_and_more.py
 delete mode 100644 backend/server/adventures/migrations/0004_transportation_end_date.py
 delete mode 100644 backend/server/adventures/migrations/0005_collection_shared_with.py
 delete mode 100644 backend/server/adventures/migrations/0006_alter_adventure_link.py
 create mode 100644 backend/server/adventures/migrations/migrate_visits_and_categories.py

diff --git a/backend/server/adventures/admin.py b/backend/server/adventures/admin.py
index de7227d..b0dd607 100644
--- a/backend/server/adventures/admin.py
+++ b/backend/server/adventures/admin.py
@@ -6,19 +6,9 @@ from worldtravel.models import Country, Region, VisitedRegion
 
 
 class AdventureAdmin(admin.ModelAdmin):
-    list_display = ('name', 'type', 'user_id', 'is_public', 'image_display')
+    list_display = ('name', 'type', 'user_id', 'is_public')
     list_filter = ('type', 'user_id', 'is_public')
 
-    def image_display(self, obj):
-        if obj.image:
-            public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/')
-            public_url = public_url.replace("'", "")
-            return mark_safe(f'<img src="{public_url}/media/{obj.image.name}" width="100px" height="100px"')
-        else:
-            return
-
-    image_display.short_description = 'Image Preview'
-
 
 class CountryAdmin(admin.ModelAdmin):
     list_display = ('name', 'country_code', 'number_of_regions')
diff --git a/backend/server/adventures/migrations/0001_adventure_image.py b/backend/server/adventures/migrations/0001_adventure_image.py
deleted file mode 100644
index 6906db4..0000000
--- a/backend/server/adventures/migrations/0001_adventure_image.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-15 23:20
-
-import django_resized.forms
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('adventures', 'migrate_images'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            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/'),
-        ),
-    ]
diff --git a/backend/server/adventures/migrations/0001_initial.py b/backend/server/adventures/migrations/0001_initial.py
index 4b0082c..3c1dfd3 100644
--- a/backend/server/adventures/migrations/0001_initial.py
+++ b/backend/server/adventures/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.8 on 2024-08-11 13:37
+# Generated by Django 5.0.8 on 2024-09-22 15:12
 
 import django.contrib.postgres.fields
 import django.db.models.deletion
@@ -17,6 +17,37 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Adventure',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('type', models.CharField(choices=[('general', 'General 🌍'), ('Outdoor', 'Outdoor 🏞️'), ('lodging', 'Lodging 🛌'), ('dining', 'Dining 🍽️'), ('activity', 'Activity 🏄'), ('attraction', 'Attraction 🎢'), ('shopping', 'Shopping 🛍️'), ('nightlife', 'Nightlife 🌃'), ('event', 'Event 🎉'), ('transportation', 'Transportation 🚗'), ('culture', 'Culture 🎭'), ('water_sports', 'Water Sports 🚤'), ('hiking', 'Hiking 🥾'), ('wildlife', 'Wildlife 🦒'), ('historical_sites', 'Historical Sites 🏛️'), ('music_concerts', 'Music & Concerts 🎶'), ('fitness', 'Fitness 🏋️'), ('art_museums', 'Art & Museums 🎨'), ('festivals', 'Festivals 🎪'), ('spiritual_journeys', 'Spiritual Journeys 🧘\u200d♀️'), ('volunteer_work', 'Volunteer Work 🤝'), ('other', 'Other')], max_length=100)),
+                ('name', models.CharField(max_length=200)),
+                ('location', models.CharField(blank=True, max_length=200, null=True)),
+                ('activity_types', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), blank=True, null=True, size=None)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('rating', models.FloatField(blank=True, null=True)),
+                ('link', models.URLField(blank=True, max_length=2083, null=True)),
+                ('is_public', models.BooleanField(default=False)),
+                ('longitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
+                ('latitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('image', 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/')),
+                ('date', models.DateField(blank=True, null=True)),
+                ('end_date', models.DateField(blank=True, null=True)),
+                ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='AdventureImage',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('image', django_resized.forms.ResizedImageField(crop=None, force_format='WEBP', keep_meta=True, quality=75, scale=None, size=[1920, 1080], upload_to='images/')),
+                ('adventure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='adventures.adventure')),
+                ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
         migrations.CreateModel(
             name='Checklist',
             fields=[
@@ -53,6 +84,7 @@ class Migration(migrations.Migration):
                 ('end_date', models.DateField(blank=True, null=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
                 ('is_archived', models.BooleanField(default=False)),
+                ('shared_with', models.ManyToManyField(blank=True, related_name='shared_with', to=settings.AUTH_USER_MODEL)),
                 ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
@@ -61,27 +93,10 @@ class Migration(migrations.Migration):
             name='collection',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection'),
         ),
-        migrations.CreateModel(
-            name='Adventure',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('type', models.CharField(choices=[('visited', 'Visited'), ('planned', 'Planned'), ('lodging', 'Lodging'), ('dining', 'Dining')], max_length=100)),
-                ('name', models.CharField(max_length=200)),
-                ('location', models.CharField(blank=True, max_length=200, null=True)),
-                ('activity_types', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), blank=True, null=True, size=None)),
-                ('description', models.TextField(blank=True, null=True)),
-                ('rating', models.FloatField(blank=True, null=True)),
-                ('link', models.URLField(blank=True, null=True)),
-                ('image', 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/')),
-                ('date', models.DateField(blank=True, null=True)),
-                ('is_public', models.BooleanField(default=False)),
-                ('longitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
-                ('latitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-                ('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')),
-            ],
+        migrations.AddField(
+            model_name='adventure',
+            name='collection',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection'),
         ),
         migrations.CreateModel(
             name='Note',
@@ -108,6 +123,7 @@ class Migration(migrations.Migration):
                 ('rating', models.FloatField(blank=True, null=True)),
                 ('link', models.URLField(blank=True, null=True)),
                 ('date', models.DateTimeField(blank=True, null=True)),
+                ('end_date', models.DateTimeField(blank=True, null=True)),
                 ('flight_number', models.CharField(blank=True, max_length=100, null=True)),
                 ('from_location', models.CharField(blank=True, max_length=200, null=True)),
                 ('to_location', models.CharField(blank=True, max_length=200, null=True)),
@@ -117,5 +133,5 @@ class Migration(migrations.Migration):
                 ('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')),
                 ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
-        ),
+        )
     ]
diff --git a/backend/server/adventures/migrations/0002_adventureimage.py b/backend/server/adventures/migrations/0002_adventureimage.py
deleted file mode 100644
index bf80832..0000000
--- a/backend/server/adventures/migrations/0002_adventureimage.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-15 23:17
-
-import django.db.models.deletion
-import django_resized.forms
-import uuid
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('adventures', '0001_initial'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='AdventureImage',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('image', django_resized.forms.ResizedImageField(crop=None, force_format='WEBP', keep_meta=True, quality=75, scale=None, size=[1920, 1080], upload_to='images/')),
-                ('adventure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='adventures.adventure')),
-                ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]
diff --git a/backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py b/backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py
deleted file mode 100644
index b03c3ad..0000000
--- a/backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-15 23:31
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('adventures', '0001_adventure_image'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adventureimage',
-            name='adventure',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='adventures.adventure'),
-        ),
-    ]
diff --git a/backend/server/adventures/migrations/0007_remove_adventure_date_remove_adventure_end_date_and_more.py b/backend/server/adventures/migrations/0002_visit.py
similarity index 64%
rename from backend/server/adventures/migrations/0007_remove_adventure_date_remove_adventure_end_date_and_more.py
rename to backend/server/adventures/migrations/0002_visit.py
index 03f6b1e..8fa8f5d 100644
--- a/backend/server/adventures/migrations/0007_remove_adventure_date_remove_adventure_end_date_and_more.py
+++ b/backend/server/adventures/migrations/0002_visit.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.8 on 2024-09-22 04:02
+# Generated by Django 5.0.8 on 2024-09-22 15:32
 
 import django.db.models.deletion
 import uuid
@@ -8,24 +8,16 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('adventures', '0006_alter_adventure_link'),
+        ('adventures', '0001_initial'),
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name='adventure',
-            name='date',
-        ),
-        migrations.RemoveField(
-            model_name='adventure',
-            name='end_date',
-        ),
         migrations.CreateModel(
             name='Visit',
             fields=[
                 ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('start_date', models.DateField()),
-                ('end_date', models.DateField()),
+                ('start_date', models.DateField(blank=True, null=True)),
+                ('end_date', models.DateField(blank=True, null=True)),
                 ('notes', models.TextField(blank=True, null=True)),
                 ('created_at', models.DateTimeField(auto_now_add=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
diff --git a/backend/server/adventures/migrations/0003_adventure_end_date.py b/backend/server/adventures/migrations/0003_adventure_end_date.py
deleted file mode 100644
index a04bbdb..0000000
--- a/backend/server/adventures/migrations/0003_adventure_end_date.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-18 16:16
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('adventures', '0002_alter_adventureimage_adventure'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='adventure',
-            name='end_date',
-            field=models.DateField(blank=True, null=True),
-        ),
-    ]
diff --git a/backend/server/adventures/migrations/0003_remove_adventure_date_remove_adventure_end_date_and_more.py b/backend/server/adventures/migrations/0003_remove_adventure_date_remove_adventure_end_date_and_more.py
new file mode 100644
index 0000000..7e4e6d6
--- /dev/null
+++ b/backend/server/adventures/migrations/0003_remove_adventure_date_remove_adventure_end_date_and_more.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.0.8 on 2024-09-22 15:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', 'migrate_visits_and_categories'),
+        ('adventures', 'migrate_images'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='adventure',
+            name='date',
+        ),
+        migrations.RemoveField(
+            model_name='adventure',
+            name='end_date',
+        ),
+        migrations.RemoveField(
+            model_name='adventure',
+            name='image',
+        ),
+    ]
diff --git a/backend/server/adventures/migrations/0004_transportation_end_date.py b/backend/server/adventures/migrations/0004_transportation_end_date.py
deleted file mode 100644
index 04f3b57..0000000
--- a/backend/server/adventures/migrations/0004_transportation_end_date.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2024-08-19 20:04
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('adventures', '0003_adventure_end_date'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='transportation',
-            name='end_date',
-            field=models.DateTimeField(blank=True, null=True),
-        ),
-    ]
diff --git a/backend/server/adventures/migrations/0005_collection_shared_with.py b/backend/server/adventures/migrations/0005_collection_shared_with.py
deleted file mode 100644
index c3ee3ac..0000000
--- a/backend/server/adventures/migrations/0005_collection_shared_with.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# Generated by Django 5.0.8 on 2024-09-02 13:21
-
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('adventures', '0004_transportation_end_date'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='collection',
-            name='shared_with',
-            field=models.ManyToManyField(blank=True, related_name='shared_with', to=settings.AUTH_USER_MODEL),
-        ),
-    ]
diff --git a/backend/server/adventures/migrations/0006_alter_adventure_link.py b/backend/server/adventures/migrations/0006_alter_adventure_link.py
deleted file mode 100644
index 1a78820..0000000
--- a/backend/server/adventures/migrations/0006_alter_adventure_link.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 5.0.8 on 2024-09-17 14:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('adventures', '0005_collection_shared_with'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adventure',
-            name='link',
-            field=models.URLField(blank=True, max_length=2083, null=True),
-        ),
-    ]
diff --git a/backend/server/adventures/migrations/migrate_images.py b/backend/server/adventures/migrations/migrate_images.py
index 9ef361f..d2b4a91 100644
--- a/backend/server/adventures/migrations/migrate_images.py
+++ b/backend/server/adventures/migrations/migrate_images.py
@@ -17,13 +17,8 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('adventures', '0001_initial'),
-        ('adventures', '0002_adventureimage'),
     ]
 
     operations = [
         migrations.RunPython(move_images_to_new_model),
-        migrations.RemoveField(
-            model_name='Adventure',
-            name='image',
-        ),
     ]
\ No newline at end of file
diff --git a/backend/server/adventures/migrations/migrate_visits_and_categories.py b/backend/server/adventures/migrations/migrate_visits_and_categories.py
new file mode 100644
index 0000000..1322712
--- /dev/null
+++ b/backend/server/adventures/migrations/migrate_visits_and_categories.py
@@ -0,0 +1,31 @@
+from django.db import migrations
+from django.db import migrations, models
+
+def move_images_to_new_model(apps, schema_editor):
+    Adventure = apps.get_model('adventures', 'Adventure')
+    Visit = apps.get_model('adventures', 'Visit')
+
+    for adventure in Adventure.objects.all():
+        # if the type is visited and there is no date, set note to 'No date provided.'
+        note = 'No date provided.' if adventure.type == 'visited' and not adventure.date else ''
+        if adventure.date or adventure.type == 'visited':
+            Visit.objects.create(
+                adventure=adventure,
+                start_date=adventure.date,
+                end_date=adventure.end_date,
+                notes=note,
+            )
+        if adventure.type == 'visited' or adventure.type == 'planned':
+            adventure.type = 'general'
+            adventure.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0002_visit')
+    ]
+
+    operations = [
+        migrations.RunPython(move_images_to_new_model),
+    ]
\ No newline at end of file
diff --git a/backend/server/adventures/models.py b/backend/server/adventures/models.py
index b9ecb72..5312d86 100644
--- a/backend/server/adventures/models.py
+++ b/backend/server/adventures/models.py
@@ -50,8 +50,8 @@ User = get_user_model()
 class Visit(models.Model):
     id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
     adventure = models.ForeignKey('Adventure', on_delete=models.CASCADE, related_name='visits')
-    start_date = models.DateField()
-    end_date = models.DateField()
+    start_date = models.DateField(null=True, blank=True)
+    end_date = models.DateField(null=True, blank=True)
     notes = models.TextField(blank=True, null=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
@@ -67,7 +67,7 @@ class Adventure(models.Model):
     id = models.UUIDField(default=uuid.uuid4, editable=False, unique=True, primary_key=True)
     user_id = models.ForeignKey(
         User, on_delete=models.CASCADE, default=default_user_id)
-    type = models.CharField(max_length=100, choices=ADVENTURE_TYPES)
+    type = models.CharField(max_length=100, choices=ADVENTURE_TYPES, default='general')
     name = models.CharField(max_length=200)
     location = models.CharField(max_length=200, blank=True, null=True)
     activity_types = ArrayField(models.CharField(
@@ -75,7 +75,6 @@ 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, max_length=2083)
-    image = ResizedImageField(force_format="WEBP", quality=75, null=True, blank=True, upload_to='images/')
     is_public = models.BooleanField(default=False)
     longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
     latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True)
@@ -83,6 +82,12 @@ class Adventure(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
+    # DEPRECATED FIELDS - TO BE REMOVED IN FUTURE VERSIONS
+    # Migrations performed in this version will remove these fields
+    # image = ResizedImageField(force_format="WEBP", quality=75, null=True, blank=True, upload_to='images/')
+    # date = models.DateField(blank=True, null=True)
+    # end_date = models.DateField(blank=True, null=True)
+
     def clean(self):
 
         if self.collection:

From 0fdc1190283bc562ee3c31f9b569266db63048d4 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Mon, 23 Sep 2024 14:12:19 -0400
Subject: [PATCH 03/15] Fix migrations

---
 backend/server/adventures/admin.py            | 22 ++++++-
 .../migrations/0001_adventure_image.py        | 19 ++++++
 .../adventures/migrations/0001_initial.py     | 62 +++++++------------
 .../migrations/0002_adventureimage.py         | 27 ++++++++
 .../0002_alter_adventureimage_adventure.py    | 19 ++++++
 .../adventures/migrations/0002_visit.py       | 27 --------
 .../migrations/0003_adventure_end_date.py     | 18 ++++++
 .../0004_transportation_end_date.py           | 18 ++++++
 .../migrations/0005_collection_shared_with.py | 20 ++++++
 .../migrations/0006_alter_adventure_link.py   | 18 ++++++
 .../adventures/migrations/0007_visit_model.py | 32 ++++++++++
 ..._and_more.py => 0008_remove_date_field.py} |  9 +--
 .../adventures/migrations/migrate_images.py   |  5 ++
 ...gories.py => migrate_visits_categories.py} |  2 +-
 14 files changed, 226 insertions(+), 72 deletions(-)
 create mode 100644 backend/server/adventures/migrations/0001_adventure_image.py
 create mode 100644 backend/server/adventures/migrations/0002_adventureimage.py
 create mode 100644 backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py
 delete mode 100644 backend/server/adventures/migrations/0002_visit.py
 create mode 100644 backend/server/adventures/migrations/0003_adventure_end_date.py
 create mode 100644 backend/server/adventures/migrations/0004_transportation_end_date.py
 create mode 100644 backend/server/adventures/migrations/0005_collection_shared_with.py
 create mode 100644 backend/server/adventures/migrations/0006_alter_adventure_link.py
 create mode 100644 backend/server/adventures/migrations/0007_visit_model.py
 rename backend/server/adventures/migrations/{0003_remove_adventure_date_remove_adventure_end_date_and_more.py => 0008_remove_date_field.py} (68%)
 rename backend/server/adventures/migrations/{migrate_visits_and_categories.py => migrate_visits_categories.py} (95%)

diff --git a/backend/server/adventures/admin.py b/backend/server/adventures/admin.py
index b0dd607..117339d 100644
--- a/backend/server/adventures/admin.py
+++ b/backend/server/adventures/admin.py
@@ -1,18 +1,20 @@
 import os
 from django.contrib import admin
 from django.utils.html import mark_safe
-from .models import Adventure, Checklist, ChecklistItem, Collection, Transportation, Note, AdventureImage
+from .models import Adventure, Checklist, ChecklistItem, Collection, Transportation, Note, AdventureImage, Visit
 from worldtravel.models import Country, Region, VisitedRegion
 
 
 class AdventureAdmin(admin.ModelAdmin):
     list_display = ('name', 'type', 'user_id', 'is_public')
     list_filter = ('type', 'user_id', 'is_public')
+    search_fields = ('name',)
 
 
 class CountryAdmin(admin.ModelAdmin):
     list_display = ('name', 'country_code', 'number_of_regions')
     list_filter = ('subregion',)
+    search_fields = ('name', 'country_code')
 
     def number_of_regions(self, obj):
         return Region.objects.filter(country=obj).count()
@@ -23,6 +25,7 @@ class CountryAdmin(admin.ModelAdmin):
 class RegionAdmin(admin.ModelAdmin):
     list_display = ('name', 'country', 'number_of_visits')
     list_filter = ('country',)
+    search_fields = ('name', 'country__name')
     # list_filter = ('country', 'number_of_visits')
 
     def number_of_visits(self, obj):
@@ -38,6 +41,7 @@ class CustomUserAdmin(UserAdmin):
     model = CustomUser
     list_display = ['username', 'email', 'is_staff', 'is_active', 'image_display']
     readonly_fields = ('uuid',)
+    search_fields = ('username', 'email')
     fieldsets = UserAdmin.fieldsets + (
         (None, {'fields': ('profile_pic', 'uuid', 'public_profile')}),
     )
@@ -52,6 +56,21 @@ class CustomUserAdmin(UserAdmin):
 class AdventureImageAdmin(admin.ModelAdmin):
     list_display = ('user_id', 'image_display')
 
+    def image_display(self, obj):
+        if obj.image:
+            public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/')
+            public_url = public_url.replace("'", "")
+            return mark_safe(f'<img src="{public_url}/media/{obj.profile_pic.name}" width="100px" height="100px"')
+        else:
+            return
+
+
+class VisitAdmin(admin.ModelAdmin):
+    list_display = ('adventure', 'start_date', 'end_date', 'notes')
+    list_filter = ('start_date', 'end_date')
+    search_fields = ('notes',)
+
+
     def image_display(self, obj):
         if obj.image:  # Ensure this field matches your model's image field
             public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/')
@@ -77,6 +96,7 @@ admin.site.register(CustomUser, CustomUserAdmin)
 
 admin.site.register(Adventure, AdventureAdmin)
 admin.site.register(Collection, CollectionAdmin)
+admin.site.register(Visit, VisitAdmin)
 admin.site.register(Country, CountryAdmin)
 admin.site.register(Region, RegionAdmin)
 admin.site.register(VisitedRegion)
diff --git a/backend/server/adventures/migrations/0001_adventure_image.py b/backend/server/adventures/migrations/0001_adventure_image.py
new file mode 100644
index 0000000..6906db4
--- /dev/null
+++ b/backend/server/adventures/migrations/0001_adventure_image.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.8 on 2024-08-15 23:20
+
+import django_resized.forms
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', 'migrate_images'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            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/'),
+        ),
+    ]
diff --git a/backend/server/adventures/migrations/0001_initial.py b/backend/server/adventures/migrations/0001_initial.py
index 3c1dfd3..4b0082c 100644
--- a/backend/server/adventures/migrations/0001_initial.py
+++ b/backend/server/adventures/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.8 on 2024-09-22 15:12
+# Generated by Django 5.0.8 on 2024-08-11 13:37
 
 import django.contrib.postgres.fields
 import django.db.models.deletion
@@ -17,37 +17,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.CreateModel(
-            name='Adventure',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('type', models.CharField(choices=[('general', 'General 🌍'), ('Outdoor', 'Outdoor 🏞️'), ('lodging', 'Lodging 🛌'), ('dining', 'Dining 🍽️'), ('activity', 'Activity 🏄'), ('attraction', 'Attraction 🎢'), ('shopping', 'Shopping 🛍️'), ('nightlife', 'Nightlife 🌃'), ('event', 'Event 🎉'), ('transportation', 'Transportation 🚗'), ('culture', 'Culture 🎭'), ('water_sports', 'Water Sports 🚤'), ('hiking', 'Hiking 🥾'), ('wildlife', 'Wildlife 🦒'), ('historical_sites', 'Historical Sites 🏛️'), ('music_concerts', 'Music & Concerts 🎶'), ('fitness', 'Fitness 🏋️'), ('art_museums', 'Art & Museums 🎨'), ('festivals', 'Festivals 🎪'), ('spiritual_journeys', 'Spiritual Journeys 🧘\u200d♀️'), ('volunteer_work', 'Volunteer Work 🤝'), ('other', 'Other')], max_length=100)),
-                ('name', models.CharField(max_length=200)),
-                ('location', models.CharField(blank=True, max_length=200, null=True)),
-                ('activity_types', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), blank=True, null=True, size=None)),
-                ('description', models.TextField(blank=True, null=True)),
-                ('rating', models.FloatField(blank=True, null=True)),
-                ('link', models.URLField(blank=True, max_length=2083, null=True)),
-                ('is_public', models.BooleanField(default=False)),
-                ('longitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
-                ('latitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('image', 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/')),
-                ('date', models.DateField(blank=True, null=True)),
-                ('end_date', models.DateField(blank=True, null=True)),
-                ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='AdventureImage',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('image', django_resized.forms.ResizedImageField(crop=None, force_format='WEBP', keep_meta=True, quality=75, scale=None, size=[1920, 1080], upload_to='images/')),
-                ('adventure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='adventures.adventure')),
-                ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
         migrations.CreateModel(
             name='Checklist',
             fields=[
@@ -84,7 +53,6 @@ class Migration(migrations.Migration):
                 ('end_date', models.DateField(blank=True, null=True)),
                 ('updated_at', models.DateTimeField(auto_now=True)),
                 ('is_archived', models.BooleanField(default=False)),
-                ('shared_with', models.ManyToManyField(blank=True, related_name='shared_with', to=settings.AUTH_USER_MODEL)),
                 ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
         ),
@@ -93,10 +61,27 @@ class Migration(migrations.Migration):
             name='collection',
             field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection'),
         ),
-        migrations.AddField(
-            model_name='adventure',
-            name='collection',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection'),
+        migrations.CreateModel(
+            name='Adventure',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('type', models.CharField(choices=[('visited', 'Visited'), ('planned', 'Planned'), ('lodging', 'Lodging'), ('dining', 'Dining')], max_length=100)),
+                ('name', models.CharField(max_length=200)),
+                ('location', models.CharField(blank=True, max_length=200, null=True)),
+                ('activity_types', django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=100), blank=True, null=True, size=None)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('rating', models.FloatField(blank=True, null=True)),
+                ('link', models.URLField(blank=True, null=True)),
+                ('image', 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/')),
+                ('date', models.DateField(blank=True, null=True)),
+                ('is_public', models.BooleanField(default=False)),
+                ('longitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
+                ('latitude', models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')),
+            ],
         ),
         migrations.CreateModel(
             name='Note',
@@ -123,7 +108,6 @@ class Migration(migrations.Migration):
                 ('rating', models.FloatField(blank=True, null=True)),
                 ('link', models.URLField(blank=True, null=True)),
                 ('date', models.DateTimeField(blank=True, null=True)),
-                ('end_date', models.DateTimeField(blank=True, null=True)),
                 ('flight_number', models.CharField(blank=True, max_length=100, null=True)),
                 ('from_location', models.CharField(blank=True, max_length=200, null=True)),
                 ('to_location', models.CharField(blank=True, max_length=200, null=True)),
@@ -133,5 +117,5 @@ class Migration(migrations.Migration):
                 ('collection', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='adventures.collection')),
                 ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
-        )
+        ),
     ]
diff --git a/backend/server/adventures/migrations/0002_adventureimage.py b/backend/server/adventures/migrations/0002_adventureimage.py
new file mode 100644
index 0000000..bf80832
--- /dev/null
+++ b/backend/server/adventures/migrations/0002_adventureimage.py
@@ -0,0 +1,27 @@
+# Generated by Django 5.0.8 on 2024-08-15 23:17
+
+import django.db.models.deletion
+import django_resized.forms
+import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AdventureImage',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('image', django_resized.forms.ResizedImageField(crop=None, force_format='WEBP', keep_meta=True, quality=75, scale=None, size=[1920, 1080], upload_to='images/')),
+                ('adventure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='adventures.adventure')),
+                ('user_id', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]
diff --git a/backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py b/backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py
new file mode 100644
index 0000000..b03c3ad
--- /dev/null
+++ b/backend/server/adventures/migrations/0002_alter_adventureimage_adventure.py
@@ -0,0 +1,19 @@
+# Generated by Django 5.0.8 on 2024-08-15 23:31
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0001_adventure_image'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='adventureimage',
+            name='adventure',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='adventures.adventure'),
+        ),
+    ]
diff --git a/backend/server/adventures/migrations/0002_visit.py b/backend/server/adventures/migrations/0002_visit.py
deleted file mode 100644
index 8fa8f5d..0000000
--- a/backend/server/adventures/migrations/0002_visit.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# Generated by Django 5.0.8 on 2024-09-22 15:32
-
-import django.db.models.deletion
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('adventures', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Visit',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
-                ('start_date', models.DateField(blank=True, null=True)),
-                ('end_date', models.DateField(blank=True, null=True)),
-                ('notes', models.TextField(blank=True, null=True)),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('updated_at', models.DateTimeField(auto_now=True)),
-                ('adventure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='visits', to='adventures.adventure')),
-            ],
-        ),
-    ]
diff --git a/backend/server/adventures/migrations/0003_adventure_end_date.py b/backend/server/adventures/migrations/0003_adventure_end_date.py
new file mode 100644
index 0000000..a04bbdb
--- /dev/null
+++ b/backend/server/adventures/migrations/0003_adventure_end_date.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.8 on 2024-08-18 16:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0002_alter_adventureimage_adventure'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='adventure',
+            name='end_date',
+            field=models.DateField(blank=True, null=True),
+        ),
+    ]
diff --git a/backend/server/adventures/migrations/0004_transportation_end_date.py b/backend/server/adventures/migrations/0004_transportation_end_date.py
new file mode 100644
index 0000000..04f3b57
--- /dev/null
+++ b/backend/server/adventures/migrations/0004_transportation_end_date.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.8 on 2024-08-19 20:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0003_adventure_end_date'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='transportation',
+            name='end_date',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]
diff --git a/backend/server/adventures/migrations/0005_collection_shared_with.py b/backend/server/adventures/migrations/0005_collection_shared_with.py
new file mode 100644
index 0000000..c3ee3ac
--- /dev/null
+++ b/backend/server/adventures/migrations/0005_collection_shared_with.py
@@ -0,0 +1,20 @@
+# Generated by Django 5.0.8 on 2024-09-02 13:21
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0004_transportation_end_date'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='collection',
+            name='shared_with',
+            field=models.ManyToManyField(blank=True, related_name='shared_with', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/backend/server/adventures/migrations/0006_alter_adventure_link.py b/backend/server/adventures/migrations/0006_alter_adventure_link.py
new file mode 100644
index 0000000..1a78820
--- /dev/null
+++ b/backend/server/adventures/migrations/0006_alter_adventure_link.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.8 on 2024-09-17 14:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0005_collection_shared_with'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='adventure',
+            name='link',
+            field=models.URLField(blank=True, max_length=2083, null=True),
+        ),
+    ]
diff --git a/backend/server/adventures/migrations/0007_visit_model.py b/backend/server/adventures/migrations/0007_visit_model.py
new file mode 100644
index 0000000..8197c08
--- /dev/null
+++ b/backend/server/adventures/migrations/0007_visit_model.py
@@ -0,0 +1,32 @@
+# Generated by Django 5.0.8 on 2024-09-23 18:06
+
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0006_alter_adventure_link'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='adventure',
+            name='type',
+            field=models.CharField(choices=[('general', 'General 🌍'), ('Outdoor', 'Outdoor 🏞️'), ('lodging', 'Lodging 🛌'), ('dining', 'Dining 🍽️'), ('activity', 'Activity 🏄'), ('attraction', 'Attraction 🎢'), ('shopping', 'Shopping 🛍️'), ('nightlife', 'Nightlife 🌃'), ('event', 'Event 🎉'), ('transportation', 'Transportation 🚗'), ('culture', 'Culture 🎭'), ('water_sports', 'Water Sports 🚤'), ('hiking', 'Hiking 🥾'), ('wildlife', 'Wildlife 🦒'), ('historical_sites', 'Historical Sites 🏛️'), ('music_concerts', 'Music & Concerts 🎶'), ('fitness', 'Fitness 🏋️'), ('art_museums', 'Art & Museums 🎨'), ('festivals', 'Festivals 🎪'), ('spiritual_journeys', 'Spiritual Journeys 🧘\u200d♀️'), ('volunteer_work', 'Volunteer Work 🤝'), ('other', 'Other')], default='general', max_length=100),
+        ),
+        migrations.CreateModel(
+            name='Visit',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False, unique=True)),
+                ('start_date', models.DateField(blank=True, null=True)),
+                ('end_date', models.DateField(blank=True, null=True)),
+                ('notes', models.TextField(blank=True, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('adventure', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='visits', to='adventures.adventure')),
+            ],
+        ),
+    ]
diff --git a/backend/server/adventures/migrations/0003_remove_adventure_date_remove_adventure_end_date_and_more.py b/backend/server/adventures/migrations/0008_remove_date_field.py
similarity index 68%
rename from backend/server/adventures/migrations/0003_remove_adventure_date_remove_adventure_end_date_and_more.py
rename to backend/server/adventures/migrations/0008_remove_date_field.py
index 7e4e6d6..72902c8 100644
--- a/backend/server/adventures/migrations/0003_remove_adventure_date_remove_adventure_end_date_and_more.py
+++ b/backend/server/adventures/migrations/0008_remove_date_field.py
@@ -1,13 +1,14 @@
-# Generated by Django 5.0.8 on 2024-09-22 15:14
+# Generated by Django 5.0.8 on 2024-09-23 18:06
 
-from django.db import migrations
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('adventures', 'migrate_visits_and_categories'),
-        ('adventures', 'migrate_images'),
+        ('adventures', 'migrate_visits_categories'),
     ]
 
     operations = [
diff --git a/backend/server/adventures/migrations/migrate_images.py b/backend/server/adventures/migrations/migrate_images.py
index d2b4a91..9ef361f 100644
--- a/backend/server/adventures/migrations/migrate_images.py
+++ b/backend/server/adventures/migrations/migrate_images.py
@@ -17,8 +17,13 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('adventures', '0001_initial'),
+        ('adventures', '0002_adventureimage'),
     ]
 
     operations = [
         migrations.RunPython(move_images_to_new_model),
+        migrations.RemoveField(
+            model_name='Adventure',
+            name='image',
+        ),
     ]
\ No newline at end of file
diff --git a/backend/server/adventures/migrations/migrate_visits_and_categories.py b/backend/server/adventures/migrations/migrate_visits_categories.py
similarity index 95%
rename from backend/server/adventures/migrations/migrate_visits_and_categories.py
rename to backend/server/adventures/migrations/migrate_visits_categories.py
index 1322712..c9afb4a 100644
--- a/backend/server/adventures/migrations/migrate_visits_and_categories.py
+++ b/backend/server/adventures/migrations/migrate_visits_categories.py
@@ -23,7 +23,7 @@ def move_images_to_new_model(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('adventures', '0002_visit')
+        ('adventures', '0007_visit_model'),
     ]
 
     operations = [

From 9a672e51cd9ab21d306f250d83b0921de516039d Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Mon, 23 Sep 2024 18:19:25 -0400
Subject: [PATCH 04/15] Valid types fixing

---
 .../server/adventures/migrations/0008_remove_date_field.py  | 1 +
 backend/server/adventures/views.py                          | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/server/adventures/migrations/0008_remove_date_field.py b/backend/server/adventures/migrations/0008_remove_date_field.py
index 72902c8..0260097 100644
--- a/backend/server/adventures/migrations/0008_remove_date_field.py
+++ b/backend/server/adventures/migrations/0008_remove_date_field.py
@@ -9,6 +9,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('adventures', 'migrate_visits_categories'),
+        ('adventures', 'migrate_images'),
     ]
 
     operations = [
diff --git a/backend/server/adventures/views.py b/backend/server/adventures/views.py
index 7d2a136..0960b1c 100644
--- a/backend/server/adventures/views.py
+++ b/backend/server/adventures/views.py
@@ -5,7 +5,7 @@ from rest_framework.decorators import action
 from rest_framework import viewsets
 from django.db.models.functions import Lower
 from rest_framework.response import Response
-from .models import Adventure, Checklist, Collection, Transportation, Note, AdventureImage
+from .models import Adventure, Checklist, Collection, Transportation, Note, AdventureImage, ADVENTURE_TYPES
 from django.core.exceptions import PermissionDenied
 from worldtravel.models import VisitedRegion, Region, Country
 from .serializers import AdventureImageSerializer, AdventureSerializer, CollectionSerializer, NoteSerializer, TransportationSerializer, ChecklistSerializer
@@ -105,7 +105,7 @@ class AdventureViewSet(viewsets.ModelViewSet):
     @action(detail=False, methods=['get'])
     def filtered(self, request):
         types = request.query_params.get('types', '').split(',')
-        valid_types = ['visited', 'planned']
+        valid_types = [t[0] for t in ADVENTURE_TYPES]
         types = [t for t in types if t in valid_types]
 
         if not types:
@@ -114,7 +114,7 @@ class AdventureViewSet(viewsets.ModelViewSet):
         queryset = Adventure.objects.none()
 
         for adventure_type in types:
-            if adventure_type in ['visited', 'planned']:
+            if adventure_type in valid_types:
                 queryset |= Adventure.objects.filter(
                     type=adventure_type, user_id=request.user.id)
 

From 86cefc8b2fbc9d96999c8d69e6996b0157d1ffa5 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Mon, 23 Sep 2024 18:46:04 -0400
Subject: [PATCH 05/15] Category frontend fixes

---
 .../src/lib/components/AdventureCard.svelte   |  28 ++---
 .../src/lib/components/AdventureModal.svelte  | 108 +++---------------
 frontend/src/lib/index.ts                     |  34 ++++++
 frontend/src/lib/types.ts                     |   7 +-
 .../src/routes/adventures/+page.server.ts     |   2 +-
 5 files changed, 62 insertions(+), 117 deletions(-)

diff --git a/frontend/src/lib/components/AdventureCard.svelte b/frontend/src/lib/components/AdventureCard.svelte
index d72fdfa..293984c 100644
--- a/frontend/src/lib/components/AdventureCard.svelte
+++ b/frontend/src/lib/components/AdventureCard.svelte
@@ -19,6 +19,7 @@
 	import DotsHorizontal from '~icons/mdi/dots-horizontal';
 	import DeleteWarning from './DeleteWarning.svelte';
 	import ImageDisplayModal from './ImageDisplayModal.svelte';
+	import { typeToString } from '$lib';
 
 	export let type: string;
 	export let user: User | null;
@@ -209,16 +210,8 @@
 			</button>
 		</div>
 		<div>
-			{#if adventure.type == 'visited'}
-				<div class="badge badge-primary">Visited</div>
-			{:else if adventure.type == 'planned'}
-				<div class="badge badge-secondary">Planned</div>
-			{:else if adventure.type == 'lodging'}
-				<div class="badge badge-success">Lodging</div>
-			{:else if adventure.type == 'dining'}
-				<div class="badge badge-accent">Dining</div>
-			{/if}
-
+			<div class="badge badge-primary">{typeToString(adventure.type)}</div>
+			<div class="badge badge-success">{adventure.visits.length > 0 ? 'Visited' : 'Planned'}</div>
 			<div class="badge badge-secondary">{adventure.is_public ? 'Public' : 'Private'}</div>
 		</div>
 		{#if adventure.location && adventure.location !== ''}
@@ -227,16 +220,13 @@
 				<p class="ml-.5">{adventure.location}</p>
 			</div>
 		{/if}
-		{#if adventure.date && adventure.date !== ''}
-			<div class="inline-flex items-center">
+		{#if adventure.visits.length > 0}
+			<!-- visited badge -->
+			<div class="flex items-center">
 				<Calendar class="w-5 h-5 mr-1" />
-				<p>
-					{new Date(adventure.date).toLocaleDateString(undefined, {
-						timeZone: 'UTC'
-					})}{adventure.end_date && adventure.end_date !== ''
-						? ' - ' +
-							new Date(adventure.end_date).toLocaleDateString(undefined, { timeZone: 'UTC' })
-						: ''}
+				<p class="ml-.5">
+					{adventure.visits.length}
+					{adventure.visits.length > 1 ? 'visits' : 'visit'}
 				</p>
 			</div>
 		{/if}
diff --git a/frontend/src/lib/components/AdventureModal.svelte b/frontend/src/lib/components/AdventureModal.svelte
index 304f55c..c91137a 100644
--- a/frontend/src/lib/components/AdventureModal.svelte
+++ b/frontend/src/lib/components/AdventureModal.svelte
@@ -22,6 +22,7 @@
 	import Earth from '~icons/mdi/earth';
 	import ActivityComplete from './ActivityComplete.svelte';
 	import { appVersion } from '$lib/config';
+	import { ADVENTURE_TYPES } from '$lib';
 
 	export let startDate: string | null = null;
 	export let endDate: string | null = null;
@@ -37,8 +38,7 @@
 		id: '',
 		name: '',
 		type: 'visited',
-		date: null,
-		end_date: null,
+		visits: [],
 		link: null,
 		description: null,
 		activity_types: [],
@@ -57,9 +57,7 @@
 	adventure = {
 		id: adventureToEdit?.id || '',
 		name: adventureToEdit?.name || '',
-		type: adventureToEdit?.type || 'visited',
-		date: adventureToEdit?.date || null,
-		end_date: adventureToEdit?.end_date || null,
+		type: adventureToEdit?.type || 'general',
 		link: adventureToEdit?.link || null,
 		description: adventureToEdit?.description || null,
 		activity_types: adventureToEdit?.activity_types || [],
@@ -70,7 +68,9 @@
 		location: adventureToEdit?.location || null,
 		images: adventureToEdit?.images || [],
 		user_id: adventureToEdit?.user_id || null,
-		collection: adventureToEdit?.collection || collection_id || null
+		collection: adventureToEdit?.collection || collection_id || null,
+		// visits: adventureToEdit?.visits || []
+		visits: []
 	};
 
 	let markers: Point[] = [];
@@ -369,18 +369,6 @@
 			}
 		}
 
-		if (adventure.date && adventure.end_date) {
-			if (new Date(adventure.date) > new Date(adventure.end_date)) {
-				addToast('error', 'Start date must be before end date');
-				return;
-			}
-		}
-
-		if (adventure.end_date && !adventure.date) {
-			adventure.end_date = null;
-			adventure.date = null;
-		}
-
 		console.log(adventure);
 		if (adventure.id === '') {
 			let res = await fetch('/api/adventures', {
@@ -449,84 +437,14 @@
 					</div>
 
 					<div>
-						<div class="form-control">
-							<label class="label cursor-pointer">
-								<span class="label-text">Visited</span>
-								<input
-									type="radio"
-									name="radio-10"
-									class="radio checked:bg-red-500"
-									on:click={() => (adventure.type = 'visited')}
-									checked={adventure.type == 'visited'}
-								/>
-							</label>
-						</div>
-						<div class="form-control">
-							<label class="label cursor-pointer">
-								<span class="label-text">Planned</span>
-								<input
-									type="radio"
-									name="radio-10"
-									class="radio checked:bg-blue-500"
-									on:click={() => (adventure.type = 'planned')}
-									checked={adventure.type == 'planned'}
-								/>
-							</label>
-						</div>
-						{#if is_collection}
-							<div class="form-control">
-								<label class="label cursor-pointer">
-									<span class="label-text">Lodging</span>
-									<input
-										type="radio"
-										name="radio-10"
-										class="radio checked:bg-blue-500"
-										on:click={() => (adventure.type = 'lodging')}
-										checked={adventure.type == 'lodging'}
-									/>
-								</label>
-							</div>
-							<div class="form-control">
-								<label class="label cursor-pointer">
-									<span class="label-text">Dining</span>
-									<input
-										type="radio"
-										name="radio-10"
-										class="radio checked:bg-blue-500"
-										on:click={() => (adventure.type = 'dining')}
-										checked={adventure.type == 'dining'}
-									/>
-								</label>
-							</div>
-						{/if}
+						<label for="link">Category</label><br />
+						<select class="select select-bordered w-full max-w-xs" bind:value={adventure.type}>
+							<option disabled selected>Select Adventure Type</option>
+							{#each ADVENTURE_TYPES as type}
+								<option value={type.type}>{type.label}</option>
+							{/each}
+						</select>
 					</div>
-
-					<div>
-						<label for="date">{adventure.date ? 'Start Date' : 'Date'}</label><br />
-						<input
-							type="date"
-							id="date"
-							name="date"
-							min={startDate || ''}
-							max={endDate || ''}
-							bind:value={adventure.date}
-							class="input input-bordered w-full"
-						/>
-					</div>
-					{#if adventure.date}
-						<div>
-							<label for="end_date">End Date</label><br />
-							<input
-								type="date"
-								id="end_date"
-								name="end_date"
-								min={startDate || ''}
-								max={endDate || ''}
-								bind:value={adventure.end_date}
-								class="input input-bordered w-full"
-							/>
-						</div>
-					{/if}
 					<div>
 						<!-- link -->
 						<div>
diff --git a/frontend/src/lib/index.ts b/frontend/src/lib/index.ts
index 233dd3f..b7c563f 100644
--- a/frontend/src/lib/index.ts
+++ b/frontend/src/lib/index.ts
@@ -216,3 +216,37 @@ export function continentCodeToString(code: string) {
 			return 'Unknown';
 	}
 }
+
+export let ADVENTURE_TYPES = [
+	{ type: 'general', label: 'General 🌍' },
+	{ type: 'Outdoor', label: 'Outdoor 🏞️' },
+	{ type: 'lodging', label: 'Lodging 🛌' },
+	{ type: 'dining', label: 'Dining 🍽️' },
+	{ type: 'activity', label: 'Activity 🏄' },
+	{ type: 'attraction', label: 'Attraction 🎢' },
+	{ type: 'shopping', label: 'Shopping 🛍️' },
+	{ type: 'nightlife', label: 'Nightlife 🌃' },
+	{ type: 'event', label: 'Event 🎉' },
+	{ type: 'transportation', label: 'Transportation 🚗' },
+	{ type: 'culture', label: 'Culture 🎭' },
+	{ type: 'water_sports', label: 'Water Sports 🚤' },
+	{ type: 'hiking', label: 'Hiking 🥾' },
+	{ type: 'wildlife', label: 'Wildlife 🦒' },
+	{ type: 'historical_sites', label: 'Historical Sites 🏛️' },
+	{ type: 'music_concerts', label: 'Music & Concerts 🎶' },
+	{ type: 'fitness', label: 'Fitness 🏋️' },
+	{ type: 'art_museums', label: 'Art & Museums 🎨' },
+	{ type: 'festivals', label: 'Festivals 🎪' },
+	{ type: 'spiritual_journeys', label: 'Spiritual Journeys 🧘‍♀️' },
+	{ type: 'volunteer_work', label: 'Volunteer Work 🤝' },
+	{ type: 'other', label: 'Other' }
+];
+
+export function typeToString(type: string) {
+	const typeObj = ADVENTURE_TYPES.find((t) => t.type === type);
+	if (typeObj) {
+		return typeObj.label;
+	} else {
+		return 'Unknown';
+	}
+}
diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts
index 4b5bb15..03f96a2 100644
--- a/frontend/src/lib/types.ts
+++ b/frontend/src/lib/types.ts
@@ -25,8 +25,11 @@ export type Adventure = {
 		id: string;
 		image: string;
 	}[];
-	date?: string | null; // Assuming date is a string in 'YYYY-MM-DD' format
-	end_date?: string | null; // Assuming date is a string in 'YYYY-MM-DD' format
+	visits: {
+		start_date: string;
+		end_date: string;
+		notes: string;
+	}[];
 	collection?: string | null;
 	latitude: number | null;
 	longitude: number | null;
diff --git a/frontend/src/routes/adventures/+page.server.ts b/frontend/src/routes/adventures/+page.server.ts
index cf80bce..07cfa0d 100644
--- a/frontend/src/routes/adventures/+page.server.ts
+++ b/frontend/src/routes/adventures/+page.server.ts
@@ -30,7 +30,7 @@ export const load = (async (event) => {
 			}
 			typeString += 'planned';
 		} else if (!visited && !planned) {
-			typeString = 'visited,planned';
+			typeString = 'general';
 		}
 
 		const include_collections = event.url.searchParams.get('include_collections') || 'false';

From ad195911ff029cb82c6cf21db1b7514c1b9d94fd Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Tue, 24 Sep 2024 17:05:16 -0400
Subject: [PATCH 06/15] Fix admin page for adventure image

---
 backend/server/adventures/admin.py  | 2 +-
 backend/server/adventures/models.py | 2 +-
 frontend/src/lib/index.ts           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/server/adventures/admin.py b/backend/server/adventures/admin.py
index 117339d..b7df19d 100644
--- a/backend/server/adventures/admin.py
+++ b/backend/server/adventures/admin.py
@@ -60,7 +60,7 @@ class AdventureImageAdmin(admin.ModelAdmin):
         if obj.image:
             public_url = os.environ.get('PUBLIC_URL', 'http://127.0.0.1:8000').rstrip('/')
             public_url = public_url.replace("'", "")
-            return mark_safe(f'<img src="{public_url}/media/{obj.profile_pic.name}" width="100px" height="100px"')
+            return mark_safe(f'<img src="{public_url}/media/{obj.image.name}" width="100px" height="100px"')
         else:
             return
 
diff --git a/backend/server/adventures/models.py b/backend/server/adventures/models.py
index 5312d86..bbeabe1 100644
--- a/backend/server/adventures/models.py
+++ b/backend/server/adventures/models.py
@@ -8,7 +8,7 @@ from django_resized import ResizedImageField
 
 ADVENTURE_TYPES = [
     ('general', 'General 🌍'),
-    ('Outdoor', 'Outdoor 🏞️'),
+    ('outdoor', 'Outdoor 🏞️'),
     ('lodging', 'Lodging 🛌'),
     ('dining', 'Dining 🍽️'),
     ('activity', 'Activity 🏄'),
diff --git a/frontend/src/lib/index.ts b/frontend/src/lib/index.ts
index b7c563f..9308b46 100644
--- a/frontend/src/lib/index.ts
+++ b/frontend/src/lib/index.ts
@@ -219,7 +219,7 @@ export function continentCodeToString(code: string) {
 
 export let ADVENTURE_TYPES = [
 	{ type: 'general', label: 'General 🌍' },
-	{ type: 'Outdoor', label: 'Outdoor 🏞️' },
+	{ type: 'outdoor', label: 'Outdoor 🏞️' },
 	{ type: 'lodging', label: 'Lodging 🛌' },
 	{ type: 'dining', label: 'Dining 🍽️' },
 	{ type: 'activity', label: 'Activity 🏄' },

From c6ecfca91d23280d9a0f3aef09459d4f4df25b1a Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Sun, 29 Sep 2024 20:42:52 -0400
Subject: [PATCH 07/15] Refactor adventure type field in migrations

---
 .../migrations/0009_alter_adventure_type.py    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 backend/server/adventures/migrations/0009_alter_adventure_type.py

diff --git a/backend/server/adventures/migrations/0009_alter_adventure_type.py b/backend/server/adventures/migrations/0009_alter_adventure_type.py
new file mode 100644
index 0000000..72178f9
--- /dev/null
+++ b/backend/server/adventures/migrations/0009_alter_adventure_type.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.0.8 on 2024-09-30 00:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adventures', '0008_remove_date_field'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='adventure',
+            name='type',
+            field=models.CharField(choices=[('general', 'General 🌍'), ('outdoor', 'Outdoor 🏞️'), ('lodging', 'Lodging 🛌'), ('dining', 'Dining 🍽️'), ('activity', 'Activity 🏄'), ('attraction', 'Attraction 🎢'), ('shopping', 'Shopping 🛍️'), ('nightlife', 'Nightlife 🌃'), ('event', 'Event 🎉'), ('transportation', 'Transportation 🚗'), ('culture', 'Culture 🎭'), ('water_sports', 'Water Sports 🚤'), ('hiking', 'Hiking 🥾'), ('wildlife', 'Wildlife 🦒'), ('historical_sites', 'Historical Sites 🏛️'), ('music_concerts', 'Music & Concerts 🎶'), ('fitness', 'Fitness 🏋️'), ('art_museums', 'Art & Museums 🎨'), ('festivals', 'Festivals 🎪'), ('spiritual_journeys', 'Spiritual Journeys 🧘\u200d♀️'), ('volunteer_work', 'Volunteer Work 🤝'), ('other', 'Other')], default='general', max_length=100),
+        ),
+    ]

From 6cb31aa1259b1d220b9539277f0dc961c9569744 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Mon, 30 Sep 2024 18:03:10 -0400
Subject: [PATCH 08/15] New AdventureModal Accordian

---
 backend/server/adventures/serializers.py      |  26 +-
 backend/server/adventures/views.py            |   3 +
 .../src/lib/components/AdventureCard.svelte   |  22 +-
 .../src/lib/components/AdventureModal.svelte  | 459 ++++++++++--------
 frontend/src/lib/types.ts                     |   1 +
 .../src/routes/adventures/+page.server.ts     |  19 +-
 frontend/src/routes/adventures/+page.svelte   |   6 +-
 7 files changed, 291 insertions(+), 245 deletions(-)

diff --git a/backend/server/adventures/serializers.py b/backend/server/adventures/serializers.py
index 99cc6c7..4bf7e8c 100644
--- a/backend/server/adventures/serializers.py
+++ b/backend/server/adventures/serializers.py
@@ -45,18 +45,34 @@ class AdventureSerializer(serializers.ModelSerializer):
     
     def update(self, instance, validated_data):
         visits_data = validated_data.pop('visits', [])
-        instance = super().update(instance, validated_data)
+        
+        # Update Adventure fields
+        for attr, value in validated_data.items():
+            setattr(instance, attr, value)
+        instance.save()
+        
+        # Get current visits
+        current_visits = instance.visits.all()
+        current_visit_ids = set(current_visits.values_list('id', flat=True))
         
         # Update or create visits
+        updated_visit_ids = set()
         for visit_data in visits_data:
-            visit_id = visit_data.get('id', None)
-            if visit_id:
-                visit = Visit.objects.get(id=visit_id, adventure=instance)
+            visit_id = visit_data.get('id')
+            if visit_id and visit_id in current_visit_ids:
+                visit = current_visits.get(id=visit_id)
                 for attr, value in visit_data.items():
                     setattr(visit, attr, value)
                 visit.save()
+                updated_visit_ids.add(visit_id)
             else:
-                Visit.objects.create(adventure=instance, **visit_data)
+                # If no ID is provided or ID doesn't exist, create new visit
+                new_visit = Visit.objects.create(adventure=instance, **visit_data)
+                updated_visit_ids.add(new_visit.id)
+        
+        # Delete visits that are not in the updated data
+        visits_to_delete = current_visit_ids - updated_visit_ids
+        instance.visits.filter(id__in=visits_to_delete).delete()
         
         return instance
     
diff --git a/backend/server/adventures/views.py b/backend/server/adventures/views.py
index 0960b1c..7280c68 100644
--- a/backend/server/adventures/views.py
+++ b/backend/server/adventures/views.py
@@ -105,6 +105,9 @@ class AdventureViewSet(viewsets.ModelViewSet):
     @action(detail=False, methods=['get'])
     def filtered(self, request):
         types = request.query_params.get('types', '').split(',')
+        # handle case where types is all
+        if 'all' in types:
+            types = [t[0] for t in ADVENTURE_TYPES]
         valid_types = [t[0] for t in ADVENTURE_TYPES]
         types = [t for t in types if t in valid_types]
 
diff --git a/frontend/src/lib/components/AdventureCard.svelte b/frontend/src/lib/components/AdventureCard.svelte
index 293984c..2494ae3 100644
--- a/frontend/src/lib/components/AdventureCard.svelte
+++ b/frontend/src/lib/components/AdventureCard.svelte
@@ -32,16 +32,6 @@
 	let image_url: string | null = null;
 	export let adventure: Adventure;
 
-	if (adventure.type == 'visited') {
-		keyword = 'Adventure';
-	} else if (adventure.type == 'planned') {
-		keyword = 'Adventure';
-	} else if (adventure.type == 'lodging') {
-		keyword = 'Lodging';
-	} else if (adventure.type == 'dining') {
-		keyword = 'Dining';
-	}
-
 	let activityTypes: string[] = [];
 	// makes it reactivty to changes so it updates automatically
 	$: {
@@ -258,7 +248,7 @@
 								><Launch class="w-6 h-6" />Open Details</button
 							>
 							<button class="btn btn-neutral mb-2" on:click={editAdventure}>
-								<FileDocumentEdit class="w-6 h-6" />Edit {keyword}
+								<FileDocumentEdit class="w-6 h-6" />Edit Adventure
 							</button>
 							{#if adventure.type == 'visited' && user?.pk == adventure.user_id}
 								<button class="btn btn-neutral mb-2" on:click={changeType('planned')}
@@ -270,18 +260,12 @@
 									><CheckBold class="w-6 h-6" />Mark Visited</button
 								>
 							{/if}
-							<!-- remove from adventure -->
-							{#if adventure.collection && (adventure.type == 'visited' || adventure.type == 'planned') && user?.pk == adventure.user_id}
+							<!-- remove from collection -->
+							{#if adventure.collection && user?.pk == adventure.user_id}
 								<button class="btn btn-neutral mb-2" on:click={removeFromCollection}
 									><LinkVariantRemove class="w-6 h-6" />Remove from Collection</button
 								>
 							{/if}
-							<!-- change a non adventure to an adventure -->
-							{#if (adventure.collection && adventure.type == 'lodging') || adventure.type == 'dining'}
-								<button class="btn btn-neutral mb-2" on:click={changeType('visited')}
-									><CheckBold class="w-6 h-6" />Change to Visit</button
-								>
-							{/if}
 							{#if !adventure.collection}
 								<button class="btn btn-neutral mb-2" on:click={() => (isCollectionModalOpen = true)}
 									><Plus class="w-6 h-6" />Add to Collection</button
diff --git a/frontend/src/lib/components/AdventureModal.svelte b/frontend/src/lib/components/AdventureModal.svelte
index c91137a..fa44947 100644
--- a/frontend/src/lib/components/AdventureModal.svelte
+++ b/frontend/src/lib/components/AdventureModal.svelte
@@ -69,8 +69,8 @@
 		images: adventureToEdit?.images || [],
 		user_id: adventureToEdit?.user_id || null,
 		collection: adventureToEdit?.collection || collection_id || null,
-		// visits: adventureToEdit?.visits || []
-		visits: []
+		visits: adventureToEdit?.visits || []
+		//visits: []
 	};
 
 	let markers: Point[] = [];
@@ -414,65 +414,156 @@
 <dialog id="my_modal_1" class="modal">
 	<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
 	<!-- svelte-ignore a11y-no-noninteractive-element-interactions -->
-	<div class="modal-box w-11/12 max-w-2xl" role="dialog" on:keydown={handleKeydown} tabindex="0">
-		<h3 class="font-bold text-lg">
+	<div class="modal-box w-11/12 max-w-3xl" role="dialog" on:keydown={handleKeydown} tabindex="0">
+		<h3 class="font-bold text-2xl">
 			{adventureToEdit ? 'Edit Adventure' : 'New Adventure'}
 		</h3>
 		{#if adventure.id === '' || isDetails}
 			<div class="modal-action items-center">
 				<form method="post" style="width: 100%;" on:submit={handleSubmit}>
 					<!-- Grid layout for form fields -->
-					<h2 class="text-2xl font-semibold mb-2">Basic Information</h2>
 					<!-- <div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-3"> -->
-					<div>
-						<label for="name">Name</label><br />
-						<input
-							type="text"
-							id="name"
-							name="name"
-							bind:value={adventure.name}
-							class="input input-bordered w-full"
-							required
-						/>
+					<div class="collapse collapse-plus bg-base-200 mb-4">
+						<input type="checkbox" checked />
+						<div class="collapse-title text-xl font-medium">Basic Information</div>
+						<div class="collapse-content">
+							<div>
+								<label for="name">Name</label><br />
+								<input
+									type="text"
+									id="name"
+									name="name"
+									bind:value={adventure.name}
+									class="input input-bordered w-full"
+									required
+								/>
+							</div>
+							<div>
+								<label for="link">Category</label><br />
+								<select class="select select-bordered w-full max-w-xs" bind:value={adventure.type}>
+									<option disabled selected>Select Adventure Type</option>
+									{#each ADVENTURE_TYPES as type}
+										<option value={type.type}>{type.label}</option>
+									{/each}
+								</select>
+							</div>
+							<div>
+								<label for="rating">Rating</label><br />
+								<input
+									type="number"
+									min="0"
+									max="5"
+									hidden
+									bind:value={adventure.rating}
+									id="rating"
+									name="rating"
+									class="input input-bordered w-full max-w-xs mt-1"
+								/>
+								<div class="rating -ml-3 mt-1">
+									<input
+										type="radio"
+										name="rating-2"
+										class="rating-hidden"
+										checked={Number.isNaN(adventure.rating)}
+									/>
+									<input
+										type="radio"
+										name="rating-2"
+										class="mask mask-star-2 bg-orange-400"
+										on:click={() => (adventure.rating = 1)}
+										checked={adventure.rating === 1}
+									/>
+									<input
+										type="radio"
+										name="rating-2"
+										class="mask mask-star-2 bg-orange-400"
+										on:click={() => (adventure.rating = 2)}
+										checked={adventure.rating === 2}
+									/>
+									<input
+										type="radio"
+										name="rating-2"
+										class="mask mask-star-2 bg-orange-400"
+										on:click={() => (adventure.rating = 3)}
+										checked={adventure.rating === 3}
+									/>
+									<input
+										type="radio"
+										name="rating-2"
+										class="mask mask-star-2 bg-orange-400"
+										on:click={() => (adventure.rating = 4)}
+										checked={adventure.rating === 4}
+									/>
+									<input
+										type="radio"
+										name="rating-2"
+										class="mask mask-star-2 bg-orange-400"
+										on:click={() => (adventure.rating = 5)}
+										checked={adventure.rating === 5}
+									/>
+									{#if adventure.rating}
+										<button
+											type="button"
+											class="btn btn-sm btn-error ml-2"
+											on:click={() => (adventure.rating = NaN)}
+										>
+											Remove
+										</button>
+									{/if}
+								</div>
+							</div>
+							<div>
+								<div>
+									<label for="link">Link</label><br />
+									<input
+										type="text"
+										id="link"
+										name="link"
+										bind:value={adventure.link}
+										class="input input-bordered w-full"
+									/>
+								</div>
+							</div>
+							<div>
+								<label for="description">Description</label><br />
+								<textarea
+									id="description"
+									name="description"
+									bind:value={adventure.description}
+									class="textarea textarea-bordered w-full h-32"
+								></textarea>
+								<div class="mt-2">
+									<button type="button" class="btn btn-neutral" on:click={generateDesc}
+										>Generate Description</button
+									>
+									<p class="text-red-500">{wikiError}</p>
+								</div>
+							</div>
+							{#if !collection_id}
+								<div>
+									<div class="form-control flex items-start mt-1">
+										<label class="label cursor-pointer flex items-start space-x-2">
+											<span class="label-text">Public Adventure</span>
+											<input
+												type="checkbox"
+												class="toggle toggle-primary"
+												id="is_public"
+												name="is_public"
+												bind:checked={adventure.is_public}
+											/>
+										</label>
+									</div>
+								</div>
+							{/if}
+						</div>
 					</div>
 
-					<div>
-						<label for="link">Category</label><br />
-						<select class="select select-bordered w-full max-w-xs" bind:value={adventure.type}>
-							<option disabled selected>Select Adventure Type</option>
-							{#each ADVENTURE_TYPES as type}
-								<option value={type.type}>{type.label}</option>
-							{/each}
-						</select>
-					</div>
-					<div>
-						<!-- link -->
-						<div>
-							<label for="link">Link</label><br />
-							<input
-								type="text"
-								id="link"
-								name="link"
-								bind:value={adventure.link}
-								class="input input-bordered w-full"
-							/>
+					<div class="collapse collapse-plus bg-base-200 mb-4">
+						<input type="checkbox" />
+						<div class="collapse-title text-xl font-medium">
+							Activity Types ({adventure.activity_types?.length || 0})
 						</div>
-					</div>
-					<div>
-						<label for="description">Description</label><br />
-						<textarea
-							id="description"
-							name="description"
-							bind:value={adventure.description}
-							class="textarea textarea-bordered w-full h-32"
-						></textarea>
-						<div class="mt-2">
-							<button type="button" class="btn btn-neutral" on:click={generateDesc}
-								>Generate Description</button
-							>
-							<p class="text-red-500">{wikiError}</p>
-						</div>
-						<div>
+						<div class="collapse-content">
 							<label for="activity_types">Activity Types</label><br />
 							<input
 								type="text"
@@ -484,170 +575,104 @@
 							/>
 							<ActivityComplete bind:activities={adventure.activity_types} />
 						</div>
-						<div>
-							<label for="rating"
-								>Rating <iconify-icon icon="mdi:star" class="text-xl -mb-1"></iconify-icon></label
-							><br />
-							<input
-								type="number"
-								min="0"
-								max="5"
-								hidden
-								bind:value={adventure.rating}
-								id="rating"
-								name="rating"
-								class="input input-bordered w-full max-w-xs mt-1"
-							/>
-							<div class="rating -ml-3 mt-1">
-								<input
-									type="radio"
-									name="rating-2"
-									class="rating-hidden"
-									checked={Number.isNaN(adventure.rating)}
-								/>
-								<input
-									type="radio"
-									name="rating-2"
-									class="mask mask-star-2 bg-orange-400"
-									on:click={() => (adventure.rating = 1)}
-									checked={adventure.rating === 1}
-								/>
-								<input
-									type="radio"
-									name="rating-2"
-									class="mask mask-star-2 bg-orange-400"
-									on:click={() => (adventure.rating = 2)}
-									checked={adventure.rating === 2}
-								/>
-								<input
-									type="radio"
-									name="rating-2"
-									class="mask mask-star-2 bg-orange-400"
-									on:click={() => (adventure.rating = 3)}
-									checked={adventure.rating === 3}
-								/>
-								<input
-									type="radio"
-									name="rating-2"
-									class="mask mask-star-2 bg-orange-400"
-									on:click={() => (adventure.rating = 4)}
-									checked={adventure.rating === 4}
-								/>
-								<input
-									type="radio"
-									name="rating-2"
-									class="mask mask-star-2 bg-orange-400"
-									on:click={() => (adventure.rating = 5)}
-									checked={adventure.rating === 5}
-								/>
-								{#if adventure.rating}
-									<button
-										type="button"
-										class="btn btn-sm btn-error ml-2"
-										on:click={() => (adventure.rating = NaN)}
-									>
-										Remove
-									</button>
-								{/if}
-							</div>
-							{#if !collection_id}
-								<div>
-									<div class="mt-2">
-										<div>
-											<label for="is_public"
-												>Public <Earth class="inline-block -mt-1 mb-1 w-6 h-6" /></label
-											><br />
-											<input
-												type="checkbox"
-												class="toggle toggle-primary"
-												id="is_public"
-												name="is_public"
-												bind:checked={adventure.is_public}
-											/>
-										</div>
-									</div>
-								</div>
-							{/if}
+					</div>
+
+					<div class="collapse collapse-plus bg-base-200 mb-4">
+						<input type="checkbox" />
+						<div class="collapse-title text-xl font-medium">
+							Visits ({adventure.visits.length})
 						</div>
-						<div class="divider"></div>
-						<h2 class="text-2xl font-semibold mb-2 mt-2">Location Information</h2>
-						<!-- <div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3"> -->
-						<div>
-							<label for="latitude">Location</label><br />
-							<input
-								type="text"
-								id="location"
-								name="location"
-								bind:value={adventure.location}
-								class="input input-bordered w-full"
-							/>
+						<div class="collapse-content">
+							<p>hello</p>
 						</div>
-						<div>
-							<form on:submit={geocode} class="mt-2">
+					</div>
+
+					<div class="collapse collapse-plus bg-base-200 mb-4">
+						<input type="checkbox" />
+						<div class="collapse-title text-xl font-medium">Location Information</div>
+						<div class="collapse-content">
+							<!-- <div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3"> -->
+							<div>
+								<label for="latitude">Location</label><br />
 								<input
 									type="text"
-									placeholder="Seach for a location"
-									class="input input-bordered w-full max-w-xs mb-2"
-									id="search"
-									name="search"
-									bind:value={query}
+									id="location"
+									name="location"
+									bind:value={adventure.location}
+									class="input input-bordered w-full"
 								/>
-								<button class="btn btn-neutral -mt-1" type="submit">Search</button>
-								<button class="btn btn-neutral -mt-1" type="button" on:click={clearMap}
-									>Clear Map</button
-								>
-							</form>
-						</div>
-						{#if places.length > 0}
-							<div class="mt-4 max-w-full">
-								<h3 class="font-bold text-lg mb-4">Search Results</h3>
-
-								<div class="flex flex-wrap">
-									{#each places as place}
-										<button
-											type="button"
-											class="btn btn-neutral mb-2 mr-2 max-w-full break-words whitespace-normal text-left"
-											on:click={() => {
-												markers = [
-													{
-														lngLat: { lng: Number(place.lon), lat: Number(place.lat) },
-														location: place.display_name,
-														name: place.name,
-														activity_type: place.type
-													}
-												];
-												checkPointInRegion();
-											}}
-										>
-											{place.display_name}
-										</button>
-									{/each}
-								</div>
 							</div>
-						{:else if noPlaces}
-							<p class="text-error text-lg">No results found</p>
-						{/if}
-						<!-- </div> -->
-						<div>
-							<MapLibre
-								style="https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
-								class="relative aspect-[9/16] max-h-[70vh] w-full sm:aspect-video sm:max-h-full"
-								standardControls
-							>
-								<!-- MapEvents gives you access to map events even from other components inside the map,
+							<div>
+								<form on:submit={geocode} class="mt-2">
+									<input
+										type="text"
+										placeholder="Seach for a location"
+										class="input input-bordered w-full max-w-xs mb-2"
+										id="search"
+										name="search"
+										bind:value={query}
+									/>
+									<button class="btn btn-neutral -mt-1" type="submit">Search</button>
+									<button class="btn btn-neutral -mt-1" type="button" on:click={clearMap}
+										>Clear Map</button
+									>
+								</form>
+							</div>
+							{#if places.length > 0}
+								<div class="mt-4 max-w-full">
+									<h3 class="font-bold text-lg mb-4">Search Results</h3>
+
+									<div class="flex flex-wrap">
+										{#each places as place}
+											<button
+												type="button"
+												class="btn btn-neutral mb-2 mr-2 max-w-full break-words whitespace-normal text-left"
+												on:click={() => {
+													markers = [
+														{
+															lngLat: { lng: Number(place.lon), lat: Number(place.lat) },
+															location: place.display_name,
+															name: place.name,
+															activity_type: place.type
+														}
+													];
+													checkPointInRegion();
+												}}
+											>
+												{place.display_name}
+											</button>
+										{/each}
+									</div>
+								</div>
+							{:else if noPlaces}
+								<p class="text-error text-lg">No results found</p>
+							{/if}
+							<!-- </div> -->
+							<div>
+								<MapLibre
+									style="https://basemaps.cartocdn.com/gl/positron-gl-style/style.json"
+									class="relative aspect-[9/16] max-h-[70vh] w-full sm:aspect-video sm:max-h-full"
+									standardControls
+								>
+									<!-- MapEvents gives you access to map events even from other components inside the map,
 where you might not have access to the top-level `MapLibre` component. In this case
 it would also work to just use on:click on the MapLibre component itself. -->
-								<MapEvents on:click={addMarker} />
+									<MapEvents on:click={addMarker} />
 
-								{#each markers as marker}
-									<DefaultMarker lngLat={marker.lngLat} />
-								{/each}
-							</MapLibre>
+									{#each markers as marker}
+										<DefaultMarker lngLat={marker.lngLat} />
+									{/each}
+								</MapLibre>
+							</div>
+							{#if region_name}
+								<p class="text-lg font-semibold mt-2">Region: {region_name} ({region_id})</p>
+							{/if}
 						</div>
-						{#if region_name}
-							<p class="text-lg font-semibold mt-2">Region: {region_name} ({region_id})</p>
-						{/if}
+					</div>
 
+					<!-- ---OLD--- -->
+
+					<div>
 						<div class="mt-4">
 							{#if warningMessage != ''}
 								<div role="alert" class="alert alert-warning mb-2">
@@ -769,3 +794,29 @@ it would also work to just use on:click on the MapLibre component itself. -->
 		{/if}
 	</div>
 </dialog>
+
+<!-- {#each adventure.visits as visit}
+								<div class="flex flex-row">
+									<p>
+										{new Date(visit.start_date).toLocaleDateString(undefined, { timeZone: 'UTC' })}
+										{#if visit.end_date}
+											- {new Date(visit.end_date).toLocaleDateString(undefined, {
+												timeZone: 'UTC'
+											})}
+										{/if}
+									</p>
+									
+									<button
+										type="button"
+										class="btn btn-sm btn-error absolute right-0 mt-2.5 mr-4"
+										on:click={() => {
+											adventure.visits = adventure.visits.filter((v) => v.id !== visit.id);
+										}}
+									>
+										Remove
+									</button>
+								</div>
+							{/each}
+							{#if adventure.visits.length == 0}
+								<p>No visits</p>
+							{/if} -->
diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts
index 03f96a2..ac862fb 100644
--- a/frontend/src/lib/types.ts
+++ b/frontend/src/lib/types.ts
@@ -26,6 +26,7 @@ export type Adventure = {
 		image: string;
 	}[];
 	visits: {
+		id: string;
 		start_date: string;
 		end_date: string;
 		notes: string;
diff --git a/frontend/src/routes/adventures/+page.server.ts b/frontend/src/routes/adventures/+page.server.ts
index 07cfa0d..a8b097f 100644
--- a/frontend/src/routes/adventures/+page.server.ts
+++ b/frontend/src/routes/adventures/+page.server.ts
@@ -16,22 +16,12 @@ export const load = (async (event) => {
 		let count = 0;
 		let adventures: Adventure[] = [];
 
-		const visited = event.url.searchParams.get('visited');
-		const planned = event.url.searchParams.get('planned');
+		// const visited = event.url.searchParams.get('visited');
+		// const planned = event.url.searchParams.get('planned');
 
-		let typeString: string = '';
+		let typeString: string = 'all';
 
-		if (visited == 'on') {
-			typeString += 'visited';
-		}
-		if (planned == 'on') {
-			if (typeString) {
-				typeString += ',';
-			}
-			typeString += 'planned';
-		} else if (!visited && !planned) {
-			typeString = 'general';
-		}
+		// *** FOR NOW TYPESTRING IS ALWAYS 'ALL' BECAUSE WE DON'T HAVE A WAY TO FILTER BY VISITED/PLANNED YET ***
 
 		const include_collections = event.url.searchParams.get('include_collections') || 'false';
 		const order_by = event.url.searchParams.get('order_by') || 'updated_at';
@@ -46,6 +36,7 @@ export const load = (async (event) => {
 				}
 			}
 		);
+
 		if (!initialFetch.ok) {
 			console.error('Failed to fetch visited adventures');
 			return redirect(302, '/login');
diff --git a/frontend/src/routes/adventures/+page.svelte b/frontend/src/routes/adventures/+page.svelte
index c4f9cef..100db4e 100644
--- a/frontend/src/routes/adventures/+page.svelte
+++ b/frontend/src/routes/adventures/+page.svelte
@@ -216,9 +216,9 @@
 		<ul class="menu p-4 w-80 h-full bg-base-200 text-base-content rounded-lg">
 			<!-- Sidebar content here -->
 			<div class="form-control">
-				<h3 class="text-center font-bold text-lg mb-4">Adventure Types</h3>
+				<!-- <h3 class="text-center font-bold text-lg mb-4">Adventure Types</h3> -->
 				<form method="get">
-					<label class="label cursor-pointer">
+					<!-- <label class="label cursor-pointer">
 						<span class="label-text">Completed</span>
 						<input
 							type="checkbox"
@@ -237,7 +237,7 @@
 							class="checkbox checkbox-primary"
 							checked={currentSort.planned}
 						/>
-					</label>
+					</label> -->
 					<!-- <div class="divider"></div> -->
 					<h3 class="text-center font-bold text-lg mb-4">Sort</h3>
 					<p class="text-lg font-semibold mb-2">Order Direction</p>

From 1eadac90f1c69a2271b73b20757a5278aa68c1ff Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Mon, 30 Sep 2024 18:16:08 -0400
Subject: [PATCH 09/15] Refactor input and button layout in ActivityComplete
 component

---
 .../lib/components/ActivityComplete.svelte    | 27 ++++++++++---------
 .../src/lib/components/AdventureModal.svelte  | 14 ++++++----
 .../src/routes/adventures/[id]/+page.svelte   | 12 ++++-----
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/frontend/src/lib/components/ActivityComplete.svelte b/frontend/src/lib/components/ActivityComplete.svelte
index 9415fc4..73f76e6 100644
--- a/frontend/src/lib/components/ActivityComplete.svelte
+++ b/frontend/src/lib/components/ActivityComplete.svelte
@@ -49,18 +49,21 @@
 </script>
 
 <div class="relative">
-	<input
-		type="text"
-		class="input input-bordered w-full"
-		placeholder="Add an activity"
-		bind:value={inputVal}
-		on:keydown={(e) => {
-			if (e.key === 'Enter') {
-				e.preventDefault();
-				addActivity();
-			}
-		}}
-	/>
+	<div class="flex gap-2">
+		<input
+			type="text"
+			class="input input-bordered w-full"
+			placeholder="Add an activity"
+			bind:value={inputVal}
+			on:keydown={(e) => {
+				if (e.key === 'Enter') {
+					e.preventDefault();
+					addActivity();
+				}
+			}}
+		/>
+		<button type="button" class="btn btn-neutral" on:click={addActivity}>Add</button>
+	</div>
 	{#if inputVal && filteredItems.length > 0}
 		<ul class="absolute z-10 w-full bg-base-100 shadow-lg max-h-60 overflow-auto">
 			<!-- svelte-ignore a11y-click-events-have-key-events -->
diff --git a/frontend/src/lib/components/AdventureModal.svelte b/frontend/src/lib/components/AdventureModal.svelte
index fa44947..c9d8054 100644
--- a/frontend/src/lib/components/AdventureModal.svelte
+++ b/frontend/src/lib/components/AdventureModal.svelte
@@ -533,9 +533,14 @@
 									class="textarea textarea-bordered w-full h-32"
 								></textarea>
 								<div class="mt-2">
-									<button type="button" class="btn btn-neutral" on:click={generateDesc}
-										>Generate Description</button
+									<div
+										class="tooltip tooltip-right"
+										data-tip="Pulls excerpt from Wikipedia article matching the name of the adventure."
 									>
+										<button type="button" class="btn btn-neutral" on:click={generateDesc}
+											>Generate Description</button
+										>
+									</div>
 									<p class="text-red-500">{wikiError}</p>
 								</div>
 							</div>
@@ -558,13 +563,12 @@
 						</div>
 					</div>
 
-					<div class="collapse collapse-plus bg-base-200 mb-4">
+					<div class="collapse collapse-plus bg-base-200 mb-4 overflow-visible">
 						<input type="checkbox" />
 						<div class="collapse-title text-xl font-medium">
 							Activity Types ({adventure.activity_types?.length || 0})
 						</div>
 						<div class="collapse-content">
-							<label for="activity_types">Activity Types</label><br />
 							<input
 								type="text"
 								id="activity_types"
@@ -583,7 +587,7 @@
 							Visits ({adventure.visits.length})
 						</div>
 						<div class="collapse-content">
-							<p>hello</p>
+							<p>Coming soon!</p>
 						</div>
 					</div>
 
diff --git a/frontend/src/routes/adventures/[id]/+page.svelte b/frontend/src/routes/adventures/[id]/+page.svelte
index a5ffd1b..085809f 100644
--- a/frontend/src/routes/adventures/[id]/+page.svelte
+++ b/frontend/src/routes/adventures/[id]/+page.svelte
@@ -185,7 +185,7 @@
 									>{adventure.is_public ? 'Public' : 'Private'}</span
 								>
 							</div>
-							{#if adventure.date}
+							<!-- {#if adventure.date}
 								<div class="flex items-center gap-2">
 									<svg
 										xmlns="http://www.w3.org/2000/svg"
@@ -215,7 +215,7 @@
 											: ''}</span
 									>
 								</div>
-							{/if}
+							{/if} -->
 							{#if adventure.location}
 								<div class="flex items-center gap-2">
 									<svg
@@ -304,11 +304,11 @@
 				></div>
 				<div class="grid gap-8">
 					<div>
-						<h2 class="text-2xl font-bold mt-4">Trip Details</h2>
+						<h2 class="text-2xl font-bold mt-4">Adventure Details</h2>
 						<div class="grid gap-4 mt-4">
 							<div class="grid md:grid-cols-2 gap-4">
 								<div>
-									<p class="text-sm text-muted-foreground">Trip Type</p>
+									<p class="text-sm text-muted-foreground">Adventure Type</p>
 									<p class="text-base font-medium">
 										{adventure.type[0].toLocaleUpperCase() + adventure.type.slice(1)}
 									</p>
@@ -353,11 +353,11 @@
 												{adventure.type.charAt(0).toUpperCase() + adventure.type.slice(1)}
 											</p>
 											<p>
-												{adventure.date
+												<!-- {adventure.date
 													? new Date(adventure.date).toLocaleDateString(undefined, {
 															timeZone: 'UTC'
 														})
-													: ''}
+													: ''} -->
 											</p>
 										</Popup>
 									</DefaultMarker>

From b9cae8a6874473d98831fdda6b9babded6f81bd4 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Tue, 1 Oct 2024 09:32:02 -0400
Subject: [PATCH 10/15] Fix adventure grouping in collections

---
 backend/server/templates/home.html            |  18 +-
 .../src/lib/components/AdventureModal.svelte  | 268 ++++++++++--------
 frontend/src/lib/index.ts                     |  36 +--
 .../src/routes/collections/[id]/+page.svelte  |  11 +-
 4 files changed, 176 insertions(+), 157 deletions(-)

diff --git a/backend/server/templates/home.html b/backend/server/templates/home.html
index 3f01ae6..7b90001 100644
--- a/backend/server/templates/home.html
+++ b/backend/server/templates/home.html
@@ -1,10 +1,10 @@
-{% extends "base.html" %}
-
-{% block content %}
-  <!-- Main jumbotron for a primary marketing message or call to action -->
-  <div class="jumbotron">
-    <h1>AdventureLog API Server</h1>
-    <p>Welcome to the server side of AdventureLog!</p>
-    <p>This site is only ment for administrative users</p>
-  </div>
+{% extends "base.html" %} {% block content %}
+<!-- Main jumbotron for a primary marketing message or call to action -->
+<div class="jumbotron">
+  <h1>AdventureLog API Server</h1>
+  <p>
+    <a class="btn btn-primary btn-lg" href="/admin" role="button">Admin Site</a>
+    <a class="btn btn-secondary btn-lg" href="/docs" role="button">API Docs</a>
+  </p>
+</div>
 {% endblock %}
diff --git a/frontend/src/lib/components/AdventureModal.svelte b/frontend/src/lib/components/AdventureModal.svelte
index c9d8054..3970ede 100644
--- a/frontend/src/lib/components/AdventureModal.svelte
+++ b/frontend/src/lib/components/AdventureModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { createEventDispatcher } from 'svelte';
-	import type { Adventure, OpenStreetMapPlace, Point } from '$lib/types';
+	import type { Adventure, Collection, OpenStreetMapPlace, Point } from '$lib/types';
 	import { onMount } from 'svelte';
 	import { enhance } from '$app/forms';
 	import { addToast } from '$lib/toasts';
@@ -8,9 +8,7 @@
 
 	export let longitude: number | null = null;
 	export let latitude: number | null = null;
-	export let collection_id: string | null = null;
-
-	export let is_collection: boolean = false;
+	export let collection: Collection | null = null;
 
 	import { DefaultMarker, MapEvents, MapLibre } from 'svelte-maplibre';
 
@@ -19,21 +17,14 @@
 	let images: { id: string; image: string }[] = [];
 	let warningMessage: string = '';
 
-	import Earth from '~icons/mdi/earth';
 	import ActivityComplete from './ActivityComplete.svelte';
 	import { appVersion } from '$lib/config';
 	import { ADVENTURE_TYPES } from '$lib';
 
-	export let startDate: string | null = null;
-	export let endDate: string | null = null;
-
 	let wikiError: string = '';
 
 	let noPlaces: boolean = false;
 
-	let region_name: string | null = null;
-	let region_id: string | null = null;
-
 	let adventure: Adventure = {
 		id: '',
 		name: '',
@@ -49,7 +40,7 @@
 		location: null,
 		images: [],
 		user_id: null,
-		collection: collection_id || null
+		collection: collection?.id || null
 	};
 
 	export let adventureToEdit: Adventure | null = null;
@@ -68,9 +59,8 @@
 		location: adventureToEdit?.location || null,
 		images: adventureToEdit?.images || [],
 		user_id: adventureToEdit?.user_id || null,
-		collection: adventureToEdit?.collection || collection_id || null,
+		collection: adventureToEdit?.collection || collection?.id || null,
 		visits: adventureToEdit?.visits || []
-		//visits: []
 	};
 
 	let markers: Point[] = [];
@@ -91,7 +81,6 @@
 				activity_type: ''
 			}
 		];
-		checkPointInRegion();
 	}
 
 	if (longitude && latitude) {
@@ -109,8 +98,6 @@
 	function clearMap() {
 		console.log('CLEAR');
 		markers = [];
-		region_id = null;
-		region_name = null;
 	}
 
 	let imageSearch: string = adventure.name || '';
@@ -147,13 +134,6 @@
 		}
 	}
 
-	$: {
-		if (adventure.type != 'visited') {
-			region_id = null;
-			region_name = null;
-		}
-	}
-
 	async function fetchImage() {
 		let res = await fetch(url);
 		let data = await res.blob();
@@ -236,6 +216,37 @@
 		}
 	}
 
+	let new_start_date: string = '';
+	let new_end_date: string = '';
+	let new_notes: string = '';
+	function addNewVisit() {
+		// check if start date is before end date
+		if (new_start_date > new_end_date) {
+			addToast('error', 'Start date must be before end date');
+			return;
+		}
+		if (new_start_date === '' || new_end_date === '') {
+			addToast('error', 'Please enter a start and end date');
+			return;
+		}
+		if (new_end_date && !new_start_date) {
+			addToast('error', 'Please enter a start date');
+			return;
+		}
+		adventure.visits = [
+			...adventure.visits,
+			{
+				start_date: new_start_date,
+				end_date: new_end_date,
+				notes: new_notes,
+				id: ''
+			}
+		];
+		new_start_date = '';
+		new_end_date = '';
+		new_notes = '';
+	}
+
 	async function reverseGeocode() {
 		let res = await fetch(
 			`https://nominatim.openstreetmap.org/search?q=${adventure.latitude},${adventure.longitude}&format=jsonv2`,
@@ -259,7 +270,6 @@
 						activity_type: data[0]?.type || ''
 					}
 				];
-				checkPointInRegion();
 			}
 		}
 		console.log(data);
@@ -297,29 +307,6 @@
 		}
 	}
 
-	async function checkPointInRegion() {
-		if (adventure.type == 'visited') {
-			let lat = markers[0].lngLat.lat;
-			let lon = markers[0].lngLat.lng;
-			let res = await fetch(`/api/countries/check_point_in_region/?lat=${lat}&lon=${lon}`);
-			let data = await res.json();
-			if (data.error) {
-				addToast('error', data.error);
-			} else {
-				if (data.in_region) {
-					region_name = data.region_name;
-					region_id = data.region_id;
-				} else {
-					region_id = null;
-					region_name = null;
-				}
-			}
-		} else {
-			region_id = null;
-			region_name = null;
-		}
-	}
-
 	async function addMarker(e: CustomEvent<any>) {
 		markers = [];
 		markers = [
@@ -331,8 +318,6 @@
 				activity_type: ''
 			}
 		];
-		checkPointInRegion();
-
 		console.log(markers);
 	}
 
@@ -355,20 +340,6 @@
 
 	async function handleSubmit(event: Event) {
 		event.preventDefault();
-
-		if (region_id && region_name) {
-			let res = await fetch(`/api/visitedregion/`, {
-				method: 'POST',
-				headers: {
-					'Content-Type': 'application/json'
-				},
-				body: JSON.stringify({ region: region_id })
-			});
-			if (res.ok) {
-				addToast('success', `Region ${region_name} marked as visited`);
-			}
-		}
-
 		console.log(adventure);
 		if (adventure.id === '') {
 			let res = await fetch('/api/adventures', {
@@ -544,7 +515,7 @@
 									<p class="text-red-500">{wikiError}</p>
 								</div>
 							</div>
-							{#if !collection_id}
+							{#if !collection?.id}
 								<div>
 									<div class="form-control flex items-start mt-1">
 										<label class="label cursor-pointer flex items-start space-x-2">
@@ -563,34 +534,6 @@
 						</div>
 					</div>
 
-					<div class="collapse collapse-plus bg-base-200 mb-4 overflow-visible">
-						<input type="checkbox" />
-						<div class="collapse-title text-xl font-medium">
-							Activity Types ({adventure.activity_types?.length || 0})
-						</div>
-						<div class="collapse-content">
-							<input
-								type="text"
-								id="activity_types"
-								name="activity_types"
-								hidden
-								bind:value={adventure.activity_types}
-								class="input input-bordered w-full"
-							/>
-							<ActivityComplete bind:activities={adventure.activity_types} />
-						</div>
-					</div>
-
-					<div class="collapse collapse-plus bg-base-200 mb-4">
-						<input type="checkbox" />
-						<div class="collapse-title text-xl font-medium">
-							Visits ({adventure.visits.length})
-						</div>
-						<div class="collapse-content">
-							<p>Coming soon!</p>
-						</div>
-					</div>
-
 					<div class="collapse collapse-plus bg-base-200 mb-4">
 						<input type="checkbox" />
 						<div class="collapse-title text-xl font-medium">Location Information</div>
@@ -640,7 +583,6 @@
 															activity_type: place.type
 														}
 													];
-													checkPointInRegion();
 												}}
 											>
 												{place.display_name}
@@ -668,13 +610,117 @@ it would also work to just use on:click on the MapLibre component itself. -->
 									{/each}
 								</MapLibre>
 							</div>
-							{#if region_name}
-								<p class="text-lg font-semibold mt-2">Region: {region_name} ({region_id})</p>
-							{/if}
 						</div>
 					</div>
 
-					<!-- ---OLD--- -->
+					<div class="collapse collapse-plus bg-base-200 mb-4 overflow-visible">
+						<input type="checkbox" />
+						<div class="collapse-title text-xl font-medium">
+							Activity Types ({adventure.activity_types?.length || 0})
+						</div>
+						<div class="collapse-content">
+							<input
+								type="text"
+								id="activity_types"
+								name="activity_types"
+								hidden
+								bind:value={adventure.activity_types}
+								class="input input-bordered w-full"
+							/>
+							<ActivityComplete bind:activities={adventure.activity_types} />
+						</div>
+					</div>
+
+					<div class="collapse collapse-plus bg-base-200 mb-4">
+						<input type="checkbox" />
+						<div class="collapse-title text-xl font-medium">
+							Visits ({adventure.visits.length})
+						</div>
+						<div class="collapse-content">
+							<label class="label cursor-pointer flex items-start space-x-2">
+								<span class="label-text">Constrain to collection dates</span>
+								<input
+									type="checkbox"
+									class="toggle toggle-primary"
+									id="is_public"
+									name="is_public"
+								/>
+								<!-- TODO: implement this constrain -->
+							</label>
+							<div class="flex gap-2 mb-1">
+								<input
+									type="date"
+									class="input input-bordered w-full"
+									placeholder="Start Date"
+									bind:value={new_start_date}
+									on:keydown={(e) => {
+										if (e.key === 'Enter') {
+											e.preventDefault();
+											addNewVisit();
+										}
+									}}
+								/>
+								<input
+									type="date"
+									class="input input-bordered w-full"
+									placeholder="End Date"
+									bind:value={new_end_date}
+									on:keydown={(e) => {
+										if (e.key === 'Enter') {
+											e.preventDefault();
+											addNewVisit();
+										}
+									}}
+								/>
+							</div>
+							<div class="flex gap-2 mb-1">
+								<!-- textarea for notes -->
+								<textarea
+									class="textarea textarea-bordered w-full"
+									placeholder="Add notes"
+									bind:value={new_notes}
+									on:keydown={(e) => {
+										if (e.key === 'Enter') {
+											e.preventDefault();
+											addNewVisit();
+										}
+									}}
+								></textarea>
+							</div>
+
+							<div class="flex gap-2">
+								<button type="button" class="btn btn-neutral" on:click={addNewVisit}>Add</button>
+							</div>
+
+							{#if adventure.visits.length > 0}
+								<h2 class=" font-bold text-xl mt-2">My Visits</h2>
+								{#each adventure.visits as visit}
+									<div class="flex gap-2">
+										<p>
+											{new Date(visit.start_date).toLocaleDateString(undefined, {
+												timeZone: 'UTC'
+											})}
+										</p>
+										<p>
+											{new Date(visit.end_date).toLocaleDateString(undefined, { timeZone: 'UTC' })}
+										</p>
+										<p>{visit.notes}</p>
+										<div>
+											<button
+												type="button"
+												class="btn btn-sm btn-error mb-1"
+												on:click={() => {
+													adventure.visits = adventure.visits.filter((v) => v !== visit);
+												}}
+											>
+												Remove
+											</button>
+										</div>
+									</div>
+								{/each}
+							{/if}
+						</div>
+					</div>
 
 					<div>
 						<div class="mt-4">
@@ -798,29 +844,3 @@ it would also work to just use on:click on the MapLibre component itself. -->
 		{/if}
 	</div>
 </dialog>
-
-<!-- {#each adventure.visits as visit}
-								<div class="flex flex-row">
-									<p>
-										{new Date(visit.start_date).toLocaleDateString(undefined, { timeZone: 'UTC' })}
-										{#if visit.end_date}
-											- {new Date(visit.end_date).toLocaleDateString(undefined, {
-												timeZone: 'UTC'
-											})}
-										{/if}
-									</p>
-									
-									<button
-										type="button"
-										class="btn btn-sm btn-error absolute right-0 mt-2.5 mr-4"
-										on:click={() => {
-											adventure.visits = adventure.visits.filter((v) => v.id !== visit.id);
-										}}
-									>
-										Remove
-									</button>
-								</div>
-							{/each}
-							{#if adventure.visits.length == 0}
-								<p>No visits</p>
-							{/if} -->
diff --git a/frontend/src/lib/index.ts b/frontend/src/lib/index.ts
index 9308b46..1bb609a 100644
--- a/frontend/src/lib/index.ts
+++ b/frontend/src/lib/index.ts
@@ -66,29 +66,31 @@ export function groupAdventuresByDate(
 	}
 
 	adventures.forEach((adventure) => {
-		if (adventure.date) {
-			const adventureDate = new Date(adventure.date).toISOString().split('T')[0];
-			if (adventure.end_date) {
-				const endDate = new Date(adventure.end_date).toISOString().split('T')[0];
+		adventure.visits.forEach((visit) => {
+			if (visit.start_date) {
+				const adventureDate = new Date(visit.start_date).toISOString().split('T')[0];
+				if (visit.end_date) {
+					const endDate = new Date(visit.end_date).toISOString().split('T')[0];
 
-				// Loop through all days and include adventure if it falls within the range
-				for (let i = 0; i < numberOfDays; i++) {
-					const currentDate = new Date(startDate);
-					currentDate.setUTCDate(startDate.getUTCDate() + i);
-					const dateString = currentDate.toISOString().split('T')[0];
+					// Loop through all days and include adventure if it falls within the range
+					for (let i = 0; i < numberOfDays; i++) {
+						const currentDate = new Date(startDate);
+						currentDate.setUTCDate(startDate.getUTCDate() + i);
+						const dateString = currentDate.toISOString().split('T')[0];
 
-					// Include the current day if it falls within the adventure date range
-					if (dateString >= adventureDate && dateString <= endDate) {
-						if (groupedAdventures[dateString]) {
-							groupedAdventures[dateString].push(adventure);
+						// Include the current day if it falls within the adventure date range
+						if (dateString >= adventureDate && dateString <= endDate) {
+							if (groupedAdventures[dateString]) {
+								groupedAdventures[dateString].push(adventure);
+							}
 						}
 					}
+				} else if (groupedAdventures[adventureDate]) {
+					// If there's no end date, add adventure to the start date only
+					groupedAdventures[adventureDate].push(adventure);
 				}
-			} else if (groupedAdventures[adventureDate]) {
-				// If there's no end date, add adventure to the start date only
-				groupedAdventures[adventureDate].push(adventure);
 			}
-		}
+		});
 	});
 
 	return groupedAdventures;
diff --git a/frontend/src/routes/collections/[id]/+page.svelte b/frontend/src/routes/collections/[id]/+page.svelte
index 0bea574..97fe05d 100644
--- a/frontend/src/routes/collections/[id]/+page.svelte
+++ b/frontend/src/routes/collections/[id]/+page.svelte
@@ -185,10 +185,7 @@
 		{adventureToEdit}
 		on:close={() => (isAdventureModalOpen = false)}
 		on:save={saveOrCreate}
-		collection_id={collection.id}
-		startDate={collection.start_date}
-		endDate={collection.end_date}
-		is_collection={true}
+		{collection}
 	/>
 {/if}
 
@@ -598,11 +595,11 @@
 							<p class="font-semibold text-black text-md">
 								{adventure.type.charAt(0).toUpperCase() + adventure.type.slice(1)}
 							</p>
-							<p>
-								{adventure.date
+							<!-- <p>
+								{adventure.
 									? new Date(adventure.date).toLocaleDateString(undefined, { timeZone: 'UTC' })
 									: ''}
-							</p>
+							</p> -->
 						</Popup>
 					</DefaultMarker>
 				{/if}

From 5ff4f66fdb73ea9b37ddfa8e65c38c4646627235 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Tue, 1 Oct 2024 21:15:27 -0400
Subject: [PATCH 11/15] Filter in sidebar of adventures list page!

---
 .../components/CategoryFilterDropdown.svelte  | 50 +++++++++++++++++++
 .../src/routes/adventures/+page.server.ts     | 10 ++--
 frontend/src/routes/adventures/+page.svelte   | 46 +++++++++--------
 3 files changed, 80 insertions(+), 26 deletions(-)
 create mode 100644 frontend/src/lib/components/CategoryFilterDropdown.svelte

diff --git a/frontend/src/lib/components/CategoryFilterDropdown.svelte b/frontend/src/lib/components/CategoryFilterDropdown.svelte
new file mode 100644
index 0000000..1d7c40b
--- /dev/null
+++ b/frontend/src/lib/components/CategoryFilterDropdown.svelte
@@ -0,0 +1,50 @@
+<script lang="ts">
+	import { ADVENTURE_TYPES } from '$lib';
+	import { onMount } from 'svelte';
+
+	let types_arr: string[] = [];
+	export let types: string;
+
+	onMount(() => {
+		console.log(types);
+		types_arr = types.split(',');
+	});
+
+	function clearTypes() {
+		types = '';
+		types_arr = [];
+	}
+
+	function toggleSelect(type: string) {
+		if (types_arr.includes(type)) {
+			types_arr = types_arr.filter((t) => t !== type);
+		} else {
+			types_arr.push(type);
+		}
+		types = types_arr.join(',');
+		console.log(types);
+		console.log(types_arr);
+	}
+</script>
+
+<div class="collapse collapse-plus bg-base-300 mb-4 overflow-visible">
+	<input type="checkbox" />
+	<div class="collapse-title text-xl font-medium">Category Filter</div>
+	<div class="collapse-content">
+		<button class="btn btn-wide mb-1 btn-neutral-300" on:click={clearTypes}>Clear</button>
+		{#each ADVENTURE_TYPES as type}
+			<!-- checkbox for each -->
+			<li>
+				<label class="cursor-pointer">
+					<input
+						type="checkbox"
+						value={type.label}
+						on:change={() => toggleSelect(type.type)}
+						checked={types.indexOf(type.type) > -1}
+					/>
+					<span>{type.label}</span>
+				</label>
+			</li>
+		{/each}
+	</div>
+</div>
diff --git a/frontend/src/routes/adventures/+page.server.ts b/frontend/src/routes/adventures/+page.server.ts
index a8b097f..25be557 100644
--- a/frontend/src/routes/adventures/+page.server.ts
+++ b/frontend/src/routes/adventures/+page.server.ts
@@ -16,12 +16,12 @@ export const load = (async (event) => {
 		let count = 0;
 		let adventures: Adventure[] = [];
 
-		// const visited = event.url.searchParams.get('visited');
-		// const planned = event.url.searchParams.get('planned');
+		let typeString = event.url.searchParams.get('types');
 
-		let typeString: string = 'all';
-
-		// *** FOR NOW TYPESTRING IS ALWAYS 'ALL' BECAUSE WE DON'T HAVE A WAY TO FILTER BY VISITED/PLANNED YET ***
+		// If no type is specified, default to 'all'
+		if (!typeString) {
+			typeString = 'all';
+		}
 
 		const include_collections = event.url.searchParams.get('include_collections') || 'false';
 		const order_by = event.url.searchParams.get('order_by') || 'updated_at';
diff --git a/frontend/src/routes/adventures/+page.svelte b/frontend/src/routes/adventures/+page.svelte
index 100db4e..2e6c270 100644
--- a/frontend/src/routes/adventures/+page.svelte
+++ b/frontend/src/routes/adventures/+page.svelte
@@ -4,6 +4,7 @@
 	import { page } from '$app/stores';
 	import AdventureCard from '$lib/components/AdventureCard.svelte';
 	import AdventureModal from '$lib/components/AdventureModal.svelte';
+	import CategoryFilterDropdown from '$lib/components/CategoryFilterDropdown.svelte';
 	import NotFound from '$lib/components/NotFound.svelte';
 	import type { Adventure } from '$lib/types';
 
@@ -28,6 +29,28 @@
 	let totalPages = Math.ceil(count / resultsPerPage);
 	let currentPage: number = 1;
 
+	let typeString: string = '';
+
+	$: {
+		if (typeof window !== 'undefined') {
+			let url = new URL(window.location.href);
+			url.searchParams.set('types', typeString);
+			goto(url.toString(), { invalidateAll: true, replaceState: true });
+		}
+	}
+
+	// sets typeString if present in the URL
+	$: {
+		// check to make sure its running on the client side
+		if (typeof window !== 'undefined') {
+			let url = new URL(window.location.href);
+			let types = url.searchParams.get('types');
+			if (types) {
+				typeString = types;
+			}
+		}
+	}
+
 	function handleChangePage(pageNumber: number) {
 		// let query = new URLSearchParams($page.url.searchParams.toString());
 
@@ -218,27 +241,8 @@
 			<div class="form-control">
 				<!-- <h3 class="text-center font-bold text-lg mb-4">Adventure Types</h3> -->
 				<form method="get">
-					<!-- <label class="label cursor-pointer">
-						<span class="label-text">Completed</span>
-						<input
-							type="checkbox"
-							name="visited"
-							id="visited"
-							class="checkbox checkbox-primary"
-							checked={currentSort.visited}
-						/>
-					</label>
-					<label class="label cursor-pointer">
-						<span class="label-text">Planned</span>
-						<input
-							type="checkbox"
-							id="planned"
-							name="planned"
-							class="checkbox checkbox-primary"
-							checked={currentSort.planned}
-						/>
-					</label> -->
-					<!-- <div class="divider"></div> -->
+					<CategoryFilterDropdown bind:types={typeString} />
+					<div class="divider"></div>
 					<h3 class="text-center font-bold text-lg mb-4">Sort</h3>
 					<p class="text-lg font-semibold mb-2">Order Direction</p>
 					<div class="join">

From d0791faad58c6d88e4cdbb7768a7abc24c2db072 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Fri, 4 Oct 2024 09:49:35 -0400
Subject: [PATCH 12/15] Update map filtering

---
 .../src/lib/components/AdventureCard.svelte   |  5 ++--
 .../components/CategoryFilterDropdown.svelte  |  9 +++---
 frontend/src/lib/index.ts                     | 19 ++++++++++++
 frontend/src/routes/map/+page.server.ts       | 20 +++++++++----
 frontend/src/routes/map/+page.svelte          | 29 ++++++++++---------
 5 files changed, 56 insertions(+), 26 deletions(-)

diff --git a/frontend/src/lib/components/AdventureCard.svelte b/frontend/src/lib/components/AdventureCard.svelte
index 2494ae3..d5b2f06 100644
--- a/frontend/src/lib/components/AdventureCard.svelte
+++ b/frontend/src/lib/components/AdventureCard.svelte
@@ -19,7 +19,7 @@
 	import DotsHorizontal from '~icons/mdi/dots-horizontal';
 	import DeleteWarning from './DeleteWarning.svelte';
 	import ImageDisplayModal from './ImageDisplayModal.svelte';
-	import { typeToString } from '$lib';
+	import { isAdventureVisited, typeToString } from '$lib';
 
 	export let type: string;
 	export let user: User | null;
@@ -28,7 +28,6 @@
 	let isCollectionModalOpen: boolean = false;
 	let isWarningModalOpen: boolean = false;
 
-	let keyword: string = '';
 	let image_url: string | null = null;
 	export let adventure: Adventure;
 
@@ -201,7 +200,7 @@
 		</div>
 		<div>
 			<div class="badge badge-primary">{typeToString(adventure.type)}</div>
-			<div class="badge badge-success">{adventure.visits.length > 0 ? 'Visited' : 'Planned'}</div>
+			<div class="badge badge-success">{isAdventureVisited(adventure) ? 'Visited' : 'Planned'}</div>
 			<div class="badge badge-secondary">{adventure.is_public ? 'Public' : 'Private'}</div>
 		</div>
 		{#if adventure.location && adventure.location !== ''}
diff --git a/frontend/src/lib/components/CategoryFilterDropdown.svelte b/frontend/src/lib/components/CategoryFilterDropdown.svelte
index 1d7c40b..ce0683d 100644
--- a/frontend/src/lib/components/CategoryFilterDropdown.svelte
+++ b/frontend/src/lib/components/CategoryFilterDropdown.svelte
@@ -27,13 +27,12 @@
 	}
 </script>
 
-<div class="collapse collapse-plus bg-base-300 mb-4 overflow-visible">
+<div class="collapse collapse-plus mb-4">
 	<input type="checkbox" />
-	<div class="collapse-title text-xl font-medium">Category Filter</div>
-	<div class="collapse-content">
-		<button class="btn btn-wide mb-1 btn-neutral-300" on:click={clearTypes}>Clear</button>
+	<div class="collapse-title text-xl bg-base-300 font-medium">Category Filter</div>
+	<div class="collapse-content bg-base-300">
+		<button class="btn btn-wide btn-neutral-300" on:click={clearTypes}>Clear</button>
 		{#each ADVENTURE_TYPES as type}
-			<!-- checkbox for each -->
 			<li>
 				<label class="cursor-pointer">
 					<input
diff --git a/frontend/src/lib/index.ts b/frontend/src/lib/index.ts
index 1bb609a..548280b 100644
--- a/frontend/src/lib/index.ts
+++ b/frontend/src/lib/index.ts
@@ -252,3 +252,22 @@ export function typeToString(type: string) {
 		return 'Unknown';
 	}
 }
+
+/**
+ * Checks if an adventure has been visited.
+ *
+ * This function determines if the `adventure.visits` array contains at least one visit
+ * with a `start_date` that is before the current date.
+ *
+ * @param adventure - The adventure object to check.
+ * @returns `true` if the adventure has been visited, otherwise `false`.
+ */
+export function isAdventureVisited(adventure: Adventure) {
+	const currentTime = Date.now();
+
+	// Check if any visit's start_date is before the current time.
+	return adventure.visits.some((visit) => {
+		const visitStartTime = new Date(visit.start_date).getTime();
+		return visit.start_date && visitStartTime <= currentTime;
+	});
+}
diff --git a/frontend/src/routes/map/+page.server.ts b/frontend/src/routes/map/+page.server.ts
index af9352b..984a563 100644
--- a/frontend/src/routes/map/+page.server.ts
+++ b/frontend/src/routes/map/+page.server.ts
@@ -8,7 +8,7 @@ export const load = (async (event) => {
 	if (!event.locals.user) {
 		return redirect(302, '/login');
 	} else {
-		let visitedFetch = await fetch(`${endpoint}/api/adventures/all/`, {
+		let visitedFetch = await fetch(`${endpoint}/api/adventures/`, {
 			headers: {
 				Cookie: `${event.cookies.get('auth')}`
 			}
@@ -25,16 +25,26 @@ export const load = (async (event) => {
 			console.error('Failed to fetch visited adventures');
 			return redirect(302, '/login');
 		} else {
-			let visited = (await visitedFetch.json()) as Adventure[];
+			let visited: Adventure[] = [];
+			try {
+				let api_result = await visitedFetch.json();
+				visited = api_result.results as Adventure[];
+				if (!Array.isArray(visited) || visited.length === 0 || !visited) {
+					throw new Error('Visited adventures response is not an array');
+				}
+			} catch (error) {
+				console.error('Error parsing visited adventures:', error);
+				return redirect(302, '/login');
+			}
+
 			// make a long lat array like this { lngLat: [-20, 0], name: 'Adventure 1' },
 			let markers = visited
 				.filter((adventure) => adventure.latitude !== null && adventure.longitude !== null)
 				.map((adventure) => {
 					return {
-						lngLat: [adventure.longitude, adventure.latitude] as [number, number],
+						lngLat: [adventure.longitude, adventure.latitude],
 						name: adventure.name,
-						type: adventure.type,
-						collection: adventure.collection
+						visits: adventure.visits
 					};
 				});
 
diff --git a/frontend/src/routes/map/+page.svelte b/frontend/src/routes/map/+page.svelte
index 5c10b8e..c1b38fc 100644
--- a/frontend/src/routes/map/+page.svelte
+++ b/frontend/src/routes/map/+page.svelte
@@ -1,5 +1,7 @@
 <script>
 	// @ts-nocheck
+
+	import { isAdventureVisited } from '$lib';
 	import AdventureModal from '$lib/components/AdventureModal.svelte';
 	import {
 		DefaultMarker,
@@ -16,12 +18,14 @@
 
 	let clickedName = '';
 
+	console.log(data);
+
 	let showVisited = true;
 	let showPlanned = true;
 
 	$: filteredMarkers = markers.filter(
 		(marker) =>
-			(showVisited && marker.type === 'visited') || (showPlanned && marker.type === 'planned')
+			(showVisited && isAdventureVisited(marker)) || (showPlanned && !isAdventureVisited(marker))
 	);
 
 	let newMarker = [];
@@ -46,7 +50,8 @@
 		let newMarker = {
 			lngLat: [event.detail.longitude, event.detail.latitude],
 			name: event.detail.name,
-			type: event.detail.type
+			type: event.detail.type,
+			visits: event.detail.visits
 		};
 		markers = [...markers, newMarker];
 		clearMarkers();
@@ -138,11 +143,11 @@
 	class="relative aspect-[9/16] max-h-[70vh] w-full sm:aspect-video sm:max-h-full"
 	standardControls
 >
-	{#each filteredMarkers as { lngLat, name, type }}
-		{#if type == 'visited'}
+	{#each filteredMarkers as marker}
+		{#if isAdventureVisited(marker)}
 			<Marker
-				{lngLat}
-				on:click={() => (clickedName = name)}
+				lngLat={marker.lngLat}
+				on:click={() => (clickedName = marker.name)}
 				class="grid h-8 w-8 place-items-center rounded-full border border-gray-200 bg-red-300 text-black shadow-md"
 			>
 				<svg
@@ -155,16 +160,14 @@
 					<circle cx="12" cy="12" r="10" stroke="red" stroke-width="2" fill="red" />
 				</svg>
 				<Popup openOn="click" offset={[0, -10]}>
-					<div class="text-lg text-black font-bold">{name}</div>
+					<div class="text-lg text-black font-bold">{marker.name}</div>
 					<p class="font-semibold text-black text-md">Visited</p>
 				</Popup>
 			</Marker>
-		{/if}
-
-		{#if type == 'planned'}
+		{:else}
 			<Marker
-				{lngLat}
-				on:click={() => (clickedName = name)}
+				lngLat={marker.lngLat}
+				on:click={() => (clickedName = marker.name)}
 				class="grid h-8 w-8 place-items-center rounded-full border border-gray-200 bg-blue-300 text-black shadow-2xl focus:outline-2 focus:outline-black"
 			>
 				<svg
@@ -177,7 +180,7 @@
 					<circle cx="12" cy="12" r="10" stroke="blue" stroke-width="2" fill="blue" />
 				</svg>
 				<Popup openOn="click" offset={[0, -10]}>
-					<div class="text-lg text-black font-bold">{name}</div>
+					<div class="text-lg text-black font-bold">{marker.name}</div>
 					<p class="font-semibold text-black text-md">Planned</p>
 				</Popup>
 			</Marker>

From f354cd1ffeb9078abccd5dbd355acd377892afa4 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Fri, 4 Oct 2024 21:33:02 -0400
Subject: [PATCH 13/15] Refactor release workflow to use "released" event type

---
 .github/workflows/backend-release.yml         |   2 +-
 .github/workflows/frontend-release.yml        |   2 +-
 .../src/lib/components/AdventureLink.svelte   |   4 +-
 .../src/lib/components/AdventureModal.svelte  | 143 +++++++++++-------
 .../src/routes/adventures/[id]/+page.svelte   |  31 +++-
 5 files changed, 125 insertions(+), 57 deletions(-)

diff --git a/.github/workflows/backend-release.yml b/.github/workflows/backend-release.yml
index e12143c..696f8b5 100644
--- a/.github/workflows/backend-release.yml
+++ b/.github/workflows/backend-release.yml
@@ -2,7 +2,7 @@ name: Upload the tagged release backend image to GHCR and Docker Hub
 
 on:
   release:
-    types: [published]
+    types: [released]
 
 env:
   IMAGE_NAME: "adventurelog-backend"
diff --git a/.github/workflows/frontend-release.yml b/.github/workflows/frontend-release.yml
index a73af32..bb7fc6b 100644
--- a/.github/workflows/frontend-release.yml
+++ b/.github/workflows/frontend-release.yml
@@ -2,7 +2,7 @@ name: Upload tagged release frontend image to GHCR and Docker Hub
 
 on:
   release:
-    types: [published]
+    types: [released]
 
 env:
   IMAGE_NAME: "adventurelog-frontend"
diff --git a/frontend/src/lib/components/AdventureLink.svelte b/frontend/src/lib/components/AdventureLink.svelte
index b1bb85f..cb4551b 100644
--- a/frontend/src/lib/components/AdventureLink.svelte
+++ b/frontend/src/lib/components/AdventureLink.svelte
@@ -19,14 +19,14 @@
 		if (modal) {
 			modal.showModal();
 		}
-		let res = await fetch(`/api/adventures/all/?include_collections=false`, {
+		let res = await fetch(`/api/adventures/?include_collections=false`, {
 			method: 'GET'
 		});
 
 		const newAdventures = await res.json();
 
 		if (res.ok && adventures) {
-			adventures = newAdventures;
+			adventures = newAdventures.results;
 		}
 		isLoading = false;
 	});
diff --git a/frontend/src/lib/components/AdventureModal.svelte b/frontend/src/lib/components/AdventureModal.svelte
index 3970ede..d8889d7 100644
--- a/frontend/src/lib/components/AdventureModal.svelte
+++ b/frontend/src/lib/components/AdventureModal.svelte
@@ -16,6 +16,7 @@
 	let places: OpenStreetMapPlace[] = [];
 	let images: { id: string; image: string }[] = [];
 	let warningMessage: string = '';
+	let constrainDates: boolean = false;
 
 	import ActivityComplete from './ActivityComplete.svelte';
 	import { appVersion } from '$lib/config';
@@ -638,40 +639,73 @@ it would also work to just use on:click on the MapLibre component itself. -->
 						</div>
 						<div class="collapse-content">
 							<label class="label cursor-pointer flex items-start space-x-2">
-								<span class="label-text">Constrain to collection dates</span>
-								<input
-									type="checkbox"
-									class="toggle toggle-primary"
-									id="is_public"
-									name="is_public"
-								/>
-								<!-- TODO: implement this constrain -->
+								{#if adventure.collection && collection && collection.start_date && collection.end_date}
+									<span class="label-text">Constrain to collection dates</span>
+									<input
+										type="checkbox"
+										class="toggle toggle-primary"
+										id="constrain_dates"
+										name="constrain_dates"
+										on:change={() => (constrainDates = !constrainDates)}
+									/>
+								{/if}
 							</label>
 							<div class="flex gap-2 mb-1">
-								<input
-									type="date"
-									class="input input-bordered w-full"
-									placeholder="Start Date"
-									bind:value={new_start_date}
-									on:keydown={(e) => {
-										if (e.key === 'Enter') {
-											e.preventDefault();
-											addNewVisit();
-										}
-									}}
-								/>
-								<input
-									type="date"
-									class="input input-bordered w-full"
-									placeholder="End Date"
-									bind:value={new_end_date}
-									on:keydown={(e) => {
-										if (e.key === 'Enter') {
-											e.preventDefault();
-											addNewVisit();
-										}
-									}}
-								/>
+								{#if !constrainDates}
+									<input
+										type="date"
+										class="input input-bordered w-full"
+										placeholder="Start Date"
+										bind:value={new_start_date}
+										on:keydown={(e) => {
+											if (e.key === 'Enter') {
+												e.preventDefault();
+												addNewVisit();
+											}
+										}}
+									/>
+									<input
+										type="date"
+										class="input input-bordered w-full"
+										placeholder="End Date"
+										bind:value={new_end_date}
+										on:keydown={(e) => {
+											if (e.key === 'Enter') {
+												e.preventDefault();
+												addNewVisit();
+											}
+										}}
+									/>
+								{:else}
+									<input
+										type="date"
+										class="input input-bordered w-full"
+										placeholder="Start Date"
+										min={collection?.start_date}
+										max={collection?.end_date}
+										bind:value={new_start_date}
+										on:keydown={(e) => {
+											if (e.key === 'Enter') {
+												e.preventDefault();
+												addNewVisit();
+											}
+										}}
+									/>
+									<input
+										type="date"
+										class="input input-bordered w-full"
+										placeholder="End Date"
+										bind:value={new_end_date}
+										min={collection?.start_date}
+										max={collection?.end_date}
+										on:keydown={(e) => {
+											if (e.key === 'Enter') {
+												e.preventDefault();
+												addNewVisit();
+											}
+										}}
+									/>
+								{/if}
 							</div>
 							<div class="flex gap-2 mb-1">
 								<!-- textarea for notes -->
@@ -695,27 +729,32 @@ it would also work to just use on:click on the MapLibre component itself. -->
 							{#if adventure.visits.length > 0}
 								<h2 class=" font-bold text-xl mt-2">My Visits</h2>
 								{#each adventure.visits as visit}
-									<div class="flex gap-2">
-										<p>
-											{new Date(visit.start_date).toLocaleDateString(undefined, {
-												timeZone: 'UTC'
-											})}
-										</p>
-										<p>
-											{new Date(visit.end_date).toLocaleDateString(undefined, { timeZone: 'UTC' })}
-										</p>
-										<p>{visit.notes}</p>
-										<div>
-											<button
-												type="button"
-												class="btn btn-sm btn-error mb-1"
-												on:click={() => {
-													adventure.visits = adventure.visits.filter((v) => v !== visit);
-												}}
-											>
-												Remove
-											</button>
+									<div class="flex flex-col gap-2">
+										<div class="flex gap-2">
+											<p>
+												{new Date(visit.start_date).toLocaleDateString(undefined, {
+													timeZone: 'UTC'
+												})}
+											</p>
+											<p>
+												{new Date(visit.end_date).toLocaleDateString(undefined, {
+													timeZone: 'UTC'
+												})}
+											</p>
+
+											<div>
+												<button
+													type="button"
+													class="btn btn-sm btn-error"
+													on:click={() => {
+														adventure.visits = adventure.visits.filter((v) => v !== visit);
+													}}
+												>
+													Remove
+												</button>
+											</div>
 										</div>
+										<p class="whitespace-pre-wrap -mt-2 mb-2">{visit.notes}</p>
 									</div>
 								{/each}
 							{/if}
diff --git a/frontend/src/routes/adventures/[id]/+page.svelte b/frontend/src/routes/adventures/[id]/+page.svelte
index 085809f..8f8b6fe 100644
--- a/frontend/src/routes/adventures/[id]/+page.svelte
+++ b/frontend/src/routes/adventures/[id]/+page.svelte
@@ -40,6 +40,7 @@
 	import EditAdventure from '$lib/components/AdventureModal.svelte';
 	import AdventureModal from '$lib/components/AdventureModal.svelte';
 	import ImageDisplayModal from '$lib/components/ImageDisplayModal.svelte';
+	import { typeToString } from '$lib';
 
 	onMount(() => {
 		if (data.props.adventure) {
@@ -310,7 +311,7 @@
 								<div>
 									<p class="text-sm text-muted-foreground">Adventure Type</p>
 									<p class="text-base font-medium">
-										{adventure.type[0].toLocaleUpperCase() + adventure.type.slice(1)}
+										{typeToString(adventure.type)}
 									</p>
 								</div>
 								{#if data.props.collection}
@@ -322,6 +323,34 @@
 										>
 									</div>
 								{/if}
+								{#if adventure.visits.length > 0}
+									<div>
+										<p class="text-sm text-muted-foreground">Visits</p>
+										<p class="text-base font-medium">
+											{adventure.visits.length}
+											{adventure.visits.length > 1 ? 'visits' : 'visit' + ':'}
+										</p>
+										<!-- show each visit start and end date as well as notes -->
+										{#each adventure.visits as visit}
+											<div class="grid gap-2">
+												<p class="text-sm text-muted-foreground">
+													{visit.start_date
+														? new Date(visit.start_date).toLocaleDateString(undefined, {
+																timeZone: 'UTC'
+															})
+														: ''}
+													{visit.end_date && visit.end_date !== ''
+														? ' - ' +
+															new Date(visit.end_date).toLocaleDateString(undefined, {
+																timeZone: 'UTC'
+															})
+														: ''}
+												</p>
+												<p class="text-sm text-muted-foreground -mt-2 mb-2">{visit.notes}</p>
+											</div>
+										{/each}
+									</div>
+								{/if}
 							</div>
 							{#if adventure.longitude && adventure.latitude}
 								<div class="grid md:grid-cols-2 gap-4">

From ed37ad45e4b9ae68c8688940b372d9f11ca8cf13 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Fri, 4 Oct 2024 21:56:43 -0400
Subject: [PATCH 14/15] Being back /all view for map AdventureLink

---
 backend/server/adventures/views.py            | 26 +++++++++----------
 .../src/lib/components/AdventureLink.svelte   |  4 +--
 .../src/lib/components/AdventureModal.svelte  | 12 +++++----
 frontend/src/routes/map/+page.server.ts       |  4 +--
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/backend/server/adventures/views.py b/backend/server/adventures/views.py
index 7280c68..8c71ba3 100644
--- a/backend/server/adventures/views.py
+++ b/backend/server/adventures/views.py
@@ -129,23 +129,21 @@ class AdventureViewSet(viewsets.ModelViewSet):
     def all(self, request):
         if not request.user.is_authenticated:
             return Response({"error": "User is not authenticated"}, status=400)
-        # include_collections = request.query_params.get('include_collections', 'false')
-        # if include_collections not in ['true', 'false']:
-        #     include_collections = 'false'
+        include_collections = request.query_params.get('include_collections', 'false')
+        if include_collections not in ['true', 'false']:
+            include_collections = 'false'
 
-        # if include_collections == 'true':
-        #     queryset = Adventure.objects.filter(
-        #         Q(is_public=True) | Q(user_id=request.user.id)
-        #     )
-        # else:
-        #     queryset = Adventure.objects.filter(
-        #         Q(is_public=True) | Q(user_id=request.user.id), collection=None
-        #     )
-        allowed_types = ['visited', 'planned']
+        if include_collections == 'true':
+            queryset = Adventure.objects.filter(
+                Q(is_public=True) | Q(user_id=request.user.id)
+            )
+        else:
+            queryset = Adventure.objects.filter(
+                Q(is_public=True) | Q(user_id=request.user.id), collection=None
+            )
         queryset = Adventure.objects.filter(
-            Q(user_id=request.user.id) & Q(type__in=allowed_types)
+            Q(user_id=request.user.id)
         )
-        
         queryset = self.apply_sorting(queryset)
         serializer = self.get_serializer(queryset, many=True)
        
diff --git a/frontend/src/lib/components/AdventureLink.svelte b/frontend/src/lib/components/AdventureLink.svelte
index cb4551b..b1bb85f 100644
--- a/frontend/src/lib/components/AdventureLink.svelte
+++ b/frontend/src/lib/components/AdventureLink.svelte
@@ -19,14 +19,14 @@
 		if (modal) {
 			modal.showModal();
 		}
-		let res = await fetch(`/api/adventures/?include_collections=false`, {
+		let res = await fetch(`/api/adventures/all/?include_collections=false`, {
 			method: 'GET'
 		});
 
 		const newAdventures = await res.json();
 
 		if (res.ok && adventures) {
-			adventures = newAdventures.results;
+			adventures = newAdventures;
 		}
 		isLoading = false;
 	});
diff --git a/frontend/src/lib/components/AdventureModal.svelte b/frontend/src/lib/components/AdventureModal.svelte
index d8889d7..3f39b3e 100644
--- a/frontend/src/lib/components/AdventureModal.svelte
+++ b/frontend/src/lib/components/AdventureModal.svelte
@@ -736,11 +736,13 @@ it would also work to just use on:click on the MapLibre component itself. -->
 													timeZone: 'UTC'
 												})}
 											</p>
-											<p>
-												{new Date(visit.end_date).toLocaleDateString(undefined, {
-													timeZone: 'UTC'
-												})}
-											</p>
+											{#if visit.end_date}
+												<p>
+													{new Date(visit.end_date).toLocaleDateString(undefined, {
+														timeZone: 'UTC'
+													})}
+												</p>
+											{/if}
 
 											<div>
 												<button
diff --git a/frontend/src/routes/map/+page.server.ts b/frontend/src/routes/map/+page.server.ts
index 984a563..6bbf24d 100644
--- a/frontend/src/routes/map/+page.server.ts
+++ b/frontend/src/routes/map/+page.server.ts
@@ -8,7 +8,7 @@ export const load = (async (event) => {
 	if (!event.locals.user) {
 		return redirect(302, '/login');
 	} else {
-		let visitedFetch = await fetch(`${endpoint}/api/adventures/`, {
+		let visitedFetch = await fetch(`${endpoint}/api/adventures/all/?include_collections=true`, {
 			headers: {
 				Cookie: `${event.cookies.get('auth')}`
 			}
@@ -28,7 +28,7 @@ export const load = (async (event) => {
 			let visited: Adventure[] = [];
 			try {
 				let api_result = await visitedFetch.json();
-				visited = api_result.results as Adventure[];
+				visited = api_result as Adventure[];
 				if (!Array.isArray(visited) || visited.length === 0 || !visited) {
 					throw new Error('Visited adventures response is not an array');
 				}

From 413aa69ac505ec567f94f979fa19b4d3e51433b9 Mon Sep 17 00:00:00 2001
From: Sean Morley <zipsm15@gmail.com>
Date: Mon, 7 Oct 2024 19:25:49 -0400
Subject: [PATCH 15/15] Hide end_date when start and end dates are the same

---
 frontend/src/lib/components/AdventureModal.svelte | 6 ++++--
 frontend/src/routes/adventures/[id]/+page.svelte  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/components/AdventureModal.svelte b/frontend/src/lib/components/AdventureModal.svelte
index 3f39b3e..33795d6 100644
--- a/frontend/src/lib/components/AdventureModal.svelte
+++ b/frontend/src/lib/components/AdventureModal.svelte
@@ -221,7 +221,9 @@
 	let new_end_date: string = '';
 	let new_notes: string = '';
 	function addNewVisit() {
-		// check if start date is before end date
+		if (new_start_date && !new_end_date) {
+			new_end_date = new_start_date;
+		}
 		if (new_start_date > new_end_date) {
 			addToast('error', 'Start date must be before end date');
 			return;
@@ -736,7 +738,7 @@ it would also work to just use on:click on the MapLibre component itself. -->
 													timeZone: 'UTC'
 												})}
 											</p>
-											{#if visit.end_date}
+											{#if visit.end_date && visit.end_date !== visit.start_date}
 												<p>
 													{new Date(visit.end_date).toLocaleDateString(undefined, {
 														timeZone: 'UTC'
diff --git a/frontend/src/routes/adventures/[id]/+page.svelte b/frontend/src/routes/adventures/[id]/+page.svelte
index 8f8b6fe..70b8075 100644
--- a/frontend/src/routes/adventures/[id]/+page.svelte
+++ b/frontend/src/routes/adventures/[id]/+page.svelte
@@ -339,7 +339,9 @@
 																timeZone: 'UTC'
 															})
 														: ''}
-													{visit.end_date && visit.end_date !== ''
+													{visit.end_date &&
+													visit.end_date !== '' &&
+													visit.end_date !== visit.start_date
 														? ' - ' +
 															new Date(visit.end_date).toLocaleDateString(undefined, {
 																timeZone: 'UTC'