From 82f16f436173d655df13ed66bae8b428805b842f Mon Sep 17 00:00:00 2001
From: Soloveyk1n <swain.volt@gmail.com>
Date: Mon, 16 Oct 2023 14:34:18 +0300
Subject: [PATCH 1/6] check error

---
 taxi/urls.py                           |  2 +-
 taxi/views.py                          |  5 +++++
 taxi_service/settings.py               |  2 ++
 taxi_service/urls.py                   |  2 ++
 templates/includes/sidebar.html        | 18 ++++++++++++++----
 templates/registration/logged_out.html |  8 ++++++++
 templates/registration/login.html      | 15 +++++++++++++++
 templates/taxi/car_list.html           |  2 +-
 templates/taxi/driver_list.html        |  2 +-
 templates/taxi/index.html              |  1 +
 10 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 templates/registration/logged_out.html
 create mode 100644 templates/registration/login.html

diff --git a/taxi/urls.py b/taxi/urls.py
index c663d6e2..28cb8941 100644
--- a/taxi/urls.py
+++ b/taxi/urls.py
@@ -1,6 +1,6 @@
 from django.urls import path
 
-from .views import (
+from taxi.views import (
     index,
     CarListView,
     CarDetailView,
diff --git a/taxi/views.py b/taxi/views.py
index 82ad312f..5c5df367 100644
--- a/taxi/views.py
+++ b/taxi/views.py
@@ -1,3 +1,4 @@
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.shortcuts import render
 from django.views import generic
 
@@ -10,11 +11,15 @@ 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 + 1
     }
 
     return render(request, "taxi/index.html", context=context)
diff --git a/taxi_service/settings.py b/taxi_service/settings.py
index b6c0cf19..bfdba372 100644
--- a/taxi_service/settings.py
+++ b/taxi_service/settings.py
@@ -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..263195fd 100644
--- a/taxi_service/urls.py
+++ b/taxi_service/urls.py
@@ -22,4 +22,6 @@
 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..09affeab 100644
--- a/templates/includes/sidebar.html
+++ b/templates/includes/sidebar.html
@@ -1,6 +1,16 @@
 <ul class="sidebar-nav">
-  <li><a href="{% url "taxi:index" %}">Home page</a></li>
-  <li><a href="{% url "taxi:manufacturer-list" %}">Manufacturers</a></li>
-  <li><a href="{% url "taxi:car-list" %}">Cars</a></li>
-  <li><a href="{% url "taxi:driver-list" %}">Drivers</a></li>
+  {% if driver.is_authenticated %}
+    <li>User: {{ driver.username }}</li>
+    <li><a href="{% url 'logout' %}">Logout</a></li>
+  {% else %}
+    <li><a href="{% url 'login' %}">Login</a></li>
+  {% endif %}
+
+  <br>
+
+
+  <li><a href="{% url 'taxi:index' %}">Home page</a></li>
+  <li><a href="{% url 'taxi:manufacturer-list' %}">Manufacturers</a></li>
+  <li><a href="{% url 'taxi:car-list' %}">Cars</a></li>
+  <li><a href="{% url 'taxi:driver-list' %}">Drivers</a></li>
 </ul>
diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html
new file mode 100644
index 00000000..a5b29aa4
--- /dev/null
+++ b/templates/registration/logged_out.html
@@ -0,0 +1,8 @@
+{% extends "base.html" %}
+
+{% block content %}
+    <p>Logged out!</p>
+
+    <a href="{% url 'login' %}">Click here</a>
+
+{% 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..b0326131
--- /dev/null
+++ b/templates/registration/login.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+
+{% block content %}
+    <h1>Login</h1>
+
+    {% if form.errors %}
+        <p style="color: red">Invalid credentials</p>
+    {% endif %}
+
+    <form method="post" action="{% url 'login' %}">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit" value="login">
+    </form>
+{% endblock %}
\ No newline at end of file
diff --git a/templates/taxi/car_list.html b/templates/taxi/car_list.html
index e107b579..90067b92 100644
--- a/templates/taxi/car_list.html
+++ b/templates/taxi/car_list.html
@@ -6,7 +6,7 @@ <h1>Car list</h1>
     <ul>
       {% for car in car_list %}
         <li>
-          <a href="{% url "taxi:car-detail" pk=car.id %} ">{{ car.id }}</a>
+          <a href="{% url 'taxi:car-detail' pk=car.id %} ">{{ car.id }}</a>
           {{ car.model }} ({{ car.manufacturer.name }})
         </li>
       {% endfor %}
diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html
index c6c3e823..e749e347 100644
--- a/templates/taxi/driver_list.html
+++ b/templates/taxi/driver_list.html
@@ -6,7 +6,7 @@ <h1>Driver list</h1>
     <ul>
       {% for driver in driver_list%}
         <li>
-          <a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
+          <a href="{% url 'taxi:driver-detail' pk=driver.id %}">{{ driver.username }}</a>
           ({{ driver.first_name }} {{ driver.last_name }})
         </li>
       {% endfor %}
diff --git a/templates/taxi/index.html b/templates/taxi/index.html
index 13c59aa8..4d30ced2 100644
--- a/templates/taxi/index.html
+++ b/templates/taxi/index.html
@@ -10,4 +10,5 @@ <h2>Dynamic content</h2>
     <li><strong>Drivers:</strong> {{ num_drivers }}</li>
     <li><strong>Manufacturers:</strong> {{ num_manufacturers }}</li>
   </ul>
+  <p>You have visited this page {{ num_visits }} time{{ num_visits|pluralize }}.</p>
 {% endblock %}

From 9050719ab22cd97e4892415731d700286a092f45 Mon Sep 17 00:00:00 2001
From: Soloveyk1n <swain.volt@gmail.com>
Date: Mon, 16 Oct 2023 15:01:56 +0300
Subject: [PATCH 2/6] without error flake8

---
 taxi/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/taxi/views.py b/taxi/views.py
index 5c5df367..4ffe9ca4 100644
--- a/taxi/views.py
+++ b/taxi/views.py
@@ -14,7 +14,6 @@ def index(request):
     num_visits = request.session.get("num_visits", 0)
     request.session["num_visits"] = num_visits + 1
 
-
     context = {
         "num_drivers": num_drivers,
         "num_cars": num_cars,

From 908a12c63a1d0247437328035602103d3f109a38 Mon Sep 17 00:00:00 2001
From: Soloveyk1n <swain.volt@gmail.com>
Date: Mon, 16 Oct 2023 16:10:14 +0300
Subject: [PATCH 3/6] Solution

---
 taxi/views.py                   | 13 +++++++------
 taxi_service/settings.py        |  2 +-
 templates/includes/sidebar.html |  4 ++--
 templates/taxi/driver_list.html |  3 +++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/taxi/views.py b/taxi/views.py
index 4ffe9ca4..7ea734ce 100644
--- a/taxi/views.py
+++ b/taxi/views.py
@@ -1,10 +1,11 @@
+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."""
 
@@ -24,28 +25,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 bfdba372..cc71a76f 100644
--- a/taxi_service/settings.py
+++ b/taxi_service/settings.py
@@ -108,7 +108,7 @@
 
 AUTH_USER_MODEL = "taxi.Driver"
 
-LOGIN_REDIRECT_URL = "/taxi/"
+LOGIN_REDIRECT_URL = "/"
 
 # Internationalization
 # https://docs.djangoproject.com/en/4.0/topics/i18n/
diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html
index 09affeab..4e3726ac 100644
--- a/templates/includes/sidebar.html
+++ b/templates/includes/sidebar.html
@@ -1,6 +1,6 @@
 <ul class="sidebar-nav">
-  {% if driver.is_authenticated %}
-    <li>User: {{ driver.username }}</li>
+  {% if user.is_authenticated %}
+    <li>User: {{ user.username }}</li>
     <li><a href="{% url 'logout' %}">Logout</a></li>
   {% else %}
     <li><a href="{% url 'login' %}">Login</a></li>
diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html
index e749e347..6134ee31 100644
--- a/templates/taxi/driver_list.html
+++ b/templates/taxi/driver_list.html
@@ -8,6 +8,9 @@ <h1>Driver list</h1>
         <li>
           <a href="{% url 'taxi:driver-detail' pk=driver.id %}">{{ driver.username }}</a>
           ({{ driver.first_name }} {{ driver.last_name }})
+          {% if driver.username == user.username %}
+          (ME)
+          {% endif %}
         </li>
       {% endfor %}
     </ul>

From f7a1fa29996ab76bffab5c2eafe8a9c063085260 Mon Sep 17 00:00:00 2001
From: Soloveyk1n <swain.volt@gmail.com>
Date: Mon, 16 Oct 2023 16:11:09 +0300
Subject: [PATCH 4/6] Solutions

---
 taxi/views.py                     | 1 +
 templates/registration/login.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/taxi/views.py b/taxi/views.py
index 7ea734ce..e859ab7a 100644
--- a/taxi/views.py
+++ b/taxi/views.py
@@ -5,6 +5,7 @@
 
 from .models import Driver, Car, Manufacturer
 
+
 @login_required
 def index(request):
     """View function for the home page of the site."""
diff --git a/templates/registration/login.html b/templates/registration/login.html
index b0326131..5333b9b5 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -12,4 +12,4 @@ <h1>Login</h1>
         {{ form.as_p }}
         <input type="submit" value="login">
     </form>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 516f040cfd5808d23ed99a4b0ae2e10975105232 Mon Sep 17 00:00:00 2001
From: Soloveyk1n <swain.volt@gmail.com>
Date: Mon, 16 Oct 2023 16:55:58 +0300
Subject: [PATCH 5/6] new solution

---
 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 a5b29aa4..d564243a 100644
--- a/templates/registration/logged_out.html
+++ b/templates/registration/logged_out.html
@@ -5,4 +5,4 @@
 
     <a href="{% url 'login' %}">Click here</a>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From a87e02e8f48609df159a2c4f0ca74f1363591cdf Mon Sep 17 00:00:00 2001
From: Soloveyk1n <swain.volt@gmail.com>
Date: Mon, 16 Oct 2023 17:28:58 +0300
Subject: [PATCH 6/6] fixed import

---
 taxi/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/taxi/urls.py b/taxi/urls.py
index 28cb8941..c663d6e2 100644
--- a/taxi/urls.py
+++ b/taxi/urls.py
@@ -1,6 +1,6 @@
 from django.urls import path
 
-from taxi.views import (
+from .views import (
     index,
     CarListView,
     CarDetailView,