From 661c320e964acffe750714584d1dc9130ba03c7f Mon Sep 17 00:00:00 2001 From: Nadiia Date: Fri, 17 Nov 2023 11:56:33 +0200 Subject: [PATCH] Solution-py-taxi-service-authantication --- taxi/urls.py | 2 ++ taxi/views.py | 23 ++++++++++++++++++----- taxi_service/settings.py | 5 ++++- taxi_service/urls.py | 2 ++ templates/includes/sidebar.html | 17 +++++++++++++---- templates/registration/logged_out.html | 8 ++++++++ templates/registration/login.html | 17 +++++++++++++++++ templates/taxi/index.html | 1 + 8 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/taxi/urls.py b/taxi/urls.py index c663d6e2..2ea2da18 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -7,6 +7,7 @@ DriverListView, DriverDetailView, ManufacturerListView, + test_session_view ) urlpatterns = [ @@ -22,6 +23,7 @@ path( "drivers//", DriverDetailView.as_view(), name="driver-detail" ), + path("test-session/", test_session_view, name="test-session"), ] app_name = "taxi" diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..d3deb1da 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,60 @@ +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 +@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") + + +def test_session_view(request: HttpRequest) -> HttpResponse: + return HttpResponse( + "

Test session

" + ) diff --git a/taxi_service/settings.py b/taxi_service/settings.py index b6c0cf19..293076f8 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -11,6 +11,7 @@ """ from pathlib import Path +import os # Build paths inside the project like this: BASE_DIR / "subdir". BASE_DIR = Path(__file__).resolve().parent.parent @@ -57,7 +58,7 @@ TEMPLATES = [ { "BACKEND": "django.template.backends.django.DjangoTemplates", - "DIRS": [BASE_DIR / "templates"], + "DIRS": [os.path.join(BASE_DIR, "templates")], "APP_DIRS": True, "OPTIONS": { "context_processors": [ @@ -108,6 +109,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..263195fd 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -22,4 +22,6 @@ 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..62bd0335 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..72bbc3d1 --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,8 @@ +{% extends "base.html" %} + +{% block content %} +

Logged out

+ +Click here to login again + +{% endblock %} \ No newline at end of file diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..58e7af1d --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,17 @@ +{% extends "base.html" %} + + +{% block content %} +

Login

+ +{% if form.errors %} +

Invalid credentials

+{% endif %} + +
+ {% csrf_token %} + {{ form.as_p }} + + +
+{% endblock %} diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..549801ae 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 %}