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-36.pyc b/blogging/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..a1ca561 Binary files /dev/null and b/blogging/__pycache__/__init__.cpython-36.pyc differ diff --git a/blogging/__pycache__/admin.cpython-36.pyc b/blogging/__pycache__/admin.cpython-36.pyc new file mode 100644 index 0000000..81af54c Binary files /dev/null and b/blogging/__pycache__/admin.cpython-36.pyc differ diff --git a/blogging/__pycache__/models.cpython-36.pyc b/blogging/__pycache__/models.cpython-36.pyc new file mode 100644 index 0000000..1a980eb Binary files /dev/null and b/blogging/__pycache__/models.cpython-36.pyc differ diff --git a/blogging/__pycache__/tests.cpython-36.pyc b/blogging/__pycache__/tests.cpython-36.pyc new file mode 100644 index 0000000..71a858e Binary files /dev/null and b/blogging/__pycache__/tests.cpython-36.pyc differ diff --git a/blogging/admin.py b/blogging/admin.py index 3db7856..ccd1f40 100644 --- a/blogging/admin.py +++ b/blogging/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from blogging.models import Post -admin.site.register(Post) +from blogging.models import Post +admin.site.register(Post) \ No newline at end of file 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..95e099a 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 2020-05-18 15:31 from django.conf import settings from django.db import migrations, models diff --git a/blogging/migrations/__pycache__/0001_initial.cpython-36.pyc b/blogging/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000..42fb473 Binary files /dev/null and b/blogging/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/blogging/migrations/__pycache__/__init__.cpython-36.pyc b/blogging/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..146e2e9 Binary files /dev/null and b/blogging/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/blogging/models.py b/blogging/models.py index 6b49f00..373a8d4 100644 --- a/blogging/models.py +++ b/blogging/models.py @@ -2,12 +2,15 @@ from django.contrib.auth.models import User class Post(models.Model): + title = models.CharField(max_length=128) text = models.TextField(blank=True) author = models.ForeignKey(User, on_delete=models.CASCADE) created_date = models.DateTimeField(auto_now_add=True) modified_date = models.DateTimeField(auto_now=True) published_date = models.DateTimeField(blank=True, null=True) - + + def __str__(self): return self.title + \ No newline at end of file diff --git a/blogging/tests.py b/blogging/tests.py index 03b08d1..1ca2439 100644 --- a/blogging/tests.py +++ b/blogging/tests.py @@ -1,17 +1,15 @@ from django.test import TestCase from django.contrib.auth.models import User - from blogging.models import Post - class PostTestCase(TestCase): fixtures = ['blogging_test_fixture.json', ] def setUp(self): self.user = User.objects.get(pk=1) - + def test_string_representation(self): expected = "This is a title" p1 = Post(title=expected) actual = str(p1) - self.assertEqual(expected, actual) + self.assertEqual(expected, actual) \ No newline at end of file diff --git a/db.sqlite3 b/db.sqlite3 new file mode 100644 index 0000000..a99112d Binary files /dev/null and b/db.sqlite3 differ diff --git a/mysite/__pycache__/__init__.cpython-36.pyc b/mysite/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..7f06be1 Binary files /dev/null and b/mysite/__pycache__/__init__.cpython-36.pyc differ diff --git a/mysite/__pycache__/settings.cpython-36.pyc b/mysite/__pycache__/settings.cpython-36.pyc new file mode 100644 index 0000000..3089dff Binary files /dev/null and b/mysite/__pycache__/settings.cpython-36.pyc differ diff --git a/mysite/__pycache__/urls.cpython-36.pyc b/mysite/__pycache__/urls.cpython-36.pyc new file mode 100644 index 0000000..c7ccf92 Binary files /dev/null and b/mysite/__pycache__/urls.cpython-36.pyc differ diff --git a/mysite/__pycache__/wsgi.cpython-36.pyc b/mysite/__pycache__/wsgi.cpython-36.pyc new file mode 100644 index 0000000..b3d10e2 Binary files /dev/null and b/mysite/__pycache__/wsgi.cpython-36.pyc differ diff --git a/mysite/settings.py b/mysite/settings.py index cddc23e..859ab13 100644 --- a/mysite/settings.py +++ b/mysite/settings.py @@ -20,7 +20,7 @@ # See https://docs.djangoproject.com/en/2.1/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'xak=ca*e6hvh8q5hgfz5l9ees)_pxjif0)ui!ikifg4!enjk+7' +SECRET_KEY = '9@s4f=3pgo)l2(#*zoogaurq$#v*%bi1d9cmim1(z(2budl@!%' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True diff --git a/mysite/templates/base.html b/mysite/templates/base.html index 2eacafa..70181f9 100644 --- a/mysite/templates/base.html +++ b/mysite/templates/base.html @@ -1,3 +1,5 @@ +{# mysite/templates/base.html #} + @@ -12,4 +14,4 @@ - +` \ No newline at end of file diff --git a/polling/__pycache__/__init__.cpython-36.pyc b/polling/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..770a044 Binary files /dev/null and b/polling/__pycache__/__init__.cpython-36.pyc differ diff --git a/polling/__pycache__/admin.cpython-36.pyc b/polling/__pycache__/admin.cpython-36.pyc new file mode 100644 index 0000000..b8c98e2 Binary files /dev/null and b/polling/__pycache__/admin.cpython-36.pyc differ diff --git a/polling/__pycache__/models.cpython-36.pyc b/polling/__pycache__/models.cpython-36.pyc new file mode 100644 index 0000000..1d2f106 Binary files /dev/null and b/polling/__pycache__/models.cpython-36.pyc differ diff --git a/polling/__pycache__/urls.cpython-36.pyc b/polling/__pycache__/urls.cpython-36.pyc new file mode 100644 index 0000000..84b5f8b Binary files /dev/null and b/polling/__pycache__/urls.cpython-36.pyc differ diff --git a/polling/__pycache__/views.cpython-36.pyc b/polling/__pycache__/views.cpython-36.pyc new file mode 100644 index 0000000..32a6c10 Binary files /dev/null and b/polling/__pycache__/views.cpython-36.pyc differ diff --git a/polling/admin.py b/polling/admin.py index 15a1f46..9d87e02 100644 --- a/polling/admin.py +++ b/polling/admin.py @@ -1,4 +1,5 @@ +# blogging/admin.py from django.contrib import admin from polling.models import Poll -admin.site.register(Poll) +admin.site.register(Poll) \ No newline at end of file diff --git a/polling/migrations/0001_initial.py b/polling/migrations/0001_initial.py index 2be60e7..930380c 100644 --- a/polling/migrations/0001_initial.py +++ b/polling/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.1 on 2019-10-29 01:24 +# Generated by Django 2.1.1 on 2020-05-18 14:54 from django.db import migrations, models diff --git a/polling/migrations/__pycache__/0001_initial.cpython-36.pyc b/polling/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000..e9ceb15 Binary files /dev/null and b/polling/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/polling/migrations/__pycache__/__init__.cpython-36.pyc b/polling/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..52a00ae Binary files /dev/null and b/polling/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/polling/models.py b/polling/models.py index 6a940d2..1467d04 100644 --- a/polling/models.py +++ b/polling/models.py @@ -1,3 +1,4 @@ +# blogging/models.py from django.db import models class Poll(models.Model): @@ -6,4 +7,4 @@ class Poll(models.Model): score = models.IntegerField(default=0) def __str__(self): - return self.title + return self.title \ No newline at end of file diff --git a/polling/templates/polling/detail.html b/polling/templates/polling/detail.html index bb18db0..744b29c 100644 --- a/polling/templates/polling/detail.html +++ b/polling/templates/polling/detail.html @@ -16,4 +16,4 @@

{{ poll.title }}

-{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/polling/templates/polling/list.html b/polling/templates/polling/list.html index 9cf4282..d434e41 100644 --- a/polling/templates/polling/list.html +++ b/polling/templates/polling/list.html @@ -1,3 +1,5 @@ +{# polling/templates/polling/list.html #} + {% extends "base.html" %} {% block content %}

Polls

@@ -8,4 +10,4 @@

{% endfor %} -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/polling/urls.py b/polling/urls.py index 9c4e2fd..e51198d 100644 --- a/polling/urls.py +++ b/polling/urls.py @@ -4,4 +4,4 @@ urlpatterns = [ path('', list_view, name="poll_index"), path('polls//', detail_view, name="poll_detail"), -] +] \ No newline at end of file diff --git a/polling/views.py b/polling/views.py index 6339808..ec672cf 100644 --- a/polling/views.py +++ b/polling/views.py @@ -1,3 +1,5 @@ +# polling/views.py + from django.shortcuts import render from django.http import Http404 from polling.models import Poll @@ -20,4 +22,4 @@ def detail_view(request, poll_id): poll.save() context = {'poll': poll} - return render(request, 'polling/detail.html', context) + return render(request, 'polling/detail.html', context) \ No newline at end of file