diff --git a/taxi/urls.py b/taxi/urls.py index c663d6e2..44f0cc44 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -22,6 +22,7 @@ path( "drivers//", DriverDetailView.as_view(), name="driver-detail" ), + ] app_name = "taxi" diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..776831c7 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,54 @@ +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 +from taxi.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) + 1 + request.session["num_visits"] = num_visits context = { "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..b82adf88 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -108,6 +108,11 @@ AUTH_USER_MODEL = "taxi.Driver" +LOGIN_REDIRECT_URL = "/" + +LOGIN_URL = "/account/login/" + + # Internationalization # https://docs.djangoproject.com/en/4.0/topics/i18n/ diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..d0bf8018 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("account/", 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..c88e4011 100644 --- a/templates/base.html +++ b/templates/base.html @@ -27,7 +27,7 @@
{% block content %}{% endblock %} - +

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

{% block pagination %} {% include "includes/pagination.html" %} {% endblock %} diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..d3d8b8a9 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,11 @@