source/lostplaces/lostplaces/settings.py

@@ -126,6 +126,3 @@ STATICFILES_DIRS = [
 
 MEDIA_URL = '/uploads/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'uploads')
-
-# Use custom user model
-AUTH_USER_MODEL = 'lostplaces_app.Explorer'

source/lostplaces/lostplaces_app/admin.py

@@ -1,20 +1,7 @@
 from django.contrib import admin
-from django.contrib.auth import get_user_model
-from django.contrib.auth.admin import UserAdmin
 from .models import *
 
-from .forms import ExplorerCreationForm, ExplorerChangeForm
-from .models import Explorer
-
 # Register your models here.
 
-class ExplorerAdmin(UserAdmin):
-    add_form = ExplorerCreationForm
-    form = ExplorerChangeForm
-    model = Explorer
-    list_display = ['email', 'username',]
-
-admin.site.register(Explorer, ExplorerAdmin)
-
 admin.site.register(Place)
 admin.site.register(PlaceImage)

source/lostplaces/lostplaces_app/forms.py

@@ -1,15 +0,0 @@
-from django import forms
-from django.contrib.auth.forms import UserCreationForm, UserChangeForm
-from .models import Explorer
-
-class ExplorerCreationForm(UserCreationForm):
-
-    class Meta:
-        model = Explorer
-        fields = ('username', 'email')
-
-class ExplorerChangeForm(UserChangeForm):
-
-    class Meta:
-        model = Explorer
-        fields = ('username', 'email')

source/lostplaces/lostplaces_app/migrations/0001_initial.py

@@ -1,12 +1,6 @@
-# Generated by Django 3.0.8 on 2020-07-28 19:00
+# Generated by Django 3.0.8 on 2020-07-18 20:12
 
-import django.contrib.auth.models
-import django.contrib.auth.validators
 from django.db import migrations, models
-import django.db.models.deletion
-import django.utils.timezone
-import django_thumbs.fields
-import lostplaces_app.models
 
 
 class Migration(migrations.Migration):
@@ -14,7 +8,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('auth', '0011_update_proxy_permissions'),
     ]
 
     operations = [
@@ -29,39 +22,4 @@ class Migration(migrations.Migration):
                 ('description', models.TextField()),
             ],
         ),
-        migrations.CreateModel(
-            name='PlaceImage',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('filename', django_thumbs.fields.ImageThumbsField(max_length=50, sizes=({'code': 'thumbnail', 'wxh': '390x390'}, {'code': 'hero', 'wxh': '700x700'}, {'code': 'large', 'wxh': '1920x1920'}), upload_to=lostplaces_app.models.generate_image_upload_path)),
-                ('description', models.TextField(blank=True)),
-                ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='lostplaces_app.Place')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Explorer',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('password', models.CharField(max_length=128, verbose_name='password')),
-                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
-                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
-                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
-                ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')),
-                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
-                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
-                ('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')),
-                ('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')),
-            ],
-            options={
-                'verbose_name': 'user',
-                'verbose_name_plural': 'users',
-                'abstract': False,
-            },
-            managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
-            ],
-        ),
     ]

source/lostplaces/lostplaces_app/migrations/0002_placeimage.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.0.8 on 2020-07-27 17:58
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces_app', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PlaceImage',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('filename', models.ImageField(max_length=50, upload_to='places/%Y/%m/')),
+                ('description', models.TextField()),
+                ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='lostplaces_app.Place')),
+            ],
+        ),
+    ]

source/lostplaces/lostplaces_app/migrations/0003_auto_20200727_1801.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.8 on 2020-07-27 18:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces_app', '0002_placeimage'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='placeimage',
+            name='description',
+            field=models.TextField(null=True),
+        ),
+    ]

source/lostplaces/lostplaces_app/migrations/0004_auto_20200727_1803.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.0.8 on 2020-07-27 18:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces_app', '0003_auto_20200727_1801'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='placeimage',
+            name='description',
+            field=models.TextField(blank=True, default=''),
+            preserve_default=False,
+        ),
+    ]

source/lostplaces/lostplaces_app/migrations/0005_auto_20200728_0738.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.0.8 on 2020-07-28 07:38
+
+from django.db import migrations
+import django_thumbs.fields
+import lostplaces_app.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('lostplaces_app', '0004_auto_20200727_1803'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='placeimage',
+            name='filename',
+            field=django_thumbs.fields.ImageThumbsField(max_length=50, sizes=({'code': 'thumbnail', 'wxh': '390x390'}, {'code': 'hero', 'wxh': '700x700'}, {'code': 'large', 'wxh': '1920x1920'}), upload_to=lostplaces_app.models.generate_image_upload_path),
+        ),
+    ]

source/lostplaces/lostplaces_app/models.py

@@ -3,19 +3,10 @@ import uuid
 
 from django.db import models
 from django.dispatch import receiver
-from django.contrib.auth.models import AbstractUser
 from django_thumbs.fields import ImageThumbsField
 
 # Create your models here.
 
-# Custom user model
-class Explorer(AbstractUser):
-    # add additional fields in here
-
-    def __str__(self):
-        return self.username
-
-# Place defines a lost place (location, name, description etc.).
 class Place (models.Model):
     name = models.CharField(max_length=50)
     location = models.CharField(max_length=50)
@@ -26,7 +17,6 @@ class Place (models.Model):
     def __str__(self):
         return self.name
 
-# Define callback that generates /path/to/image.ext as filename.
 def generate_image_upload_path(instance, filename):
     return 'places/' + str(uuid.uuid4())+'.'+filename.split('.')[-1]