From a28fa9c6462afc658ee7fa85380581454419b4ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=27=D1=8F=D0=BD=D0=B0=20=D0=A2=D0=B8?= =?UTF-8?q?=D1=85=D0=B0?= Date: Thu, 19 Dec 2024 15:13:11 +0200 Subject: [PATCH 1/2] taxi service authentication --- taxi/urls.py | 25 ++-------------- taxi/views.py | 40 ++++---------------------- taxi_service/settings.py | 6 ++++ taxi_service/urls.py | 4 +-- templates/includes/sidebar.html | 6 ++++ templates/registration/logged_out.html | 12 ++++++++ templates/registration/login.html | 13 +++++++++ templates/taxi/driver_list.html | 4 ++- templates/taxi/index.html | 2 +- 9 files changed, 50 insertions(+), 62 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..bf73e46f 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -1,27 +1,8 @@ from django.urls import path +from . import views -from .views import ( - index, - CarListView, - CarDetailView, - DriverListView, - DriverDetailView, - ManufacturerListView, -) +app_name = "taxi" urlpatterns = [ - path("", index, name="index"), - path( - "manufacturers/", - ManufacturerListView.as_view(), - name="manufacturer-list", - ), - path("cars/", CarListView.as_view(), name="car-list"), - path("cars//", CarDetailView.as_view(), name="car-detail"), - path("drivers/", DriverListView.as_view(), name="driver-list"), - path( - "drivers//", DriverDetailView.as_view(), name="driver-detail" - ), + path("", views.index, name="index"), ] - -app_name = "taxi" diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..04706856 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,17 @@ +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() - - context = { - "num_drivers": num_drivers, - "num_cars": num_cars, - "num_manufacturers": num_manufacturers, - } - - return render(request, "taxi/index.html", context=context) - - -class ManufacturerListView(generic.ListView): - model = Manufacturer - context_object_name = "manufacturer_list" - template_name = "taxi/manufacturer_list.html" - paginate_by = 5 - - -class CarListView(generic.ListView): - model = Car - paginate_by = 5 - queryset = Car.objects.select_related("manufacturer") - - -class CarDetailView(generic.DetailView): - model = Car - - -class DriverListView(generic.ListView): - model = Driver - paginate_by = 5 - - -class DriverDetailView(generic.DetailView): - model = Driver - queryset = Driver.objects.prefetch_related("cars__manufacturer") + num_visits = request.session.get("num_visits", 1) + request.session["num_visits"] = num_visits + 1 diff --git a/taxi_service/settings.py b/taxi_service/settings.py index b6c0cf19..93487abb 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -42,6 +42,8 @@ "taxi", ] +LOGIN_URL = "/login/" + MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", "django.contrib.sessions.middleware.SessionMiddleware", @@ -133,3 +135,7 @@ # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" + +LOGIN_REDIRECT_URL = "/" + +LOGOUT_REDIRECT_URL = "/" diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..c8e2f44a 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -1,5 +1,4 @@ """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: @@ -17,9 +16,8 @@ from django.urls import path, include from django.conf import settings from django.conf.urls.static import static - - 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..23a1a0f6 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,3 +1,9 @@ +{% if user.is_authenticated %} +

Username: {{ user.username }}

+ Logout +{% else %} + Login +{% endif %}
  • Home page
  • Manufacturers
    • diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..fa056d1f --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,12 @@ +{% extends 'base.html' %} + +{% block sidebar %} + Home page +{% endblock %} + +{% block content %} +
    +

    You're Logged Out

    + Log in +
    +{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..3696d5a6 --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,13 @@ +{% extends 'base.html' %} + +{% block sidebar %} + Home page +{% endblock %} + +{% block content %} +
    + {% csrf_token %} + {{ form.as_p }} + +
    +{% endblock %} diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..4d8d1796 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -1,5 +1,4 @@ {% extends "base.html" %} - {% block content %}

    Driver list

    {% if driver_list %} @@ -8,6 +7,9 @@

    Driver list

  • {{ driver.username }} ({{ driver.first_name }} {{ driver.last_name }}) + {% if driver.id == user.id %} + (Me) + {% endif %}
    • {% endfor %}
diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..b9010a2e 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -1,5 +1,4 @@ {% extends "base.html" %} - {% block content %}

Taxi Service Home

Welcome to Best Taxi Ever!

@@ -10,4 +9,5 @@

Dynamic content

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

    You've visited this page {{ num_visits }} time{{ num_visits|pluralize }}

    {% endblock %} From 336621c7b1268e1d8e46cc2a0dd25233e1f06592 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B0=D1=80=27=D1=8F=D0=BD=D0=B0=20=D0=A2=D0=B8?= =?UTF-8?q?=D1=85=D0=B0?= Date: Thu, 19 Dec 2024 15:19:39 +0200 Subject: [PATCH 2/2] Solution --- taxi/views.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/taxi/views.py b/taxi/views.py index 04706856..e7dc4312 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -10,8 +10,5 @@ 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