From f7fbe19029dd2e01164d9b190eeb427cfc00f84b Mon Sep 17 00:00:00 2001 From: Serhii Date: Thu, 16 Nov 2023 18:26:31 +0200 Subject: [PATCH 1/5] solution --- accounts/urls.py | 10 ++++++++++ taxi/migrations/0001_initial.py | 2 +- taxi/views.py | 16 +++++++++++----- taxi_service/settings.py | 3 +++ taxi_service/urls.py | 1 + templates/includes/sidebar.html | 6 ++++++ templates/registration/logged_out.html | 6 ++++++ templates/registration/login.html | 13 +++++++++++++ templates/taxi/driver_detail.html | 3 +++ templates/taxi/index.html | 1 + 10 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 accounts/urls.py create mode 100644 templates/registration/logged_out.html create mode 100644 templates/registration/login.html diff --git a/accounts/urls.py b/accounts/urls.py new file mode 100644 index 00000000..6a281419 --- /dev/null +++ b/accounts/urls.py @@ -0,0 +1,10 @@ +from django.urls import path +from accounts.views import login_view, logout_view + + +urlpatterns = [ + path("login/", login_view, name="login"), + path("logout/", logout_view, name="logout") +] + +app_name = "accounts" 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..1cab8eb3 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,53 @@ +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() + 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..7b705d5b 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -40,6 +40,7 @@ "django.contrib.messages", "django.contrib.staticfiles", "taxi", + "accounts", ] MIDDLEWARE = [ @@ -108,6 +109,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..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/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..53aceeef 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,10 @@ {% endblock %} From 33ca03010acd7934c5b8caa2b0fb209c8dd7526c Mon Sep 17 00:00:00 2001 From: Serhii Date: Mon, 20 Nov 2023 05:27:18 +0200 Subject: [PATCH 2/5] useless app_name --- accounts/urls.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/accounts/urls.py b/accounts/urls.py index 6a281419..1a1f05df 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -6,5 +6,3 @@ path("login/", login_view, name="login"), path("logout/", logout_view, name="logout") ] - -app_name = "accounts" From 6a561ebc70cf517fd14d6a1e752bf5b3f9386053 Mon Sep 17 00:00:00 2001 From: Serhii Date: Mon, 20 Nov 2023 21:50:37 +0200 Subject: [PATCH 3/5] fix --- taxi_service/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 5d781485..531b9ed8 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -22,5 +22,5 @@ urlpatterns = [ path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), - path("accounts/", include("django.contrib.auth.urls")) + path("", include("django.contrib.auth.urls")) ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) From 817477861973232664f514999247e6070cb1bd55 Mon Sep 17 00:00:00 2001 From: Serhii Date: Tue, 21 Nov 2023 17:08:57 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=C3=90god=20help?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- accounts/urls.py | 8 -------- taxi_service/urls.py | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 accounts/urls.py diff --git a/accounts/urls.py b/accounts/urls.py deleted file mode 100644 index 1a1f05df..00000000 --- a/accounts/urls.py +++ /dev/null @@ -1,8 +0,0 @@ -from django.urls import path -from accounts.views import login_view, logout_view - - -urlpatterns = [ - path("login/", login_view, name="login"), - path("logout/", logout_view, name="logout") -] diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 531b9ed8..5d781485 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -22,5 +22,5 @@ urlpatterns = [ path("admin/", admin.site.urls), path("", include("taxi.urls", namespace="taxi")), - path("", include("django.contrib.auth.urls")) + path("accounts/", include("django.contrib.auth.urls")) ] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) From 2395cf6656c5480d41c704de06a20b12486e23f1 Mon Sep 17 00:00:00 2001 From: Serhii Date: Tue, 21 Nov 2023 17:11:20 +0200 Subject: [PATCH 5/5] delete from settings --- taxi_service/settings.py | 1 - 1 file changed, 1 deletion(-) diff --git a/taxi_service/settings.py b/taxi_service/settings.py index 7b705d5b..cc71a76f 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -40,7 +40,6 @@ "django.contrib.messages", "django.contrib.staticfiles", "taxi", - "accounts", ] MIDDLEWARE = [