From ec11098e4645fc6f2ca5a0ae71a295b514270297 Mon Sep 17 00:00:00 2001 From: Andrii Ishchenko Date: Fri, 17 Nov 2023 11:19:33 +0200 Subject: [PATCH 1/3] Solution --- .gitignore | 1 + db.sqlite3 | Bin 0 -> 176128 bytes taxi/urls.py | 2 +- taxi/views.py | 17 +++++++++++------ taxi_service/settings.py | 6 +++++- taxi_service/urls.py | 1 + templates/includes/sidebar.html | 22 ++++++++++++++++++---- templates/registration/logged_out.html | 5 +++++ templates/registration/login.html | 18 ++++++++++++++++++ templates/taxi/car_list.html | 2 +- templates/taxi/driver_list.html | 15 +++++++++++---- templates/taxi/index.html | 1 + 12 files changed, 73 insertions(+), 17 deletions(-) create mode 100644 db.sqlite3 create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/.gitignore b/.gitignore index b26d6116..abb32ddc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ venv/ .pytest_cache/ **__pycache__/ +.pylintrc diff --git a/db.sqlite3 b/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..b59363401944225553d5c42fa6805eb6a9d383f4 GIT binary patch literal 176128 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/", DriverDetailView.as_view(), name="driver-detail" - ), + ) ] app_name = "taxi" diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..6e86b58c 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,52 @@ +from django.contrib.auth.mixins import LoginRequiredMixin +from django.http import HttpRequest, HttpResponse from django.shortcuts import render from django.views import generic from .models import Driver, Car, Manufacturer -def index(request): +def index(request: HttpRequest) -> 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..4706af52 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -12,6 +12,8 @@ from pathlib import Path +from django.conf.global_settings import LOGIN_REDIRECT_URL + # Build paths inside the project like this: BASE_DIR / "subdir". BASE_DIR = Path(__file__).resolve().parent.parent @@ -39,7 +41,7 @@ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", - "taxi", + "taxi" ] MIDDLEWARE = [ @@ -108,6 +110,8 @@ AUTH_USER_MODEL = "taxi.Driver" +LOGIN_REDIRECT_URL = "/" + # Internationalization # https://docs.djangoproject.com/en/4.0/topics/i18n/ 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..02c4d2c4 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,20 @@ diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..4ffb1809 --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,5 @@ +{% extends "base.html" %} +{% block content %} +

Logged out

+ Click here to login again +{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..1d951e5c --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} + +{% block content %} +

Login

+ + {% if form.errors %} +

Invalid credentials

+ {% endif %} + +
+ {% csrf_token %} + {{ form.as_p }} + + + + +
+{% endblock %} diff --git a/templates/taxi/car_list.html b/templates/taxi/car_list.html index e107b579..90067b92 100644 --- a/templates/taxi/car_list.html +++ b/templates/taxi/car_list.html @@ -6,7 +6,7 @@

Car list

    {% for car in car_list %}
  • - {{ car.id }} + {{ car.id }} {{ car.model }} ({{ car.manufacturer.name }})
    • {% endfor %} diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..f895dd3b 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -5,10 +5,17 @@

    Driver list

    {% if driver_list %}
      {% for driver in driver_list%} -
    • - {{ driver.username }} - ({{ driver.first_name }} {{ driver.last_name }}) -
      • + {% if user.id == driver.id %} +
    • + {{ driver.username }} + ({{ driver.first_name }} {{ driver.last_name }}) (Me) +
      • + {% else %} +
    • + {{ driver.username }} + ({{ driver.first_name }} {{ driver.last_name }}) +
      • + {% endif %} {% endfor %}
    {% else %} 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 583446971ba8fc879004a8587d199d7b8b40734b Mon Sep 17 00:00:00 2001 From: Andrii Ishchenko Date: Fri, 17 Nov 2023 11:44:52 +0200 Subject: [PATCH 2/3] Solution 2 --- db.sqlite3 | Bin 176128 -> 176128 bytes taxi/views.py | 4 +++- taxi_service/settings.py | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/db.sqlite3 b/db.sqlite3 index b59363401944225553d5c42fa6805eb6a9d383f4..3f1524c23e0acf8801a77ef07de6651cb0b6bb1e 100644 GIT binary patch delta 536 zcmajbyKd7^0D$4f1yV%;11l9O5))F=V;`SmJA%Qn6FW|#+(=Sq$<210*l}*YB}+;x z7?^;i6Ke-LBIJ=5Vdx9+4s>8eJi-6zKfg_#-=;o2OWb@u785t`2JZ)n9|Pk0G$kH9 zx_;=BAJby|7!WYMzc_txzj`?r*6Xc-$Kwry5H@_YT%#3_SqHE1bnXXkkTuk(Gn4Gv zWG6I)dVgA5tD9~;FV1@m?AE;51lF~}LIZ6R8>M2wX2;RuY*T4@8$_?59F;YzIaCzf z(^#%z^mI!MoEF;48KiX7w?0A=!+)NTAh#6>(13;+ip~J)1n@aX=O{J{FyvWqk-c~K z%oeUzec~kk`i5|yCcls|sgUva7vKq5B7YsIoZ;vW50>=MbQgiO@kR`uxE^QeA>wUL zPrf{?CjNIlcKXC`@)gbHC@zaQ3PLvd{7^{z(-vPYh!02UzgkH1n7;bCCxo~Y5#QK9 DW?rTn delta 535 zcmaiwJ#W)c7)EQCk}4EjSV2$(6H>!{eeJ}yU~nOkoy5>2RhwjSf9oHxZ3D77Wv&Ks#||LK2Mm5O{mSriWr=@vLv85zK7M9{Uw2S@m?^ z(GK5^j^viSD|%UicG@*p6k~p_YO&M6AggiEL|B~fHB)ZdpK3KBV$DD|gg6+Xv6;jT zHe(?ec2zDJ_0&CKk#?-mN+!FZV}!{BqUxOOxq7wNCmi(07L+yd^+7)rmg_gywB;k& zh)mNB+^FmuUL`b1JVp2&;n_?G5M<88I;s=%0BqCuvSGKKsm=`9EeRq_vatm1xi@^H zcYI>ElwnvEUIeivay2iE+6}_uZ3xxwtVt9_>9OdF*=+<{NR&X3FfQ?8nG?|a(v7vN zWT&A{Z{^=!($jkdh55?l%#$CF(OpJmey`N8>sffZs!`Xy$vvI^!#o3C0 HttpResponse: +@login_required +def index(request: HttpRequest) -> HttpResponse: """View function for the home page of the site.""" num_drivers = Driver.objects.count() diff --git a/taxi_service/settings.py b/taxi_service/settings.py index 4706af52..a4ef2fd3 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -12,8 +12,6 @@ from pathlib import Path -from django.conf.global_settings import LOGIN_REDIRECT_URL - # Build paths inside the project like this: BASE_DIR / "subdir". BASE_DIR = Path(__file__).resolve().parent.parent From f88e1dcd1500437d132da60182c5a7ea314f4b84 Mon Sep 17 00:00:00 2001 From: Andrii Ishchenko Date: Fri, 17 Nov 2023 13:18:31 +0200 Subject: [PATCH 3/3] may be this way --- db.sqlite3 | Bin 176128 -> 176128 bytes templates/taxi/driver_list.html | 9 +-------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/db.sqlite3 b/db.sqlite3 index 3f1524c23e0acf8801a77ef07de6651cb0b6bb1e..7a70f11439cf51d647d5768dc232e667da9be846 100644 GIT binary patch delta 255 zcmZp8z}4`8Yl1Z6hKVxHj2jvgS`!$zCNRCWR!FQeO*Jt}wx}|(NXyHrG)&2_CG_x|a)H5(QF*7r0(qm!uZO(R_UKr1$uzjvA zQ=Sm32md7g?b`(cm~8k7I%j)MJQJq?AF8R_oAa5PIrtHR#+D}L2GjS~GdXS#t6*AX F4gl*3PgMW_ delta 255 zcmZp8z}4`8Yl1Z6>WMPWjH??HS`!$zCNRCWRwyc}Of^eRE;cbWHA^iuEhsWAv@|o% zF)K97%q=a;E1RBe!*npP%(=>{(y%nt(ZJn3%_S`AIIL*a0(lIi} zQMaT#%D_F;!^ObJz{ptF&`8(7P{F{`%Gk)t&|J^J%-GW0ph=H~)wem@ae84qlfw47 zwoG|Ktdsb+^LuO;2w<||C+M8*Iq^)K0(_{ZZg0+KYUbca2pSt%ni);sU(e*YJ*Driver list {% if driver_list %}
    {% for driver in driver_list%} - {% if user.id == driver.id %}
  • {{ driver.username }} - ({{ driver.first_name }} {{ driver.last_name }}) (Me) + ({{ driver.first_name }} {{ driver.last_name }}) {% if user.id == driver.id %}(Me){% endif %}
    • - {% else %} -
  • - {{ driver.username }} - ({{ driver.first_name }} {{ driver.last_name }}) -
    • - {% endif %} {% endfor %}
{% else %}