From f91165d7b908b3378cdcf138b7bb3170ca8ce8bf Mon Sep 17 00:00:00 2001
From: Niko Abeler <niko@rerere.org>
Date: Tue, 13 Jun 2023 20:24:54 +0200
Subject: [PATCH] more cleanup

---
 guild/templates/guild/home.html    | 38 +++++++++++++++++++-----------
 guild/urls.py                      |  9 +++++++
 guild/views/account.py             |  0
 guild/views/adventure.py           |  1 +
 guild_journal/urls.py              |  1 -
 templates/base.html                | 11 +++++++++
 templates/registration/login.html  |  2 +-
 templates/registration/logout.html |  9 +++++++
 8 files changed, 55 insertions(+), 16 deletions(-)
 create mode 100644 guild/views/account.py
 create mode 100644 templates/registration/logout.html

diff --git a/guild/templates/guild/home.html b/guild/templates/guild/home.html
index c86e91c..1515846 100644
--- a/guild/templates/guild/home.html
+++ b/guild/templates/guild/home.html
@@ -3,19 +3,15 @@
 {% block content %}
 <h1>Home</h1>
 
-<ul>
-    <li>
-        <a href="{% url 'guild:create_player' %}">Create New Player</a>
-    </li>
-    <li>
-        <a href="{% url 'guild:create_character' %}">Create New Character</a>
-    </li>
-    <li>
-        <a href="{% url 'guild:create_adventure' %}">Create New Adventure</a>
-    </li>
-</ul>
+<div class="row">
+    <div class="column column-75">
+        <h2>Adventures</h2>
+    </div>
+    <div class="column column-25">
+        <a class="button button-outline" href="{% url 'guild:create_adventure' %}">Create New Adventure</a>
+    </div>
+</div>
 
-<h2>Adventures</h2>
 
 <ul>
     {% for adventure in adventures %}
@@ -25,7 +21,14 @@
     {% endfor %}
 </ul>
 
-<h2>Characters</h2>
+<div class="row">
+    <div class="column column-75">
+        <h2>Characters</h2>
+    </div>
+    <div class="column column-25">
+        <a class="button button-outline" href="{% url 'guild:create_character' %}">Create New Character</a>
+    </div>
+</div>
 
 <ul>
     {% for character in characters %}
@@ -35,7 +38,14 @@
     {% endfor %}
 </ul>
 
-<h2>Players</h2>
+<div class="row">
+    <div class="column column-75">
+        <h2>Players</h2>
+    </div>
+    <div class="column column-25">
+        <a class="button button-outline" href="{% url 'guild:create_player' %}">Create New Player</a>
+    </div>
+</div>
 
 <ul>
     {% for player in players %}
diff --git a/guild/urls.py b/guild/urls.py
index 1a2fcd8..17280af 100644
--- a/guild/urls.py
+++ b/guild/urls.py
@@ -3,9 +3,18 @@ import guild.views as views
 import guild.views.player as player_views
 import guild.views.character as character_views
 import guild.views.adventure as adventure_views
+from django.contrib.auth import views as auth_views
 
 urlpatterns = [
     path("", views.HomeView.as_view(), name="home"),
+    path("acounnt/login/", auth_views.LoginView.as_view(next_page="/"), name="login"),
+    path(
+        "account/logout/",
+        auth_views.LogoutView.as_view(
+            template_name="registration/logout.html",
+        ),
+        name="logout",
+    ),
     # path("players/", views.PlayerListView.as_view(), name="player_list"),
     path(
         "players/create/", player_views.CreatePlayerView.as_view(), name="create_player"
diff --git a/guild/views/account.py b/guild/views/account.py
new file mode 100644
index 0000000..e69de29
diff --git a/guild/views/adventure.py b/guild/views/adventure.py
index a686c63..d22eeb5 100644
--- a/guild/views/adventure.py
+++ b/guild/views/adventure.py
@@ -50,6 +50,7 @@ class PlaySessionCreateView(LoginRequiredMixin, CreateView):
 class PlaySessionUpdateView(LoginRequiredMixin, UpdateView):
     model = PlaySession
     form_class = PlaySessionForm
+    pk_url_kwarg = "playsession_pk"
 
     def dispatch(self, request, *args, **kwargs):
         self.adventure = get_object_or_404(Adventure, pk=kwargs["pk"])
diff --git a/guild_journal/urls.py b/guild_journal/urls.py
index 3003f2a..d89bd1f 100644
--- a/guild_journal/urls.py
+++ b/guild_journal/urls.py
@@ -19,6 +19,5 @@ from django.urls import include, path
 
 urlpatterns = [
     path("admin/", admin.site.urls),
-    path("accounts/", include("django.contrib.auth.urls")),
     path("", include(("guild.urls", "guild"), namespace="guild")),
 ]
diff --git a/templates/base.html b/templates/base.html
index b823b64..2ebce8c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -67,6 +67,17 @@
             <li class="navigation-item">
                 <a href="{% url 'guild:character_list' %}">Characters</a>
             </li>
+
+            {% if user.is_authenticated %}
+            <li class="navigation-item">
+                <a href="{% url 'guild:logout' %}">Logout</a>
+            </li>
+            {% else %}
+            <li class="navigation-item">
+                <a href="{% url 'guild:login' %}">Login</a>
+            </li>
+            {% endif %}
+            
         </ul>
     </section>
 </nav>
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 4e47fd6..46fffff 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -15,7 +15,7 @@
     {% endif %}
 {% endif %}
 
-<form method="post" action="{% url 'login' %}">
+<form method="post" action="{% url 'guild:login' %}">
 {% csrf_token %}
 {{form}}
 <input type="submit" value="login">
diff --git a/templates/registration/logout.html b/templates/registration/logout.html
new file mode 100644
index 0000000..30e8e43
--- /dev/null
+++ b/templates/registration/logout.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+<h1>Logged Out</h1>
+
+<p>You have been logged out. <a href="{% url 'guild:login' %}">Log in again</a>.</p>
+
+{% endblock %}
\ No newline at end of file