From a7a4b82207a3bef5ff7a2625b157b58baf3c7041 Mon Sep 17 00:00:00 2001 From: Kitaiskyi Oleksii Date: Thu, 16 Nov 2023 17:31:32 +0200 Subject: [PATCH 1/2] sol --- taxi/views.py | 17 ++++++++++++----- taxi_service/urls.py | 17 ++--------------- templates/includes/sidebar.html | 13 +++++++++++++ templates/registration/__init__.py | 0 templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 15 +++++++++++++++ templates/taxi/driver_list.html | 11 +++++++++-- templates/taxi/index.html | 1 + 8 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 templates/registration/__init__.py create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..e445150e 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,9 +1,12 @@ +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.""" @@ -11,37 +14,41 @@ def index(request): 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/urls.py b/taxi_service/urls.py index 8b94449f..485c50f0 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -1,18 +1,3 @@ -"""taxi_service URL Configuration - -The `urlpatterns` list routes URLs to views. For more information please see: - https://docs.djangoproject.com/en/4.0/topics/http/urls/ -Examples: -Function views - 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: path("", views.home, name="home") -Class-based views - 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: path("", Home.as_view(), name="home") -Including another URLconf - 1. Import the include() function: from django.urls import include, path - 2. Add a URL to urlpatterns: path("blog/", include("blog.urls")) -""" from django.contrib import admin from django.urls import path, include from django.conf import settings @@ -22,4 +7,6 @@ urlpatterns = [ path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), + path("accounts/", include("django.contrib.auth.urls")), + path("accounts/profile/", include("taxi.urls", namespace="taxi")), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..907e4d49 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,17 @@ +

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

{% endblock %} From 0fa5dd25da0c5aa9a1133aca44a071c5431a884a Mon Sep 17 00:00:00 2001 From: Kitaiskyi Oleksii Date: Mon, 20 Nov 2023 12:48:18 +0200 Subject: [PATCH 2/2] LOGIN_REDIRECT_URL --- taxi_service/settings.py | 2 ++ taxi_service/urls.py | 1 - templates/registration/logged_out.html | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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 485c50f0..e7e8407f 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -8,5 +8,4 @@ path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), path("accounts/", include("django.contrib.auth.urls")), - path("accounts/profile/", include("taxi.urls", namespace="taxi")), ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html index 0347c8b2..10fbccf9 100644 --- a/templates/registration/logged_out.html +++ b/templates/registration/logged_out.html @@ -3,4 +3,4 @@ {% block content %}

Logged out!

Click here to login again. -{% endblock %} \ No newline at end of file +{% endblock %}