diff --git a/.gitignore b/.gitignore index b26d6116..4f1caafd 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..016adf08 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) + 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..06d9b4f0 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -133,3 +133,7 @@ # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" + +LOGIN_URL = "/login/" +LOGIN_REDIRECT_URL = "/" +LOGOUT_REDIRECT_URL = "/" diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..2e9e444b 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -17,9 +17,22 @@ from django.urls import path, include from django.conf import settings from django.conf.urls.static import static - +from django.contrib.auth import views as auth_views urlpatterns = [ path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), -] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + path( + "login/", + auth_views.LoginView.as_view(), + name="login" + ), + path( + "logout/", + auth_views.LogoutView.as_view(), + name="logout" + ) +] + static( + settings.STATIC_URL, + document_root=settings.STATIC_ROOT +) diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..00fe29ee 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,16 @@ diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..60a4c1ee --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,35 @@ +{% extends "base.html" %} + +{% block content %} + + {% if form.errors %} +

Your username and password didn't match. Please try again.

+ {% endif %} + + {% if next %} + {% if user.is_authenticated %} +

Your account doesn't have access to this page. To proceed, + please login with an account that has access.

+ {% else %} +

Please login to see this page.

+ {% endif %} + {% endif %} + +
+ {% csrf_token %} + + + + + + + + + +
{{ form.username.label_tag }}{{ form.username }}
{{ form.password.label_tag }}{{ form.password }}
+ + + +
+ +{% endblock %} diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..21997512 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -5,10 +5,17 @@

Driver list

{% if driver_list %} {% else %} diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..227860fc 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -4,6 +4,7 @@

Taxi Service Home

Welcome to Best Taxi Ever!

Dynamic content

+

Number of visits: {{ num_visits }}

The Taxi service has the following record counts: