From 1cd67a717ed57729eec961461cca85c3ae27fc7b Mon Sep 17 00:00:00 2001 From: Kateryna Zadorozhna Date: Tue, 26 Sep 2023 01:55:01 +0300 Subject: [PATCH 1/2] Solution --- static/css/styles.css | 10 ++++++++++ taxi/views.py | 19 +++++++++++++------ taxi_service/settings.py | 2 ++ taxi_service/urls.py | 1 + templates/base.html | 1 - templates/includes/sidebar.html | 21 +++++++++++++++------ templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 16 ++++++++++++++++ templates/taxi/driver_list.html | 2 +- templates/taxi/index.html | 2 ++ 10 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/static/css/styles.css b/static/css/styles.css index 1d8a1b3d..cded86bb 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1,3 +1,13 @@ body { margin-top: 20px; + background-color: whitesmoke; +} + +.sidebar-nav { + list-style: none; + padding: 0; +} + +.sidebar-nav-element { + color: black; } diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..7a582c33 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,54 @@ +from django.contrib.auth.decorators import login_required +from django.contrib.auth.mixins import LoginRequiredMixin +from django.http import HttpResponse from django.shortcuts import render from django.views import generic from .models import Driver, Car, Manufacturer -def index(request): +@login_required +def index(request) -> HttpResponse: """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..7dc811ed 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -108,6 +108,8 @@ AUTH_USER_MODEL = "taxi.Driver" +LOGIN_REDIRECT_URL = "/cars/" + # Internationalization # https://docs.djangoproject.com/en/4.0/topics/i18n/ diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..5d781485 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/base.html b/templates/base.html index f4a0b6cf..c0f2e0e2 100644 --- a/templates/base.html +++ b/templates/base.html @@ -9,7 +9,6 @@ href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous"> - {% load static %} diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..4af5214a 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,15 @@ - +
+ +
diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..a4cd22eb --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} + +{% block content %} +

Logged out!

+ Click here to login again. +{% endblock %} \ No newline at end of file diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..a6e4f58c --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} + +{% block content %} +

Login

+ + {% if form.errors %} +

Invalid credentials

+ {% endif %} + +
+ {% csrf_token %} + {{ form.as_p }} +
+ +
+{% endblock %} diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..a97f66a1 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -7,7 +7,7 @@

Driver list

{% for driver in driver_list%}
  • {{ driver.username }} - ({{ driver.first_name }} {{ driver.last_name }}) + ({{ driver.first_name }} {{ driver.last_name }}) {% if user.id == driver.id %}(Me){% endif %}
    • {% endfor %} diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..a50d7eb4 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -10,4 +10,6 @@

    Dynamic content

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

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

    {% endblock %} From c27ef12088f0e2cd282dae085ed7d830959f3e1e Mon Sep 17 00:00:00 2001 From: Kateryna Zadorozhna <136272476+katryana@users.noreply.github.com> Date: Tue, 26 Sep 2023 02:06:19 +0300 Subject: [PATCH 2/2] Update logged_out.html --- templates/registration/logged_out.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html index a4cd22eb..a39e502d 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 %}