From c8265a78e9661439a315555ed8fee5046c53dad8 Mon Sep 17 00:00:00 2001 From: Vasya Turok Date: Thu, 21 Sep 2023 23:20:46 +0300 Subject: [PATCH] Solution --- taxi/views.py | 16 +++++++++++----- taxi_service/settings.py | 1 + taxi_service/urls.py | 2 ++ templates/base.html | 1 - templates/includes/sidebar.html | 20 ++++++++++++++++---- templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 17 +++++++++++++++++ templates/taxi/driver_list.html | 9 +++++++-- templates/taxi/index.html | 1 + 9 files changed, 61 insertions(+), 12 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..a9b350f5 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,12 +1,17 @@ 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.""" + num_visits = request.session.get("num_visits", 0) + 1 + request.session["num_visits"] = num_visits num_drivers = Driver.objects.count() num_cars = Car.objects.count() num_manufacturers = Manufacturer.objects.count() @@ -15,33 +20,34 @@ def index(request): "num_drivers": num_drivers, "num_cars": num_cars, "num_manufacturers": num_manufacturers, + "num_visits": 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..050808a8 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -107,6 +107,7 @@ ] 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..263195fd 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -22,4 +22,6 @@ 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/base.html b/templates/base.html index f4a0b6cf..3c917a6d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -18,7 +18,6 @@
- {% block sidebar %} {% include "includes/sidebar.html" %} {% endblock %} diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..b5c8b8a2 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,18 @@ diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..0bec39a2 --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} + +{% block content %} +

Logged out

+ Login +{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..3a9fbd8f --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,17 @@ +{% extends 'base.html' %} + + +{% block content %} + +

Login

+ + {% if form.errors %} +

Invalid credentials

+ {% endif %} + +
+ {% csrf_token %} + {{ form.as_p}} + +
+{% endblock content %} diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..151c3035 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -6,8 +6,13 @@

Driver list

    {% for driver in driver_list%}
  • - {{ driver.username }} - ({{ driver.first_name }} {{ driver.last_name }}) + {{ driver.username }} + {{ driver.first_name }} {{ driver.last_name }} + + {% if driver.username == user.username %} + (Me) + {% endif %} +
  • {% endfor %}
diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..977c511d 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 %}