mate-academy · ZaichenkoViktoriia · Sep 23, 2023
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,4 @@
-.idea/
-.vscode/
-*.iml
-.env
-.DS_Store
 venv/
 .pytest_cache/
 **__pycache__/
+*sqlite3
diff --git a/static/css/styles.css b/static/css/styles.css
@@ -1,3 +1,36 @@
-body {
-    margin-top: 20px;
+
+.sidebar-nav {
+  padding: 10px 0;
+  background-color: lightblue;
+  list-style: none;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+}
+
+
+.sidebar-nav li {
+  margin: 0;
+  padding: 0;
+}
+
+
+.sidebar-nav a {
+  text-decoration: none;
+  color: #333;
+  padding: 10px 20px;
+}
+
+
+.sidebar-nav a:hover {
+  background-color: #007bff;
+  color: #fff;
+}
+
+.mt-90 {
+  margin-top: 90px;
 }
diff --git a/taxi/models.py b/taxi/models.py
@@ -21,6 +21,7 @@ class Meta:
         verbose_name_plural = "drivers"
 
     def __str__(self):
+        # user.username
         return f"{self.username} ({self.first_name} {self.last_name})"
 
 

diff --git a/taxi/views.py b/taxi/views.py
@@ -1,47 +1,50 @@
 from django.shortcuts import render
 from django.views import generic
 
-from .models import Driver, Car, Manufacturer
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.auth.decorators import login_required
+from django.http import HttpRequest, HttpResponse
 
+from .models import Driver, Car, Manufacturer
 
-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()
+@login_required
+def index(request: HttpRequest) -> HttpResponse:
+    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_drivers": Driver.objects.count(),
+        "num_cars": Car.objects.count(),
+        "num_manufacturers": Manufacturer.objects.count(),
+        "num_visits": num_visits + 1
     }
 
     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
@@ -108,6 +108,8 @@
 
 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
@@ -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
@@ -17,14 +17,14 @@
 <body>
 <div class="container-fluid">
   <div class="row">
-    <div class="col-sm-2">
+    <div class="col-sm-2 mt-90">
 
       {% block sidebar %}
         {% include "includes/sidebar.html" %}
       {% endblock %}
 
     </div>
-    <div class="col-sm-10 ">
+    <div class="col-sm-10 mt-90">
 
       {% block content %}{% endblock %}
 

diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html
@@ -1,3 +1,13 @@
+
+  {% if user.is_authenticated %}
+    <span>User: <a href="{% url 'taxi:driver-detail' pk=user.id %}">{{ user.username }}</a></span>
+  <br>
+    <a href="{% url 'logout' %}">Logout</a>
+  {% else %}
+    <br>
+    <a href="{% url 'login' %}">Login</a>
+  {% endif %}
+    <br>
 <ul class="sidebar-nav">
   <li><a href="{% url "taxi:index" %}">Home page</a></li>
   <li><a href="{% url "taxi:manufacturer-list" %}">Manufacturers</a></li>

diff --git a/templates/registration/login.html b/templates/registration/login.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% block content %}
+  <h1>Login</h1>
+  <hr>
+  {% 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="Submit">
+    <input type="hidden" name="next" value="{{ next }}">
+  </form>
+{% endblock %}
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
@@ -0,0 +1,5 @@
+{% extends "base.html" %}
+{% block content %}
+  <p>Logout</p>
+  <a href="{% url "login" %}">Tap for login!</a>
+{% endblock %}
diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html
@@ -4,14 +4,17 @@
   <h1>Driver list</h1>
   {% if driver_list %}
     <ul>
-      {% for driver in driver_list%}
+      {% 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.username == user.username %}
+            (Me)
+        {% endif %}
         </li>
       {% endfor %}
     </ul>
   {% else %}
-    <p>There are no drivers in taxi</p>
+    <p>There are no drivers</p>
   {% endif %}
 {% endblock %}
diff --git a/templates/taxi/index.html b/templates/taxi/index.html
@@ -10,4 +10,7 @@ <h2>Dynamic content</h2>
     <li><strong>Drivers:</strong> {{ num_drivers }}</li>
     <li><strong>Manufacturers:</strong> {{ num_manufacturers }}</li>
   </ul>
+  <br>
+  <p>Number of visits: {{ num_visits }} time{{ num_visits|pluralize }}</p>
+
 {% endblock %}