From cdd6616c6005f912317a4183a07ed7a61c62ff69 Mon Sep 17 00:00:00 2001 From: Tymur Yermolenko Date: Wed, 27 Sep 2023 19:10:18 +0300 Subject: [PATCH 1/2] "Solution" --- taxi/views.py | 17 +++++++++++------ taxi_service/settings.py | 2 ++ taxi_service/urls.py | 1 + templates/includes/sidebar.html | 6 ++++++ templates/registration/logged_out.html | 5 +++++ templates/registration/login.html | 13 +++++++++++++ templates/taxi/driver_list.html | 1 + templates/taxi/index.html | 1 + 8 files changed, 40 insertions(+), 6 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..41a3291b 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,52 @@ +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_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..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..97b13c1e 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,10 @@ diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..549801ae 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 37ddaa78677b78105fa57ea83205da28bc0c13a7 Mon Sep 17 00:00:00 2001 From: Tymur Yermolenko Date: Wed, 27 Sep 2023 19:13:16 +0300 Subject: [PATCH 2/2] "Solution" --- templates/registration/logged_out.html | 2 +- templates/registration/login.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html index 228e3b92..14434b70 100644 --- a/templates/registration/logged_out.html +++ b/templates/registration/logged_out.html @@ -2,4 +2,4 @@ {% block content %}

    Logged out

    Click here to login -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html index 1f43fc80..423a9ecb 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -10,4 +10,4 @@

    Login

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