Skip to content

Commit

Permalink
solution
Browse files Browse the repository at this point in the history
  • Loading branch information
BastovOleksandr committed Sep 4, 2024
1 parent 46d9023 commit dfceeae
Show file tree
Hide file tree
Showing 8 changed files with 54 additions and 10 deletions.
19 changes: 12 additions & 7 deletions taxi/views.py
Original file line number Diff line number Diff line change
@@ -1,47 +1,52 @@
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(login_url="login")
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) + 1
request.session["num_visits"] = num_visits

context = {
"num_drivers": num_drivers,
"num_cars": num_cars,
"num_manufacturers": num_manufacturers,
"num_visits": 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")
2 changes: 2 additions & 0 deletions taxi_service/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@

AUTH_USER_MODEL = "taxi.Driver"

LOGIN_REDIRECT_URL = "/"

# Internationalization
# https://docs.djangoproject.com/en/4.0/topics/i18n/

Expand Down
1 change: 1 addition & 0 deletions taxi_service/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 12 additions & 0 deletions templates/includes/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
<ul class="sidebar-nav">
{% if user.is_authenticated %}
<h4 class="title"><a href="{% url "taxi:driver-detail" pk=user.id %}">User: {{ user.username }}</a></h4>
<h6 class="title"><a href="{% url "logout" %}">Logout</a></h6>

{% if num_visits %}
<p>You have visited home page {{ num_visits }} time{{ num_visits|pluralize }}</p>
{% endif %}

{% else %}
<h6 class="title"><a href="{% url "login" %}">Login</a></h6>
{% endif %}

<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>
Expand Down
6 changes: 6 additions & 0 deletions templates/registration/logged_out.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% extends "base.html" %}

{% block content %}
<p>Logged out!</p>
<a href="{% url "login" %}">Click here to login again.</a>
{% endblock %}
16 changes: 16 additions & 0 deletions templates/registration/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{% extends "base.html" %}

{% block content %}

{% if form.errors %}
<p class="errors">Invalid credentials</p>
{% endif %}

<form action="{% url "login" %}" method="post">
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Submit">
<input type="hidden" name="next" value="{{ next }}">
</form>

{% endblock %}
3 changes: 2 additions & 1 deletion templates/taxi/driver_detail.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{% extends "base.html" %}

{% block content %}
<p><strong>
<p><strong>
{{ driver.first_name }} {{ driver.last_name }}.</strong>
License number: {{ driver.license_number }}
</p>

{% for car in driver.cars.all %}
<hr>
<p><strong>Id:</strong>{{ car.id }}
Expand Down
5 changes: 3 additions & 2 deletions templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
<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>
<a href="{% url "taxi:driver-detail" pk=driver.id %}">
{{ driver.username }}{% if driver.pk == user.pk %} (Me){% endif %}</a>
({{ driver.first_name }} {{ driver.last_name }})
</li>
{% endfor %}
Expand Down

0 comments on commit dfceeae

Please sign in to comment.