From e5b3229c29c2df3dc8a9c0c5de4a0ed63a7384c3 Mon Sep 17 00:00:00 2001 From: Semyon Yerep Date: Fri, 13 Sep 2024 16:58:37 +0300 Subject: [PATCH 1/2] Solution --- .gitignore | 1 + static/css/styles.css | 5 +++++ taxi/views.py | 19 +++++++++++++------ taxi_service/settings.py | 2 ++ taxi_service/urls.py | 1 + templates/includes/sidebar.html | 14 ++++++++++++++ templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 14 ++++++++++++++ templates/taxi/driver_list.html | 13 +++++++------ templates/taxi/index.html | 1 + 10 files changed, 64 insertions(+), 12 deletions(-) create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/.gitignore b/.gitignore index 4a7076c2..3e23e8ac 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ venv/ .venv/ .pytest_cache/ **__pycache__/ +db.sqlite3 diff --git a/static/css/styles.css b/static/css/styles.css index 1d8a1b3d..1c3f45eb 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1,3 +1,8 @@ body { margin-top: 20px; } + +.sidebar-nav { + padding: 0; + list-style: none; +} diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..47a80249 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,17 +1,24 @@ +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_visits": num_visits + 1, "num_drivers": num_drivers, "num_cars": num_cars, "num_manufacturers": num_manufacturers, @@ -20,28 +27,28 @@ def index(request): 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..e8f0543a 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -133,3 +133,5 @@ # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" + +LOGIN_REDIRECT_URL = "/" 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..aacec8ef 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,18 @@ +

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

{% endblock %} From 9439ba44d2df27d0bebc759be7a76e1b491c9498 Mon Sep 17 00:00:00 2001 From: Semyon Yerep Date: Sat, 14 Sep 2024 15:09:00 +0300 Subject: [PATCH 2/2] fixed format in sidebar.html --- templates/includes/sidebar.html | 34 ++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index aacec8ef..5842d62d 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,20 +1,20 @@