-
Notifications
You must be signed in to change notification settings - Fork 853
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e4d52bc
commit 71d51d7
Showing
11 changed files
with
141 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,3 +7,9 @@ venv/ | |
.venv/ | ||
.pytest_cache/ | ||
**__pycache__/ | ||
*.pyc | ||
**db.sqlite3 | ||
.vs/ | ||
.git/ | ||
**__init__.py | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,47 +1,63 @@ | ||
from django.shortcuts import render | ||
from django.shortcuts import render, redirect | ||
from django.views import generic | ||
from django.contrib.auth.decorators import login_required | ||
from django.contrib.auth import logout | ||
from django.contrib.auth.mixins import LoginRequiredMixin | ||
|
||
from .models import Driver, Car, Manufacturer | ||
from taxi.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 | ||
|
||
request.session.save() | ||
|
||
context = { | ||
"num_drivers": num_drivers, | ||
"num_cars": num_cars, | ||
"num_manufacturers": num_manufacturers, | ||
"num_visits": request.session["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") | ||
|
||
|
||
@login_required | ||
def user_logout(request): | ||
"""View function to log out the user.""" | ||
logout(request) | ||
return redirect("taxi:index") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,37 @@ | ||
<!DOCTYPE html> | ||
<html lang="en"> | ||
|
||
<head> | ||
{% block title %}<title>Taxi Service</title>{% endblock %} | ||
<meta charset="utf-8"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1"> | ||
<link rel="stylesheet" | ||
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' %}"> | ||
{% block title %} | ||
<title>Taxi Service</title>{% endblock %} | ||
<meta charset="utf-8"> | ||
<meta name="viewport" content="width=device-width, initial-scale=1"> | ||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous"> | ||
{% 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 class="container-fluid"> | ||
<div class="row"> | ||
<div class="col-sm-2"> | ||
{% block sidebar %} | ||
{% include "includes/sidebar.html" %} | ||
{% endblock %} | ||
</div> | ||
<div class="col-sm-10 "> | ||
{% if user.is_authenticated %} | ||
<p>Welcome, {{ user.username }}!</p> | ||
<a href="{% url 'taxi:logout' %}">Logout</a> | ||
{% else %} | ||
<a href="{% url 'taxi:login' %}">Login</a> | ||
{% endif %} | ||
|
||
{% block content %}{% endblock %} | ||
|
||
{% block pagination %} | ||
{% include "includes/pagination.html" %} | ||
{% endblock %} | ||
</div> | ||
</div> | ||
</div> | ||
<div class="col-sm-10 "> | ||
|
||
{% block content %}{% endblock %} | ||
|
||
{% block pagination %} | ||
{% include "includes/pagination.html" %} | ||
{% endblock %} | ||
|
||
</div> | ||
</div> | ||
</div> | ||
</body> | ||
|
||
</html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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> | ||
<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' user.id %}">{{ user.username }}{% if user.id == current_user_id %} (Me){% endif %}</a> | ||
</li> | ||
<li><a href="{% url 'taxi:logout' %}">Logout</a></li> | ||
{% else %} | ||
<li><a href="{% url 'taxi:login' %}">Login</a></li> | ||
{% endif %} | ||
</ul> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<h2>You have been logged out.</h2> | ||
<a href="{% url 'taxi:login' %}">Log in again</a> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<h2>Login</h2> | ||
<form method="post"> | ||
{% csrf_token %} | ||
{{ form.as_p }} | ||
<button type="submit">Login</button> | ||
</form> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,18 @@ | ||
{% extends "base.html" %} | ||
|
||
{% block content %} | ||
<h1>Driver list</h1> | ||
<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 }}) | ||
</li> | ||
{% endfor %} | ||
</ul> | ||
<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 == user %} (Me){% endif %} | ||
</li> | ||
{% endfor %} | ||
</ul> | ||
{% else %} | ||
<p>There are no drivers in taxi</p> | ||
<p>There are no drivers in taxi</p> | ||
{% endif %} | ||
{% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,14 @@ | ||
{% extends "base.html" %} | ||
|
||
{% 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> | ||
<h1>Taxi Service Home</h1> | ||
<p>Welcome to Best Taxi Ever!</p> | ||
<p>You have visited this page {{ num_visits }} times.</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> | ||
</ul> | ||
{% endblock %} |