Revert "Revert "Merge pull request #28 from devmahmud/dev""

Author: devmahmud

accounts/templates/accounts/register.html

@@ -3,7 +3,7 @@
 {% block content %}
 <div class="container">
     <div class="row center">
-        <div class="col-md-6 offset-md-3">
+        <div class="col-md-5 mx-auto p-5 shadow-sm border rounded border-primary">
             <p>Already have an account? <a href="{% url 'accounts:login' %}">Login Here</a></p>
             {% if messages %}
             <div class="messages">

polls/admin.py

@@ -2,23 +2,28 @@
 from .models import Poll, Choice, Vote
 
 
+class ChoiceInline(admin.TabularInline):  # or admin.StackedInline for a different layout
+    model = Choice
+    extra = 1
+
 @admin.register(Poll)
 class PollAdmin(admin.ModelAdmin):
-    list_display = ["text", "owner", "pub_date", "active"]
+    list_display = ["text", "owner", "pub_date", "active", "created_at"]
     search_fields = ["text", "owner__username"]
-    list_filter = ["active"]
+    list_filter = ["active", 'created_at', 'pub_date']
     date_hierarchy = "pub_date"
+    inlines = [ChoiceInline]
 
 
 @admin.register(Choice)
 class ChoiceAdmin(admin.ModelAdmin):
-    list_display = ["choice_text", "poll"]
+    list_display = ["choice_text", "poll", 'created_at', 'updated_at']
     search_fields = ["choice_text", "poll__text"]
     autocomplete_fields = ["poll"]
 
 
 @admin.register(Vote)
 class VoteAdmin(admin.ModelAdmin):
-    list_display = ["choice", "poll", "user"]
+    list_display = ["choice", "poll", "user", 'created_at']
     search_fields = ["choice__choice_text", "poll__text", "user__username"]
     autocomplete_fields = ["choice", "poll", "user"]

polls/migrations/0002_auto_20231018_1318.py

@@ -0,0 +1,42 @@
+# Generated by Django 3.1.14 on 2023-10-18 07:18
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('polls', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='choice',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='choice',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True),
+        ),
+        migrations.AddField(
+            model_name='poll',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='vote',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='vote',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

polls/models.py

@@ -9,6 +9,7 @@ class Poll(models.Model):
     text = models.TextField()
     pub_date = models.DateTimeField(default=timezone.now)
     active = models.BooleanField(default=True)
+    created_at = models.DateTimeField(auto_now_add=True)
 
     def user_can_vote(self, user):
         """ 
@@ -50,6 +51,8 @@ def __str__(self):
 class Choice(models.Model):
     poll = models.ForeignKey(Poll, on_delete=models.CASCADE)
     choice_text = models.CharField(max_length=255)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
 
     @property
     def get_vote_count(self):
@@ -63,6 +66,8 @@ class Vote(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     poll = models.ForeignKey(Poll, on_delete=models.CASCADE)
     choice = models.ForeignKey(Choice, on_delete=models.CASCADE)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
 
     def __str__(self):
         return f'{self.poll.text[:15]} - {self.choice.choice_text[:15]} - {self.user.username}'

polls/templates/polls/poll_result.html

@@ -18,7 +18,7 @@
             {% if poll.active %}
             <h3 class="mt-3 mb-3 text-center">Result for: {{ poll.text }}</h3>
             {% else %}
-            <h3 class="mt-3 mb-3 text-center">"{{ poll.text }}" Has Ended Polling !</h3>
+            <h3 class="mt-3 mb-3 text-center">"{{ poll.text }}" Has Ended Polling!</h3>
             {% endif %}
             <h3 class="mb-2 text-center">Total: {{ poll.get_vote_count }} votes</h3>
             <!-- progress bar -->

polls/templates/polls/polls_list.html

@@ -4,7 +4,7 @@
 <div class="container">
     <div class="row">
         <div class="col-md-8 offset-sm-2">
-            <h1 class="text-center mt-3 mb-3">Welcome to polls List!</h1>
+            <h1 class="text-center mb-5">Welcome to polls List!</h1>
             {% if messages %}
             <div class="messages">
                 {% for message in messages %}
@@ -54,6 +54,7 @@ <h1 class="text-center mt-3 mb-3">Welcome to polls List!</h1>
 
                 {% endfor %}
             </ul>
+            {% if polls.paginator.num_pages > 1 %}
             <nav class="mt-3">
                 <ul class="pagination">
                     {% if polls.has_previous %}
@@ -69,6 +70,7 @@ <h1 class="text-center mt-3 mb-3">Welcome to polls List!</h1>
                     {% endif %}
                 </ul>
             </nav>
+            {% endif %}
         </div>
     </div>
 </div>

polls/urls.py

@@ -9,7 +9,7 @@
     path('add/', views.polls_add, name='add'),
     path('edit/<int:poll_id>/', views.polls_edit, name='edit'),
     path('delete/<int:poll_id>/', views.polls_delete, name='delete_poll'),
-    path('end/<int:poll_id>/', views.endpoll, name='end_poll'),
+    path('end/<int:poll_id>/', views.end_poll, name='end_poll'),
     path('edit/<int:poll_id>/choice/add/', views.add_choice, name='add_choice'),
     path('edit/choice/<int:choice_id>/', views.choice_edit, name='choice_edit'),
     path('delete/choice/<int:choice_id>/',

polls/views.py

@@ -114,6 +114,7 @@ def polls_add(request):
                 poll.save()
                 Choice(poll=poll, choice_text=form.cleaned_data["choice1"]).save()
                 Choice(poll=poll, choice_text=form.cleaned_data["choice2"]).save()
+
                 messages.success(
                     request,
                     "Poll & Choices added successfully.",
@@ -288,7 +289,7 @@ def poll_vote(request, poll_id):
 
 
 @login_required
-def endpoll(request, poll_id):
+def end_poll(request, poll_id):
     poll = get_object_or_404(Poll, pk=poll_id)
     if request.user != poll.owner:
         return redirect("home")

templates/includes/navbar.html

@@ -1,4 +1,4 @@
-<nav class="navbar navbar-expand-sm navbar-light bg-light">
+<nav class="navbar navbar-expand-sm navbar-light bg-light mb-5">
     <a class="navbar-brand" href="{% url 'home' %}"><i class="fas fa-person-booth"></i></a>
     <button class="navbar-toggler d-lg-none" type="button" data-toggle="collapse" data-target="#collapsibleNavId"
         aria-controls="collapsibleNavId" aria-expanded="false" aria-label="Toggle navigation">