diff --git a/requirements.txt b/requirements.txt index 53898f6d..f5ac048e 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 +django-debug-toolbar<=4.8.0 \ No newline at end of file diff --git a/taxi/urls.py b/taxi/urls.py index c663d6e2..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 82ad312f..c8573cf1 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,33 +1,43 @@ -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.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, reverse_lazy 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 +47,7 @@ class CarDetailView(generic.DetailView): model = Car -class DriverListView(generic.ListView): +class DriverListView(LoginRequiredMixin, generic.ListView): model = Driver paginate_by = 5 @@ -45,3 +55,13 @@ class DriverListView(generic.ListView): class DriverDetailView(generic.DetailView): model = Driver queryset = Driver.objects.prefetch_related("cars__manufacturer") + + +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") 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..bfaaa75f 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 %}