From a5504e9a705d391c87d3e19a27a4abc65d023a92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?= Date: Thu, 16 Nov 2023 22:56:54 +0200 Subject: [PATCH] solution --- taxi/views.py | 18 ++++++++++++------ taxi_service/settings.py | 2 ++ taxi_service/urls.py | 3 +++ templates/base.html | 15 ++++++++++----- templates/includes/sidebar.html | 7 +++++++ templates/registration/logout.html | 6 ++++++ templates/taxi/index.html | 1 + 7 files changed, 41 insertions(+), 11 deletions(-) create mode 100644 templates/registration/logout.html diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..fba629c9 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,9 +1,11 @@ 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.""" @@ -11,37 +13,41 @@ def index(request): 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": 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") diff --git a/taxi_service/settings.py b/taxi_service/settings.py index b6c0cf19..37713182 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -26,6 +26,8 @@ # SECURITY WARNING: don"t run with debug turned on in production! DEBUG = True +LOGIN_REDIRECT_URL = "/" +LOGIN_URL = "login" ALLOWED_HOSTS = [] diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..076476a0 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -17,9 +17,12 @@ from django.urls import path, include from django.conf import settings from django.conf.urls.static import static +from django.contrib.auth import views as auth_views urlpatterns = [ + path("login/", auth_views.LoginView.as_view(), name="login"), + path("logout/", auth_views.LogoutView.as_view(), name="logout"), path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/templates/base.html b/templates/base.html index f4a0b6cf..697c46f7 100644 --- a/templates/base.html +++ b/templates/base.html @@ -26,11 +26,16 @@
- {% block content %}{% endblock %} - - {% block pagination %} - {% include "includes/pagination.html" %} - {% endblock %} +
diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..fc9d4a9e 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,13 @@ diff --git a/templates/registration/logout.html b/templates/registration/logout.html new file mode 100644 index 00000000..ffa5aaed --- /dev/null +++ b/templates/registration/logout.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} + +{% block content %} +

Logged out

+ Press to login +{% endblock %} \ No newline at end of file diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..c28901ea 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 }} times

    {% endblock %}