From 1ee4c7a1fb5f9001ec869e27aa1c10e53e56e28a Mon Sep 17 00:00:00 2001 From: Illia Zhmurskiy Date: Sun, 22 Oct 2023 17:21:31 +0300 Subject: [PATCH 1/6] Solution --- taxi/urls.py | 2 +- taxi/views.py | 44 +++++++++++++++++++++++--- taxi_service/settings.py | 9 ++++++ taxi_service/urls.py | 2 ++ templates/includes/sidebar.html | 6 ++++ templates/registration/logged_out.html | 6 ++++ templates/registration/login.html | 17 ++++++++++ templates/taxi/driver_list.html | 3 ++ templates/taxi/index.html | 1 + 9 files changed, 85 insertions(+), 5 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..a7226d8d 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -6,7 +6,7 @@ CarDetailView, DriverListView, DriverDetailView, - ManufacturerListView, + ManufacturerListView ) urlpatterns = [ diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..9e73fe04 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,33 +1,42 @@ -from django.shortcuts import render +from django.contrib.auth import authenticate, login, logout +from django.contrib.auth.decorators import login_required +from django.contrib.auth.mixins import LoginRequiredMixin +from django.http import HttpResponseRedirect +from django.shortcuts import render, get_object_or_404 +from django.urls import reverse 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", 1) + request.session["num_visits"] = num_visits + 1 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") @@ -37,7 +46,7 @@ class CarDetailView(generic.DetailView): model = Car -class DriverListView(generic.ListView): +class DriverListView(LoginRequiredMixin, generic.ListView): model = Driver paginate_by = 5 @@ -45,3 +54,30 @@ class DriverListView(generic.ListView): class DriverDetailView(generic.DetailView): model = Driver queryset = Driver.objects.prefetch_related("cars__manufacturer") + + +def login_view(request): + if request.method == "GET": + return render(request, "registration/login.html") + elif request.method == "POST": + username = request.POST["username"] + password = request.POST["password"] + user = authenticate(username=username, password=password) + + if user: + login(request, user) + return HttpResponseRedirect(reverse("taxi:index")) + else: + error_context = { + "error_message": "Invalid values" + } + return render( + request, + "registration/login.html", + context=error_context + ) + + +def logout_view(request): + logout(request) + return render(request, "registration/login.html") diff --git a/taxi_service/settings.py b/taxi_service/settings.py index b6c0cf19..400cbef4 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -33,17 +33,20 @@ # Application definition INSTALLED_APPS = [ + "debug_toolbar", "django.contrib.admin", "django.contrib.auth", "django.contrib.contenttypes", "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", + "templates.registration", "taxi", ] MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", + "debug_toolbar.middleware.DebugToolbarMiddleware", "django.contrib.sessions.middleware.SessionMiddleware", "django.middleware.common.CommonMiddleware", "django.middleware.csrf.CsrfViewMiddleware", @@ -108,6 +111,8 @@ AUTH_USER_MODEL = "taxi.Driver" +LOGIN_REDIRECT_URL = "/" + # Internationalization # https://docs.djangoproject.com/en/4.0/topics/i18n/ @@ -133,3 +138,7 @@ # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" + +INTERNAL_IPS = [ + "127.0.0.1", +] diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..b267d319 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("__debug__/", include("debug_toolbar.urls")), + 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..a15d37e6 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,10 @@ 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 %} From ff764e0147ff62f29839f894157a68525bfff65a Mon Sep 17 00:00:00 2001 From: Illia Zhmurskiy Date: Sun, 22 Oct 2023 17:25:29 +0300 Subject: [PATCH 2/6] Solution --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 53898f6d..e714b1ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ flake8==5.0.4 flake8-quotes==3.3.1 flake8-variables-names==0.0.5 pep8-naming==0.13.2 +debug__toolbar \ No newline at end of file From e51c2912e1eccfb6a6f3a7ec4bdae0bc77ce7563 Mon Sep 17 00:00:00 2001 From: Illia Zhmurskiy Date: Sun, 22 Oct 2023 17:33:39 +0300 Subject: [PATCH 3/6] Solution --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e714b1ad..f980e8eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ flake8==5.0.4 flake8-quotes==3.3.1 flake8-variables-names==0.0.5 pep8-naming==0.13.2 -debug__toolbar \ No newline at end of file +django-debug-toolbar==3.2.4 \ No newline at end of file From 7f2b805a9df9607cbecc322c3f6b2732fd2cbb78 Mon Sep 17 00:00:00 2001 From: Illia Zhmurskiy Date: Sun, 22 Oct 2023 17:35:17 +0300 Subject: [PATCH 4/6] Solution --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f980e8eb..f5ac048e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,4 +3,4 @@ flake8==5.0.4 flake8-quotes==3.3.1 flake8-variables-names==0.0.5 pep8-naming==0.13.2 -django-debug-toolbar==3.2.4 \ No newline at end of file +django-debug-toolbar<=4.8.0 \ No newline at end of file From 6e94434594dfb31abd81c723446167d83ab0c9ca Mon Sep 17 00:00:00 2001 From: Illia Zhmurskiy Date: Sun, 22 Oct 2023 18:00:16 +0300 Subject: [PATCH 5/6] Solution --- taxi/urls.py | 4 +++- taxi/views.py | 36 ++++++++++-------------------------- 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/taxi/urls.py b/taxi/urls.py index a7226d8d..1f473334 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -6,7 +6,7 @@ CarDetailView, DriverListView, DriverDetailView, - ManufacturerListView + ManufacturerListView, UserLoginView, UserLogoutView ) urlpatterns = [ @@ -22,6 +22,8 @@ path( "drivers//", DriverDetailView.as_view(), name="driver-detail" ), + path("login/", UserLoginView.as_view(), name="user-login"), + path("logout/", UserLogoutView.as_view(), name="user-logout"), ] app_name = "taxi" diff --git a/taxi/views.py b/taxi/views.py index 9e73fe04..c8573cf1 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,9 +1,10 @@ from django.contrib.auth import authenticate, login, logout from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.views import LoginView, LogoutView from django.http import HttpResponseRedirect from django.shortcuts import render, get_object_or_404 -from django.urls import reverse +from django.urls import reverse, reverse_lazy from django.views import generic from .models import Driver, Car, Manufacturer @@ -56,28 +57,11 @@ class DriverDetailView(generic.DetailView): queryset = Driver.objects.prefetch_related("cars__manufacturer") -def login_view(request): - if request.method == "GET": - return render(request, "registration/login.html") - elif request.method == "POST": - username = request.POST["username"] - password = request.POST["password"] - user = authenticate(username=username, password=password) - - if user: - login(request, user) - return HttpResponseRedirect(reverse("taxi:index")) - else: - error_context = { - "error_message": "Invalid values" - } - return render( - request, - "registration/login.html", - context=error_context - ) - - -def logout_view(request): - logout(request) - return render(request, "registration/login.html") +class UserLoginView(LoginView): + template_name = "registration/login.html" + success_url = reverse_lazy("taxi:index") + + +class UserLogoutView(LogoutView): + template_name = "registration/login.html" + success_url = reverse_lazy("taxi:index") From cdd2bed4f5abc6b3353f950925fa884f3e49b99d Mon Sep 17 00:00:00 2001 From: Illia Zhmurskiy Date: Sun, 22 Oct 2023 18:03:23 +0300 Subject: [PATCH 6/6] Solution --- templates/includes/sidebar.html | 4 ++-- templates/registration/login.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index a15d37e6..bfaaa75f 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,9 +1,9 @@
      {% if user.is_authenticated %}

      User: {{ user.username }}

      - Logout + Logout {% else %} - Login + Login {% endif %}
    • Home page
    • Manufacturers
      • diff --git a/templates/registration/login.html b/templates/registration/login.html index 8effea87..dcef141e 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,16 +1,16 @@ {% extends "base.html" %} {% block content %} -

      Logout

      +

      Login

      {% if form.errors %}

      Invalid username or password!

      {% endif %} -
      + {% csrf_token %} {{ form.as_p }} - +