Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solution #883

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions taxi/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class Meta:
verbose_name_plural = "drivers"

def __str__(self):

return f"{self.username} ({self.first_name} {self.last_name})"


Expand Down
19 changes: 9 additions & 10 deletions taxi/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from django.urls import path

from .views import (
index,
CarListView,
Expand All @@ -8,20 +7,20 @@
DriverDetailView,
ManufacturerListView,
)
from django.contrib.auth import views as auth_views

urlpatterns = [
path("", index, name="index"),
path(
"manufacturers/",
ManufacturerListView.as_view(),
name="manufacturer-list",
),
path("manufacturers/", ManufacturerListView.as_view(),
name="manufacturer-list"),
path("cars/", CarListView.as_view(), name="car-list"),
path("cars/<int:pk>/", CarDetailView.as_view(), name="car-detail"),
path("drivers/", DriverListView.as_view(), name="driver-list"),
path(
"drivers/<int:pk>/", DriverDetailView.as_view(), name="driver-detail"
),
path("drivers/", DriverListView.as_view(),
name="driver-list"),
path("drivers/<int:pk>/", DriverDetailView.as_view(),
name="driver-detail"),
path("login/", auth_views.LoginView.as_view(), name="login"),
path("logout/", auth_views.LogoutView.as_view(), name="logout"),
]
Comment on lines +22 to 24

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to define this urls here. You should use already provided views from django auth.

You imported it in your settings app(main app).


app_name = "taxi"
27 changes: 18 additions & 9 deletions taxi/views.py
Original file line number Diff line number Diff line change
@@ -1,47 +1,56 @@
from django.shortcuts import render
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.views import generic

from .models import Driver, Car, Manufacturer


@login_required(login_url="taxi: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
login_url = "taxi:login"


class CarListView(generic.ListView):
class CarListView(LoginRequiredMixin, generic.ListView):
model = Car
paginate_by = 5
queryset = Car.objects.select_related("manufacturer")
queryset = Car.objects.select_related("manufacturer").order_by("id")
login_url = "taxi:login"


class CarDetailView(generic.DetailView):
class CarDetailView(LoginRequiredMixin, generic.DetailView):
model = Car
login_url = "taxi:login"


class DriverListView(generic.ListView):
class DriverListView(LoginRequiredMixin, generic.ListView):
model = Driver
paginate_by = 5
login_url = "taxi:login"


class DriverDetailView(generic.DetailView):
class DriverDetailView(LoginRequiredMixin, generic.DetailView):
model = Driver
queryset = Driver.objects.prefetch_related("cars__manufacturer")
login_url = "taxi:login"
3 changes: 3 additions & 0 deletions taxi_service/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,6 @@
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field

DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

LOGIN_REDIRECT_URL = "/"
LOGOUT_REDIRECT_URL = "/"
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)
25 changes: 21 additions & 4 deletions templates/includes/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
<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>
{% if user.is_authenticated %}
<li><strong>Hello, {{ user.username }}!</strong></li>
{% 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>
<li><a href="{% url 'taxi:driver-list' %}">Drivers</a></li>

{% if user.is_authenticated %}
<li>
<a href="{% url 'taxi:driver-detail' pk=user.pk %}">{{ user.username }}</a> (Me)
</li>
<li>
<a href="{% url 'taxi:logout' %}">Logout</a>
</li>
{% else %}
<li>
<a href="{% url 'taxi:login' %}">Login</a>
</li>
{% endif %}
</ul>
10 changes: 10 additions & 0 deletions templates/registration/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{% extends "base.html" %}

{% block content %}
<h2>Login</h2>
<form method="post">
{% csrf_token %}
{{ form.as_p }}
<button type="submit">Login</button>
</form>
{% endblock %}
13 changes: 6 additions & 7 deletions templates/taxi/driver_detail.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
{% extends "base.html" %}

{% block content %}
<p><strong>
{{ driver.first_name }} {{ driver.last_name }}.</strong>
License number: {{ driver.license_number }}
<p><strong>
{{ object.first_name }} {{ object.last_name }}.</strong>
License number: {{ object.license_number }}
</p>
{% for car in driver.cars.all %}

{% for car in object.cars.all %}
<hr>
<p><strong>Id:</strong>{{ car.id }}
<p><strong>Id:</strong> {{ car.id }}
<strong>Car model:</strong> {{ car.model }}
</p>

{% empty %}
<p>No cars!</p>
{% endfor %}

{% endblock %}
9 changes: 6 additions & 3 deletions templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
<a href="{% url 'taxi:driver-detail' pk=driver.id %}">{{ driver.username }}</a>
({{ driver.first_name }} {{ driver.last_name }})
{% if driver.is_me %}
(Me)
{% endif %}
</li>
{% endfor %}
</ul>
{% else %}
<p>There are no drivers in taxi</p>
<p>There are no drivers in the taxi service.</p>
{% endif %}
{% endblock %}
4 changes: 4 additions & 0 deletions templates/taxi/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@
{% 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>
<li><strong>Cars:</strong> {{ num_cars }}</li>
<li><strong>Drivers:</strong> {{ num_drivers }}</li>
<li><strong>Manufacturers:</strong> {{ num_manufacturers }}</li>
</ul>

<h3>Visit Counter</h3>
<p>You have visited this page {{ num_visits }} time{{ num_visits|pluralize }}.</p>
{% endblock %}