From 9750c41fe160c221518988afbd33e61fd1daa0f4 Mon Sep 17 00:00:00 2001 From: Ihor Utkin Date: Wed, 11 Sep 2024 16:29:39 +0200 Subject: [PATCH 1/7] First commit --- db.sqlite3 | Bin 0 -> 176128 bytes taxi/migrations/0001_initial.py | 2 +- taxi/views.py | 13 ++++++++----- taxi_service/settings.py | 8 ++++++++ taxi_service/urls.py | 5 ++++- templates/includes/sidebar.html | 9 +++++++++ templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 15 +++++++++++++++ templates/taxi/driver_list.html | 19 +++++++++++++++---- 9 files changed, 66 insertions(+), 11 deletions(-) create mode 100644 db.sqlite3 create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/db.sqlite3 b/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..09313b24c957ab06b1fea9c20830eab5f82e8980 GIT binary patch literal 176128 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 literal 0 HcmV?d00001 diff --git a/taxi/migrations/0001_initial.py b/taxi/migrations/0001_initial.py index ff29293e..6e6e989b 100644 --- a/taxi/migrations/0001_initial.py +++ b/taxi/migrations/0001_initial.py @@ -29,7 +29,7 @@ class Migration(migrations.Migration): ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), - ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting registration.', verbose_name='active')), ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), ('license_number', models.CharField(max_length=255)), ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..b9fef82a 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,9 +1,12 @@ +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.""" @@ -20,28 +23,28 @@ def index(request): 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..f23a7d34 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -39,6 +39,7 @@ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", + "debug_toolbar", "taxi", ] @@ -50,6 +51,7 @@ "django.contrib.auth.middleware.AuthenticationMiddleware", "django.contrib.messages.middleware.MessageMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", + "debug_toolbar.middleware.DebugToolbarMiddleware" ] ROOT_URLCONF = "taxi_service.urls" @@ -108,6 +110,12 @@ AUTH_USER_MODEL = "taxi.Driver" +INTERNAL_IPS = [ + "127.0.0.1", +] + +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..ec78e718 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -17,9 +17,12 @@ from django.urls import path, include from django.conf import settings from django.conf.urls.static import static +from debug_toolbar.toolbar import debug_toolbar_urls urlpatterns = [ path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), -] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + path("registration/", include("django.contrib.auth.urls")), +] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + debug_toolbar_urls() + diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..a9de6cc4 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,13 @@
    + {% if user.is_authenticated %} +
  • + User: {{ user.username }} +
  • Logout
    • + + {% else %} +
  • Login
    • + {% endif %} +
  • Home page
  • Manufacturers
  • Cars
    • diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..a7f74987 --- /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 %} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..3c158bcc --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,15 @@ +{% 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..1568021a 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -5,10 +5,21 @@

    Driver list

    {% if driver_list %} {% else %} From 15ab7d55949beff1fdb457ff737c0d09bd31f2db Mon Sep 17 00:00:00 2001 From: Ihor Utkin Date: Wed, 11 Sep 2024 16:39:37 +0200 Subject: [PATCH 2/7] Resolve --- db.sqlite3 | Bin 176128 -> 176128 bytes taxi/views.py | 3 +++ taxi_service/urls.py | 6 ++++-- templates/taxi/index.html | 1 + 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/db.sqlite3 b/db.sqlite3 index 09313b24c957ab06b1fea9c20830eab5f82e8980..7f4cd1d7c31f5b58ea96e756d371ce4787bbff3e 100644 GIT binary patch delta 363 zcmX}gOHzVh007`1YtmkecGWa?01AEq{h4y)rAeZQ5b4GjLE}3?5H?y(n^v{*23??O z+;meammYip^KCw~cq)&$0_2~5lMxg;3)yZBOg?RX?MD=KjCus12Qu=+NK zP8YCYQlCD_j%mH8UvZUHsE=!Qc6LOSUvZX6hOSp|s$WQ=r-h$kK}C{Ld}vr|ppSb_ znX_qCMwo$-fsu)>fu*jIse+-gm8qqbskxqssgb#<`F1;7rf?%+R6!OwW=F>9UUp1U L+YjY4**O3JhbS)5 diff --git a/taxi/views.py b/taxi/views.py index b9fef82a..bba6f12e 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -13,11 +13,14 @@ def index(request): 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, } return render(request, "taxi/index.html", context=context) diff --git a/taxi_service/urls.py b/taxi_service/urls.py index ec78e718..19a5b706 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -24,5 +24,7 @@ path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), path("registration/", include("django.contrib.auth.urls")), -] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + debug_toolbar_urls() - +] + static( + settings.STATIC_URL, + document_root=settings.STATIC_ROOT +) + debug_toolbar_urls() 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 d7f3b8c61c423587f51c93267dee20557b357493 Mon Sep 17 00:00:00 2001 From: Ihor Utkin Date: Wed, 11 Sep 2024 16:41:57 +0200 Subject: [PATCH 3/7] Resolve --- taxi/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taxi/views.py b/taxi/views.py index bba6f12e..1cab8eb3 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -20,7 +20,7 @@ def index(request): "num_drivers": num_drivers, "num_cars": num_cars, "num_manufacturers": num_manufacturers, - "num_visits": num_visits, + "num_visits": num_visits + 1, } return render(request, "taxi/index.html", context=context) From 34b78144756c7f88b7982995a07adc4fdd270ef1 Mon Sep 17 00:00:00 2001 From: Ihor Utkin Date: Wed, 11 Sep 2024 16:44:45 +0200 Subject: [PATCH 4/7] Resolve without debug toolbar --- db.sqlite3 | Bin 176128 -> 176128 bytes taxi_service/settings.py | 2 -- taxi_service/urls.py | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/db.sqlite3 b/db.sqlite3 index 7f4cd1d7c31f5b58ea96e756d371ce4787bbff3e..da2ae7e1ebeb5063595c238d68e7f2372697f5bd 100644 GIT binary patch delta 436 zcmajbzi!$<0Dy7Xv}u(gB<ZmTW)&2FLTqcgYN_G*MPr!f8baw zHv_rY_41cP9L|Sc@P%4pX(&=`=;ut*RTj>a zgyM23Fr0*0Z9l+5FEoiMp^RhF!eksp78gtUij&obdrAfxwpPZA04F{-2dh!*L{9#ckkca nvv;WixB2vuf0O(f^UBMezgkuT=$K#u3S{$p#TSy!g1^O2X%CAt delta 436 zcmajbO;4L(007`Xom)Iu-ENyPCVH)bm-mIf_>llbEtc93TGl2@D@E8Sr6?_5mv$!J z)l2__H?u4pO}zLgcJQa{>dim!9G>~>%KUZZ_8Z~dZAgUoyMNOs{`Seoy{-6?M!(oJ zWrEOwQPART0q4z!zt-erzW#S#`&vGBQjMbkaskDd}7@(0bNswTaufc9n|t z4pl3)csdxLH9P!7h_5OQGgSo}_X^F4>C$$oAyz==rwmUlJb@-SDl6rvJ_Hni1qv4c z+M*%Pusj62RFN)H)b)1mLna=OFP}f&=d=93{OHg6{6~IgC#Mqc Date: Wed, 11 Sep 2024 16:46:14 +0200 Subject: [PATCH 5/7] Resolve without debug toolbar --- taxi_service/settings.py | 4 ---- taxi_service/urls.py | 1 - 2 files changed, 5 deletions(-) diff --git a/taxi_service/settings.py b/taxi_service/settings.py index 3584b2d9..cc71a76f 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -108,10 +108,6 @@ AUTH_USER_MODEL = "taxi.Driver" -INTERNAL_IPS = [ - "127.0.0.1", -] - LOGIN_REDIRECT_URL = "/" # Internationalization diff --git a/taxi_service/urls.py b/taxi_service/urls.py index c67efbf7..c80646b4 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -17,7 +17,6 @@ from django.urls import path, include from django.conf import settings from django.conf.urls.static import static -from debug_toolbar.toolbar import debug_toolbar_urls urlpatterns = [ From 4f87da8c3f4cc60b230bafa982b3345a4f312034 Mon Sep 17 00:00:00 2001 From: Ihor Utkin Date: Fri, 13 Sep 2024 12:56:00 +0200 Subject: [PATCH 6/7] Resolve .2 --- db.sqlite3 | Bin 176128 -> 176128 bytes templates/registration/login.html | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/db.sqlite3 b/db.sqlite3 index da2ae7e1ebeb5063595c238d68e7f2372697f5bd..12e43e3bd979b4bfed092c6a4195951ed9987141 100644 GIT binary patch delta 707 zcmaiwO>fe00EgQ$$IHr!CT2z#Gb5f%q5b!bl5DZSR$j)-WH2Bx2!+v>wv=~hOknZg zO*anq=x11V=+Q)v#&6(ZAHahjz=LLb@aFIE+bxiYu6P~ zGiqG6I@1b8Y1%xjG(ZYh%S4Qqm-u&y@|!p7z)O+dq=_zCKl@J)X?bQ^SZTv9+hKq3a#|0ud@K5CowZ2VtD!St2;*^SZX+n?Gs`?~u>yD5gW0?s(1-3A?rC N^24Yz_<+0(`~sD;)TjUe delta 625 zcmaiwO>fe00LE#zq?2wIO-#%*MiZ_b|CYY+C)tvg0pq1GpioL;CKTGyL02fymY9sh zgE!qc*rT6e*`X&ddNh6m5BmUq1P|iPo5^$f9iAt@XLTQ4-AAvVA+ww38Dw_*hD#v$ zyCCsCNFZU5K$p8$y5?|m!1?AV)$j85qC2uChQ_)kOu3qF`v-%f*D@uiYWPB}u9LZb zvzpC!@*H1b7X?WYMl$1O2lSZh!FJZuXV7MsOUhvsTdz;$cC~Ei^^D)DE?CD}I0N5E zW=zcn7c#AM9QJC!7Yx{CqP4syYQdO9PrA0VHYmCB>u}CQX9_I>j?d7# z-ydURVoij^&$~yf*F-$NB_aR2F}yiLu~_V%rtKG70umID(EZ@+B`WUY*gAr(AAZ{V zwa4$i#ed*Wqxyr}o!>jHJ0Uj1g0+i!crp!`1ISY}1;ZyEN@2*CAb*9vQsVXg)K4~x zrJ^*Mr!Gc@URJe6F20aEDqXV*DhHrl5xa%t`AONBh@3^$N>HANO?Tl*!=|Z%!;Ljf zg48B|tv3P5U^61@L?e+1P6&}OxLogin From 72d5a941b68600afab7443c61ee19482ce68de42 Mon Sep 17 00:00:00 2001 From: Ihor Utkin Date: Mon, 16 Sep 2024 15:26:57 +0200 Subject: [PATCH 7/7] resolve without database --- db.sqlite3 | Bin 176128 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 db.sqlite3 diff --git a/db.sqlite3 b/db.sqlite3 deleted file mode 100644 index 12e43e3bd979b4bfed092c6a4195951ed9987141..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176128 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 JN}a*|{{gNkX~h5l