From c327cd23d509037c0315058844062ddea71c9da9 Mon Sep 17 00:00:00 2001 From: Eduard Habryd Date: Tue, 19 Sep 2023 15:05:43 +0300 Subject: [PATCH 1/2] Solution --- taxi/views.py | 17 ++++++++++++----- taxi_service/settings.py | 2 ++ taxi_service/urls.py | 3 ++- templates/includes/sidebar.html | 9 +++++++++ templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 15 +++++++++++++++ templates/taxi/driver_list.html | 8 ++++++-- templates/taxi/index.html | 1 + 8 files changed, 53 insertions(+), 8 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..b724cff2 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,54 @@ from django.shortcuts import render from django.views import generic +from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.decorators import login_required + 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() + 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") -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/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..2b76b074 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -17,9 +17,10 @@ from django.urls import path, include from django.conf import settings from django.conf.urls.static import static - +import django 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..55ae8562 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,13 @@ +

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

{% endblock %} From 7c2866e20dca98c63f945b594c4bbd0c56635954 Mon Sep 17 00:00:00 2001 From: Eduard Habryd Date: Tue, 19 Sep 2023 15:10:23 +0300 Subject: [PATCH 2/2] Solution 1.1 --- taxi_service/settings.py | 2 +- templates/registration/logged_out.html | 2 +- templates/registration/login.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/taxi_service/settings.py b/taxi_service/settings.py index 40573d6e..e8f0543a 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -134,4 +134,4 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" -LOGIN_REDIRECT_URL = '/' +LOGIN_REDIRECT_URL = "/" diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html index 0347c8b2..10fbccf9 100644 --- a/templates/registration/logged_out.html +++ b/templates/registration/logged_out.html @@ -3,4 +3,4 @@ {% block content %}

Logged out!

Click here to login again. -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html index d985e23d..a41c72ff 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -12,4 +12,4 @@

Login

{{ form.as_p }} -{% endblock %} \ No newline at end of file +{% endblock %}