From eb57800bf865cb0a0228c41da4fe0d66dab9452a Mon Sep 17 00:00:00 2001 From: Viktor Rura Date: Wed, 13 Dec 2023 21:55:12 +0000 Subject: [PATCH] Solution --- db.sqlite3 | Bin 0 -> 176128 bytes taxi/views.py | 14 ++++++++++---- taxi_service/settings.py | 2 ++ taxi_service/urls.py | 1 + templates/includes/sidebar.html | 8 ++++++++ templates/registration/log_out.html | 10 ++++++++++ templates/registration/login.html | 10 ++++++++++ templates/taxi/driver_list.html | 6 +++++- templates/taxi/index.html | 1 + 9 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 db.sqlite3 create mode 100644 templates/registration/log_out.html create mode 100644 templates/registration/login.html diff --git a/db.sqlite3 b/db.sqlite3 new file mode 100644 index 0000000000000000000000000000000000000000..695f50a1a936dfd08ae1c973cec3eb746232d009 GIT binary patch literal 176128 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 user.username }} +
+ Logout + {% else %} + Login + {% endif %} +
  • Home page
  • Manufacturers
    • diff --git a/templates/registration/log_out.html b/templates/registration/log_out.html new file mode 100644 index 00000000..9d636250 --- /dev/null +++ b/templates/registration/log_out.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} + +{% block content %} +

    Logout

    +

    Are you sure you want to log out?

    +
    + {% csrf_token %} + +
    +{% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html new file mode 100644 index 00000000..8403d5b0 --- /dev/null +++ b/templates/registration/login.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} + +{% block content %} +

    Login

    +
    + {% csrf_token %} + {{ form.as_p }} + +
    +{% endblock %} diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index c6c3e823..8dc05f28 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -7,7 +7,11 @@

    Driver list

    {% for driver in driver_list%}
  • {{ driver.username }} - ({{ driver.first_name }} {{ driver.last_name }}) + {% if driver == user %} + (Me) + {% else %} + ({{ driver.first_name }} {{ driver.last_name }}) + {% endif %}
    • {% endfor %}
diff --git a/templates/taxi/index.html b/templates/taxi/index.html index 13c59aa8..d25a2862 100644 --- a/templates/taxi/index.html +++ b/templates/taxi/index.html @@ -10,4 +10,5 @@

Dynamic content

  • Drivers: {{ num_drivers }}
  • Manufacturers: {{ num_manufacturers }}
    • +

    You have visited this page {{ num_visits }} time{{ num_visits|pluralize }}.

    {% endblock %}