diff --git a/.gitignore b/.gitignore index b26d6116..b9b230d8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ venv/ .pytest_cache/ **__pycache__/ +db.sqlite3 diff --git a/taxi/urls.py b/taxi/urls.py index c663d6e2..30a5dbd1 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -21,7 +21,7 @@ path("drivers/", DriverListView.as_view(), name="driver-list"), path( "drivers//", DriverDetailView.as_view(), name="driver-detail" - ), + ) ] app_name = "taxi" diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..f2d2b3b4 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,5 +1,6 @@ from django.shortcuts import render from django.views import generic +from django.contrib.auth.mixins import LoginRequiredMixin from .models import Driver, Car, Manufacturer @@ -10,38 +11,41 @@ def index(request): 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 } 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..03e4a26f 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -107,6 +107,8 @@ ] AUTH_USER_MODEL = "taxi.Driver" +LOGIN_REDIRECT_URL = "taxi:index" +LOGIN_URL = "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..531b9ed8 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("", 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..0e3d5d05 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,15 @@ diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..fa76b6ff --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,7 @@ +{% extends "base.html" %} +{% block content %} +
+

You have successfully logged out

+ Back to the home page +
+{% endblock content %} \ No newline at end of file diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..7a3966f3 --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,26 @@ +{% extends "base.html" %} +{% block content %} +
+
+ {% if form.errors %} + + {% endif %} + +
+
+{% endblock content %} + diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..c1ee0933 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -4,10 +4,11 @@

Driver list

{% if driver_list %} diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..832ce2c4 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 %}