Skip to content

Commit

Permalink
Solution
Browse files Browse the repository at this point in the history
  • Loading branch information
Kateryna Zadorozhna committed Sep 25, 2023
1 parent 46d9023 commit 1cd67a7
Show file tree
Hide file tree
Showing 10 changed files with 66 additions and 14 deletions.
10 changes: 10 additions & 0 deletions static/css/styles.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
body {
margin-top: 20px;
background-color: whitesmoke;
}

.sidebar-nav {
list-style: none;
padding: 0;
}

.sidebar-nav-element {
color: black;
}
19 changes: 13 additions & 6 deletions taxi/views.py
Original file line number Diff line number Diff line change
@@ -1,47 +1,54 @@
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.http import HttpResponse
from django.shortcuts import render
from django.views import generic

from .models import Driver, Car, Manufacturer


def index(request):
@login_required
def index(request) -> HttpResponse:
"""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")
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 = "/cars/"

# 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)
1 change: 0 additions & 1 deletion templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2"
crossorigin="anonymous">
<!-- Add additional CSS in static file -->
{% load static %}
<link rel="stylesheet" href="{% static 'css/styles.css' %}">
</head>
Expand Down
21 changes: 15 additions & 6 deletions templates/includes/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
<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>
</ul>
<div class="sidebar">
<ul class="sidebar-nav">
{% if user.is_authenticated %}
<li><h4>User: <a class="sidebar-nav-element" href="{% url 'taxi:driver-detail' pk=user.id %}">{{ user.username }}</a></h4></li>
<li><a href="{% url 'logout' %}">Log out</a></li>
{% else %}
<li><a class="sidebar-nav-element" href="{% url 'login' %}">Login</a></li>
{% endif %}
<br>
<li><a class="sidebar-nav-element" href="{% url "taxi:index" %}">Home page</a></li>
<li><a class="sidebar-nav-element" href="{% url "taxi:manufacturer-list" %}">Manufacturers</a></li>
<li><a class="sidebar-nav-element" href="{% url "taxi:car-list" %}">Cars</a></li>
<li><a class="sidebar-nav-element" href="{% url "taxi:driver-list" %}">Drivers</a></li>
</ul>
</div>
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 %}
<h1>Logged out!</h1>
<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 %}
<h1>Login</h1>

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

<form action="{% url 'login' %}" method="post">
{% csrf_token %}
{{ form.as_p }}
<br>
<input type="submit" name="submit" value="Submit">
</form>
{% endblock %}
2 changes: 1 addition & 1 deletion templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ <h1>Driver list</h1>
{% for driver in driver_list%}
<li>
<a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
({{ driver.first_name }} {{ driver.last_name }})
({{ driver.first_name }} {{ driver.last_name }}) {% if user.id == driver.id %}(Me){% endif %}
</li>
{% endfor %}
</ul>
Expand Down
2 changes: 2 additions & 0 deletions templates/taxi/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ <h2>Dynamic content</h2>
<li><strong>Drivers:</strong> {{ num_drivers }}</li>
<li><strong>Manufacturers:</strong> {{ num_manufacturers }}</li>
</ul>
<br>
<p>You have visited this page: {{ num_visits }} time{{ num_visits|pluralize }}</p>
{% endblock %}

0 comments on commit 1cd67a7

Please sign in to comment.