Skip to content

Commit

Permalink
Solution.. Here we go again
Browse files Browse the repository at this point in the history
  • Loading branch information
Ivan-Shakhman committed Sep 11, 2024
1 parent 46d9023 commit 041127d
Show file tree
Hide file tree
Showing 10 changed files with 47 additions and 9 deletions.
3 changes: 2 additions & 1 deletion taxi/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.urls import path
from django.urls import path, include

from .views import (
index,
Expand All @@ -22,6 +22,7 @@
path(
"drivers/<int:pk>/", DriverDetailView.as_view(), name="driver-detail"
),

]

app_name = "taxi"
17 changes: 12 additions & 5 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.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")
5 changes: 5 additions & 0 deletions taxi_service/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,11 @@

AUTH_USER_MODEL = "taxi.Driver"

LOGIN_REDIRECT_URL = "/"

LOGIN_URL = "/account/login/"


# 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("account/", include("django.contrib.auth.urls"), name="login"),
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
2 changes: 1 addition & 1 deletion templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<div class="col-sm-10 ">

{% block content %}{% endblock %}

<p>You have visit this page {{ num_visits }} time{{ num_visits|pluralize }}</p>
{% block pagination %}
{% include "includes/pagination.html" %}
{% endblock %}
Expand Down
7 changes: 7 additions & 0 deletions templates/includes/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
<ul class="sidebar-nav">
{% if user.is_authenticated %}
<a href="{% url 'taxi:driver-detail' user.id %}"> {{ user.username }}</a>
<li><a href="{% url "logout" %}">logout</a> </li>
{% else %}
<li><a href="{% url "login" %}">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>
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>You logged out from site :(</p>
<li><a href="{% url "login" %}">Login again pls :)</a> </li>
{% endblock %}
9 changes: 9 additions & 0 deletions templates/registration/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{% extends "base.html" %}
{% block content %}
<h1>Login</h1>
<form action="{% url "login" %}" method="post">
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Submit">
</form>
{% endblock %}
3 changes: 2 additions & 1 deletion templates/taxi/driver_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

{% block content %}
<p><strong>
{{ driver.first_name }} {{ driver.last_name }}.</strong>
{{ driver.first_name }} {{ driver.last_name }}.
</strong>
License number: {{ driver.license_number }}
</p>
{% for car in driver.cars.all %}
Expand Down
3 changes: 2 additions & 1 deletion templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ <h1>Driver list</h1>
<ul>
{% 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 user.id == driver.pk %} (me) {% endif %}</a>
({{ driver.first_name }} {{ driver.last_name }})
</li>
{% endfor %}
Expand Down

0 comments on commit 041127d

Please sign in to comment.