From 2e37b05659a2c705c1b38b702f520e0bbce9056c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=B7=D0=B5=D0=B3=D0=B0=D0=BD?= Date: Sat, 26 Oct 2024 17:23:01 +0200 Subject: [PATCH 1/2] Solution --- taxi/views.py | 29 +++++++++++++++++++------- taxi_service/settings.py | 2 ++ taxi_service/urls.py | 1 + templates/includes/sidebar.html | 8 +++++++ templates/registration/logged_out.html | 7 +++++++ templates/registration/login.html | 12 +++++++++++ templates/taxi/driver_list.html | 1 + templates/taxi/index.html | 1 + 8 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..edc153fb 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -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 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") \ No newline at end of file diff --git a/taxi_service/settings.py b/taxi_service/settings.py index b6c0cf19..cc71a76f 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -108,6 +108,8 @@ AUTH_USER_MODEL = "taxi.Driver" +LOGIN_REDIRECT_URL = "/" + # Internationalization # https://docs.djangoproject.com/en/4.0/topics/i18n/ diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..baf83d1a 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -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) diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..46f67df7 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,3 +1,11 @@ +{% if user.is_authenticated %} + User: {{ user.username }} + {% else %} + Login + {% endif %} +
+Logout +
diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..0fbbe0eb 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -10,4 +10,5 @@

Dynamic content

  • Drivers: {{ num_drivers }}
  • Manufacturers: {{ num_manufacturers }}
    • +

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

    {% endblock %} From b3b9dc0484c48eb323ba49223ab8190300d80081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=A0=D0=BE?= =?UTF-8?q?=D0=B7=D0=B5=D0=B3=D0=B0=D0=BD?= Date: Sat, 26 Oct 2024 17:32:17 +0200 Subject: [PATCH 2/2] My fixed solution --- taxi/views.py | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/taxi/views.py b/taxi/views.py index edc153fb..6f4b7283 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -12,8 +12,7 @@ def index(request): 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) + request.session["num_visits"] = (request.session.get("num_visits", 0) + 1) context = { "num_drivers": num_drivers, @@ -25,38 +24,28 @@ def index(request): return render(request, "taxi/index.html", context=context) -class ManufacturerListView( - LoginRequiredMixin, - 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( - LoginRequiredMixin, - generic.ListView): +class CarListView(LoginRequiredMixin, generic.ListView): model = Car paginate_by = 5 queryset = Car.objects.select_related("manufacturer") -class CarDetailView( - LoginRequiredMixin, - generic.DetailView): +class CarDetailView(LoginRequiredMixin, generic.DetailView): model = Car -class DriverListView( - LoginRequiredMixin, - generic.ListView): +class DriverListView(LoginRequiredMixin, generic.ListView): model = Driver paginate_by = 5 -class DriverDetailView( - LoginRequiredMixin, - generic.DetailView): +class DriverDetailView(LoginRequiredMixin, generic.DetailView): model = Driver - queryset = Driver.objects.prefetch_related("cars__manufacturer") \ No newline at end of file + queryset = Driver.objects.prefetch_related("cars__manufacturer")