From 4eae754b71ce04de207f48e0e9aa23998123ad33 Mon Sep 17 00:00:00 2001 From: Danyil Date: Fri, 30 Aug 2024 13:19:39 +0300 Subject: [PATCH 1/2] Solution --- .gitignore | 2 ++ taxi/views.py | 16 +++++++++++----- taxi_service/settings.py | 2 ++ taxi_service/urls.py | 1 + templates/includes/sidebar.html | 12 ++++++++++++ templates/registration/logged_out.html | 5 +++++ templates/registration/login.html | 14 ++++++++++++++ templates/taxi/driver_list.html | 6 +++++- templates/taxi/index.html | 1 + 9 files changed, 53 insertions(+), 6 deletions(-) create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/.gitignore b/.gitignore index b26d6116..0d52250c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ *.iml .env .DS_Store +taxi_service/settings.py +db.sqlite3 venv/ .pytest_cache/ **__pycache__/ diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..1cab8eb3 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,53 @@ +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_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") 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..31cfa6f2 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,3 +1,15 @@ +
+ {% if user.is_authenticated %} +

+ User: {{ user.username }} +
+ Logout +

+ + {% else %} +

Login

+ {% endif %} +
diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..38f35634 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -10,4 +10,5 @@

Dynamic content

  • Drivers: {{ num_drivers }}
  • Manufacturers: {{ num_manufacturers }}
    • +

    Times_visited: {{ num_visits }}

    {% endblock %} From 76b9499a3ba450bdc24ae8958a1ce6a1ad7e7f84 Mon Sep 17 00:00:00 2001 From: Danyil Artomov <150262586+dartomOOv@users.noreply.github.com> Date: Mon, 9 Sep 2024 14:41:11 +0200 Subject: [PATCH 2/2] FIxed_1 --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0d52250c..e36bbce6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,6 @@ *.iml .env .DS_Store -taxi_service/settings.py db.sqlite3 venv/ .pytest_cache/