From 1b2c0047a29075b8b87d5dfbb467a8591de33f6e Mon Sep 17 00:00:00 2001 From: onyevyerov Date: Tue, 10 Sep 2024 15:04:14 +0200 Subject: [PATCH 1/2] Solution --- .flake8 | 2 +- taxi/views.py | 20 ++++++++++++++------ taxi_service/settings.py | 2 ++ taxi_service/urls.py | 3 ++- templates/includes/sidebar.html | 15 ++++++++++++++- templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 15 +++++++++++++++ templates/taxi/driver_list.html | 3 +++ templates/taxi/index.html | 1 + 9 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/.flake8 b/.flake8 index b5381af3..d1d71bb6 100644 --- a/.flake8 +++ b/.flake8 @@ -6,5 +6,5 @@ max-complexity = 18 select = B,C,E,F,W,T4,B9,Q0,N8,VNE exclude = **migrations - venv + .venv tests \ No newline at end of file diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..d476c327 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,55 @@ +from django.contrib.auth.decorators import login_required +from django.http import HttpResponse from django.shortcuts import render from django.views import generic +from django.contrib.auth.mixins import LoginRequiredMixin from .models import Driver, Car, Manufacturer -def index(request): +@login_required +def index(request) -> HttpResponse: """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["test"] = "test session" + 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..bfdba372 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -108,6 +108,8 @@ AUTH_USER_MODEL = "taxi.Driver" +LOGIN_REDIRECT_URL = "/taxi/" + # Internationalization # https://docs.djangoproject.com/en/4.0/topics/i18n/ diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..db559532 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -21,5 +21,6 @@ urlpatterns = [ path("admin/", admin.site.urls), - path("", include("taxi.urls", namespace="taxi")), + path("taxi/", 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..8713c390 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,17 @@ - +

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

{% endblock %} From 0d98afa132d7b31112b528910821b8ac573388ce Mon Sep 17 00:00:00 2001 From: onyevyerov Date: Wed, 11 Sep 2024 15:16:53 +0200 Subject: [PATCH 2/2] Added blank lines --- 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 bb8d1e18..81acc390 100644 --- a/templates/registration/logged_out.html +++ b/templates/registration/logged_out.html @@ -3,4 +3,4 @@ {% block content %}

Logged out!

Click here to log in -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html index a06b99f3..ee674e6f 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 %}