Merge pull request #9 from shivBoy77/little

Minor Fixes

Author: devmahmud

accounts/templates/accounts/login.html

@@ -19,11 +19,11 @@
                 {% csrf_token %}
                 <div class="form-group">
                     <label for="username">Username</label>
-                    <input type="text" class="form-control" name="username" placeholder="Enter Username">
+                    <input type="text" class="form-control" name="username" placeholder="Enter Username" required>
                 </div>
                 <div class="form-group">
                     <label for="password">Password</label>
-                    <input type="password" class="form-control" name="password" placeholder="Password">
+                    <input type="password" class="form-control" name="password" placeholder="Password" required>
                 </div>
                 <button type="submit" class="btn btn-primary">Login</button>
                 <p>Need an account? <a href="{% url 'accounts:register' %}">Register Here</a></p>

accounts/views.py

@@ -17,7 +17,7 @@ def login_user(request):
             redirect_url = request.GET.get('next', 'home')
             return redirect(redirect_url)
         else:
-            messages.error(request, "Username Or Password is incorrect!!",
+            messages.error(request, "Username Or Password is incorrect!",
                            extra_tags='alert alert-warning alert-dismissible fade show')
 
     return render(request, 'accounts/login.html')
@@ -42,26 +42,26 @@ def create_user(request):
 
             if password1 != password2:
                 check1 = True
-                messages.error(request, 'Password doesn\'t matched',
+                messages.error(request, 'Password did not match!',
                                extra_tags='alert alert-warning alert-dismissible fade show')
             if User.objects.filter(username=username).exists():
                 check2 = True
-                messages.error(request, 'Username already exists',
+                messages.error(request, 'Username already exists!',
                                extra_tags='alert alert-warning alert-dismissible fade show')
             if User.objects.filter(email=email).exists():
                 check3 = True
-                messages.error(request, 'Email already registered',
+                messages.error(request, 'Email already registered!',
                                extra_tags='alert alert-warning alert-dismissible fade show')
 
             if check1 or check2 or check3:
                 messages.error(
-                    request, "Registration Failed", extra_tags='alert alert-warning alert-dismissible fade show')
+                    request, "Registration Failed!", extra_tags='alert alert-warning alert-dismissible fade show')
                 return redirect('accounts:register')
             else:
                 user = User.objects.create_user(
                     username=username, password=password1, email=email)
                 messages.success(
-                    request, f'Thanks for registering {user.username}!', extra_tags='alert alert-success alert-dismissible fade show')
+                    request, f'Thanks for registering {user.username}.', extra_tags='alert alert-success alert-dismissible fade show')
                 return redirect('accounts:login')
     else:
         form = UserRegistrationForm()

polls/forms.py

@@ -4,9 +4,9 @@
 
 class PollAddForm(forms.ModelForm):
 
-    choice1 = forms.CharField(label='Choice 1', max_length=100, min_length=2,
+    choice1 = forms.CharField(label='Choice 1', max_length=100, min_length=1,
                               widget=forms.TextInput(attrs={'class': 'form-control'}))
-    choice2 = forms.CharField(label='Choice 2', max_length=100, min_length=2,
+    choice2 = forms.CharField(label='Choice 2', max_length=100, min_length=1,
                               widget=forms.TextInput(attrs={'class': 'form-control'}))
 
     class Meta:

polls/views.py

@@ -69,7 +69,7 @@ def polls_add(request):
                     poll=poll, choice_text=form.cleaned_data['choice2']).save()
 
                 messages.success(
-                    request, "Poll & Choices added successfully", extra_tags='alert alert-success alert-dismissible fade show')
+                    request, "Poll & Choices added successfully.", extra_tags='alert alert-success alert-dismissible fade show')
 
                 return redirect('polls:list')
         else:
@@ -78,7 +78,7 @@ def polls_add(request):
             'form': form,
         }
         return render(request, 'polls/add_poll.html', context)
-    else: 
+    else:
         return HttpResponse("Sorry but you don't have permission to do that!")
 
 
@@ -92,7 +92,7 @@ def polls_edit(request, poll_id):
         form = EditPollForm(request.POST, instance=poll)
         if form.is_valid:
             form.save()
-            messages.success(request, "Poll Updated successfully",
+            messages.success(request, "Poll Updated successfully.",
                              extra_tags='alert alert-success alert-dismissible fade show')
             return redirect("polls:list")
 
@@ -108,7 +108,7 @@ def polls_delete(request, poll_id):
     if request.user != poll.owner:
         return redirect('home')
     poll.delete()
-    messages.success(request, "Poll Deleted successfully",
+    messages.success(request, "Poll Deleted successfully.",
                      extra_tags='alert alert-success alert-dismissible fade show')
     return redirect("polls:list")
 
@@ -126,7 +126,7 @@ def add_choice(request, poll_id):
             new_choice.poll = poll
             new_choice.save()
             messages.success(
-                request, "Choice added successfully", extra_tags='alert alert-success alert-dismissible fade show')
+                request, "Choice added successfully.", extra_tags='alert alert-success alert-dismissible fade show')
             return redirect('polls:edit', poll.id)
     else:
         form = ChoiceAddForm()
@@ -150,7 +150,7 @@ def choice_edit(request, choice_id):
             new_choice.poll = poll
             new_choice.save()
             messages.success(
-                request, "Choice Updated successfully", extra_tags='alert alert-success alert-dismissible fade show')
+                request, "Choice Updated successfully.", extra_tags='alert alert-success alert-dismissible fade show')
             return redirect('polls:edit', poll.id)
     else:
         form = ChoiceAddForm(instance=choice)
@@ -170,7 +170,7 @@ def choice_delete(request, choice_id):
         return redirect('home')
     choice.delete()
     messages.success(
-        request, "Choice Deleted successfully", extra_tags='alert alert-success alert-dismissible fade show')
+        request, "Choice Deleted successfully.", extra_tags='alert alert-success alert-dismissible fade show')
     return redirect('polls:edit', poll.id)
 
 
@@ -193,7 +193,7 @@ def poll_vote(request, poll_id):
     choice_id = request.POST.get('choice')
     if not poll.user_can_vote(request.user):
         messages.error(
-            request, "You already voted this poll", extra_tags='alert alert-warning alert-dismissible fade show')
+            request, "You already voted this poll!", extra_tags='alert alert-warning alert-dismissible fade show')
         return redirect("polls:list")
 
     if choice_id:
@@ -204,7 +204,7 @@ def poll_vote(request, poll_id):
         return render(request, 'polls/poll_result.html', {'poll': poll})
     else:
         messages.error(
-            request, "No choice selected", extra_tags='alert alert-warning alert-dismissible fade show')
+            request, "No choice selected!", extra_tags='alert alert-warning alert-dismissible fade show')
         return redirect("polls:detail", poll_id)
     return render(request, 'polls/poll_result.html', {'poll': poll})
 

templates/includes/navbar.html

@@ -1,5 +1,5 @@
 <nav class="navbar navbar-expand-sm navbar-light bg-light">
-    <a class="navbar-brand" href=""><i class="fas fa-person-booth"></i></a>
+    <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">
         <span class="navbar-toggler-icon"></span>
@@ -9,9 +9,11 @@
             <li class="nav-item active">
                 <a class="nav-link" href="{% url 'home' %}">Home <span class="sr-only">(current)</span></a>
             </li>
+            {% if request.user.is_authenticated %}
             <li class="nav-item">
                 <a class="nav-link" href="{% url 'polls:list' %}">Polls</a>
             </li>
+            {% endif %}
         </ul>
         <div class="navbar-nav ml-auto">
             {% if request.user.is_authenticated %}