From 737fad975edb9ca80eb7aa5fc12df7e504ad85b6 Mon Sep 17 00:00:00 2001 From: Yeva Date: Fri, 22 Sep 2023 18:19:18 +0300 Subject: [PATCH 1/6] Solution --- db.sqlite3 | Bin 0 -> 176128 bytes taxi/models.py | 4 ---- taxi/urls.py | 2 +- taxi/views.py | 17 +++++++++++------ taxi_service/settings.py | 1 + taxi_service/urls.py | 1 + templates/includes/sidebar.html | 12 ++++++++++++ templates/registration/logged_out.html | 5 +++++ templates/registration/login.html | 16 ++++++++++++++++ templates/taxi/driver_list.html | 2 +- templates/taxi/index.html | 1 + 11 files changed, 49 insertions(+), 12 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..66b8570a5e68c96b0f0883e60e6ecae471f40c70 GIT binary patch literal 176128 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 IaR%T22k)|Spa1{> literal 0 HcmV?d00001 diff --git a/taxi/models.py b/taxi/models.py index 9061de82..14d8749a 100644 --- a/taxi/models.py +++ b/taxi/models.py @@ -16,10 +16,6 @@ def __str__(self): class Driver(AbstractUser): license_number = models.CharField(max_length=255, unique=True) - class Meta: - verbose_name = "driver" - verbose_name_plural = "drivers" - def __str__(self): return f"{self.username} ({self.first_name} {self.last_name})" 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..e44b800f 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,52 @@ +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", 1) + 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) -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..050808a8 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -107,6 +107,7 @@ ] 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..0facf5ec 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..b13623ca 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,4 +1,16 @@
    + {% if user.is_authenticated %} +
  • + User: {{ user.username }} +
    • +
  • + Log out +
    • + {% else %} +
  • + Log in +
    • + {% 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..69afc196 --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,5 @@ +{% extends 'base.html' %} +{% block content %} +

    Logged out

    +Click here to log in again +{% endblock %} \ No newline at end of file diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..4c29e90e --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,16 @@ +{% 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..e79f5bcb 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -7,7 +7,7 @@

    Driver list

    {% for driver in driver_list%}
  • {{ driver.username }} - ({{ driver.first_name }} {{ driver.last_name }}) + ({{ driver.first_name }} {{ driver.last_name }}) {% if driver.username == user.username %} (Me) {% endif %}
    • {% endfor %}
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 9b828c9e0072c4db19fb66d213fbf13d8f24f1dc Mon Sep 17 00:00:00 2001 From: Yeva Date: Fri, 22 Sep 2023 18:22:42 +0300 Subject: [PATCH 2/6] Added db in gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index b26d6116..b9b230d8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ venv/ .pytest_cache/ **__pycache__/ +db.sqlite3 From 44bea059258cf8e9dfb54e95694e85ba3130e0ad Mon Sep 17 00:00:00 2001 From: Yeva Date: Fri, 22 Sep 2023 18:23:30 +0300 Subject: [PATCH 3/6] Added db in gitignore --- 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 66b8570a5e68c96b0f0883e60e6ecae471f40c70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 176128 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 IaR%T22k)|Spa1{> From af5dd2e73b0055b7cfda203bc3b595ed13963a4c Mon Sep 17 00:00:00 2001 From: Yeva Date: Fri, 22 Sep 2023 18:24:39 +0300 Subject: [PATCH 4/6] Added blank line in html --- templates/registration/logged_out.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html index 69afc196..a0990e53 100644 --- a/templates/registration/logged_out.html +++ b/templates/registration/logged_out.html @@ -2,4 +2,4 @@ {% block content %}

    Logged out

    Click here to log in again -{% endblock %} \ No newline at end of file +{% endblock %} From ea5c81f339297d0fdf848ab35d9badbb72865b31 Mon Sep 17 00:00:00 2001 From: Yeva Date: Fri, 22 Sep 2023 19:37:15 +0300 Subject: [PATCH 5/6] Fixed num of visits --- ...ons_alter_manufacturer_options_and_more.py | 31 +++++++++++++++++++ ...002_alter_manufacturer_options_and_more.py | 22 ------------- .../0003_alter_manufacturer_name.py | 18 ----------- taxi/views.py | 4 +-- 4 files changed, 33 insertions(+), 42 deletions(-) create mode 100644 taxi/migrations/0002_alter_driver_options_alter_manufacturer_options_and_more.py delete mode 100644 taxi/migrations/0002_alter_manufacturer_options_and_more.py delete mode 100644 taxi/migrations/0003_alter_manufacturer_name.py diff --git a/taxi/migrations/0002_alter_driver_options_alter_manufacturer_options_and_more.py b/taxi/migrations/0002_alter_driver_options_alter_manufacturer_options_and_more.py new file mode 100644 index 00000000..f88f8f3d --- /dev/null +++ b/taxi/migrations/0002_alter_driver_options_alter_manufacturer_options_and_more.py @@ -0,0 +1,31 @@ +# Generated by Django 4.1 on 2023-09-22 16:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("taxi", "0001_initial"), + ] + + operations = [ + migrations.AlterModelOptions( + name="driver", + options={"verbose_name": "user", "verbose_name_plural": "users"}, + ), + 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/0002_alter_manufacturer_options_and_more.py b/taxi/migrations/0002_alter_manufacturer_options_and_more.py deleted file mode 100644 index a056822c..00000000 --- a/taxi/migrations/0002_alter_manufacturer_options_and_more.py +++ /dev/null @@ -1,22 +0,0 @@ -# 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), - ), - ] 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/views.py b/taxi/views.py index e44b800f..4adabdff 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -12,14 +12,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", 1) + 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 + "num_visits": request.session["num_visits"] } return render(request, "taxi/index.html", context=context) From 3e588991f52e38904a277d49e9fd38d19a55bdd5 Mon Sep 17 00:00:00 2001 From: Yeva Date: Fri, 22 Sep 2023 19:40:01 +0300 Subject: [PATCH 6/6] Removed redundant import --- taxi/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taxi/urls.py b/taxi/urls.py index bbb16a09..c663d6e2 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -1,4 +1,4 @@ -from django.urls import path, include +from django.urls import path from .views import ( index,