Skip to content
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 #836

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions taxi/views.py
Original file line number Diff line number Diff line change
@@ -1,47 +1,62 @@
from django.shortcuts import render
from django.views import generic

from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from .models import Driver, Car, Manufacturer


@login_required

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The login_required decorator is correctly used to protect the index view, ensuring only authenticated users can access it. However, ensure that this aligns with the application's requirements, as it restricts access to the home page for unauthenticated users.

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()
request.session["num_visits"] = (
request.session.get("num_visits", 0) + 1)

context = {
"num_drivers": num_drivers,
"num_cars": num_cars,
"num_manufacturers": num_manufacturers,
"num_visits": request.session["num_visits"],
}

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")
queryset = Driver.objects.prefetch_related("cars__manufacturer")
2 changes: 2 additions & 0 deletions taxi_service/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@

AUTH_USER_MODEL = "taxi.Driver"

LOGIN_REDIRECT_URL = "/"

# Internationalization
# https://docs.djangoproject.com/en/4.0/topics/i18n/

Expand Down
1 change: 1 addition & 0 deletions taxi_service/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@
urlpatterns = [
path("admin/", admin.site.urls),
path("", include("taxi.urls", namespace="taxi")),
path("accounts/", include("django.contrib.auth.urls")),

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The inclusion of django.contrib.auth.urls under the accounts/ path is a good practice as it provides a set of authentication views. Ensure that the templates for these views are correctly set up in your project.

] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
8 changes: 8 additions & 0 deletions templates/includes/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{% if user.is_authenticated %}
User: <a href="{% url 'taxi:driver-detail' user.id %}">{{ user.username }}</a>
{% else %}
<a href="{% url 'login' %}">Login</a>
{% endif %}
<br>
<a href="{% url 'logout' %}">Logout</a>

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 'Logout' link is always displayed, regardless of the user's authentication status. Consider moving this link inside the {% if user.is_authenticated %} block to ensure it only appears when a user is logged in.

<br>
<ul class="sidebar-nav">
<li><a href="{% url "taxi:index" %}">Home page</a></li>
<li><a href="{% url "taxi:manufacturer-list" %}">Manufacturers</a></li>
Expand Down
7 changes: 7 additions & 0 deletions templates/registration/logged_out.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% extends "base.html" %}

{% block content %}
<h1>Logout</h1>
<p>Logged out!</p>
<a href="{% url 'login'%}">Click here to login again.</a>
{% endblock %}
12 changes: 12 additions & 0 deletions templates/registration/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{% extends "base.html" %}
{%block content%}
<h1>Login</h1>
{% if form.errors %}
<p>Invalid credentials</p>
{% endif %}
<form action="{% url 'login' %}" method="post">
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="submit">
</form>
{%endblock%}
1 change: 1 addition & 0 deletions templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ <h1>Driver list</h1>
<li>
<a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
({{ driver.first_name }} {{ driver.last_name }})
{% if user.username == driver.username%}(Me){%endif%}
</li>
{% endfor %}
</ul>
Expand Down
1 change: 1 addition & 0 deletions templates/taxi/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ <h2>Dynamic content</h2>
<li><strong>Drivers:</strong> {{ num_drivers }}</li>
<li><strong>Manufacturers:</strong> {{ num_manufacturers }}</li>
</ul>
<p>You have visited this page {{ num_visits }} time{{ num_visits|pluralize }}</p>
{% endblock %}
Loading