diff --git a/.gitignore b/.gitignore index 4a7076c2..545b52f7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,9 @@ venv/ .venv/ .pytest_cache/ **__pycache__/ +*.pyc +**db.sqlite3 +.vs/ +.git/ +**__init__.py + diff --git a/taxi/urls.py b/taxi/urls.py index c663d6e2..2e2cfe09 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -9,6 +9,7 @@ ManufacturerListView, ) + urlpatterns = [ path("", index, name="index"), path( diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..2a482982 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,53 @@ from django.shortcuts import render from django.views import generic +from django.contrib.auth.decorators import login_required +from django.contrib.auth.mixins import LoginRequiredMixin -from .models import Driver, Car, Manufacturer +from taxi.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": request.session["num_visits"] } 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..e8f0543a 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -133,3 +133,5 @@ # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" + +LOGIN_REDIRECT_URL = "/" 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/base.html b/templates/base.html index f4a0b6cf..9ac3f6eb 100644 --- a/templates/base.html +++ b/templates/base.html @@ -1,40 +1,30 @@ - - {% block title %}Taxi Service{% endblock %} - - - - - {% load static %} - + {% block title %} + Taxi Service{% endblock %} + + + + {% load static %} + - -
-
-
- - {% block sidebar %} - {% include "includes/sidebar.html" %} - {% endblock %} - +
+
+
+ {% block sidebar %} + {% include "includes/sidebar.html" %} + {% endblock %} +
+
+ {% block content %}{% endblock %} + + {% block pagination %} + {% include "includes/pagination.html" %} + {% endblock %} +
+
-
- - {% block content %}{% endblock %} - - {% block pagination %} - {% include "includes/pagination.html" %} - {% endblock %} - -
-
-
- diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..4ec0ceb7 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,16 @@ diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..9541599c --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,6 @@ +

Login

+
+ {% csrf_token %} + {{ form.as_p }} + +
diff --git a/templates/registration/logout.html b/templates/registration/logout.html new file mode 100644 index 00000000..a539e423 --- /dev/null +++ b/templates/registration/logout.html @@ -0,0 +1,2 @@ +

You have been logged out.

+Log in again diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..263fc1a2 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -1,17 +1,18 @@ {% extends "base.html" %} {% block content %} -

Driver list

+

Driver list

{% if driver_list %} - + {% else %} -

There are no drivers in taxi

+

There are no drivers in taxi

{% endif %} {% endblock %} diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..5053b246 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -1,13 +1,14 @@ {% extends "base.html" %} {% block content %} -

Taxi Service Home

-

Welcome to Best Taxi Ever!

-

Dynamic content

-

The Taxi service has the following record counts:

- {% endblock %}