From 0a2c7bd65d8e2a0dfb3e499d00d9d3020738acc7 Mon Sep 17 00:00:00 2001 From: musakovskiy Date: Thu, 2 Nov 2023 15:30:42 +0200 Subject: [PATCH 1/6] created login requiredmixin and vizit counter --- taxi/views.py | 14 +++++++++----- templates/taxi/index.html | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..edb21163 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,3 +1,4 @@ +from django.contrib.auth.mixins import LoginRequiredMixin from django.shortcuts import render from django.views import generic @@ -10,38 +11,41 @@ def index(request): num_drivers = Driver.objects.count() num_cars = Car.objects.count() num_manufacturers = Manufacturer.objects.count() + num_vizits = request.session.get("num_vizits", 0) + request.session["num_vizits"] = num_vizits + 1 context = { "num_drivers": num_drivers, "num_cars": num_cars, "num_manufacturers": num_manufacturers, + "num_vizits": num_vizits + 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") -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") diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..3e02debb 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -10,4 +10,5 @@

Dynamic content

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

    You vizited this page {{ num_vizits }} time{{ num_vizits|pluralize }}

    {% endblock %} From 73d68f51bd18e869bc1ff35e52377dc0c753f24c Mon Sep 17 00:00:00 2001 From: musakovskiy Date: Thu, 2 Nov 2023 20:47:42 +0200 Subject: [PATCH 2/6] created login and logout in side bar --- taxi_service/settings.py | 2 ++ taxi_service/urls.py | 1 + templates/includes/sidebar.html | 12 ++++++++++++ templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 13 +++++++++++++ 5 files changed, 34 insertions(+) create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/taxi_service/settings.py b/taxi_service/settings.py index b6c0cf19..40573d6e 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -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 = '/' diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..5d781485 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..02f42a72 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,16 @@