diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6f8f59b..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*.pyc -*.db -*.sqlite3 diff --git a/blogging/__pycache__/__init__.cpython-39.pyc b/blogging/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..d8e73f9 Binary files /dev/null and b/blogging/__pycache__/__init__.cpython-39.pyc differ diff --git a/blogging/__pycache__/admin.cpython-39.pyc b/blogging/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..d01999b Binary files /dev/null and b/blogging/__pycache__/admin.cpython-39.pyc differ diff --git a/blogging/__pycache__/apps.cpython-39.pyc b/blogging/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..62cd420 Binary files /dev/null and b/blogging/__pycache__/apps.cpython-39.pyc differ diff --git a/blogging/__pycache__/models.cpython-39.pyc b/blogging/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..0af53d0 Binary files /dev/null and b/blogging/__pycache__/models.cpython-39.pyc differ diff --git a/blogging/__pycache__/tests.cpython-39.pyc b/blogging/__pycache__/tests.cpython-39.pyc new file mode 100644 index 0000000..37eff0e Binary files /dev/null and b/blogging/__pycache__/tests.cpython-39.pyc differ diff --git a/blogging/__pycache__/urls.cpython-39.pyc b/blogging/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..58fe017 Binary files /dev/null and b/blogging/__pycache__/urls.cpython-39.pyc differ diff --git a/blogging/__pycache__/views.cpython-39.pyc b/blogging/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..766b077 Binary files /dev/null and b/blogging/__pycache__/views.cpython-39.pyc differ diff --git a/blogging/admin.py b/blogging/admin.py index 1175916..d51e404 100644 --- a/blogging/admin.py +++ b/blogging/admin.py @@ -1,6 +1,11 @@ from django.contrib import admin -from blogging.models import Post, Category +from .models import Post, Category +class PostAdmin(admin.ModelAdmin): + prepopulated_fields = {'title':('text',)} -admin.site.register(Post) -admin.site.register(Category) +class CatagoryAdmin(admin.ModelAdmin): + prepopulated_fields = {'name':('description',)} + +admin.site.register(Post, PostAdmin) +admin.site.register(Category, CatagoryAdmin) diff --git a/blogging/fixtures/blogging_test_fixture.json b/blogging/fixtures/blogging_test_fixture.json index bf5269e..d85425f 100644 --- a/blogging/fixtures/blogging_test_fixture.json +++ b/blogging/fixtures/blogging_test_fixture.json @@ -35,4 +35,4 @@ "date_joined": "2013-05-24T05:35:58.628Z" } } -] +] \ No newline at end of file diff --git a/blogging/migrations/0001_initial.py b/blogging/migrations/0001_initial.py index 5d406bf..c783614 100644 --- a/blogging/migrations/0001_initial.py +++ b/blogging/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.1 on 2019-10-29 01:39 +# Generated by Django 2.1.1 on 2021-06-30 23:44 from django.conf import settings from django.db import migrations, models diff --git a/blogging/migrations/0002_category.py b/blogging/migrations/0002_category.py index 0ccbe19..19cf067 100644 --- a/blogging/migrations/0002_category.py +++ b/blogging/migrations/0002_category.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.1 on 2019-11-05 03:35 +# Generated by Django 2.1.1 on 2021-07-09 22:32 from django.db import migrations, models @@ -18,5 +18,8 @@ class Migration(migrations.Migration): ('description', models.TextField(blank=True)), ('posts', models.ManyToManyField(blank=True, related_name='categories', to='blogging.Post')), ], + options={ + 'verbose_name_plural': 'Categories', + }, ), ] diff --git a/blogging/migrations/0003_auto_20191104_1942.py b/blogging/migrations/0003_remove_category_posts.py similarity index 50% rename from blogging/migrations/0003_auto_20191104_1942.py rename to blogging/migrations/0003_remove_category_posts.py index 663c56d..ae14874 100644 --- a/blogging/migrations/0003_auto_20191104_1942.py +++ b/blogging/migrations/0003_remove_category_posts.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.1 on 2019-11-05 03:42 +# Generated by Django 2.1.1 on 2021-08-11 00:28 from django.db import migrations @@ -10,8 +10,8 @@ class Migration(migrations.Migration): ] operations = [ - migrations.AlterModelOptions( - name='category', - options={'verbose_name_plural': 'Categories'}, + migrations.RemoveField( + model_name='category', + name='posts', ), ] diff --git a/blogging/migrations/__pycache__/0001_initial.cpython-39.pyc b/blogging/migrations/__pycache__/0001_initial.cpython-39.pyc new file mode 100644 index 0000000..c383c0c Binary files /dev/null and b/blogging/migrations/__pycache__/0001_initial.cpython-39.pyc differ diff --git a/blogging/migrations/__pycache__/0002_category.cpython-39.pyc b/blogging/migrations/__pycache__/0002_category.cpython-39.pyc new file mode 100644 index 0000000..ffbe588 Binary files /dev/null and b/blogging/migrations/__pycache__/0002_category.cpython-39.pyc differ diff --git a/blogging/migrations/__pycache__/0003_remove_category_posts.cpython-39.pyc b/blogging/migrations/__pycache__/0003_remove_category_posts.cpython-39.pyc new file mode 100644 index 0000000..47b9685 Binary files /dev/null and b/blogging/migrations/__pycache__/0003_remove_category_posts.cpython-39.pyc differ diff --git a/blogging/migrations/__pycache__/__init__.cpython-39.pyc b/blogging/migrations/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..e0f926b Binary files /dev/null and b/blogging/migrations/__pycache__/__init__.cpython-39.pyc differ diff --git a/blogging/models.py b/blogging/models.py index 10d6cc3..f8d311f 100644 --- a/blogging/models.py +++ b/blogging/models.py @@ -1,3 +1,6 @@ +# blogging/models.py + +from django.contrib import admin from django.db import models from django.contrib.auth.models import User @@ -15,7 +18,6 @@ def __str__(self): class Category(models.Model): name = models.CharField(max_length=128) description = models.TextField(blank=True) - posts = models.ManyToManyField(Post, blank=True, related_name='categories') class Meta: verbose_name_plural = 'Categories' diff --git a/blogging/static/django_blog.css b/blogging/static/django_blog.css index 45a882d..64560dc 100644 --- a/blogging/static/django_blog.css +++ b/blogging/static/django_blog.css @@ -71,4 +71,4 @@ ul.categories { } ul.categories li { display: inline; -} +} \ No newline at end of file diff --git a/blogging/templates/blogging/detail.html b/blogging/templates/blogging/detail.html index ea5b9c8..1658f91 100644 --- a/blogging/templates/blogging/detail.html +++ b/blogging/templates/blogging/detail.html @@ -1,5 +1,4 @@ {% extends "base.html" %} - {% block content %} Home