-
Notifications
You must be signed in to change notification settings - Fork 853
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Solution #880
base: master
Are you sure you want to change the base?
Solution #880
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,47 +1,53 @@ | ||
from django.contrib.auth.decorators import login_required | ||
from django.contrib.auth.mixins import LoginRequiredMixin | ||
from django.shortcuts import render | ||
from django.views import generic | ||
|
||
from .models import Driver, Car, Manufacturer | ||
|
||
|
||
@login_required | ||
def index(request): | ||
"""View function for the home page of the site.""" | ||
|
||
num_drivers = Driver.objects.count() | ||
num_cars = Car.objects.count() | ||
num_manufacturers = Manufacturer.objects.count() | ||
num_visits = request.session.get("num_visits", 0) | ||
request.session["num_visits"] = num_visits + 1 | ||
|
||
context = { | ||
"num_drivers": num_drivers, | ||
"num_cars": num_cars, | ||
"num_manufacturers": num_manufacturers, | ||
"num_visits": num_visits + 1, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The |
||
} | ||
|
||
return render(request, "taxi/index.html", context=context) | ||
|
||
|
||
class ManufacturerListView(generic.ListView): | ||
class ManufacturerListView(LoginRequiredMixin, generic.ListView): | ||
model = Manufacturer | ||
context_object_name = "manufacturer_list" | ||
template_name = "taxi/manufacturer_list.html" | ||
paginate_by = 5 | ||
|
||
|
||
class CarListView(generic.ListView): | ||
class CarListView(LoginRequiredMixin, generic.ListView): | ||
model = Car | ||
paginate_by = 5 | ||
queryset = Car.objects.select_related("manufacturer") | ||
|
||
|
||
class CarDetailView(generic.DetailView): | ||
class CarDetailView(LoginRequiredMixin, generic.DetailView): | ||
model = Car | ||
|
||
|
||
class DriverListView(generic.ListView): | ||
class DriverListView(LoginRequiredMixin, generic.ListView): | ||
model = Driver | ||
paginate_by = 5 | ||
|
||
|
||
class DriverDetailView(generic.DetailView): | ||
class DriverDetailView(LoginRequiredMixin, generic.DetailView): | ||
model = Driver | ||
queryset = Driver.objects.prefetch_related("cars__manufacturer") |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,32 @@ | ||
<ul class="sidebar-nav"> | ||
<li><a href="{% url "taxi:index" %}">Home page</a></li> | ||
<li><a href="{% url "taxi:manufacturer-list" %}">Manufacturers</a></li> | ||
<li><a href="{% url "taxi:car-list" %}">Cars</a></li> | ||
<li><a href="{% url "taxi:driver-list" %}">Drivers</a></li> | ||
{% if user.is_authenticate %} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is a typo in the template tag. It should be |
||
<li> | ||
<a href="{% url 'taxi:driver-detail' user.pk %}"> | ||
User: {{ user.username }} | ||
</a> | ||
</li> | ||
<li> | ||
<form action="{% url 'logout' %}" method="post"> | ||
{% csrf_token %} | ||
<button type="submit">Logout</button> | ||
</form> | ||
</li> | ||
{% else %} | ||
<li> | ||
<a href="{% url 'login' %}">Login</a> | ||
</li> | ||
{% endif %} | ||
<br> | ||
<li> | ||
<a href="{% url "taxi:index" %}">Home page</a> | ||
</li> | ||
<li> | ||
<a href="{% url "taxi:manufacturer-list" %}">Manufacturers</a> | ||
</li> | ||
<li> | ||
<a href="{% url "taxi:car-list" %}">Cars</a> | ||
</li> | ||
<li> | ||
<a href="{% url "taxi:driver-list" %}">Drivers</a> | ||
</li> | ||
</ul> |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
{% extends "base.html" %} | ||
|
||
{% block content %} | ||
<p>Logged Out</p> | ||
<a href="{% url 'login' %}">Click here to log in again.</a> | ||
{% endblock %} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
{% extends "base.html" %} | ||
|
||
{% block content %} | ||
<h1>Login</h1> | ||
{% if form.errors %} | ||
<p style="color: red">Invalid credentials</p> | ||
{% endif %} | ||
<form action="{% url 'login' %}" method="post"> | ||
{% csrf_token %} | ||
{{ form.as_p }} | ||
<input type="submit" value="Submit"> | ||
<input type="hidden" name="next" value="{{ next }}"> | ||
</form> | ||
{% endblock %} |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,8 +5,8 @@ | |
<h1>Drivers</h1> | ||
<hr> | ||
<ul> | ||
{% for driver in car.drivers.all %} | ||
<li>{{ driver.first_name }} {{ driver.last_name }}</li> | ||
{% endfor %} | ||
{% for driver in car.drivers.all %} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The iteration over |
||
<li>{{ driver.first_name }} {{ driver.last_name }}</li> | ||
{% endfor %} | ||
</ul> | ||
{% endblock %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
num_visits
variable is incremented twice: once when retrieving it from the session and again when updating the session. This results in an off-by-one error in the context dictionary. Consider incrementingnum_visits
only once and using the updated value both for setting the session and in the context.