diff --git a/bookify/bookify/views.py b/bookify/bookify/views.py index c05b4cf..fc315cc 100644 --- a/bookify/bookify/views.py +++ b/bookify/bookify/views.py @@ -5,4 +5,4 @@ from django.shortcuts import get_object_or_404, redirect, render def custom_logout(request): """Разлогиниться и перейти на главную.""" logout(request) - return redirect("books:book_list") + return redirect("books:logout") diff --git a/bookify/books/templates/accounts/login.html b/bookify/books/templates/accounts/login.html index 77a3206..166ae83 100644 --- a/bookify/books/templates/accounts/login.html +++ b/bookify/books/templates/accounts/login.html @@ -1,16 +1,12 @@ + +{% extends 'books/base.html' %} {% load static %} - - - - - Вход - - -

Вход

+ +{% block content %} +

Вход

{% csrf_token %} {{ form.as_p }}
- - +{% endblock %} diff --git a/bookify/books/templates/accounts/logout.html b/bookify/books/templates/accounts/logout.html index 3df748f..b5ed29c 100644 --- a/bookify/books/templates/accounts/logout.html +++ b/bookify/books/templates/accounts/logout.html @@ -1,11 +1,8 @@ - - - - - Выход - - -

Вы вышли из аккаунта

-На главную - - + +{% extends 'books/base.html' %} +{% load static %} + +{% block content %} +

Вы вышли из аккаунта

+

Вернуться на главную

+{% endblock %} diff --git a/bookify/books/templates/books/genre_list.html b/bookify/books/templates/books/genre_list.html index a9352f9..1728286 100644 --- a/bookify/books/templates/books/genre_list.html +++ b/bookify/books/templates/books/genre_list.html @@ -5,7 +5,7 @@ {% for genre in genres %}
  • {{ genre.name }} - Перейти к книгам + Перейти к рекомендациям {% if user.is_authenticated %} Редактировать diff --git a/bookify/books/urls.py b/bookify/books/urls.py index 734350e..22d6e02 100644 --- a/bookify/books/urls.py +++ b/bookify/books/urls.py @@ -22,4 +22,5 @@ urlpatterns = [ name="genre_recommendations", ), path("register/", views.register, name="register"), + path("succesful-logout/", views.logout, name="logout"), ] diff --git a/bookify/books/views.py b/bookify/books/views.py index 64a1b80..5f1e2bd 100644 --- a/bookify/books/views.py +++ b/bookify/books/views.py @@ -21,6 +21,10 @@ def register(request): return render(request, "accounts/register.html", {"form": form}) +def logout(requst): + return render(requst, "accounts/logout.html") + + def book_list(request): """Главная страница со списком всех книг.""" books = Book.objects.all()