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 #855

Open
wants to merge 5 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
17 changes: 17 additions & 0 deletions taxi/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,25 @@

from .views import index

from .views import (
ManufacturerListView, CarListView,
car_detail_view, DriverListView, DriverDetailView
)


urlpatterns = [
path("", index, name="index"),
path("manufacturers/", ManufacturerListView.as_view(),
name="manufacturer-list"),
path("cars/", CarListView.as_view(),
name="car-list"),
path("cars/<int:pk>/", car_detail_view,
name="car-detail"),
path("drivers/", DriverListView.as_view(),
name="driver-list"),
path("drivers/<int:pk>/", DriverDetailView.as_view(),
name="driver-detail"),
]


app_name = "taxi"
49 changes: 45 additions & 4 deletions taxi/views.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,56 @@
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 taxi.models import Driver, Car, Manufacturer
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": Driver.objects.count(),
"num_cars": Car.objects.count(),
"num_manufacturers": Manufacturer.objects.count(),
"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(LoginRequiredMixin, generic.ListView):
model = Manufacturer
context_object_name = "manufacturer_list"
template_name = "taxi/manufacturer_list.html"
paginate_by = 5


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

def get_queryset(self):
return Car.objects.select_related("manufacturer")


class CarDetailView(LoginRequiredMixin, generic.DetailView):
model = Car


class DriverListView(LoginRequiredMixin, generic.ListView):
model = Driver
paginate_by = 5


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 @@ -131,3 +131,5 @@
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field

DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

LOGIN_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)
7 changes: 1 addition & 6 deletions templates/base.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<!DOCTYPE html>
<html lang="en">

<head>
{% block title %}<title>Taxi Service</title>{% endblock %}
<meta charset="utf-8">
Expand All @@ -13,27 +12,23 @@
{% 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>
<div class="col-sm-10 ">

{% block content %}{% endblock %}

{% block pagination %}
{% include "includes/pagination.html" %}
{% endblock %}

</div>
</div>
</div>
</body>

</html>
15 changes: 15 additions & 0 deletions templates/includes/pagination.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{% if is_paginated %}
<ul class="pagination">
{% if page_obj.has_previous %}
<li class="page-item">
<a class="page-link" href="?page={{ page_obj.previous_page_number }}">Prev</a>
</li>
{% endif %}
<li class="page-item active"><span class="page-link">{{ page_obj.number }} of {{ paginator.num_pages }}</span></li>
{% if page_obj.has_next %}
<li class="page-item">
<a class="page-link" href="?page={{ page_obj.next_page_number }}">Next</a>
</li>
{% endif %}
</ul>
{% endif %}
24 changes: 20 additions & 4 deletions templates/includes/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,22 @@
<ul class="sidebar-nav">
<li><a href="#">Home page</a></li>
<li><a href="#">Manufacturers</a></li>
<li><a href="#">Cars</a></li>
<li><a href="#">Drivers</a></li>
{% if user.is_authenticated %}
<li>User: {{ user.get_username }}</li>
<li>
<form action="{% url 'logout' %}" id="logout-form" method="post">
{% csrf_token %}
<button class="btn btn-link" type="submit">Logout</button>
</form>
</li>
{% else %}
<li>
<a href="{% url 'login' %}?next={{ request.path }}">Login</a>
</li>
{% endif %}

<br>

<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>
</ul>
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 log in again</a>
{% endblock %}
14 changes: 14 additions & 0 deletions templates/registration/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% extends "base.html" %}

{% block content %}
<h1>Login</h1>
{% if form.errors %}
<p style="color: red">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 %}
24 changes: 24 additions & 0 deletions templates/taxi/car_detail.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{% extends "base.html" %}

{% block content %}

<h1>Car Details: {{ car.model }}</h1>

<h2>Manufacturers:</h2>
<ul>
<li>Name: {{ car.manufacturer.name }}</li>
<li>Country: {{ car.manufacturer.country }}</li>
</ul>

<h2>Drivers</h2>
{% if car.drivers.exists %}
<ul>
{% for driver in car.drivers.all %}
<li>{{ driver.first_name }} {{ driver.last_name }}</li>
{% endfor %}
</ul>
{% else %}
<p>No drivers for this car.</p>
{% endif %}

{% endblock %}
13 changes: 13 additions & 0 deletions templates/taxi/car_list.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{% extends "base.html" %}

{% block content %}
<h1>Car List</h1>
{% if car_list %}
<ul>
{% for car in car_list %}
<li><a href="{% url "taxi:car-detail" car.id %}">{{ car.id }}) {{ car.model }}, {{ car.manufacturer.name }}</a></li>
{% endfor %}
</ul>
{% endif %}

{% endblock %}
19 changes: 19 additions & 0 deletions templates/taxi/driver_detail.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{% extends "base.html" %}

{% block content %}

<h1>Driver Details: {{ driver.first_name }} {{ driver.last_name }}</h1>

{% if driver.cars.all %}
<ul>
{% for car in driver.cars.all %}
<li>
{{ car.title }}
(Manufacturer: {{ car.manufacturer.name }}, Country: {{ car.manufacturer.country }})
</li>
{% endfor %}
</ul>
{% else %}
<p>This driver doesn't have any cars.</p>
{% endif %}
{% endblock %}
17 changes: 17 additions & 0 deletions templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{% extends "base.html" %}
{% block content %}
<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 }})
{% if driver == request.user %} (Me) {% endif %}
</li>
{% endfor %}
</ul>
{% else %}
<p>There are no drivers in taxi</p>
{% endif %}
{% endblock %}
2 changes: 1 addition & 1 deletion templates/taxi/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{% extends "base.html" %}

{% block content %}
<h1>Taxi Service Home</h1>
<p>Welcome to Best Taxi Ever!</p>
Expand All @@ -10,4 +9,5 @@ <h2>Dynamic content</h2>
<li><strong>Drivers:</strong> {{ num_drivers }}</li>
<li><strong>Manufacturers:</strong> {{ num_manufacturers }}</li>
</ul>
<p>You have visited this page {{ num_visits }} time{{ num_visits|pluralize }}.</p>
{% endblock %}
14 changes: 14 additions & 0 deletions templates/taxi/manufacturer_list.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% extends "base.html" %}

{% block content %}
<h1>Manufacturers List</h1>
{% if manufacturer_list %}
<ul>
{% for manufacturer in manufacturer_list %}
<li>{{ manufacturer.name }} - {{ manufacturer.country }}</li>
{% endfor %}
</ul>
{% else %}
<p>No manufacturers available.</p>
{% endif %}
{% endblock %}
Loading