diff --git a/accounts/urls.py b/accounts/urls.py new file mode 100644 index 00000000..b60f350d --- /dev/null +++ b/accounts/urls.py @@ -0,0 +1,8 @@ +from django.urls import path, include + +from accounts.views import login, logout_view + + +urlpatterns = [ + path("", login, namespace=login), +] diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..a18e1a16 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,47 @@ 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("visits", 0) + request.session["visits"] = num_visits + 1 context = { - "num_drivers": num_drivers, - "num_cars": num_cars, - "num_manufacturers": num_manufacturers, + "num_drivers": Driver.objects.count(), + "num_cars": Car.objects.count(), + "num_manufacturers": Manufacturer.objects.count(), + "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..e8f0543a 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -133,3 +133,5 @@ # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" + +LOGIN_REDIRECT_URL = "/" 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/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..182740b4 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,19 @@ - + + diff --git a/templates/registration/loged_out.html b/templates/registration/loged_out.html new file mode 100644 index 00000000..531c2a95 --- /dev/null +++ b/templates/registration/loged_out.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} + +{% block content %} +

Logged out

+ Click here to log in to assign +{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..498e1972 --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} + +{% block content %} +

Login

+ {% if form.errors %} +

Invalid credentials

+ {% endif %} +
+ {% csrf_token %} + {{ form.as_p }} + +
+{% endblock %} diff --git a/templates/taxi/driver_detail.html b/templates/taxi/driver_detail.html index 37b766d0..93fb0682 100644 --- a/templates/taxi/driver_detail.html +++ b/templates/taxi/driver_detail.html @@ -2,8 +2,13 @@ {% block content %}

- {{ driver.first_name }} {{ driver.last_name }}. + {{ driver.first_name }} {{ driver.last_name }} + {% if driver.license_number %} License number: {{ driver.license_number }} + {% else %} + License number: Unknown + + {% endif %}

{% for car in driver.cars.all %}
diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..4294fe3c 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -4,10 +4,14 @@

Driver list

{% if driver_list %} diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..146d35d1 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -9,5 +9,6 @@

Dynamic content

  • Cars: {{ num_cars }}
  • Drivers: {{ num_drivers }}
  • Manufacturers: {{ num_manufacturers }}
  • +
  • Visited {{ num_visits }}
  • {% endblock %}