Merge pull request #185 from seanmorley15/development

Development
seanmorley15 · Aug 11, 2024 · 3da1526 · 3da1526
2 parents a656889 + b88cd5d
commit 3da1526
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 235 deletions.
diff --git a/backend/server/adventures/migrations/0001_initial.py b/backend/server/adventures/migrations/0001_initial.py
diff --git a/backend/server/adventures/migrations/0002_rename_id_adventure_temp_id_and_more.py b/backend/server/adventures/migrations/0002_rename_id_adventure_temp_id_and_more.py
diff --git a/backend/server/adventures/migrations/__init__.py b/backend/server/adventures/migrations/__init__.py
diff --git a/backend/server/users/migrations/0001_initial.py b/backend/server/users/migrations/0001_initial.py
@@ -1,8 +1,10 @@
-# Generated by Django 5.0.6 on 2024-06-28 01:01
+# Generated by Django 5.0.8 on 2024-08-11 13:07
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
 import django.utils.timezone
+import django_resized.forms
+import uuid
 from django.db import migrations, models
 
 
@@ -29,7 +31,8 @@ class Migration(migrations.Migration):
                 ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
                 ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
-                ('profile_pic', models.ImageField(blank=True, null=True, upload_to='profile-pics/')),
+                ('profile_pic', django_resized.forms.ResizedImageField(blank=True, crop=None, force_format='WEBP', keep_meta=True, null=True, quality=75, scale=None, size=[1920, 1080], upload_to='profile-pics/')),
+                ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, unique=True)),
                 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
             ],

diff --git a/backend/server/users/migrations/0002_alter_customuser_profile_pic.py b/backend/server/users/migrations/0002_alter_customuser_profile_pic.py
diff --git a/backend/server/users/migrations/0003_remove_customuser_id_customuser_uuid.py b/backend/server/users/migrations/0003_remove_customuser_id_customuser_uuid.py
diff --git a/backend/server/users/migrations/0004_customuser_id_alter_customuser_uuid.py b/backend/server/users/migrations/0004_customuser_id_alter_customuser_uuid.py
diff --git a/backend/server/users/models.py b/backend/server/users/models.py
@@ -5,7 +5,7 @@
 
 class CustomUser(AbstractUser):
     profile_pic = ResizedImageField(force_format="WEBP", quality=75, null=True, blank=True, upload_to='profile-pics/')
-    uuid = models.UUIDField(default=uuid.uuid4, editable=True, unique=True, null=True, blank=True)
-
+    uuid = models.UUIDField(default=uuid.uuid4, editable=False, unique=True)
+    
     def __str__(self):
         return self.username