diff --git a/static/css/styles.css b/static/css/styles.css index 1d8a1b3d..1c3f45eb 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1,3 +1,8 @@ body { margin-top: 20px; } + +.sidebar-nav { + padding: 0; + list-style: none; +} diff --git a/taxi/migrations/0002_alter_manufacturer_options_and_more.py b/taxi/migrations/0002_alter_manufacturer_options_and_more.py index a056822c..4f955935 100644 --- a/taxi/migrations/0002_alter_manufacturer_options_and_more.py +++ b/taxi/migrations/0002_alter_manufacturer_options_and_more.py @@ -1,22 +1,27 @@ -# Generated by Django 4.0.2 on 2022-04-12 06:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taxi', '0001_initial'), - ] - - operations = [ - migrations.AlterModelOptions( - name='manufacturer', - options={'ordering': ['name']}, - ), - migrations.AlterField( - model_name='driver', - name='license_number', - field=models.CharField(max_length=255, unique=True), - ), - ] +# Generated by Django 4.1 on 2023-12-14 07:33 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('taxi', '0001_initial'), + ] + + operations = [ + migrations.AlterModelOptions( + name='manufacturer', + options={'ordering': ['name']}, + ), + migrations.AlterField( + model_name='driver', + name='license_number', + field=models.CharField(max_length=255, unique=True), + ), + migrations.AlterField( + model_name='manufacturer', + name='name', + field=models.CharField(max_length=255, unique=True), + ), + ] diff --git a/taxi/migrations/0003_alter_manufacturer_name.py b/taxi/migrations/0003_alter_manufacturer_name.py deleted file mode 100644 index 806cc0e6..00000000 --- a/taxi/migrations/0003_alter_manufacturer_name.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.0.2 on 2022-06-16 07:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('taxi', '0002_alter_manufacturer_options_and_more'), - ] - - operations = [ - migrations.AlterField( - model_name='manufacturer', - name='name', - field=models.CharField(max_length=255, unique=True), - ), - ] diff --git a/taxi/urls.py b/taxi/urls.py index c663d6e2..bbb16a09 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -1,4 +1,4 @@ -from django.urls import path +from django.urls import path, include from .views import ( index, diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..89ad9ba2 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) + 1 + request.session["num_visits"] = num_visits 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) -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..2d013a55 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -9,7 +9,7 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/4.0/ref/settings/ """ - +import os from pathlib import Path # Build paths inside the project like this: BASE_DIR / "subdir". @@ -57,7 +57,7 @@ TEMPLATES = [ { "BACKEND": "django.template.backends.django.DjangoTemplates", - "DIRS": [BASE_DIR / "templates"], + "DIRS": [os.path.join(BASE_DIR, "templates")], "APP_DIRS": True, "OPTIONS": { "context_processors": [ @@ -108,6 +108,8 @@ AUTH_USER_MODEL = "taxi.Driver" +LOGIN_REDIRECT_URL = "/taxi/" + # Internationalization # https://docs.djangoproject.com/en/4.0/topics/i18n/ diff --git a/taxi_service/urls.py b/taxi_service/urls.py index 8b94449f..db559532 100644 --- a/taxi_service/urls.py +++ b/taxi_service/urls.py @@ -21,5 +21,6 @@ urlpatterns = [ path("admin/", admin.site.urls), - path("", include("taxi.urls", namespace="taxi")), + path("taxi/", 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..f012427d 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,12 @@ +

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

{% endblock %}