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 #879

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
15 changes: 14 additions & 1 deletion taxi/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.urls import path
from django.contrib.auth import views as auth_views

from .views import (
index,
Expand All @@ -20,7 +21,19 @@
path("cars/<int:pk>/", CarDetailView.as_view(), name="car-detail"),
path("drivers/", DriverListView.as_view(), name="driver-list"),
path(
"drivers/<int:pk>/", DriverDetailView.as_view(), name="driver-detail"
"drivers/<int:pk>/", DriverDetailView.as_view(), name="driver-detail",
),
path(
"login/",
auth_views.LoginView.as_view(template_name="registration/login.html"),
name="login"
),
path(
"logout/",
auth_views.LogoutView.as_view(
template_name="registration/logout.html"
Comment on lines +33 to +34

Choose a reason for hiding this comment

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

The LogoutView does not require a template_name because it doesn't render a template. It simply logs the user out and redirects them. Consider removing the template_name argument.

Comment on lines +33 to +34

Choose a reason for hiding this comment

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

The LogoutView does not require a template_name since it doesn't render a template. You can remove the template_name argument here.

),
name="logout"
),
]

Expand Down
21 changes: 16 additions & 5 deletions taxi/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
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_visits = request.session.get("num_visits", 0) + 1
request.session["num_visits"] = num_visits

num_drivers = Driver.objects.count()
num_cars = Car.objects.count()
Expand All @@ -15,33 +20,39 @@ def index(request):
"num_drivers": num_drivers,
"num_cars": num_cars,
"num_manufacturers": num_manufacturers,
"num_visits": request.session.get("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

def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["current_user"] = self.request.user
return context

class DriverDetailView(generic.DetailView):

class DriverDetailView(LoginRequiredMixin, generic.DetailView):
model = Driver
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 @@ -133,3 +133,5 @@
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field

DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

LOGIN_REDIRECT_URL = "/"
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")),
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
25 changes: 19 additions & 6 deletions templates/includes/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
<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>
</ul>
<div class="sidebar">
{% if user.is_authenticated %}
<p>Welcome,
<a href="{% url 'taxi:driver-detail' user.id %}">
{{ user.username }}

Choose a reason for hiding this comment

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

Ensure that the user.id corresponds to a driver. If the user model is not directly linked to the Driver model, this URL might not work as expected. Consider adding a check or modifying the logic to ensure the correct ID is used.

Choose a reason for hiding this comment

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

Ensure that user.id corresponds to a driver, as the current logic might not work as expected if the user model is not directly linked to the Driver model. Consider verifying the relationship between the user and driver models.

</a>!
</p>
<a href="{% url "taxi:logout" %}">Logout</a>
{% else %}
<a href="{% url "taxi:login" %}">Login</a>
{% endif %}
<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>
<li><a href="{% url "taxi:car-list" %}">Cars</a></li>
<li><a href="{% url "taxi:driver-list" %}">Drivers</a></li>
</ul>
</div>
13 changes: 13 additions & 0 deletions templates/registration/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{% extends "base.html" %}

{% block content %}
<h1>Login</h1>
{% if form.errors %}
<p style="color: red;">Invalid username or password</p>
{% endif %}
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<button type="submit">Login</button>
</form>
{% endblock %}
6 changes: 6 additions & 0 deletions templates/registration/logout.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% extends "base.html" %}

{% block content %}
<h1>Logged out</h1>
<p>You have been logged out. <a href="{% url "taxi:login" %}">Login again?</a></p>
{% endblock %}
4 changes: 3 additions & 1 deletion templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ <h1>Driver list</h1>
<ul>
{% for driver in driver_list%}
<li>
<a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
<a href="{% url "taxi:driver-detail" pk=driver.id %}">

Choose a reason for hiding this comment

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

Ensure that driver.id corresponds to the correct primary key for the Driver model. This is crucial for generating the correct URL for the driver's detail page.

{{ driver.username }} {% if driver == current_user %}(Me){% endif %}

Choose a reason for hiding this comment

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

Ensure that driver.username is correctly linked to the Driver model. If username is not a field on the Driver model, consider using the appropriate field.

</a>
({{ driver.first_name }} {{ driver.last_name }})
</li>
{% endfor %}
Expand Down
2 changes: 2 additions & 0 deletions templates/taxi/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
{% block content %}
<h1>Taxi Service Home</h1>
<p>Welcome to Best Taxi Ever!</p>
<p>You have visited this page {{ num_visits }} times.</p>

<h2>Dynamic content</h2>
<p>The Taxi service has the following record counts:</p>
<ul>
Expand Down
Loading