diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..2c054693 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,53 @@ 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_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/pagination.html b/templates/includes/pagination.html index 118c2806..ba09f543 100644 --- a/templates/includes/pagination.html +++ b/templates/includes/pagination.html @@ -1,17 +1,27 @@ -{% if is_paginated %} - -{% endif %} + diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..e447baeb 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,12 @@ diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..e3f92b07 --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,5 @@ +{% extends "base.html" %} + +{% block content %} +

Logged out

+{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..9a221539 --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,14 @@ +{% extends "base.html" %} + +{% block content %} +

Login

+ {% if form.errors %} +

Invalid credentials

+ {% endif %} +
+ {% csrf_token %} + {{ form.as_p }} + + +
+{% endblock %} diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..5a918a58 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -1,17 +1,22 @@ {% extends "base.html" %} {% block content %} -

Driver list

- {% if driver_list %} - - {% else %} -

There are no drivers in taxi

- {% endif %} +

Driver list

+ {% if driver_list %} + + {% else %} +

There are no drivers in taxi

+ {% endif %} {% endblock %}