From 51faf96c07b2542990a13f0e6c352e7c9e2a791d Mon Sep 17 00:00:00 2001
From: Viva1-ua <veronikaboeva935@gmail.com>
Date: Thu, 12 Dec 2024 13:52:56 +0100
Subject: [PATCH] Solution 11.12.2024/3

---
 taxi/views.py                      | 2 +-
 taxi_service/settings.py           | 2 +-
 templates/includes/sidebar.html    | 6 +++---
 templates/registration/login.html  | 2 +-
 templates/registration/logout.html | 2 +-
 templates/taxi/driver_list.html    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/taxi/views.py b/taxi/views.py
index 0f39dead..34d37a53 100644
--- a/taxi/views.py
+++ b/taxi/views.py
@@ -19,7 +19,7 @@ def index(request):
         "num_drivers": num_drivers,
         "num_cars": num_cars,
         "num_manufacturers": num_manufacturers,
-        "num_visits": num_visits,
+        "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 c136dc08..81184b16 100644
--- a/taxi_service/settings.py
+++ b/taxi_service/settings.py
@@ -129,7 +129,7 @@
 
 STATIC_ROOT = BASE_DIR / "staticfiles"
 
-LOGIN_REDIRECT_URL = "/taxi/"
+LOGIN_REDIRECT_URL = "/"
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html
index 6c83719d..334b3e5e 100644
--- a/templates/includes/sidebar.html
+++ b/templates/includes/sidebar.html
@@ -1,13 +1,13 @@
 <ul class="sidebar-nav">
   {% if user.is_authenticated %}
     <li>
-      User: {{ user.username }}
+      {{ user.username }}
     </li>
     <li>
-      <a href="{% url "logout" %}">Log out</a>
+      <a href="{% url "logout" %}">Logout</a>
     </li>
   {% else %}  
-    <li><a href="{% url "login" %}">Log in</a></li>
+    <li><a href="{% url "login" %}">Login</a></li>
   {% endif %}
   <br>
   <li><a href="{% url "taxi:index" %}">Home page</a></li>
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 6ba8af1d..42b30c52 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -2,7 +2,7 @@
 
 {% block content %}
   <h1>Login</h1>
-  {% if form.error %}
+  {% if form.errors %}
     <p>Invalid credentials</p>
   {% endif %}
   <form action="{% url "login" %}" method="post">
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
index d6ffcd64..cbec7d7f 100644
--- a/templates/registration/logout.html
+++ b/templates/registration/logout.html
@@ -2,5 +2,5 @@
 
 {% block content %}
   <p>Logged Out</p>
-  <a href="{% url "logout" %}">Click here to log in again.</a>
+  <a href="{% url "login" %}">Click here to log in again.</a>
 {% endblock %}
diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html
index 5a2792b8..08ef7422 100644
--- a/templates/taxi/driver_list.html
+++ b/templates/taxi/driver_list.html
@@ -8,10 +8,10 @@ <h1>Driver list</h1>
         <li>
           <a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
           ({{ driver.first_name }} {{ driver.last_name }})
-        </li>
         {% if driver.username == user.username %}
           (Me)
         {% endif %}
+        </li>
       {% endfor %}
     </ul>
   {% else %}