mate-academy · DOLC3-GABBANA · Sep 20, 2024 · Sep 20, 2024 · Sep 21, 2024 · Sep 21, 2024
diff --git 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
@@ -9,6 +9,7 @@
     ManufacturerListView,
 )
 
+
 urlpatterns = [
     path("", index, name="index"),
     path(

diff --git 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
@@ -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
@@ -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
@@ -1,40 +1,37 @@
 <!DOCTYPE html>
 <html lang="en">
-
 <head>
-  {% block title %}<title>Taxi Service</title>{% endblock %}
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
-      integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2"
-      crossorigin="anonymous">
-  <!-- Add additional CSS in static file -->
-  {% load static %}
-  <link rel="stylesheet" href="{% static 'css/styles.css' %}">
+    {% block title %}
+    <title>Taxi Service</title>{% endblock %}
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
+    {% load static %}
+    <link rel="stylesheet" href="{% static 'css/styles.css' %}">
 </head>
-
 <body>
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-sm-2">
-
-      {% block sidebar %}
-        {% include "includes/sidebar.html" %}
-      {% endblock %}
-
+    <div class="container-fluid">
+        <div class="row">
+            <div class="col-sm-2">
+                {% block sidebar %}
+                {% include "includes/sidebar.html" %}
+                {% endblock %}
+            </div>
+            <div class="col-sm-10 ">
+                {% if user.is_authenticated %}
+                <p>Welcome, {{ user.username }}!</p>
+                <a href="{% url 'logout' %}">Logout</a>
+                {% else %}
+                <a href="{% url 'taxi:login' %}">Login</a>
+                {% endif %}
+
+                {% block content %}{% endblock %}
+
+                {% block pagination %}
+                {% include "includes/pagination.html" %}
+                {% endblock %}
+            </div>
+        </div>
     </div>
-    <div class="col-sm-10 ">
-
-      {% block content %}{% endblock %}
-
-      {% block pagination %}
-        {% include "includes/pagination.html" %}
-      {% endblock %}
-
-    </div>
-  </div>
-</div>
 </body>
-
 </html>
diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html
@@ -1,6 +1,15 @@
 <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>
+    <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 user.is_authenticated %}
+    <li>
+        <a href="{% url 'taxi:driver-detail' user.id %}">{{ user.username }}{% if user.id == current_user_id %} (Me){% endif %}</a>
+    </li>
+    <li><a href="{% url 'logout' %}">Logout</a></li>
+    {% else %}
+    <li><a href="{% url 'taxi:login' %}">Login</a></li>
+    {% endif %}
 </ul>
diff --git a/templates/registration/login.html b/templates/registration/login.html
@@ -0,0 +1,6 @@
+<h2>Login</h2>
+<form method="post">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <button type="submit">Login</button>
+</form>
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
@@ -0,0 +1,2 @@
+<h2>You have been logged out.</h2>
+<a href="{% url 'taxi:login' %}">Log in again</a>
diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html
@@ -1,17 +1,18 @@
 {% extends "base.html" %}
 
 {% block content %}
-  <h1>Driver list</h1>
+<h1>Driver list</h1>
   {% if driver_list %}
-    <ul>
-      {% for driver in driver_list%}
-        <li>
-          <a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
-          ({{ driver.first_name }} {{ driver.last_name }})
-        </li>
-      {% endfor %}
-    </ul>
+<ul>
+    {% for driver in driver_list %}
+    <li>
+        <a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
+        ({{ driver.first_name }} {{ driver.last_name }})
+        {% if driver == user %} (Me){% endif %}
+    </li>
+    {% endfor %}
+</ul>
   {% else %}
-    <p>There are no drivers in taxi</p>
+<p>There are no drivers in taxi</p>
   {% endif %}
 {% endblock %}
diff --git a/templates/taxi/index.html b/templates/taxi/index.html
@@ -1,13 +1,14 @@
 {% extends "base.html" %}
 
 {% block content %}
-  <h1>Taxi Service Home</h1>
-  <p>Welcome to Best Taxi Ever!</p>
-  <h2>Dynamic content</h2>
-  <p>The Taxi service has the following record counts:</p>
-  <ul>
+<h1>Taxi Service Home</h1>
+<p>Welcome to Best Taxi Ever!</p>
+<p>You have visited this page {{ num_visits }} times.</p>
+<h2>Dynamic content</h2>
+<p>The Taxi service has the following record counts:</p>
+<ul>
     <li><strong>Cars:</strong> {{ num_cars }}</li>
     <li><strong>Drivers:</strong> {{ num_drivers }}</li>
     <li><strong>Manufacturers:</strong> {{ num_manufacturers }}</li>
-  </ul>
+</ul>
 {% endblock %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
         ManufacturerListView,
     )
     urlpatterns = [
         path("", index, name="index"),
         path(
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 = "/"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<h2>You have been logged out.</h2>
		<a href="{% url 'taxi:login' %}">Log in again</a>