My Blog Login
+ + + + {% endblock %} diff --git a/mysite/urls.py b/mysite/urls.py index 059aaad..6276a85 100644 --- a/mysite/urls.py +++ b/mysite/urls.py @@ -14,12 +14,18 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path, include -from django.contrib.auth.views import LoginView, LogoutView +from django.urls import path, include # <-- Make sure you have both of these imports. +from django.conf.urls import url +from django.contrib.auth.views import LoginView, LogoutView +from blogging.views import post_new urlpatterns = [ + path('polling/', include('polling.urls')), # <-- Add this path('admin/', admin.site.urls), - path('', include('myblog.urls')), + path('', include('blogging.urls')), path('login/', LoginView.as_view(template_name='login.html'), name="login"), path('logout/', LogoutView.as_view(next_page='/'), name="logout"), + url(r'^accounts/', include('allauth.urls')), + path('', include('blogging.urls')), # <-- Add this + path('post/new/', post_new, name='post_new'), ] diff --git a/polling/__init__.py b/polling/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/polling/admin.py b/polling/admin.py new file mode 100644 index 0000000..1874dd8 --- /dev/null +++ b/polling/admin.py @@ -0,0 +1,5 @@ +# blogging/admin.py +from django.contrib import admin +from polling.models import Poll + +admin.site.register(Poll) diff --git a/polling/apps.py b/polling/apps.py new file mode 100644 index 0000000..6254e54 --- /dev/null +++ b/polling/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class PollingConfig(AppConfig): + name = 'polling' diff --git a/polling/migrations/0001_initial.py b/polling/migrations/0001_initial.py new file mode 100644 index 0000000..97114cb --- /dev/null +++ b/polling/migrations/0001_initial.py @@ -0,0 +1,23 @@ +# Generated by Django 2.1.1 on 2019-10-29 14:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Poll', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=128)), + ('text', models.TextField(blank=True)), + ('score', models.IntegerField(default=0)), + ], + ), + ] diff --git a/polling/migrations/__init__.py b/polling/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/polling/models.py b/polling/models.py new file mode 100644 index 0000000..fa8da99 --- /dev/null +++ b/polling/models.py @@ -0,0 +1,10 @@ +# blogging/models.py +from django.db import models + +class Poll(models.Model): + title = models.CharField(max_length=128) + text = models.TextField(blank=True) + score = models.IntegerField(default=0) + + def __str__(self): + return self.title diff --git a/polling/templates/polling/detail.html b/polling/templates/polling/detail.html new file mode 100644 index 0000000..bb18db0 --- /dev/null +++ b/polling/templates/polling/detail.html @@ -0,0 +1,19 @@ +{# polling/templates/polling/detail.html #} + +{% extends "base.html" %} +{% block content %} +{{ poll.title }}
+
+ {{ poll.text }}
+
+
+ Current score: {{ poll.score }}
+
+
+
+
+{% endblock %}
diff --git a/polling/templates/polling/list.html b/polling/templates/polling/list.html
new file mode 100644
index 0000000..fc36de4
--- /dev/null
+++ b/polling/templates/polling/list.html
@@ -0,0 +1,13 @@
+{# polling/templates/polling/list.html #}
+
+{% extends "base.html" %}
+{% block content %}
+Polls
+{% for poll in polls %} +
+
+{% endfor %}
+{% endblock %}
diff --git a/polling/tests.py b/polling/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/polling/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/polling/urls.py b/polling/urls.py
new file mode 100644
index 0000000..e3560bc
--- /dev/null
+++ b/polling/urls.py
@@ -0,0 +1,9 @@
+# polling/urls.py
+
+from django.urls import path
+from polling.views import list_view, detail_view
+
+urlpatterns = [
+ path('', list_view, name="poll_index"),
+ path('polls/