edit detail page

.gitignore

@@ -0,0 +1,97 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+.DS_Store
+
+staticfiles
+media
+*.sqlite3
+
+templates/trial.html

main/admin.py

@@ -1,16 +1,35 @@
 from django.contrib import admin
 from .models import User, Manna
 from django.contrib.auth.admin import UserAdmin
-admin.site.register(User, UserAdmin)
 
 
 
+
+
+@admin.register(Manna)
 class MannaAdmin(admin.ModelAdmin):
-    list_display = ('title', 'keyverses', 'user',)
-    list_filter = ('created','keyverses', 'user')
+    list_display = ('title','user',)
+    list_filter = ('created', 'user')
     search_fields = ('title', 'user')
     prepopulated_fields = {'slug': ('title',)}
     raw_id_fields = ('user',)
     date_hierarchy = 'created'
     ordering = ('-updated', '-created')
-admin.site.register(Manna,MannaAdmin)
+
+@admin.register(User)
+class CustomUserAdmin(UserAdmin):
+    fieldsets = UserAdmin.fieldsets + (
+        (None, {
+            "fields": (
+                'avatar',
+            ),
+        }),
+    )
+
+    add_fieldsets = UserAdmin.add_fieldsets + (
+        (None, {
+            "fields": (
+                'email','avatar',
+            ),
+        }),
+    )    

main/forms.py

@@ -8,15 +8,10 @@ class MannaForm(ModelForm):
     class Meta:
         model = Manna
         exclude = ['user','slug', 'created','updated']
+
 
 
 
-    def keyverses_clean(self):
-        data = self.cleaned_data.get('keyverses')
-
-        if ':' not in data:
-            raise ValidationError(_('key verses refers to pages in the bible, so must contain ":"'), code='Invalid')
-        return data
 
 
 class RegisterForm(UserCreationForm):

main/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.2.7 on 2022-05-04 10:24
+# Generated by Django 3.2.7 on 2022-05-07 18:43
 
 from django.conf import settings
 import django.contrib.auth.models
@@ -48,16 +48,18 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('title', models.CharField(max_length=50, unique=True)),
+                ('category', models.CharField(default='Christian Charge', help_text='e.g Prayer upliftment, Charge on Faith', max_length=30)),
                 ('thumbnail', models.ImageField(upload_to='thumbnail/')),
                 ('body', models.TextField()),
                 ('keyverses', models.TextField(help_text='Write each key verse seperated by a comma')),
-                ('slug', models.SlugField(default='', max_length=200)),
+                ('slug', models.SlugField(blank=True, default=' ', max_length=200)),
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('updated', models.DateTimeField(auto_now=True)),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
             ],
             options={
                 'verbose_name_plural': 'manna',
+                'ordering': ['?'],
             },
         ),
         migrations.CreateModel(

main/migrations/0002_auto_20220504_1028.py → main/migrations/0002_auto_20220507_1844.py

@@ -1,4 +1,4 @@
-# Generated by Django 3.2.7 on 2022-05-04 10:28
+# Generated by Django 3.2.7 on 2022-05-07 18:44
 
 from django.db import migrations, models
 import main.models
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='user',
             name='avatar',
-            field=models.ImageField(blank=True, null=True, upload_to=main.models.user_directory_path),
+            field=models.ImageField(blank=True, default='default/avatar.svg', null=True, upload_to=main.models.user_directory_path),
         ),
         migrations.AlterField(
             model_name='user',

main/migrations/0003_text.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.7 on 2022-05-09 11:46
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0002_auto_20220507_1844'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Text',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=40)),
+            ],
+        ),
+    ]

main/migrations/0004_delete_text.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.2.7 on 2022-05-09 11:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0003_text'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Text',
+        ),
+    ]

main/migrations/0005_alter_manna_user.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.7 on 2022-05-10 22:03
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0004_delete_text'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='manna',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='author', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

main/migrations/0006_alter_manna_user.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.7 on 2022-05-11 11:20
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0005_alter_manna_user'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='manna',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

main/migrations/0007_user_bio.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.7 on 2022-05-11 22:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0006_alter_manna_user'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='bio',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

main/migrations/0008_auto_20220513_1240.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.7 on 2022-05-13 12:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0007_user_bio'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='manna',
+            name='keyverses',
+        ),
+        migrations.AlterField(
+            model_name='manna',
+            name='thumbnail',
+            field=models.ImageField(blank=True, null=True, upload_to='thumbnail/'),
+        ),
+    ]