From fb3e42547106c994c774635179a014f4736cd875 Mon Sep 17 00:00:00 2001
From: Martin Bley <dev@mb-oss.de>
Date: Sun, 18 Sep 2022 17:48:33 +0200
Subject: [PATCH] fix for clean logout

---
 templates/login.html               | 33 ------------------------------
 templates/nav.html                 |  2 +-
 templates/registration/logout.html | 15 ++++++++++++++
 tipp/urls.py                       |  2 +-
 4 files changed, 17 insertions(+), 35 deletions(-)
 delete mode 100644 templates/login.html
 create mode 100644 templates/registration/logout.html

diff --git a/templates/login.html b/templates/login.html
deleted file mode 100644
index 1e8be5c..0000000
--- a/templates/login.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% extends "base.html" %}
-{% load url from future %}
-{% comment %}
-  Main page to authenticate users.
-{% endcomment %}
-
-{% block head %}
-  <title>TipPy | Login</title>
-{% endblock %}
-
-{% block nav %}
-{% include "nav_login.html" with ls=ls season=season %}
-{% endblock %}
-
-{% block body %}
-{% if form.errors %}
-<div class="row">
-    <p>Benutzename und Passwort passen nicht zusammen. Bitte versuche es noch einmal.</p>
-</div>
-{% endif %}
-<div class="row">
-    <div class="col-md-3">
-        <form class="form-signin" role="form" method="post" action="{% url 'django.contrib.auth.views.login' %}">
-            <h2 class="form-signin-heading">Bitte melde dich an</h2>
-            {% csrf_token %}
-            <input class="form-control" type="text" autofocus="" required="" name="{{form.username.html_name}}" placeholder="Anmeldename" />
-            <input class="form-control" type="password" required="" placeholder="Passwort" name="{{form.password.html_name}}" />
-            <button class="btn btn-lg btn-primary btn-block" type="submit">Anmelden</button>
-            <input type="hidden" name="next" value="{{ next }}" />
-        </form>
-    </div>
-</div>
-{% endblock %}
diff --git a/templates/nav.html b/templates/nav.html
index 2fff481..e75dd27 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -32,7 +32,7 @@
             <ul class="dropdown-menu">
               <li><a href="/accounts/profile/{{user.id}}">Profil ändern</a></li>
               <li><a href="/accounts/password_change/">Passwort ändern</a></li>
-              <li><a href="/logout">Abmelden</a></li>
+              <li><a href="/accounts/logout">Abmelden</a></li>
             </ul>
           </li>
         </ul>
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
new file mode 100644
index 0000000..ae81917
--- /dev/null
+++ b/templates/registration/logout.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% load url from future %}
+{% comment %}
+  Main page to authenticate users.
+{% endcomment %}
+
+{% block head %}
+  <title>TipPy | Logout</title>
+{% endblock %}
+
+{% block body %}
+<div class="row">
+    <p>Auf wiedersehen</p>
+</div>
+{% endblock %}
diff --git a/tipp/urls.py b/tipp/urls.py
index 3403e3c..79dc6d6 100644
--- a/tipp/urls.py
+++ b/tipp/urls.py
@@ -23,7 +23,7 @@ urlpatterns = [
     re_path(r'^blog/(?P<page>\d)$', views.blogindex),
     re_path(r'^about$', views.about),
     re_path(r'^accounts/login/', auth_views.LoginView.as_view()),
-    re_path(r'^logout', auth_views.LogoutView.as_view())
+    re_path(r'^accounts/logout/', auth_views.LogoutView.as_view())
 ]
 
 if settings.DEBUG is True: