diff --git a/.gitignore b/.gitignore index b26d6116..720ca28b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,10 @@ .idea/ .vscode/ + *.iml .env .DS_Store + venv/ .pytest_cache/ **__pycache__/ diff --git a/static/css/styles.css b/static/css/styles.css index 1d8a1b3d..a3cbc2e7 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1,3 +1,4 @@ body { - margin-top: 20px; + height: 100vh; + overflow: hidden; } diff --git a/taxi/views.py b/taxi/views.py index 82ad312f..1cab8eb3 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,47 +1,53 @@ +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", 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) -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..cc71a76f 100644 --- 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 index 8b94449f..5d781485 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/base.html b/templates/base.html index f4a0b6cf..097b0b7d 100644 --- a/templates/base.html +++ b/templates/base.html @@ -5,18 +5,17 @@ {% block title %}Taxi Service{% endblock %} + - + href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200"/> {% load static %} -
-
+
+
{% block sidebar %} @@ -24,7 +23,7 @@ {% endblock %}
-
+
{% block content %}{% endblock %} diff --git a/templates/includes/pagination.html b/templates/includes/pagination.html index 118c2806..b297c1c2 100644 --- a/templates/includes/pagination.html +++ b/templates/includes/pagination.html @@ -2,7 +2,9 @@ diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index b7cd72dc..bcfc1508 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,6 +1,49 @@ - +
+ {% if user.is_authenticated %} +
+ + account_circle + + {{ user.username }} +
+
+ + input + + + Logout + +
+ {% else %} +
+ + input + + + Login + +
+ {% endif %} +
+ {% with request.resolver_match.url_name as url_name %} + + {% endwith %} +
diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html new file mode 100644 index 00000000..4f83ee6b --- /dev/null +++ b/templates/registration/logged_out.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} + +{% block content %} +
+ + logout + +

Logged out!

+
+{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..d3ffaa66 --- /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/car_detail.html b/templates/taxi/car_detail.html index db6da00a..cf291e56 100644 --- a/templates/taxi/car_detail.html +++ b/templates/taxi/car_detail.html @@ -1,12 +1,38 @@ {% extends "base.html" %} {% block content %} -

Manufacturer: ({{ car.manufacturer.name }}, {{ car.manufacturer.country }})

-

Drivers

-
-
    - {% for driver in car.drivers.all %} -
  • {{ driver.first_name }} {{ driver.last_name }}
    • - {% endfor %} -
+
+ + local_taxi + +

+ {{ car.model }} +

+
+ Manufacturer: ({{ car.manufacturer.name }}, {{ car.manufacturer.country }}) +
+
Drivers:
+ + + + + + + + + + + + {% for driver in car.drivers.all %} + + + + + + + {% empty %} +

No cars!

+ {% endfor %} + +
#First nameLast nameLicense number
{{ driver.id }}{{ driver.first_name }}{{ driver.last_name }}{{ driver.license_number }}
{% endblock %} diff --git a/templates/taxi/car_list.html b/templates/taxi/car_list.html index e107b579..cab93224 100644 --- a/templates/taxi/car_list.html +++ b/templates/taxi/car_list.html @@ -3,11 +3,10 @@ {% block content %}

Car list

{% if car_list %} -
    + diff --git a/templates/taxi/driver_detail.html b/templates/taxi/driver_detail.html index 37b766d0..bc2b947c 100644 --- a/templates/taxi/driver_detail.html +++ b/templates/taxi/driver_detail.html @@ -1,18 +1,35 @@ {% extends "base.html" %} {% block content %} -

    - {{ driver.first_name }} {{ driver.last_name }}. - License number: {{ driver.license_number }} -

    - {% for car in driver.cars.all %} -
    -

    Id:{{ car.id }} - Car model: {{ car.model }} +

    + + airline_seat_recline_extra + +

    + {{ driver.first_name }} {{ driver.last_name }}

    +
    + License number: {{ driver.license_number }} - {% empty %} -

    No cars!

    - {% endfor %} + + + + + + + + + + {% for car in driver.cars.all %} + + + + + + {% empty %} +

    No cars!

    + {% endfor %} + +
    #Car modelManufacturer
    {{ car.id }}{{ car.model }}{{ car.manufacturer.name }}
    {% endblock %} diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..956d05eb 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -3,11 +3,13 @@ {% block content %}

    Driver list

    {% if driver_list %} -
      + diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..9e65034e 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -5,9 +5,10 @@

      Taxi Service Home

      Welcome to Best Taxi Ever!

      Dynamic content

      The Taxi service has the following record counts:

      -
        -
      • Cars: {{ num_cars }}
        • -
      • Drivers: {{ num_drivers }}
        • -
      • Manufacturers: {{ num_manufacturers }}
        • +
          +
        • Cars: {{ num_cars }}
          • +
        • Drivers: {{ num_drivers }}
          • +
        • Manufacturers: {{ num_manufacturers }}
        + You have visited this page {{ num_visits }} time{{ num_visits|pluralize }} {% endblock %} diff --git a/templates/taxi/manufacturer_list.html b/templates/taxi/manufacturer_list.html index 2d86e7e6..91a1b3c0 100644 --- a/templates/taxi/manufacturer_list.html +++ b/templates/taxi/manufacturer_list.html @@ -4,9 +4,9 @@

        Manufacturer list

        {% if manufacturer_list %} -
          +
            {% for manufacturer in manufacturer_list %} -
          • {{ manufacturer.name }} {{ manufacturer.country }}
            • +
          • {{ manufacturer.name }} {{ manufacturer.country }}
            • {% endfor %}
          {% endif %}