diff --git a/.gitignore b/.gitignore index b26d6116..abb32ddc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ venv/ .pytest_cache/ **__pycache__/ +.pylintrc diff --git a/db.sqlite3 b/db.sqlite3 new file mode 100644 index 00000000..7a70f114 Binary files /dev/null and b/db.sqlite3 differ 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..fbd0be56 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.http import HttpRequest, HttpResponse from django.shortcuts import render from django.views import generic from .models import Driver, Car, Manufacturer -def index(request): +@login_required +def index(request: HttpRequest) -> HttpResponse: """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..a4ef2fd3 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -39,7 +39,7 @@ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", - "taxi", + "taxi" ] MIDDLEWARE = [ @@ -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/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..02c4d2c4 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,20 @@ diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..4ffb1809 --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,5 @@ +{% extends "base.html" %} +{% block content %} +

Logged out

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

Login

+ + {% if form.errors %} +

Invalid credentials

+ {% endif %} + +
+ {% csrf_token %} + {{ form.as_p }} + + + + +
+{% endblock %} diff --git a/templates/taxi/car_list.html b/templates/taxi/car_list.html index e107b579..90067b92 100644 --- a/templates/taxi/car_list.html +++ b/templates/taxi/car_list.html @@ -6,7 +6,7 @@

Car list

+

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

{% endblock %}