diff --git a/requirements.txt b/requirements.txt index 53898f6d..ca8a51ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,6 @@ flake8==5.0.4 flake8-quotes==3.3.1 flake8-variables-names==0.0.5 pep8-naming==0.13.2 +django-debug-toolbar==3.8.1 + + diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..4a99a2cd 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,9 +1,12 @@ +from django.contrib.auth.decorators import login_required from django.shortcuts import render from django.views import generic +from django.contrib.auth.mixins import LoginRequiredMixin from .models import Driver, Car, Manufacturer +@login_required def index(request): """View function for the home page of the site.""" @@ -11,37 +14,41 @@ def index(request): 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, } 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") + queryset = Car.objects.all().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.all().prefetch_related("cars__manufacturer") diff --git a/taxi_service/settings.py b/taxi_service/settings.py index b6c0cf19..21055cf6 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -40,10 +40,12 @@ "django.contrib.messages", "django.contrib.staticfiles", "taxi", + "debug_toolbar", ] MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", + "debug_toolbar.middleware.DebugToolbarMiddleware", "django.contrib.sessions.middleware.SessionMiddleware", "django.middleware.common.CommonMiddleware", "django.middleware.csrf.CsrfViewMiddleware", @@ -133,3 +135,9 @@ # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" + +LOGIN_REDIRECT_URL = "/" + +INTERNAL_IPS = [ + "127.0.0.1", +] diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..a2341345 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -22,4 +22,6 @@ urlpatterns = [ path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), + path("accounts/", include("django.contrib.auth.urls")), + path("__debug__/", include("debug_toolbar.urls")), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..78262d29 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,15 @@ - + +

You have visited this page + {{ num_visits }} time{{ num_visits|pluralize }}. +

+ {% endblock %} diff --git a/templates/taxi/manufacturer_list.html b/templates/taxi/manufacturer_list.html index 2d86e7e6..58caad38 100644 --- a/templates/taxi/manufacturer_list.html +++ b/templates/taxi/manufacturer_list.html @@ -1,13 +1,32 @@ {% extends "base.html" %} {% block content %} -

Manufacturer list

- - {% if manufacturer_list %} - - {% endif %} +

Manufacturer List

+ + {% if manufacturer_list %} + + + + + + + + {% for manufacturer in manufacturer_list %} + + + + + + {% endfor %} +
IDNameCountry
+ {{ manufacturer.id }} + + {{ manufacturer.name }} + + {{ manufacturer.country }} +
+ + {% else %} +

There are no manufacturers in the service.

+ {% endif %} {% endblock %}