From 5d4eb0da904309e2f16b38d8d5d7a3dca26774c3 Mon Sep 17 00:00:00 2001 From: Olexander Bryl Date: Mon, 25 Sep 2023 20:10:01 +0300 Subject: [PATCH 1/2] solution --- taxi/urls.py | 2 +- taxi/views.py | 17 +++++++++++------ taxi_service/settings.py | 5 ++++- taxi_service/urls.py | 1 + templates/includes/sidebar.html | 20 ++++++++++++++++---- templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 14 ++++++++++++++ templates/taxi/driver_list.html | 3 ++- templates/taxi/index.html | 1 + 9 files changed, 56 insertions(+), 13 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..bbb16a09 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -1,4 +1,4 @@ -from django.urls import path +from django.urls import path, include from .views import ( index, diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..d7328a5a 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,12 +1,16 @@ +from django.contrib.auth.decorators import login_required +from django.contrib.auth.mixins import LoginRequiredMixin 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_visited = request.session.get("num_visited", 0) + 1 + request.session["num_visited"] = num_visited num_drivers = Driver.objects.count() num_cars = Car.objects.count() num_manufacturers = Manufacturer.objects.count() @@ -15,33 +19,34 @@ def index(request): "num_drivers": num_drivers, "num_cars": num_cars, "num_manufacturers": num_manufacturers, + "num_visited": num_visited, } 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..a28fe180 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 = "/taxi/" + # 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..95358161 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,18 @@ diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..8325fe67 --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,6 @@ +{% extends 'base.html' %} +{% block content %} +

You have successfully logged out.

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

Log in

+{% if form.errors %} +

Invalid credentials

+{% endif %} + +
+ {% csrf_token %} + {{ form.as_p }} + + +
+{% endblock %} diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..b7120d76 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -6,8 +6,9 @@

Driver list

diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..e4cb1f45 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_visited }} time{{ num_visited|pluralize }}.

    {% endblock %} From 847945458b968cf42f3ead07b9dbb2db3fadf644 Mon Sep 17 00:00:00 2001 From: Olexander Bryl Date: Mon, 25 Sep 2023 20:15:52 +0300 Subject: [PATCH 2/2] solution --- taxi/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/taxi/views.py b/taxi/views.py index d7328a5a..bdb2bf36 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -9,8 +9,8 @@ @login_required def index(request): """View function for the home page of the site.""" - num_visited = request.session.get("num_visited", 0) + 1 - request.session["num_visited"] = num_visited + num_visits = request.session.get("num_visits", 0) + 1 + request.session["num_visits"] = num_visits num_drivers = Driver.objects.count() num_cars = Car.objects.count() num_manufacturers = Manufacturer.objects.count() @@ -19,7 +19,7 @@ def index(request): "num_drivers": num_drivers, "num_cars": num_cars, "num_manufacturers": num_manufacturers, - "num_visited": num_visited, + "num_visits": num_visits, } return render(request, "taxi/index.html", context=context)