From bad3ffb4c597a814b4b5dad3abb403217bdd83d8 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 00:08:23 +0000 Subject: [PATCH 01/48] Updates Bootstrap to v4 stable. --- evennia/web/website/templates/website/base.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evennia/web/website/templates/website/base.html b/evennia/web/website/templates/website/base.html index a2172b308f..556aad0306 100644 --- a/evennia/web/website/templates/website/base.html +++ b/evennia/web/website/templates/website/base.html @@ -12,7 +12,7 @@ - + @@ -56,7 +56,7 @@ - - + + From a0e3afd9a43716fd8ee32ba2ab8ac12aac7b1b50 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 00:32:38 +0000 Subject: [PATCH 02/48] Adds template tag to override body. --- evennia/web/website/templates/website/base.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/evennia/web/website/templates/website/base.html b/evennia/web/website/templates/website/base.html index 556aad0306..2004425849 100644 --- a/evennia/web/website/templates/website/base.html +++ b/evennia/web/website/templates/website/base.html @@ -29,6 +29,8 @@ {{game_name}} - {% if flatpage %}{{flatpage.title}}{% else %}{% block titleblock %}{{page_title}}{% endblock %}{% endif %} + {% block body %} + {% include "website/_menu.html" %}
@@ -53,6 +55,8 @@
{% endblock %} + + {% endblock %} From 63c8ae5bd5b7a2b9f012267640516272f84f34eb Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 00:33:32 +0000 Subject: [PATCH 03/48] Fixes failure to display error messages and display form as standalone. --- .../templates/website/registration/login.html | 73 ++++++++++--------- 1 file changed, 39 insertions(+), 34 deletions(-) diff --git a/evennia/web/website/templates/website/registration/login.html b/evennia/web/website/templates/website/registration/login.html index 8b2213a251..2aa32d5cff 100644 --- a/evennia/web/website/templates/website/registration/login.html +++ b/evennia/web/website/templates/website/registration/login.html @@ -4,44 +4,49 @@ Login {% endblock %} -{% block content %} +{% block body %} {% load addclass %} - -
-
-
-
-

Login

-
- {% if user.is_authenticated %} -

You are already logged in!

- {% else %} - {% if form.has_errors %} -

Your username and password didn't match. Please try again.

- {% endif %} - -
- {% csrf_token %} - -
- - {{ form.username | addclass:"form-control" }} -
- -
- - {{ form.password | addclass:"form-control" }} -
- -
- - -
-
+
+
+
+
+
+

Login

+
+ {% if user.is_authenticated %} + + {% else %} + {% if form.errors %} + + {% endif %} + {% endif %} + + {% if not user.is_authenticated %} +
+ {% csrf_token %} + +
+ + {{ form.username | addclass:"form-control" }} +
+ +
+ + {{ form.password | addclass:"form-control" }} +
+ +
+
+ + +
+
+ + {% endif %} +
-{% endif %} {% endblock %} From db5b68e94309e1e946f5550110829b2986ec7380 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 17:19:52 +0000 Subject: [PATCH 04/48] Adds link to password reset form. --- .../web/website/templates/website/registration/login.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/evennia/web/website/templates/website/registration/login.html b/evennia/web/website/templates/website/registration/login.html index 2aa32d5cff..87f5d7b9f7 100644 --- a/evennia/web/website/templates/website/registration/login.html +++ b/evennia/web/website/templates/website/registration/login.html @@ -35,6 +35,12 @@ Login {{ form.password | addclass:"form-control" }}
+ +
+
+
Forgot Password?
+
Sign Up
+
From 32c8d0fce206bd0b4846226edaaef354905f4627 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 18:17:32 +0000 Subject: [PATCH 05/48] Updates style of password reset forms to use Bootstrap instead of Django Admin. --- .../registration/password_reset_complete.html | 31 +++++++++++ .../registration/password_reset_confirm.html | 55 +++++++++++++++++++ .../registration/password_reset_done.html | 34 ++++++++++++ .../registration/password_reset_email.html | 15 +++++ .../registration/password_reset_form.html | 48 ++++++++++++++++ 5 files changed, 183 insertions(+) create mode 100644 evennia/web/website/templates/website/registration/password_reset_complete.html create mode 100644 evennia/web/website/templates/website/registration/password_reset_confirm.html create mode 100644 evennia/web/website/templates/website/registration/password_reset_done.html create mode 100644 evennia/web/website/templates/website/registration/password_reset_email.html create mode 100644 evennia/web/website/templates/website/registration/password_reset_form.html diff --git a/evennia/web/website/templates/website/registration/password_reset_complete.html b/evennia/web/website/templates/website/registration/password_reset_complete.html new file mode 100644 index 0000000000..697b4bc4ad --- /dev/null +++ b/evennia/web/website/templates/website/registration/password_reset_complete.html @@ -0,0 +1,31 @@ +{% extends "base.html" %} + +{% block titleblock %} +Forgot Password - Reset Successful +{% endblock %} + +{% block body %} + +{% load addclass %} +
+
+
+
+
+

Password Reset

+
+ {% if user.is_authenticated %} + + {% else %} + +

Your password has been successfully reset!

+ +

You may now log in using it here.

+ + {% endif %} +
+
+
+
+
+{% endblock %} diff --git a/evennia/web/website/templates/website/registration/password_reset_confirm.html b/evennia/web/website/templates/website/registration/password_reset_confirm.html new file mode 100644 index 0000000000..a7bdc683be --- /dev/null +++ b/evennia/web/website/templates/website/registration/password_reset_confirm.html @@ -0,0 +1,55 @@ +{% extends "base.html" %} + +{% block titleblock %} +Forgot Password - Reset +{% endblock %} + +{% block body %} + +{% load addclass %} +
+
+
+
+
+

Reset Password

+
+ {% if not validlink %} + + {% else %} + + {% if form.errors %} + {% for field in form %} + {% for error in field.errors %} + + {% endfor %} + {% endfor %} + {% endif %} + +
+ {% csrf_token %} + +
+ + {{ form.new_password1 | addclass:"form-control" }} +
+ +
+ + {{ form.new_password2 | addclass:"form-control" }} +
+ +
+
+ + +
+
+ + {% endif %} +
+
+
+
+
+{% endblock %} diff --git a/evennia/web/website/templates/website/registration/password_reset_done.html b/evennia/web/website/templates/website/registration/password_reset_done.html new file mode 100644 index 0000000000..d248c56d0f --- /dev/null +++ b/evennia/web/website/templates/website/registration/password_reset_done.html @@ -0,0 +1,34 @@ +{% extends "base.html" %} + +{% block titleblock %} +Forgot Password - Reset Link Sent +{% endblock %} + +{% block body %} + +{% load addclass %} +
+
+
+
+
+

Reset Sent

+
+ {% if user.is_authenticated %} + + {% else %} + +

Instructions for resetting your password will be emailed to the + address you provided, if that address matches the one we have on file + for your account. You should receive them shortly.

+ +

Please allow up to to a few hours for the email to transmit, and be + sure to check your spam folder if it doesn't show up in a timely manner.

+ + {% endif %} +
+
+
+
+
+{% endblock %} diff --git a/evennia/web/website/templates/website/registration/password_reset_email.html b/evennia/web/website/templates/website/registration/password_reset_email.html new file mode 100644 index 0000000000..28e5a0daa2 --- /dev/null +++ b/evennia/web/website/templates/website/registration/password_reset_email.html @@ -0,0 +1,15 @@ +{% autoescape off %} +To initiate the password reset process for your {{ user.get_username }} {{ site_name }} account, +click the link below: + +{{ protocol }}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %} + +If clicking the link above doesn't work, please copy and paste the URL in a new browser +window instead. + +If you did not request a password reset, please disregard this notice. Whoever requested it +cannot follow through on resetting your password without access to this message. + +Sincerely, +{{ site_name }} Management. +{% endautoescape %} \ No newline at end of file diff --git a/evennia/web/website/templates/website/registration/password_reset_form.html b/evennia/web/website/templates/website/registration/password_reset_form.html new file mode 100644 index 0000000000..f13c532a58 --- /dev/null +++ b/evennia/web/website/templates/website/registration/password_reset_form.html @@ -0,0 +1,48 @@ +{% extends "base.html" %} + +{% block titleblock %} +Forgot Password +{% endblock %} + +{% block body %} + +{% load addclass %} +
+
+
+
+
+

Forgot Password

+
+ {% if user.is_authenticated %} + + {% else %} + {% if form.errors %} + + {% endif %} + {% endif %} + + {% if not user.is_authenticated %} +
+ {% csrf_token %} + +
+ + {{ form.email | addclass:"form-control" }} + The email address you provided at registration. If you left it blank, your password cannot be reset through this form. +
+ +
+
+ + +
+
+ + {% endif %} +
+
+
+
+
+{% endblock %} From aae242a41129f3e95efbd4ae34b1b5c3016ea9a4 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 20:04:37 +0000 Subject: [PATCH 06/48] Enables django.contrib.messages via INSTALLED_APPS and adds a context processor for it. --- evennia/settings_default.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evennia/settings_default.py b/evennia/settings_default.py index 9efbb6314b..4922b08996 100644 --- a/evennia/settings_default.py +++ b/evennia/settings_default.py @@ -751,6 +751,7 @@ TEMPLATES = [{ 'django.contrib.auth.context_processors.auth', 'django.template.context_processors.media', 'django.template.context_processors.debug', + 'django.contrib.messages.context_processors.messages', 'sekizai.context_processors.sekizai', 'evennia.web.utils.general_context.general_context'], # While true, show "pretty" error messages for template syntax errors. @@ -785,6 +786,7 @@ INSTALLED_APPS = ( 'django.contrib.flatpages', 'django.contrib.sites', 'django.contrib.staticfiles', + 'django.contrib.messages', 'sekizai', 'evennia.utils.idmapper', 'evennia.server', From 927a1044627a8eadeeed0c6f68d83a4184e72664 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 20:05:32 +0000 Subject: [PATCH 07/48] Adds hook to retrieve messsages and an include for the actual blocks. --- evennia/web/website/templates/website/base.html | 2 ++ evennia/web/website/templates/website/messages.html | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 evennia/web/website/templates/website/messages.html diff --git a/evennia/web/website/templates/website/base.html b/evennia/web/website/templates/website/base.html index 2004425849..e690d61d2b 100644 --- a/evennia/web/website/templates/website/base.html +++ b/evennia/web/website/templates/website/base.html @@ -42,6 +42,8 @@
{% endif %}
+ {% include 'website/messages.html' %} + {% block content %} {% endblock %}
diff --git a/evennia/web/website/templates/website/messages.html b/evennia/web/website/templates/website/messages.html new file mode 100644 index 0000000000..7b237180eb --- /dev/null +++ b/evennia/web/website/templates/website/messages.html @@ -0,0 +1,9 @@ +{% if messages %} + +{% for message in messages %} +
+ {{ message }} +
+{% endfor %} + +{% endif %} \ No newline at end of file From 9b924fc07e481325e481a4d20e1ab449fb4daf1c Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 20:05:55 +0000 Subject: [PATCH 08/48] Adds include block for messages. --- evennia/web/website/templates/website/registration/login.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evennia/web/website/templates/website/registration/login.html b/evennia/web/website/templates/website/registration/login.html index 87f5d7b9f7..27339c9480 100644 --- a/evennia/web/website/templates/website/registration/login.html +++ b/evennia/web/website/templates/website/registration/login.html @@ -14,6 +14,7 @@ Login

Login

+ {% include 'website/messages.html' %} {% if user.is_authenticated %} {% else %} @@ -39,7 +40,7 @@ Login
Forgot Password?
-
Sign Up
+
Sign Up
From 79d122a1dda42a4b1455becb653e977d6fab8ce1 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 20:21:02 +0000 Subject: [PATCH 09/48] Adds account registration form. --- evennia/web/website/forms.py | 13 +++++ .../web/website/templates/website/_menu.html | 2 +- .../templates/website/registration/login.html | 2 +- .../website/registration/register.html | 56 +++++++++++++++++++ evennia/web/website/urls.py | 3 +- evennia/web/website/views.py | 42 ++++++++++++++ 6 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 evennia/web/website/forms.py create mode 100644 evennia/web/website/templates/website/registration/register.html diff --git a/evennia/web/website/forms.py b/evennia/web/website/forms.py new file mode 100644 index 0000000000..cc7677926c --- /dev/null +++ b/evennia/web/website/forms.py @@ -0,0 +1,13 @@ +from django import forms +from django.conf import settings +from django.contrib.auth.forms import UserCreationForm, UsernameField +from evennia.utils import class_from_module + +class AccountCreationForm(UserCreationForm): + + class Meta: + model = class_from_module(settings.BASE_ACCOUNT_TYPECLASS) + fields = ("username", "email") + field_classes = {'username': UsernameField} + + email = forms.EmailField(help_text="A valid email address. Optional; used for password resets.", required=False) \ No newline at end of file diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html index 8430d0f805..6a81d04866 100644 --- a/evennia/web/website/templates/website/_menu.html +++ b/evennia/web/website/templates/website/_menu.html @@ -51,7 +51,7 @@ folder and edit it to add/remove links to the menu. Log In
  • - Register + Register
    • {% endif %} {% endblock %} diff --git a/evennia/web/website/templates/website/registration/login.html b/evennia/web/website/templates/website/registration/login.html index 27339c9480..cf798e8f76 100644 --- a/evennia/web/website/templates/website/registration/login.html +++ b/evennia/web/website/templates/website/registration/login.html @@ -40,7 +40,7 @@ Login
    Forgot Password?
    -
    Sign Up
    +
    Create Account
    diff --git a/evennia/web/website/templates/website/registration/register.html b/evennia/web/website/templates/website/registration/register.html new file mode 100644 index 0000000000..5475d922be --- /dev/null +++ b/evennia/web/website/templates/website/registration/register.html @@ -0,0 +1,56 @@ +{% extends "base.html" %} + +{% block titleblock %} +Register +{% endblock %} + +{% block body %} + +{% load addclass %} +
    +
    +
    +
    +
    +

    Register

    +
    + {% if user.is_authenticated %} + + {% else %} + {% if form.errors %} + {% for field in form %} + {% for error in field.errors %} + + {% endfor %} + {% endfor %} + {% endif %} + {% endif %} + + {% if not user.is_authenticated %} +
    + {% csrf_token %} + + {% for field in form %} +
    + {{ field.label_tag }} + {{ field | addclass:"form-control" }} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} +
    + {% endfor %} + +
    +
    + + +
    +
    + + {% endif %} +
    +
    +
    +
    +
    +{% endblock %} diff --git a/evennia/web/website/urls.py b/evennia/web/website/urls.py index f906b6b142..1cc7fe75d8 100644 --- a/evennia/web/website/urls.py +++ b/evennia/web/website/urls.py @@ -13,7 +13,8 @@ urlpatterns = [ url(r'^tbi/', website_views.to_be_implemented, name='to_be_implemented'), # User Authentication (makes login/logout url names available) - url(r'^authenticate/', include('django.contrib.auth.urls')), + url(r'^auth/', include('django.contrib.auth.urls')), + url(r'^auth/register', website_views.AccountCreationView.as_view(), name="register"), # Django original admin page. Make this URL is always available, whether # we've chosen to use Evennia's custom admin or not. diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index fe93b06426..e4342ebc6d 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -7,14 +7,19 @@ templates on the fly. """ from django.contrib.admin.sites import site from django.conf import settings +from django.contrib import messages from django.contrib.auth import authenticate from django.contrib.admin.views.decorators import staff_member_required +from django.http import HttpResponseRedirect from django.shortcuts import render +from django.urls import reverse, reverse_lazy +from django.views.generic import View, DetailView, ListView, FormView from evennia import SESSION_HANDLER from evennia.objects.models import ObjectDB from evennia.accounts.models import AccountDB from evennia.utils import logger +from evennia.web.website.forms import AccountCreationForm from django.contrib.auth import login @@ -134,3 +139,40 @@ def admin_wrapper(request): Wrapper that allows us to properly use the base Django admin site, if needed. """ return staff_member_required(site.index)(request) + +class AccountCreationView(FormView): + form_class = AccountCreationForm + template_name = 'website/registration/register.html' + success_url = reverse_lazy('login') + + def form_valid(self, form): + # Check to make sure basics validated + valid = super(AccountCreationView, self).form_valid(form) + if not valid: return self.form_invalid(form) + + username = form.cleaned_data['username'] + password = form.cleaned_data['password1'] + email = form.cleaned_data.get('email', '') + + # Create a fake session object to intercept calls to the terminal + from mock import Mock + session = self.request + session.address = self.request.META.get('REMOTE_ADDR', '') + session.msg = Mock() + + # Create account + from evennia.commands.default.unloggedin import _create_account + permissions = settings.PERMISSION_ACCOUNT_DEFAULT + account = _create_account(session, username, password, permissions) + + # If unsuccessful, get messages passed to session.msg + if not account: + [messages.error(self.request, call) for call in session.msg.call_args_list] + return self.form_invalid(form) + + # Append email address if given + account.email = email + account.save() + + messages.success(self.request, "Your account '%s' was successfully created! You may log in using it now." % account.name) + return HttpResponseRedirect(self.success_url) \ No newline at end of file From a465b6c39f1b17c064e2f7df6cc43aacf087fea0 Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 22:54:35 +0000 Subject: [PATCH 10/48] Adds authenticated dropdown with links to password change form, create/manage characters, and character quickselect. --- evennia/accounts/accounts.py | 4 ++++ .../web/website/templates/website/_menu.html | 17 +++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py index 2c33e5c1f8..f4711299cf 100644 --- a/evennia/accounts/accounts.py +++ b/evennia/accounts/accounts.py @@ -189,6 +189,10 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)): @lazy_property def sessions(self): return AccountSessionHandler(self) + + @lazy_property + def characters(self): + return self.db._playable_characters # session-related methods diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html index 6a81d04866..ea01404967 100644 --- a/evennia/web/website/templates/website/_menu.html +++ b/evennia/web/website/templates/website/_menu.html @@ -40,8 +40,21 @@ folder and edit it to add/remove links to the menu. {% endblock %} {% block navbar_user %} {% if user.is_authenticated %} -
  • - Logged in as {{user.username}} +
  • + +
    + Create + Manage +
    + {% for character in user.characters %} + {{ character }} + {% empty %} + No characters found! + {% endfor %} +
    + Change Password + Log Out +
  • Log Out From 0531afceef9c70885d581ee6416c89e20ac897da Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 4 Oct 2018 22:54:48 +0000 Subject: [PATCH 11/48] Stylizes password_change form. --- .../registration/password_change_form.html | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 evennia/web/website/templates/website/registration/password_change_form.html diff --git a/evennia/web/website/templates/website/registration/password_change_form.html b/evennia/web/website/templates/website/registration/password_change_form.html new file mode 100644 index 0000000000..bae8c90962 --- /dev/null +++ b/evennia/web/website/templates/website/registration/password_change_form.html @@ -0,0 +1,51 @@ +{% extends "base.html" %} + +{% block titleblock %} +Password Change +{% endblock %} + +{% block content %} + +{% load addclass %} +
    +
    +
    +
    +
    +

    Password Change

    +
    + + {% if form.errors %} + {% for field in form %} + {% for error in field.errors %} + + {% endfor %} + {% endfor %} + {% endif %} + +
    + {% csrf_token %} + + {% for field in form %} +
    + {{ field.label_tag }} + {{ field | addclass:"form-control" }} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} +
    + {% endfor %} + +
    +
    + + +
    +
    + +
    +
    +
    +
    +
    +{% endblock %} From 40f5f283ad862224e6b49a9e21d7205c527c8f2c Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 18:59:55 +0000 Subject: [PATCH 12/48] Implements web-based character creation. --- evennia/web/website/forms.py | 131 +++++++++++++++++- .../web/website/templates/website/_menu.html | 2 +- .../templates/website/chargen_form.html | 51 +++++++ evennia/web/website/urls.py | 3 + evennia/web/website/views.py | 61 +++++++- 5 files changed, 244 insertions(+), 4 deletions(-) create mode 100644 evennia/web/website/templates/website/chargen_form.html diff --git a/evennia/web/website/forms.py b/evennia/web/website/forms.py index cc7677926c..ca93dd2c3b 100644 --- a/evennia/web/website/forms.py +++ b/evennia/web/website/forms.py @@ -2,6 +2,7 @@ from django import forms from django.conf import settings from django.contrib.auth.forms import UserCreationForm, UsernameField from evennia.utils import class_from_module +from random import choice, randint class AccountCreationForm(UserCreationForm): @@ -10,4 +11,132 @@ class AccountCreationForm(UserCreationForm): fields = ("username", "email") field_classes = {'username': UsernameField} - email = forms.EmailField(help_text="A valid email address. Optional; used for password resets.", required=False) \ No newline at end of file + email = forms.EmailField(help_text="A valid email address. Optional; used for password resets.", required=False) + +class CharacterCreationForm(forms.Form): + name = forms.CharField(help_text="The name of your intended character.") + age = forms.IntegerField(min_value=3, max_value=99, help_text="How old your character should be once spawned.") + description = forms.CharField(widget=forms.Textarea(attrs={'rows': 3}), max_length=2048, min_length=160, required=False) + + @classmethod + def assign_attributes(cls, attribute_list, points, min_points, max_points): + """ + Randomly distributes a number of points across the given attributes, + while also ensuring each attribute gets at least a certain amount + and at most a certain amount. + + Args: + attribute_list (iterable): List or tuple of attribute names to assign + points to. + points (int): Starting number of points + min_points (int): Least amount of points each attribute should have + max_points (int): Most amount of points each attribute should have + + Returns: + spread (dict): Dict of attributes and a point assignment. + + """ + num_buckets = len(attribute_list) + point_spread = (x for x in self.random_distribution(points, num_buckets, min_points, max_points)) + + # For each field, get the point calculation for the next attribute value generated + return {attribute: next(point_spread) for k in attribute_list} + + @classmethod + def random_distribution(cls, points, num_buckets, min_points, max_points): + """ + Distributes a set number of points randomly across a number of 'buckets' + while also attempting to ensure each bucket's value finishes within a + certain range. + + If your math doesn't add up (you try to distribute 5 points across 100 + buckets and insist each bucket has at least 20 points), the algorithm + will return the best spread it could achieve but will not raise an error + (so in this case, 5 random buckets would get 1 point each and that's all). + + Args: + points (int): The number of points to distribute. + num_buckets (int): The number of 'buckets' (or stats, skills, etc) + you wish to distribute points to. + min_points (int): The least amount of points each bucket should have. + max_points (int): The most points each bucket should have. + + Returns: + buckets (list): List of random point assignments. + + """ + buckets = [0 for x in range(num_buckets)] + indices = [i for (i, value) in enumerate(buckets)] + + # Do this while we have eligible buckets, points to assign and we haven't + # maxed out all the buckets. + while indices and points and sum(buckets) <= (max_points * num_buckets): + # Pick a random bucket index + index = choice(indices) + + # Add to bucket + buckets[index] = buckets[index] + 1 + points = points - 1 + + # Get the indices of eligible buckets + indices = [i for (i, value) in enumerate(buckets) if (value < min_points) or (value < max_points)] + + return buckets + +class ExtendedCharacterCreationForm(forms.Form): + + GENDERS = ( + ('male', 'Male'), + ('female', 'Female'), + ('androgynous', 'Androgynous'), + ('special', 'Special') + ) + + RACES = ( + ('human', 'Human'), + ('elf', 'Elf'), + ('orc', 'Orc'), + ) + + CLASSES = ( + ('civilian', 'Civilian'), + ('warrior', 'Warrior'), + ('thief', 'Thief'), + ('cleric', 'Cleric') + ) + + PERKS = ( + ('strong', 'Extra strength'), + ('nimble', 'Quick on their toes'), + ('diplomatic', 'Fast talker') + ) + + name = forms.CharField(help_text="The name of your intended character.") + age = forms.IntegerField(min_value=3, max_value=99, help_text="How old your character should be once spawned.") + gender = forms.ChoiceField(choices=GENDERS, help_text="Which end of the multidimensional spectrum does your character most closely align with, in terms of gender?") + race = forms.ChoiceField(choices=RACES, help_text="What race does your character belong to?") + job = forms.ChoiceField(choices=CLASSES, help_text="What profession or role does your character fulfill or is otherwise destined to?") + + perks = forms.MultipleChoiceField(choices=PERKS, help_text="What extraordinary abilities does your character possess?") + description = forms.CharField(widget=forms.Textarea(attrs={'rows': 3}), max_length=2048, min_length=160, required=False) + + strength = forms.IntegerField(min_value=1, max_value=10) + perception = forms.IntegerField(min_value=1, max_value=10) + intelligence = forms.IntegerField(min_value=1, max_value=10) + dexterity = forms.IntegerField(min_value=1, max_value=10) + charisma = forms.IntegerField(min_value=1, max_value=10) + vitality = forms.IntegerField(min_value=1, max_value=10) + magic = forms.IntegerField(min_value=1, max_value=10) + + def __init__(self, *args, **kwargs): + # Do all the normal initizliation stuff that would otherwise be happening + super(ExtendedCharacterCreationForm, self).__init__(*args, **kwargs) + + # Given a pool of points, let's randomly distribute them across attributes. + # First get a list of attributes + attributes = ('strength', 'perception', 'intelligence', 'dexterity', 'charisma', 'vitality', 'magic') + # Distribute a random number of points across them + attrs = self.assign_attributes(attributes, 50, 1, 10) + # Initialize the form with the results of the point distribution + for field in attrs.keys(): + self.initial[field] = attrs[field] \ No newline at end of file diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html index ea01404967..432b6e4827 100644 --- a/evennia/web/website/templates/website/_menu.html +++ b/evennia/web/website/templates/website/_menu.html @@ -43,7 +43,7 @@ folder and edit it to add/remove links to the menu.
  • - Create + Create Manage
    {% for character in user.characters %} diff --git a/evennia/web/website/templates/website/chargen_form.html b/evennia/web/website/templates/website/chargen_form.html new file mode 100644 index 0000000000..8864fb3c5d --- /dev/null +++ b/evennia/web/website/templates/website/chargen_form.html @@ -0,0 +1,51 @@ +{% extends "base.html" %} + +{% block titleblock %} +Character Creation +{% endblock %} + +{% block content %} + +{% load addclass %} +
    +
    +
    +
    +
    +

    Character Creation

    +
    + + {% if form.errors %} + {% for field in form %} + {% for error in field.errors %} + + {% endfor %} + {% endfor %} + {% endif %} + +
    + {% csrf_token %} + + {% for field in form %} +
    + {{ field.label_tag }} + {{ field | addclass:"form-control" }} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} +
    + {% endfor %} + +
    +
    + + +
    +
    + +
    +
    +
    +
    +
    +{% endblock %} diff --git a/evennia/web/website/urls.py b/evennia/web/website/urls.py index 1cc7fe75d8..d7b10208de 100644 --- a/evennia/web/website/urls.py +++ b/evennia/web/website/urls.py @@ -15,6 +15,9 @@ urlpatterns = [ # User Authentication (makes login/logout url names available) url(r'^auth/', include('django.contrib.auth.urls')), url(r'^auth/register', website_views.AccountCreationView.as_view(), name="register"), + + # Character management + url(r'^characters/create/', website_views.CharacterCreationView.as_view(), name="chargen"), # Django original admin page. Make this URL is always available, whether # we've chosen to use Evennia's custom admin or not. diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index e4342ebc6d..bd20add0d5 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -9,6 +9,7 @@ from django.contrib.admin.sites import site from django.conf import settings from django.contrib import messages from django.contrib.auth import authenticate +from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.admin.views.decorators import staff_member_required from django.http import HttpResponseRedirect from django.shortcuts import render @@ -19,7 +20,7 @@ from evennia import SESSION_HANDLER from evennia.objects.models import ObjectDB from evennia.accounts.models import AccountDB from evennia.utils import logger -from evennia.web.website.forms import AccountCreationForm +from evennia.web.website.forms import AccountCreationForm, CharacterCreationForm from django.contrib.auth import login @@ -175,4 +176,60 @@ class AccountCreationView(FormView): account.save() messages.success(self.request, "Your account '%s' was successfully created! You may log in using it now." % account.name) - return HttpResponseRedirect(self.success_url) \ No newline at end of file + return HttpResponseRedirect(self.success_url) + +class CharacterCreationView(LoginRequiredMixin, FormView): + form_class = CharacterCreationForm + template_name = 'website/chargen_form.html' + success_url = '/'#reverse_lazy('character-manage') + + def form_valid(self, form): + # Get account ref + account = self.request.user + character = None + + # Get attributes from the form + self.attributes = {k: form.cleaned_data[k] for k in form.cleaned_data.keys()} + charname = self.attributes.pop('name') + description = self.attributes.pop('description') + + # Create a character + permissions = settings.PERMISSION_ACCOUNT_DEFAULT + typeclass = settings.BASE_CHARACTER_TYPECLASS + default_home = ObjectDB.objects.get_id(settings.DEFAULT_HOME) + + from evennia.utils import create + try: + character = create.create_object(typeclass, key=charname, home=default_home, permissions=permissions) + # set playable character list + account.db._playable_characters.append(character) + + # allow only the character itself and the account to puppet this character (and Developers). + character.locks.add("puppet:id(%i) or pid(%i) or perm(Developer) or pperm(Developer)" % + (character.id, account.id)) + + # If no description is set, set a default description + if not description: + character.db.desc = "This is a character." + else: + character.db.desc = description + + # We need to set this to have @ic auto-connect to this character + account.db._last_puppet = character + + # Assign attributes from form + [setattr(character.db, field, self.attributes[field]) for field in self.attributes.keys()] + character.creator_id = account.id + character.save() + + except Exception as e: + messages.error(self.request, "There was an error creating your character. If this problem persists, contact an admin.") + logger.log_trace() + return self.form_invalid(form) + + if character: + messages.success(self.request, "Your character '%s' was created!" % character.name) + return HttpResponseRedirect(self.success_url) + else: + messages.error(self.request, "Your character could not be created. Please contact an admin.") + return self.form_invalid(form) \ No newline at end of file From c57877b8276ab641d3c0e3f2fc85935d7297b2c1 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 19:01:05 +0000 Subject: [PATCH 13/48] Limits number of characters on quickselect to 10. --- evennia/web/website/templates/website/_menu.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html index 432b6e4827..9874b7ef4a 100644 --- a/evennia/web/website/templates/website/_menu.html +++ b/evennia/web/website/templates/website/_menu.html @@ -46,7 +46,7 @@ folder and edit it to add/remove links to the menu. Create Manage
    - {% for character in user.characters %} + {% for character in user.characters|slice:"10" %} {{ character }} {% empty %} No characters found! From 465215ef51054d7cc92e98f7510d2d4ff3a7750d Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 19:01:38 +0000 Subject: [PATCH 14/48] Fixes incorrect LOGIN_URL and LOGOUT_URL by means of reverse_lazy call. --- evennia/settings_default.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/evennia/settings_default.py b/evennia/settings_default.py index 4922b08996..91a6e75dbd 100644 --- a/evennia/settings_default.py +++ b/evennia/settings_default.py @@ -13,6 +13,7 @@ always be sure of what you have changed and what is default behaviour. """ from builtins import range +from django.urls import reverse_lazy import os import sys @@ -697,9 +698,9 @@ ROOT_URLCONF = 'web.urls' # Where users are redirected after logging in via contrib.auth.login. LOGIN_REDIRECT_URL = '/' # Where to redirect users when using the @login_required decorator. -LOGIN_URL = '/accounts/login' +LOGIN_URL = reverse_lazy('login') # Where to redirect users who wish to logout. -LOGOUT_URL = '/accounts/login' +LOGOUT_URL = reverse_lazy('logout') # URL that handles the media served from MEDIA_ROOT. # Example: "http://media.lawrence.com" MEDIA_URL = '/media/' From bfe5680eff6b828f34c287477fd057676b03e851 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 19:22:23 +0000 Subject: [PATCH 15/48] Fixes storage of creator_id to dbhandler. --- evennia/web/website/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index bd20add0d5..9a7d62d8c2 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -219,7 +219,7 @@ class CharacterCreationView(LoginRequiredMixin, FormView): # Assign attributes from form [setattr(character.db, field, self.attributes[field]) for field in self.attributes.keys()] - character.creator_id = account.id + character.db.creator_id = account.id character.save() except Exception as e: From 6d8643d6f396d86926014f89999d0af55960b15c Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 19:43:23 +0000 Subject: [PATCH 16/48] Adds a generic form to templates. --- .../templates/website/generic_form.html | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 evennia/web/website/templates/website/generic_form.html diff --git a/evennia/web/website/templates/website/generic_form.html b/evennia/web/website/templates/website/generic_form.html new file mode 100644 index 0000000000..091d5f4f20 --- /dev/null +++ b/evennia/web/website/templates/website/generic_form.html @@ -0,0 +1,51 @@ +{% extends "base.html" %} + +{% block titleblock %} +Form +{% endblock %} + +{% block body %} + +{% load addclass %} +
    +
    +
    +
    +
    +

    Form

    +
    + + {% if form.errors %} + {% for field in form %} + {% for error in field.errors %} + + {% endfor %} + {% endfor %} + {% endif %} + +
    + {% csrf_token %} + + {% for field in form %} +
    + {{ field.label_tag }} + {{ field | addclass:"form-control" }} + {% if field.help_text %} + {{ field.help_text|safe }} + {% endif %} +
    + {% endfor %} + +
    +
    + + +
    +
    + +
    +
    +
    +
    +
    +{% endblock %} From b0cd7d33e53112a23af650ddf3dcea77c9c75219 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 20:16:01 +0000 Subject: [PATCH 17/48] Implements character management and update views. --- evennia/web/website/forms.py | 146 +++++++++++++++++++++++++++++++++++ evennia/web/website/urls.py | 10 ++- evennia/web/website/views.py | 119 ++++++++++++++++++++++++++++ 3 files changed, 273 insertions(+), 2 deletions(-) create mode 100644 evennia/web/website/forms.py diff --git a/evennia/web/website/forms.py b/evennia/web/website/forms.py new file mode 100644 index 0000000000..937c6be6e8 --- /dev/null +++ b/evennia/web/website/forms.py @@ -0,0 +1,146 @@ +from django import forms +from django.conf import settings +from django.contrib.auth.forms import UserCreationForm, UsernameField +from evennia.utils import class_from_module +from random import choice, randint + +class AccountForm(UserCreationForm): + + class Meta: + model = class_from_module(settings.BASE_ACCOUNT_TYPECLASS) + fields = ("username", "email") + field_classes = {'username': UsernameField} + + email = forms.EmailField(help_text="A valid email address. Optional; used for password resets.", required=False) + +class CharacterForm(forms.Form): + name = forms.CharField(help_text="The name of your intended character.") + age = forms.IntegerField(min_value=3, max_value=99, help_text="How old your character should be once spawned.") + description = forms.CharField(widget=forms.Textarea(attrs={'rows': 3}), max_length=2048, min_length=160, required=False) + + @classmethod + def assign_attributes(cls, attribute_list, points, min_points, max_points): + """ + Randomly distributes a number of points across the given attributes, + while also ensuring each attribute gets at least a certain amount + and at most a certain amount. + + Args: + attribute_list (iterable): List or tuple of attribute names to assign + points to. + points (int): Starting number of points + min_points (int): Least amount of points each attribute should have + max_points (int): Most amount of points each attribute should have + + Returns: + spread (dict): Dict of attributes and a point assignment. + + """ + num_buckets = len(attribute_list) + point_spread = (x for x in self.random_distribution(points, num_buckets, min_points, max_points)) + + # For each field, get the point calculation for the next attribute value generated + return {attribute: next(point_spread) for k in attribute_list} + + @classmethod + def random_distribution(cls, points, num_buckets, min_points, max_points): + """ + Distributes a set number of points randomly across a number of 'buckets' + while also attempting to ensure each bucket's value finishes within a + certain range. + + If your math doesn't add up (you try to distribute 5 points across 100 + buckets and insist each bucket has at least 20 points), the algorithm + will return the best spread it could achieve but will not raise an error + (so in this case, 5 random buckets would get 1 point each and that's all). + + Args: + points (int): The number of points to distribute. + num_buckets (int): The number of 'buckets' (or stats, skills, etc) + you wish to distribute points to. + min_points (int): The least amount of points each bucket should have. + max_points (int): The most points each bucket should have. + + Returns: + buckets (list): List of random point assignments. + + """ + buckets = [0 for x in range(num_buckets)] + indices = [i for (i, value) in enumerate(buckets)] + + # Do this while we have eligible buckets, points to assign and we haven't + # maxed out all the buckets. + while indices and points and sum(buckets) <= (max_points * num_buckets): + # Pick a random bucket index + index = choice(indices) + + # Add to bucket + buckets[index] = buckets[index] + 1 + points = points - 1 + + # Get the indices of eligible buckets + indices = [i for (i, value) in enumerate(buckets) if (value < min_points) or (value < max_points)] + + return buckets + +class CharacterUpdateForm(CharacterForm): + class Meta: + fields = ('description',) + +class ExtendedCharacterForm(CharacterForm): + + GENDERS = ( + ('male', 'Male'), + ('female', 'Female'), + ('androgynous', 'Androgynous'), + ('special', 'Special') + ) + + RACES = ( + ('human', 'Human'), + ('elf', 'Elf'), + ('orc', 'Orc'), + ) + + CLASSES = ( + ('civilian', 'Civilian'), + ('warrior', 'Warrior'), + ('thief', 'Thief'), + ('cleric', 'Cleric') + ) + + PERKS = ( + ('strong', 'Extra strength'), + ('nimble', 'Quick on their toes'), + ('diplomatic', 'Fast talker') + ) + + name = forms.CharField(help_text="The name of your intended character.") + age = forms.IntegerField(min_value=3, max_value=99, help_text="How old your character should be once spawned.") + gender = forms.ChoiceField(choices=GENDERS, help_text="Which end of the multidimensional spectrum does your character most closely align with, in terms of gender?") + race = forms.ChoiceField(choices=RACES, help_text="What race does your character belong to?") + job = forms.ChoiceField(choices=CLASSES, help_text="What profession or role does your character fulfill or is otherwise destined to?") + + perks = forms.MultipleChoiceField(choices=PERKS, help_text="What extraordinary abilities does your character possess?") + description = forms.CharField(widget=forms.Textarea(attrs={'rows': 3}), max_length=2048, min_length=160, required=False) + + strength = forms.IntegerField(min_value=1, max_value=10) + perception = forms.IntegerField(min_value=1, max_value=10) + intelligence = forms.IntegerField(min_value=1, max_value=10) + dexterity = forms.IntegerField(min_value=1, max_value=10) + charisma = forms.IntegerField(min_value=1, max_value=10) + vitality = forms.IntegerField(min_value=1, max_value=10) + magic = forms.IntegerField(min_value=1, max_value=10) + + def __init__(self, *args, **kwargs): + # Do all the normal initizliation stuff that would otherwise be happening + super(ExtendedCharacterCreationForm, self).__init__(*args, **kwargs) + + # Given a pool of points, let's randomly distribute them across attributes. + # First get a list of attributes + attributes = ('strength', 'perception', 'intelligence', 'dexterity', 'charisma', 'vitality', 'magic') + # Distribute a random number of points across them + attrs = self.assign_attributes(attributes, 50, 1, 10) + # Initialize the form with the results of the point distribution + for field in attrs.keys(): + self.initial[field] = attrs[field] \ No newline at end of file diff --git a/evennia/web/website/urls.py b/evennia/web/website/urls.py index f906b6b142..d6dfc0c748 100644 --- a/evennia/web/website/urls.py +++ b/evennia/web/website/urls.py @@ -13,8 +13,14 @@ urlpatterns = [ url(r'^tbi/', website_views.to_be_implemented, name='to_be_implemented'), # User Authentication (makes login/logout url names available) - url(r'^authenticate/', include('django.contrib.auth.urls')), - + url(r'^auth/', include('django.contrib.auth.urls')), + url(r'^auth/register', website_views.AccountCreationView.as_view(), name="register"), + + # Character management + url(r'^characters/create/$', website_views.CharacterCreateView.as_view(), name="chargen"), + url(r'^characters/manage/$', website_views.CharacterManageView.as_view(), name="manage-characters"), + url(r'^characters/update/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterUpdateView.as_view(), name="update-character"), + # Django original admin page. Make this URL is always available, whether # we've chosen to use Evennia's custom admin or not. url(r'django_admin/', website_views.admin_wrapper, name="django_admin"), diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index fe93b06426..d25c3493ec 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -17,6 +17,7 @@ from evennia.accounts.models import AccountDB from evennia.utils import logger from django.contrib.auth import login +from django.utils.text import slugify _BASE_CHAR_TYPECLASS = settings.BASE_CHARACTER_TYPECLASS @@ -134,3 +135,121 @@ def admin_wrapper(request): Wrapper that allows us to properly use the base Django admin site, if needed. """ return staff_member_required(site.index)(request) + +class ObjectDetailView(DetailView): + model = ObjectDB + + def get_object(self, queryset=None): + obj = super(ObjectDetailView, self).get_object(queryset) + if not slugify(obj.name) == self.kwargs.get('slug'): + raise Http404(u"No %(verbose_name)s found matching the query" % + {'verbose_name': queryset.model._meta.verbose_name}) + return obj + +class AccountCreationView(FormView): + form_class = AccountForm + template_name = 'website/registration/register.html' + success_url = reverse_lazy('login') + + def form_valid(self, form): + # Check to make sure basics validated + valid = super(AccountCreationView, self).form_valid(form) + if not valid: return self.form_invalid(form) + + username = form.cleaned_data['username'] + password = form.cleaned_data['password1'] + email = form.cleaned_data.get('email', '') + + # Create a fake session object to intercept calls to the terminal + from mock import Mock + session = self.request + session.address = self.request.META.get('REMOTE_ADDR', '') + session.msg = Mock() + + # Create account + from evennia.commands.default.unloggedin import _create_account + permissions = settings.PERMISSION_ACCOUNT_DEFAULT + account = _create_account(session, username, password, permissions) + + # If unsuccessful, get messages passed to session.msg + if not account: + [messages.error(self.request, call) for call in session.msg.call_args_list] + return self.form_invalid(form) + + # Append email address if given + account.email = email + account.save() + + messages.success(self.request, "Your account '%s' was successfully created! You may log in using it now." % account.name) + return HttpResponseRedirect(self.success_url) + +class CharacterManageView(LoginRequiredMixin, ListView): + model = ObjectDB + + def get_queryset(self): + # Get IDs of characters owned by account + ids = [getattr(x, 'id') for x in self.request.user.db._playable_characters] + + # Return a queryset consisting of those characters + return self.model.filter(id__in=ids) + +class CharacterUpdateView(LoginRequiredMixin, FormView): + form_class = CharacterUpdateForm + template_name = 'website/generic_form.html' + success_url = '/'#reverse_lazy('character-manage') + +class CharacterCreateView(LoginRequiredMixin, FormView): + form_class = CharacterForm + template_name = 'website/chargen_form.html' + success_url = '/'#reverse_lazy('character-manage') + + def form_valid(self, form): + # Get account ref + account = self.request.user + character = None + + # Get attributes from the form + self.attributes = {k: form.cleaned_data[k] for k in form.cleaned_data.keys()} + charname = self.attributes.pop('name') + description = self.attributes.pop('description') + + # Create a character + permissions = settings.PERMISSION_ACCOUNT_DEFAULT + typeclass = settings.BASE_CHARACTER_TYPECLASS + default_home = ObjectDB.objects.get_id(settings.DEFAULT_HOME) + + from evennia.utils import create + try: + character = create.create_object(typeclass, key=charname, home=default_home, permissions=permissions) + # set playable character list + account.db._playable_characters.append(character) + + # allow only the character itself and the account to puppet this character (and Developers). + character.locks.add("puppet:id(%i) or pid(%i) or perm(Developer) or pperm(Developer)" % + (character.id, account.id)) + + # If no description is set, set a default description + if not description: + character.db.desc = "This is a character." + else: + character.db.desc = description + + # We need to set this to have @ic auto-connect to this character + account.db._last_puppet = character + + # Assign attributes from form + [setattr(character.db, field, self.attributes[field]) for field in self.attributes.keys()] + character.db.creator_id = account.id + character.save() + + except Exception as e: + messages.error(self.request, "There was an error creating your character. If this problem persists, contact an admin.") + logger.log_trace() + return self.form_invalid(form) + + if character: + messages.success(self.request, "Your character '%s' was created!" % character.name) + return HttpResponseRedirect(self.success_url) + else: + messages.error(self.request, "Your character could not be created. Please contact an admin.") + return self.form_invalid(form) From 06b7b74a270678176797763a0ccd341a5024e438 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 21:04:01 +0000 Subject: [PATCH 18/48] Renames chargen form. --- .../website/{chargen_form.html => character_create_form.html} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename evennia/web/website/templates/website/{chargen_form.html => character_create_form.html} (100%) diff --git a/evennia/web/website/templates/website/chargen_form.html b/evennia/web/website/templates/website/character_create_form.html similarity index 100% rename from evennia/web/website/templates/website/chargen_form.html rename to evennia/web/website/templates/website/character_create_form.html From d124c0630bef1a20bf38a83ffc26148ceef80535 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 21:06:10 +0000 Subject: [PATCH 19/48] Adds pagination and incorporates on base template where applicable. --- .../web/website/templates/website/base.html | 2 ++ .../website/templates/website/pagination.html | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 evennia/web/website/templates/website/pagination.html diff --git a/evennia/web/website/templates/website/base.html b/evennia/web/website/templates/website/base.html index e690d61d2b..d465a17171 100644 --- a/evennia/web/website/templates/website/base.html +++ b/evennia/web/website/templates/website/base.html @@ -46,6 +46,8 @@ {% block content %} {% endblock %} + + {% include 'website/pagination.html' %}
    • diff --git a/evennia/web/website/templates/website/pagination.html b/evennia/web/website/templates/website/pagination.html new file mode 100644 index 0000000000..e2cb6bed73 --- /dev/null +++ b/evennia/web/website/templates/website/pagination.html @@ -0,0 +1,34 @@ +{% if page_obj %} + +{% endif %} \ No newline at end of file From 0ed56ad78fa3bb4daa6b9569453163169e8e7aad Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 21:06:42 +0000 Subject: [PATCH 20/48] Adds template for character management list view. --- .../website/character_manage_list.html | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 evennia/web/website/templates/website/character_manage_list.html diff --git a/evennia/web/website/templates/website/character_manage_list.html b/evennia/web/website/templates/website/character_manage_list.html new file mode 100644 index 0000000000..f4e112fd7a --- /dev/null +++ b/evennia/web/website/templates/website/character_manage_list.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} + +{% block titleblock %} +Manage Characters +{% endblock %} + +{% block content %} + +{% load addclass %} +
    +
    +
    +
    +
    +

    Manage Characters

    +
    + + {% for object in object_list %} +
    + +
    +

    {{ object.db_date_created }} +
    Delete +
    Edit

    +
    {{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}
    +

    {{ object.db.desc }}

    +
    +
    + {% endfor %} + +
    +
    +
    +
    +
    +{% endblock %} + + From 0886b8ef286f7460250a83bf74f6f5594e18756d Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 21:07:07 +0000 Subject: [PATCH 21/48] Removes character update form. --- evennia/web/website/forms.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/evennia/web/website/forms.py b/evennia/web/website/forms.py index 937c6be6e8..8759d681e8 100644 --- a/evennia/web/website/forms.py +++ b/evennia/web/website/forms.py @@ -82,10 +82,6 @@ class CharacterForm(forms.Form): indices = [i for (i, value) in enumerate(buckets) if (value < min_points) or (value < max_points)] return buckets - -class CharacterUpdateForm(CharacterForm): - class Meta: - fields = ('description',) class ExtendedCharacterForm(CharacterForm): From c5f2ac171cf75b908c1dadd207c7a2c656ba48e4 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 21:07:44 +0000 Subject: [PATCH 22/48] Adds character management/deletion views and some other changes. --- evennia/web/website/views.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index d25c3493ec..0ae996027c 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -8,13 +8,19 @@ templates on the fly. from django.contrib.admin.sites import site from django.conf import settings from django.contrib.auth import authenticate +from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.admin.views.decorators import staff_member_required +from django.db.models.functions import Lower from django.shortcuts import render +from django.urls import reverse_lazy +from django.views.generic import View, TemplateView, ListView, DetailView, FormView +from django.views.generic.edit import DeleteView from evennia import SESSION_HANDLER from evennia.objects.models import ObjectDB from evennia.accounts.models import AccountDB from evennia.utils import logger +from evennia.web.website.forms import AccountForm, CharacterForm from django.contrib.auth import login from django.utils.text import slugify @@ -185,23 +191,37 @@ class AccountCreationView(FormView): class CharacterManageView(LoginRequiredMixin, ListView): model = ObjectDB + paginate_by = 10 + template_name = 'website/character_manage_list.html' def get_queryset(self): # Get IDs of characters owned by account ids = [getattr(x, 'id') for x in self.request.user.db._playable_characters] # Return a queryset consisting of those characters - return self.model.filter(id__in=ids) + return self.model.objects.filter(id__in=ids).order_by(Lower('db_key')) class CharacterUpdateView(LoginRequiredMixin, FormView): - form_class = CharacterUpdateForm + form_class = CharacterForm template_name = 'website/generic_form.html' - success_url = '/'#reverse_lazy('character-manage') + success_url = reverse_lazy('manage-characters') + fields = ('description',) + +class CharacterDeleteView(LoginRequiredMixin, ObjectDetailView, DeleteView): + model = ObjectDB + + def get_queryset(self): + # Restrict characters available for deletion to those owned by + # the authenticated account + ids = [getattr(x, 'id') for x in self.request.user.db._playable_characters] + + # Return a queryset consisting of those characters + return self.model.objects.filter(id__in=ids).order_by(Lower('db_key')) class CharacterCreateView(LoginRequiredMixin, FormView): form_class = CharacterForm - template_name = 'website/chargen_form.html' - success_url = '/'#reverse_lazy('character-manage') + template_name = 'website/character_create_form.html' + success_url = reverse_lazy('manage-characters') def form_valid(self, form): # Get account ref From 6c56d591147540b17694c4ad40c14107ed27dbc8 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 21:08:00 +0000 Subject: [PATCH 23/48] Adds links to charman views. --- evennia/web/website/templates/website/_menu.html | 2 +- evennia/web/website/urls.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html index 9874b7ef4a..90eabba4eb 100644 --- a/evennia/web/website/templates/website/_menu.html +++ b/evennia/web/website/templates/website/_menu.html @@ -44,7 +44,7 @@ folder and edit it to add/remove links to the menu.
    Create - Manage + Manage
    {% for character in user.characters|slice:"10" %} {{ character }} diff --git a/evennia/web/website/urls.py b/evennia/web/website/urls.py index d6dfc0c748..229750bdae 100644 --- a/evennia/web/website/urls.py +++ b/evennia/web/website/urls.py @@ -20,6 +20,7 @@ urlpatterns = [ url(r'^characters/create/$', website_views.CharacterCreateView.as_view(), name="chargen"), url(r'^characters/manage/$', website_views.CharacterManageView.as_view(), name="manage-characters"), url(r'^characters/update/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterUpdateView.as_view(), name="update-character"), + url(r'^characters/delete/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterDeleteView.as_view(), name="delete-character"), # Django original admin page. Make this URL is always available, whether # we've chosen to use Evennia's custom admin or not. From 66fa1a558435e88b17cf83cbe8b70defe08c417e Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 5 Oct 2018 21:08:22 +0000 Subject: [PATCH 24/48] Adds generic listview template. --- .../templates/website/object_list.html | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 evennia/web/website/templates/website/object_list.html diff --git a/evennia/web/website/templates/website/object_list.html b/evennia/web/website/templates/website/object_list.html new file mode 100644 index 0000000000..06e513dcbb --- /dev/null +++ b/evennia/web/website/templates/website/object_list.html @@ -0,0 +1,29 @@ +{% extends "base.html" %} + +{% block titleblock %} +List +{% endblock %} + +{% block content %} + +{% load addclass %} +
    +
    +
    +
    +
    +

    List

    +
    + +
      + {% for object in object_list %} +
    • {{ object }}
      • + {% endfor %} +
    + +
    +
    +
    +
    +
    +{% endblock %} From 34915980c4148433c441b07a9c8296d7874d4dac Mon Sep 17 00:00:00 2001 From: Johnny Date: Sun, 7 Oct 2018 17:26:19 +0000 Subject: [PATCH 25/48] Adds CRUD views for characters. --- evennia/web/website/urls.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evennia/web/website/urls.py b/evennia/web/website/urls.py index 229750bdae..d8a6523c53 100644 --- a/evennia/web/website/urls.py +++ b/evennia/web/website/urls.py @@ -17,10 +17,10 @@ urlpatterns = [ url(r'^auth/register', website_views.AccountCreationView.as_view(), name="register"), # Character management - url(r'^characters/create/$', website_views.CharacterCreateView.as_view(), name="chargen"), - url(r'^characters/manage/$', website_views.CharacterManageView.as_view(), name="manage-characters"), - url(r'^characters/update/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterUpdateView.as_view(), name="update-character"), - url(r'^characters/delete/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterDeleteView.as_view(), name="delete-character"), + url(r'^characters/create/$', website_views.CharacterCreateView.as_view(), name="character-create"), + url(r'^characters/manage/$', website_views.CharacterManageView.as_view(), name="character-manage"), + url(r'^characters/update/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterUpdateView.as_view(), name="character-update"), + url(r'^characters/delete/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterDeleteView.as_view(), name="character-delete"), # Django original admin page. Make this URL is always available, whether # we've chosen to use Evennia's custom admin or not. From 712177b718b4497e16366385270bfa5c364540dc Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 18 Oct 2018 19:49:05 +0000 Subject: [PATCH 26/48] Makes forms more generic and implements a set of class-based CRUD views for character objects. --- evennia/web/website/forms.py | 164 ++++------------ ...r_create_form.html => character_form.html} | 4 +- .../website/character_manage_list.html | 4 +- .../website/object_confirm_delete.html | 33 ++++ evennia/web/website/views.py | 182 ++++++++++++++---- 5 files changed, 222 insertions(+), 165 deletions(-) rename evennia/web/website/templates/website/{character_create_form.html => character_form.html} (94%) create mode 100644 evennia/web/website/templates/website/object_confirm_delete.html diff --git a/evennia/web/website/forms.py b/evennia/web/website/forms.py index 8759d681e8..0271e3d432 100644 --- a/evennia/web/website/forms.py +++ b/evennia/web/website/forms.py @@ -1,10 +1,20 @@ from django import forms from django.conf import settings from django.contrib.auth.forms import UserCreationForm, UsernameField +from django.forms import ModelForm +from django.utils.html import escape from evennia.utils import class_from_module -from random import choice, randint -class AccountForm(UserCreationForm): +class EvenniaForm(forms.Form): + + def clean(self): + cleaned = super(EvenniaForm, self).clean() + + # Escape all values provided by user + cleaned = {k:escape(v) for k,v in cleaned.items()} + return cleaned + +class AccountForm(EvenniaForm, UserCreationForm): class Meta: model = class_from_module(settings.BASE_ACCOUNT_TYPECLASS) @@ -13,130 +23,34 @@ class AccountForm(UserCreationForm): email = forms.EmailField(help_text="A valid email address. Optional; used for password resets.", required=False) -class CharacterForm(forms.Form): - name = forms.CharField(help_text="The name of your intended character.") - age = forms.IntegerField(min_value=3, max_value=99, help_text="How old your character should be once spawned.") - description = forms.CharField(widget=forms.Textarea(attrs={'rows': 3}), max_length=2048, min_length=160, required=False) +class ObjectForm(EvenniaForm, ModelForm): - @classmethod - def assign_attributes(cls, attribute_list, points, min_points, max_points): - """ - Randomly distributes a number of points across the given attributes, - while also ensuring each attribute gets at least a certain amount - and at most a certain amount. + class Meta: + model = class_from_module(settings.BASE_OBJECT_TYPECLASS) + fields = ("db_key",) + labels = { + 'db_key': 'Name', + } + +class CharacterForm(ObjectForm): + + class Meta: + # Get the correct object model + model = class_from_module(settings.BASE_CHARACTER_TYPECLASS) + # Allow entry of the 'key' field + fields = ("db_key",) + # Rename 'key' to something more intelligible + labels = { + 'db_key': 'Name', + } - Args: - attribute_list (iterable): List or tuple of attribute names to assign - points to. - points (int): Starting number of points - min_points (int): Least amount of points each attribute should have - max_points (int): Most amount of points each attribute should have - - Returns: - spread (dict): Dict of attributes and a point assignment. - - """ - num_buckets = len(attribute_list) - point_spread = (x for x in self.random_distribution(points, num_buckets, min_points, max_points)) - - # For each field, get the point calculation for the next attribute value generated - return {attribute: next(point_spread) for k in attribute_list} + # Fields pertaining to user-configurable attributes on the Character object. + desc = forms.CharField(label='Description', widget=forms.Textarea(attrs={'rows': 3}), max_length=2048, required=False) - @classmethod - def random_distribution(cls, points, num_buckets, min_points, max_points): - """ - Distributes a set number of points randomly across a number of 'buckets' - while also attempting to ensure each bucket's value finishes within a - certain range. - - If your math doesn't add up (you try to distribute 5 points across 100 - buckets and insist each bucket has at least 20 points), the algorithm - will return the best spread it could achieve but will not raise an error - (so in this case, 5 random buckets would get 1 point each and that's all). - - Args: - points (int): The number of points to distribute. - num_buckets (int): The number of 'buckets' (or stats, skills, etc) - you wish to distribute points to. - min_points (int): The least amount of points each bucket should have. - max_points (int): The most points each bucket should have. - - Returns: - buckets (list): List of random point assignments. - - """ - buckets = [0 for x in range(num_buckets)] - indices = [i for (i, value) in enumerate(buckets)] +class CharacterUpdateForm(CharacterForm): + """ + Provides a form that only allows updating of db attributes, not model + attributes. - # Do this while we have eligible buckets, points to assign and we haven't - # maxed out all the buckets. - while indices and points and sum(buckets) <= (max_points * num_buckets): - # Pick a random bucket index - index = choice(indices) - - # Add to bucket - buckets[index] = buckets[index] + 1 - points = points - 1 - - # Get the indices of eligible buckets - indices = [i for (i, value) in enumerate(buckets) if (value < min_points) or (value < max_points)] - - return buckets - -class ExtendedCharacterForm(CharacterForm): - - GENDERS = ( - ('male', 'Male'), - ('female', 'Female'), - ('androgynous', 'Androgynous'), - ('special', 'Special') - ) - - RACES = ( - ('human', 'Human'), - ('elf', 'Elf'), - ('orc', 'Orc'), - ) - - CLASSES = ( - ('civilian', 'Civilian'), - ('warrior', 'Warrior'), - ('thief', 'Thief'), - ('cleric', 'Cleric') - ) - - PERKS = ( - ('strong', 'Extra strength'), - ('nimble', 'Quick on their toes'), - ('diplomatic', 'Fast talker') - ) - - name = forms.CharField(help_text="The name of your intended character.") - age = forms.IntegerField(min_value=3, max_value=99, help_text="How old your character should be once spawned.") - gender = forms.ChoiceField(choices=GENDERS, help_text="Which end of the multidimensional spectrum does your character most closely align with, in terms of gender?") - race = forms.ChoiceField(choices=RACES, help_text="What race does your character belong to?") - job = forms.ChoiceField(choices=CLASSES, help_text="What profession or role does your character fulfill or is otherwise destined to?") - - perks = forms.MultipleChoiceField(choices=PERKS, help_text="What extraordinary abilities does your character possess?") - description = forms.CharField(widget=forms.Textarea(attrs={'rows': 3}), max_length=2048, min_length=160, required=False) - - strength = forms.IntegerField(min_value=1, max_value=10) - perception = forms.IntegerField(min_value=1, max_value=10) - intelligence = forms.IntegerField(min_value=1, max_value=10) - dexterity = forms.IntegerField(min_value=1, max_value=10) - charisma = forms.IntegerField(min_value=1, max_value=10) - vitality = forms.IntegerField(min_value=1, max_value=10) - magic = forms.IntegerField(min_value=1, max_value=10) - - def __init__(self, *args, **kwargs): - # Do all the normal initizliation stuff that would otherwise be happening - super(ExtendedCharacterCreationForm, self).__init__(*args, **kwargs) - - # Given a pool of points, let's randomly distribute them across attributes. - # First get a list of attributes - attributes = ('strength', 'perception', 'intelligence', 'dexterity', 'charisma', 'vitality', 'magic') - # Distribute a random number of points across them - attrs = self.assign_attributes(attributes, 50, 1, 10) - # Initialize the form with the results of the point distribution - for field in attrs.keys(): - self.initial[field] = attrs[field] \ No newline at end of file + """ + pass \ No newline at end of file diff --git a/evennia/web/website/templates/website/character_create_form.html b/evennia/web/website/templates/website/character_form.html similarity index 94% rename from evennia/web/website/templates/website/character_create_form.html rename to evennia/web/website/templates/website/character_form.html index 8864fb3c5d..964f4e6aa4 100644 --- a/evennia/web/website/templates/website/character_create_form.html +++ b/evennia/web/website/templates/website/character_form.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block titleblock %} -Character Creation +{{ view.page_title }} {% endblock %} {% block content %} @@ -12,7 +12,7 @@ Character Creation
    -

    Character Creation

    +

    {{ view.page_title }}

    {% if form.errors %} diff --git a/evennia/web/website/templates/website/character_manage_list.html b/evennia/web/website/templates/website/character_manage_list.html index f4e112fd7a..aeb10ade36 100644 --- a/evennia/web/website/templates/website/character_manage_list.html +++ b/evennia/web/website/templates/website/character_manage_list.html @@ -20,8 +20,8 @@ Manage Characters

    {{ object.db_date_created }} -
    Delete -
    Edit

    +
    Delete +
    Edit

    {{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}

    {{ object.db.desc }}

    diff --git a/evennia/web/website/templates/website/object_confirm_delete.html b/evennia/web/website/templates/website/object_confirm_delete.html new file mode 100644 index 0000000000..7661819aa9 --- /dev/null +++ b/evennia/web/website/templates/website/object_confirm_delete.html @@ -0,0 +1,33 @@ +{% extends "base.html" %} + +{% block titleblock %} +Confirm Delete +{% endblock %} + +{% block body %} + +{% load addclass %} +
    +
    +
    +
    +
    +

    Confirm Delete

    +
    +
    + {% csrf_token %} +

    Are you sure you want to delete "{{ object }}"?

    + +
    +
    + + +
    +
    + +
    +
    +
    +
    +
    +{% endblock %} diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index 0ae996027c..f569830a62 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -7,20 +7,23 @@ templates on the fly. """ from django.contrib.admin.sites import site from django.conf import settings +from django.contrib import messages from django.contrib.auth import authenticate from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.admin.views.decorators import staff_member_required +from django.core.exceptions import PermissionDenied from django.db.models.functions import Lower +from django.http import HttpResponseRedirect, Http404 from django.shortcuts import render from django.urls import reverse_lazy from django.views.generic import View, TemplateView, ListView, DetailView, FormView -from django.views.generic.edit import DeleteView +from django.views.generic.edit import CreateView, UpdateView, DeleteView from evennia import SESSION_HANDLER from evennia.objects.models import ObjectDB from evennia.accounts.models import AccountDB -from evennia.utils import logger -from evennia.web.website.forms import AccountForm, CharacterForm +from evennia.utils import class_from_module, logger +from evennia.web.website.forms import * from django.contrib.auth import login from django.utils.text import slugify @@ -142,25 +145,132 @@ def admin_wrapper(request): """ return staff_member_required(site.index)(request) +# +# Class-based views +# + +class EvenniaCreateView(CreateView): + + @property + def page_title(self): + return 'Create %s' % self.model._meta.verbose_name.title() + +class EvenniaUpdateView(UpdateView): + + @property + def page_title(self): + return 'Update %s' % self.model._meta.verbose_name.title() + +class EvenniaDeleteView(DeleteView): + + @property + def page_title(self): + return 'Delete %s' % self.model._meta.verbose_name.title() + +# +# Object views +# + class ObjectDetailView(DetailView): + model = ObjectDB def get_object(self, queryset=None): + """ + Override of Django hook. + + Evennia does not natively store slugs, so where a slug is provided, + calculate the same for the object and make sure it matches. + + """ obj = super(ObjectDetailView, self).get_object(queryset) - if not slugify(obj.name) == self.kwargs.get('slug'): + if slugify(obj.name) != self.kwargs.get(self.slug_url_kwarg): raise Http404(u"No %(verbose_name)s found matching the query" % {'verbose_name': queryset.model._meta.verbose_name}) return obj + +class ObjectCreateView(LoginRequiredMixin, EvenniaCreateView): + + model = ObjectDB + +class ObjectDeleteView(LoginRequiredMixin, ObjectDetailView, EvenniaDeleteView): + + model = ObjectDB + template_name = 'website/object_confirm_delete.html' + + def delete(self, request, *args, **kwargs): + """ + Calls the delete() method on the fetched object and then + redirects to the success URL. + + We extend this so we can capture the name for the sake of confirmation. + """ + obj = str(self.get_object()) + response = super(ObjectDeleteView, self).delete(request, *args, **kwargs) + messages.success(request, "Successfully deleted '%s'." % obj) + return response + +class ObjectUpdateView(LoginRequiredMixin, ObjectDetailView, EvenniaUpdateView): + + model = ObjectDB + + def get_initial(self): + """ + Override of Django hook. + + Prepopulates form field values based on object db attributes as well as + model field values. + + """ + # Get the object we want to update + obj = self.get_object() + + # Get attributes + data = {k:getattr(obj.db, k, '') for k in self.form_class.base_fields} + + # Get model fields + data.update({k:getattr(obj, k, '') for k in self.form_class.Meta.fields}) + + return data + + def form_valid(self, form): + """ + Override of Django hook. + + Updates object attributes based on values submitted. + + This method is only called if all values for the fields submitted + passed form validation, so at this point we can assume the data is + validated and sanitized. + + """ + # Get the values submitted after they've been cleaned and validated + data = {k:v for k,v in form.cleaned_data.items() if k not in self.form_class.Meta.fields} + + # Update the object attributes + for key, value in data.items(): + setattr(self.object.db, key, value) + messages.success(self.request, "Successfully updated '%s' for %s." % (key, self.object)) + + # Do not return super().form_valid; we don't want to update the model + # instance, just its attributes. + return HttpResponseRedirect(self.success_url) + +# +# Account views +# -class AccountCreationView(FormView): +class AccountMixin(object): + + model = class_from_module(settings.BASE_ACCOUNT_TYPECLASS) form_class = AccountForm + +class AccountCreateView(AccountMixin, ObjectCreateView): + template_name = 'website/registration/register.html' success_url = reverse_lazy('login') def form_valid(self, form): - # Check to make sure basics validated - valid = super(AccountCreationView, self).form_valid(form) - if not valid: return self.form_invalid(form) username = form.cleaned_data['username'] password = form.cleaned_data['password1'] @@ -189,39 +299,39 @@ class AccountCreationView(FormView): messages.success(self.request, "Your account '%s' was successfully created! You may log in using it now." % account.name) return HttpResponseRedirect(self.success_url) -class CharacterManageView(LoginRequiredMixin, ListView): - model = ObjectDB - paginate_by = 10 - template_name = 'website/character_manage_list.html' +# +# Character views +# + +class CharacterMixin(object): + + model = class_from_module(settings.BASE_CHARACTER_TYPECLASS) + form_class = CharacterForm def get_queryset(self): # Get IDs of characters owned by account - ids = [getattr(x, 'id') for x in self.request.user.db._playable_characters] + ids = [getattr(x, 'id') for x in self.request.user.db._playable_characters if x] # Return a queryset consisting of those characters return self.model.objects.filter(id__in=ids).order_by(Lower('db_key')) -class CharacterUpdateView(LoginRequiredMixin, FormView): - form_class = CharacterForm - template_name = 'website/generic_form.html' - success_url = reverse_lazy('manage-characters') - fields = ('description',) - -class CharacterDeleteView(LoginRequiredMixin, ObjectDetailView, DeleteView): - model = ObjectDB - - def get_queryset(self): - # Restrict characters available for deletion to those owned by - # the authenticated account - ids = [getattr(x, 'id') for x in self.request.user.db._playable_characters] +class CharacterManageView(LoginRequiredMixin, CharacterMixin, ListView): + + paginate_by = 10 + template_name = 'website/character_manage_list.html' + page_title = 'Manage: Characters' - # Return a queryset consisting of those characters - return self.model.objects.filter(id__in=ids).order_by(Lower('db_key')) +class CharacterUpdateView(CharacterMixin, ObjectUpdateView): + + form_class = CharacterUpdateForm + template_name = 'website/character_form.html' + +class CharacterDeleteView(CharacterMixin, ObjectDeleteView): + pass -class CharacterCreateView(LoginRequiredMixin, FormView): - form_class = CharacterForm - template_name = 'website/character_create_form.html' - success_url = reverse_lazy('manage-characters') +class CharacterCreateView(CharacterMixin, ObjectCreateView): + + template_name = 'website/character_form.html' def form_valid(self, form): # Get account ref @@ -230,12 +340,12 @@ class CharacterCreateView(LoginRequiredMixin, FormView): # Get attributes from the form self.attributes = {k: form.cleaned_data[k] for k in form.cleaned_data.keys()} - charname = self.attributes.pop('name') - description = self.attributes.pop('description') + charname = self.attributes.pop('db_key') + description = self.attributes.pop('desc') # Create a character permissions = settings.PERMISSION_ACCOUNT_DEFAULT - typeclass = settings.BASE_CHARACTER_TYPECLASS + typeclass = self.model default_home = ObjectDB.objects.get_id(settings.DEFAULT_HOME) from evennia.utils import create @@ -258,7 +368,7 @@ class CharacterCreateView(LoginRequiredMixin, FormView): account.db._last_puppet = character # Assign attributes from form - [setattr(character.db, field, self.attributes[field]) for field in self.attributes.keys()] + [setattr(character.db, key, value) for key,value in self.attributes.items()] character.db.creator_id = account.id character.save() From 20379a7fffa0e18af7075562ffc9dbaf05c1023e Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 18 Oct 2018 20:42:02 +0000 Subject: [PATCH 27/48] Fixes links. --- evennia/web/website/templates/website/_menu.html | 4 ++-- evennia/web/website/urls.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html index 90eabba4eb..f75477ecae 100644 --- a/evennia/web/website/templates/website/_menu.html +++ b/evennia/web/website/templates/website/_menu.html @@ -43,8 +43,8 @@ folder and edit it to add/remove links to the menu.
  • - Create - Manage + Create Character + Manage Characters
    {% for character in user.characters|slice:"10" %} {{ character }} diff --git a/evennia/web/website/urls.py b/evennia/web/website/urls.py index d8a6523c53..604ac1af6c 100644 --- a/evennia/web/website/urls.py +++ b/evennia/web/website/urls.py @@ -14,7 +14,7 @@ urlpatterns = [ # User Authentication (makes login/logout url names available) url(r'^auth/', include('django.contrib.auth.urls')), - url(r'^auth/register', website_views.AccountCreationView.as_view(), name="register"), + url(r'^auth/register', website_views.AccountCreateView.as_view(), name="register"), # Character management url(r'^characters/create/$', website_views.CharacterCreateView.as_view(), name="character-create"), From 68dfaf5429faff1f50499451bc778dc3233f3c4e Mon Sep 17 00:00:00 2001 From: Johnny Date: Thu, 18 Oct 2018 20:42:22 +0000 Subject: [PATCH 28/48] Fixes page titles. --- .../website/templates/website/character_manage_list.html | 8 ++++---- .../website/templates/website/object_confirm_delete.html | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/evennia/web/website/templates/website/character_manage_list.html b/evennia/web/website/templates/website/character_manage_list.html index aeb10ade36..c65314bc8e 100644 --- a/evennia/web/website/templates/website/character_manage_list.html +++ b/evennia/web/website/templates/website/character_manage_list.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block titleblock %} -Manage Characters +{{ view.page_title }} {% endblock %} {% block content %} @@ -12,17 +12,17 @@ Manage Characters
    -

    Manage Characters

    +

    {{ view.page_title }}

    {% for object in object_list %}
    - +

    {{ object.db_date_created }}
    Delete
    Edit

    -
    {{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}
    +
    {{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}

    {{ object.db.desc }}

    diff --git a/evennia/web/website/templates/website/object_confirm_delete.html b/evennia/web/website/templates/website/object_confirm_delete.html index 7661819aa9..e42fb57de6 100644 --- a/evennia/web/website/templates/website/object_confirm_delete.html +++ b/evennia/web/website/templates/website/object_confirm_delete.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block titleblock %} -Confirm Delete +{{ view.page_title }} {% endblock %} {% block body %} @@ -12,7 +12,7 @@ Confirm Delete
    -

    Confirm Delete

    +

    {{ view.page_title }}

    {% csrf_token %} From 4b3e9bc87e4bb362c63139a3778b93bc9ce86c0b Mon Sep 17 00:00:00 2001 From: Johnny Date: Tue, 23 Oct 2018 23:42:00 +0000 Subject: [PATCH 29/48] Adds unit tests for views. --- evennia/web/website/tests.py | 167 +++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 evennia/web/website/tests.py diff --git a/evennia/web/website/tests.py b/evennia/web/website/tests.py new file mode 100644 index 0000000000..26a81c0ea6 --- /dev/null +++ b/evennia/web/website/tests.py @@ -0,0 +1,167 @@ +from django.conf import settings +from django.utils.text import slugify +from django.test import Client +from django.urls import reverse +from evennia.utils.test_resources import EvenniaTest + +class EvenniaWebTest(EvenniaTest): + + # Use the same classes the views are expecting + account_typeclass = settings.BASE_ACCOUNT_TYPECLASS + object_typeclass = settings.BASE_OBJECT_TYPECLASS + character_typeclass = settings.BASE_CHARACTER_TYPECLASS + exit_typeclass = settings.BASE_EXIT_TYPECLASS + room_typeclass = settings.BASE_ROOM_TYPECLASS + script_typeclass = settings.BASE_SCRIPT_TYPECLASS + + # Default named url + url_name = 'index' + + # Response to expect for unauthenticated requests + unauthenticated_response = 200 + + # Response to expect for authenticated requests + authenticated_response = 200 + + def setUp(self): + super(EvenniaWebTest, self).setUp() + + # Add chars to account rosters + self.account.db._playable_characters = [self.char1] + self.account2.db._playable_characters = [self.char2] + + for account in (self.account, self.account2): + # Demote accounts to Player permissions + account.permissions.add('Player') + account.permissions.remove('Developer') + + # Grant permissions to chars + for char in account.db._playable_characters: + char.locks.add('edit:id(%s) or perm(Admin)' % account.pk) + char.locks.add('delete:id(%s) or perm(Admin)' % account.pk) + char.locks.add('view:all()') + + def test_valid_chars(self): + "Make sure account has playable characters" + self.assertTrue(self.char1 in self.account.db._playable_characters) + self.assertTrue(self.char2 in self.account2.db._playable_characters) + + def get_kwargs(self): + return {} + + def test_get(self): + # Try accessing page while not logged in + response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs())) + self.assertEqual(response.status_code, self.unauthenticated_response) + + def login(self): + return self.client.login(username='TestAccount', password='testpassword') + + def test_get_authenticated(self): + logged_in = self.login() + self.assertTrue(logged_in, 'Account failed to log in!') + + # Try accessing page while logged in + response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs()), follow=True) + + self.assertEqual(response.status_code, self.authenticated_response) + + +# ------------------------------------------------------------------------------ + +class AdminTest(EvenniaWebTest): + url_name = 'django_admin' + unauthenticated_response = 302 + +class IndexTest(EvenniaWebTest): + url_name = 'index' + +class RegisterTest(EvenniaWebTest): + url_name = 'register' + unauthenticated_response = 302 + +class LoginTest(EvenniaWebTest): + url_name = 'login' + +class LogoutTest(EvenniaWebTest): + url_name = 'logout' + +class PasswordResetTest(EvenniaWebTest): + url_name = 'password_change' + unauthenticated_response = 302 + +class WebclientTest(EvenniaWebTest): + url_name = 'webclient:index' + +class CharacterCreateView(EvenniaWebTest): + url_name = 'character-create' + unauthenticated_response = 302 + +class CharacterManageView(EvenniaWebTest): + url_name = 'character-manage' + unauthenticated_response = 302 + +class CharacterUpdateView(EvenniaWebTest): + url_name = 'character-update' + unauthenticated_response = 302 + + def get_kwargs(self): + return { + 'pk': self.char1.pk, + 'slug': slugify(self.char1.name) + } + + def test_valid_access(self): + "Account1 should be able to update Account1:Char1" + # Login account + self.login() + + # Try to access update page for char1 + response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs()), follow=True) + self.assertEqual(response.status_code, 200) + + def test_invalid_access(self): + "Account1 should not be able to update Account2:Char2" + # Login account + self.login() + + # Try to access update page for char2 + kwargs = { + 'pk': self.char2.pk, + 'slug': slugify(self.char2.name) + } + response = self.client.get(reverse(self.url_name, kwargs=kwargs), follow=True) + self.assertEqual(response.status_code, 403) + +class CharacterDeleteView(EvenniaWebTest): + url_name = 'character-delete' + unauthenticated_response = 302 + + def get_kwargs(self): + return { + 'pk': self.char1.pk, + 'slug': slugify(self.char1.name) + } + + def test_valid_access(self): + "Account1 should be able to delete Account1:Char1" + # Login account + self.login() + + # Try to access delete page for char1 + response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs()), follow=True) + self.assertEqual(response.status_code, 200) + + def test_invalid_access(self): + "Account1 should not be able to delete Account2:Char2" + # Login account + self.login() + + # Try to access delete page for char2 + kwargs = { + 'pk': self.char2.pk, + 'slug': slugify(self.char2.name) + } + response = self.client.get(reverse(self.url_name, kwargs=kwargs), follow=True) + self.assertEqual(response.status_code, 403) + \ No newline at end of file From 48b62a258a1bf7d3ca7959d66c802ee52b8cfe16 Mon Sep 17 00:00:00 2001 From: Johnny Date: Tue, 23 Oct 2018 23:43:40 +0000 Subject: [PATCH 30/48] Adds permissions checks for views involving objects. --- evennia/web/website/views.py | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index f569830a62..09e2705fc0 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -13,7 +13,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.admin.views.decorators import staff_member_required from django.core.exceptions import PermissionDenied from django.db.models.functions import Lower -from django.http import HttpResponseRedirect, Http404 +from django.http import HttpResponseBadRequest, HttpResponseRedirect, Http404 from django.shortcuts import render from django.urls import reverse_lazy from django.views.generic import View, TemplateView, ListView, DetailView, FormView @@ -173,7 +173,8 @@ class EvenniaDeleteView(DeleteView): class ObjectDetailView(DetailView): - model = ObjectDB + model = class_from_module(settings.BASE_OBJECT_TYPECLASS) + access_type = 'view' def get_object(self, queryset=None): """ @@ -183,19 +184,35 @@ class ObjectDetailView(DetailView): calculate the same for the object and make sure it matches. """ - obj = super(ObjectDetailView, self).get_object(queryset) + if not queryset: + queryset = self.get_queryset() + + # Get the object, ignoring all checks and filters + obj = self.model.objects.get(pk=self.kwargs.get('pk')) + + # Check if this object was requested in a valid manner if slugify(obj.name) != self.kwargs.get(self.slug_url_kwarg): - raise Http404(u"No %(verbose_name)s found matching the query" % - {'verbose_name': queryset.model._meta.verbose_name}) + raise HttpResponseBadRequest(u"No %(verbose_name)s found matching the query" % + {'verbose_name': queryset.model._meta.verbose_name}) + + # Check if account has permissions to access object + account = self.request.user + if not obj.access(account, self.access_type): + raise PermissionDenied(u"You are not authorized to %s this object." % self.access_type) + + # Get the object, based on the specified queryset + obj = super(ObjectDetailView, self).get_object(queryset) + return obj class ObjectCreateView(LoginRequiredMixin, EvenniaCreateView): - model = ObjectDB + model = class_from_module(settings.BASE_OBJECT_TYPECLASS) class ObjectDeleteView(LoginRequiredMixin, ObjectDetailView, EvenniaDeleteView): - model = ObjectDB + model = class_from_module(settings.BASE_OBJECT_TYPECLASS) + access_type = 'delete' template_name = 'website/object_confirm_delete.html' def delete(self, request, *args, **kwargs): @@ -212,7 +229,8 @@ class ObjectDeleteView(LoginRequiredMixin, ObjectDetailView, EvenniaDeleteView): class ObjectUpdateView(LoginRequiredMixin, ObjectDetailView, EvenniaUpdateView): - model = ObjectDB + model = class_from_module(settings.BASE_OBJECT_TYPECLASS) + access_type = 'edit' def get_initial(self): """ From 21972dac31d86b745a0d86c81fec7e27ba5eb4af Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 00:02:26 +0000 Subject: [PATCH 31/48] Adds unit tests for char create and delete, fixes bugs. --- .../website/object_confirm_delete.html | 2 +- evennia/web/website/tests.py | 25 +++++++++++++++++++ evennia/web/website/views.py | 3 ++- 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/evennia/web/website/templates/website/object_confirm_delete.html b/evennia/web/website/templates/website/object_confirm_delete.html index e42fb57de6..1073b26d0c 100644 --- a/evennia/web/website/templates/website/object_confirm_delete.html +++ b/evennia/web/website/templates/website/object_confirm_delete.html @@ -20,7 +20,7 @@
    - +
    diff --git a/evennia/web/website/tests.py b/evennia/web/website/tests.py index 26a81c0ea6..a45ec2d17a 100644 --- a/evennia/web/website/tests.py +++ b/evennia/web/website/tests.py @@ -97,6 +97,23 @@ class CharacterCreateView(EvenniaWebTest): url_name = 'character-create' unauthenticated_response = 302 + def test_valid_access(self): + "Account1 should be able to create a new character" + # Login account + self.login() + + # Post data for a new character + data = { + 'db_key': 'gannon', + 'desc': 'Some dude.' + } + + response = self.client.post(reverse(self.url_name), data=data, follow=True) + self.assertEqual(response.status_code, 200) + + # Make sure the character was actually created + self.assertTrue(len(self.account.db._playable_characters) > 1, 'Account only has the following characters attributed to it: %s' % self.account.db._playable_characters) + class CharacterManageView(EvenniaWebTest): url_name = 'character-manage' unauthenticated_response = 302 @@ -152,6 +169,14 @@ class CharacterDeleteView(EvenniaWebTest): response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs()), follow=True) self.assertEqual(response.status_code, 200) + # Proceed with deleting it + data = {'value': 'yes'} + response = self.client.post(reverse(self.url_name, kwargs=self.get_kwargs()), data=data, follow=True) + self.assertEqual(response.status_code, 200) + + # Make sure it deleted + self.assertFalse(self.char1 in self.account.db._playable_characters, 'Char1 is still in Account playable characters list.') + def test_invalid_access(self): "Account1 should not be able to delete Account2:Char2" # Login account diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index 09e2705fc0..738c445061 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -345,11 +345,12 @@ class CharacterUpdateView(CharacterMixin, ObjectUpdateView): template_name = 'website/character_form.html' class CharacterDeleteView(CharacterMixin, ObjectDeleteView): - pass + success_url = reverse_lazy('character-manage') class CharacterCreateView(CharacterMixin, ObjectCreateView): template_name = 'website/character_form.html' + success_url = reverse_lazy('character-manage') def form_valid(self, form): # Get account ref From e37b014d4aae124e1822348f3140c5cf93df8722 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 00:52:57 +0000 Subject: [PATCH 32/48] Fixes web UI dropdown failure to refresh after character creation. --- evennia/accounts/accounts.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py index f4711299cf..6a599f8d91 100644 --- a/evennia/accounts/accounts.py +++ b/evennia/accounts/accounts.py @@ -190,9 +190,18 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)): def sessions(self): return AccountSessionHandler(self) - @lazy_property + # Do not make this a lazy property; the web UI will not refresh it! + @property def characters(self): - return self.db._playable_characters + # Get playable characters list + objs = self.db._playable_characters + + # Rebuild the list if legacy code left null values after deletion + if None in objs: + objs = [x for x in self.db._playable_characters if x] + self.db._playable_characters = objs + + return objs # session-related methods From f9999119e2c5a2e2e3afc15e25162766e1b402c1 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 00:55:37 +0000 Subject: [PATCH 33/48] Housekeeping. --- evennia/web/utils/general_context.py | 8 ++++++++ evennia/web/website/templates/website/_menu.html | 4 ++-- evennia/web/website/views.py | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/evennia/web/utils/general_context.py b/evennia/web/utils/general_context.py index 44bc8b3cb3..57b46bf59a 100644 --- a/evennia/web/utils/general_context.py +++ b/evennia/web/utils/general_context.py @@ -67,7 +67,15 @@ def general_context(request): Returns common Evennia-related context stuff, which is automatically added to context of all views. """ + account = None + if request.user.is_authenticated(): account = request.user + + puppet = None + if request.session.get('puppet'): puppet = request.session['puppet'] + return { + 'account': account, + 'puppet': puppet, 'game_name': GAME_NAME, 'game_slogan': GAME_SLOGAN, 'evennia_userapps': ACCOUNT_RELATED, diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html index f75477ecae..e82db1ca58 100644 --- a/evennia/web/website/templates/website/_menu.html +++ b/evennia/web/website/templates/website/_menu.html @@ -39,14 +39,14 @@ folder and edit it to add/remove links to the menu. {% block navbar_right %} {% endblock %} {% block navbar_user %} - {% if user.is_authenticated %} + {% if account %}
  • Create Character Manage Characters
    - {% for character in user.characters|slice:"10" %} + {% for character in account.characters|slice:"10" %} {{ character }} {% empty %} No characters found! diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index 738c445061..f07e7f80f0 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -328,7 +328,7 @@ class CharacterMixin(object): def get_queryset(self): # Get IDs of characters owned by account - ids = [getattr(x, 'id') for x in self.request.user.db._playable_characters if x] + ids = [getattr(x, 'id') for x in self.request.user.characters if x] # Return a queryset consisting of those characters return self.model.objects.filter(id__in=ids).order_by(Lower('db_key')) @@ -337,7 +337,7 @@ class CharacterManageView(LoginRequiredMixin, CharacterMixin, ListView): paginate_by = 10 template_name = 'website/character_manage_list.html' - page_title = 'Manage: Characters' + page_title = 'Manage Characters' class CharacterUpdateView(CharacterMixin, ObjectUpdateView): @@ -390,6 +390,7 @@ class CharacterCreateView(CharacterMixin, ObjectCreateView): [setattr(character.db, key, value) for key,value in self.attributes.items()] character.db.creator_id = account.id character.save() + account.save() except Exception as e: messages.error(self.request, "There was an error creating your character. If this problem persists, contact an admin.") From 882e6130e48ff5a125a075c5f6eb86be3701f888 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 18:57:48 +0000 Subject: [PATCH 34/48] Minor fixes to handle addition of created chars to account playable characters list, and check for multisession mode compliance. --- evennia/accounts/accounts.py | 3 ++- evennia/objects/objects.py | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/evennia/accounts/accounts.py b/evennia/accounts/accounts.py index 86573f389c..2a8915a59c 100644 --- a/evennia/accounts/accounts.py +++ b/evennia/accounts/accounts.py @@ -733,7 +733,8 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)): if character: # Update playable character list - account.db._playable_characters.append(character) + if character not in account.characters: + account.db._playable_characters.append(character) # We need to set this to have @ic auto-connect to this character account.db._last_puppet = character diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index f41dd02d02..0dca98ef75 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -1944,12 +1944,20 @@ class DefaultCharacter(DefaultObject): locks = kwargs.pop('locks', '') try: + # Check to make sure account does not have too many chars + if len(account.characters) >= settings.MAX_NR_CHARACTERS: + errors.append("There are too many characters associated with this account.") + return obj, errors + # Create the Character obj = create.create_object(**kwargs) # Record creator id and creation IP if ip: obj.db.creator_ip = ip - if account: obj.db.creator_id = account.id + if account: + obj.db.creator_id = account.id + if obj not in account.characters: + account.db._playable_characters.append(obj) # Add locks if not locks and account: @@ -1963,7 +1971,7 @@ class DefaultCharacter(DefaultObject): # If no description is set, set a default description if description or not obj.db.desc: obj.db.desc = description if description else "This is a character." - + except Exception as e: errors.append("An error occurred while creating this '%s' object." % key) logger.log_err(e) From 4f6b8f323cd731f95bb98cd6d382344fbf58cac4 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 18:59:56 +0000 Subject: [PATCH 35/48] Adds account and puppet to context processor, modifies test. --- evennia/web/utils/general_context.py | 2 +- evennia/web/utils/tests.py | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/evennia/web/utils/general_context.py b/evennia/web/utils/general_context.py index 57b46bf59a..117036e772 100644 --- a/evennia/web/utils/general_context.py +++ b/evennia/web/utils/general_context.py @@ -69,7 +69,7 @@ def general_context(request): """ account = None if request.user.is_authenticated(): account = request.user - + puppet = None if request.session.get('puppet'): puppet = request.session['puppet'] diff --git a/evennia/web/utils/tests.py b/evennia/web/utils/tests.py index e2b28c3510..093b858f4d 100644 --- a/evennia/web/utils/tests.py +++ b/evennia/web/utils/tests.py @@ -1,10 +1,8 @@ -from mock import Mock, patch - -from django.test import TestCase - +from django.contrib.auth.models import AnonymousUser +from django.test import RequestFactory, TestCase +from mock import MagicMock, patch from . import general_context - class TestGeneralContext(TestCase): maxDiff = None @@ -15,8 +13,18 @@ class TestGeneralContext(TestCase): @patch('evennia.web.utils.general_context.WEBSOCKET_PORT', "websocket_client_port_testvalue") @patch('evennia.web.utils.general_context.WEBSOCKET_URL', "websocket_client_url_testvalue") def test_general_context(self): - request = Mock() - self.assertEqual(general_context.general_context(request), { + request = RequestFactory().get('/') + request.user = AnonymousUser() + request.session = { + 'account': None, + 'puppet': None, + } + + response = general_context.general_context(request) + + self.assertEqual(response, { + 'account': None, + 'puppet': None, 'game_name': "test_name", 'game_slogan': "test_game_slogan", 'evennia_userapps': ['Accounts'], From 659b26416079ace2913930747cb71d7a1407b89b Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 19:00:47 +0000 Subject: [PATCH 36/48] Changes charcreateview to use new typeclass create() method instead. --- evennia/web/website/tests.py | 26 ++++++++++++++++++++++++-- evennia/web/website/views.py | 22 +--------------------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/evennia/web/website/tests.py b/evennia/web/website/tests.py index a45ec2d17a..6a6c6ae7e1 100644 --- a/evennia/web/website/tests.py +++ b/evennia/web/website/tests.py @@ -1,6 +1,6 @@ from django.conf import settings from django.utils.text import slugify -from django.test import Client +from django.test import Client, override_settings from django.urls import reverse from evennia.utils.test_resources import EvenniaTest @@ -97,7 +97,29 @@ class CharacterCreateView(EvenniaWebTest): url_name = 'character-create' unauthenticated_response = 302 - def test_valid_access(self): + @override_settings(MULTISESSION_MODE=0) + def test_valid_access_multisession_0(self): + "Account1 with no characters should be able to create a new one" + self.account.db._playable_characters = [] + + # Login account + self.login() + + # Post data for a new character + data = { + 'db_key': 'gannon', + 'desc': 'Some dude.' + } + + response = self.client.post(reverse(self.url_name), data=data, follow=True) + self.assertEqual(response.status_code, 200) + + # Make sure the character was actually created + self.assertTrue(len(self.account.db._playable_characters) == 1, 'Account only has the following characters attributed to it: %s' % self.account.db._playable_characters) + + @override_settings(MULTISESSION_MODE=2) + @override_settings(MAX_NR_CHARACTERS=10) + def test_valid_access_multisession_2(self): "Account1 should be able to create a new character" # Login account self.login() diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index f07e7f80f0..c044623e8d 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -363,28 +363,8 @@ class CharacterCreateView(CharacterMixin, ObjectCreateView): description = self.attributes.pop('desc') # Create a character - permissions = settings.PERMISSION_ACCOUNT_DEFAULT - typeclass = self.model - default_home = ObjectDB.objects.get_id(settings.DEFAULT_HOME) - - from evennia.utils import create try: - character = create.create_object(typeclass, key=charname, home=default_home, permissions=permissions) - # set playable character list - account.db._playable_characters.append(character) - - # allow only the character itself and the account to puppet this character (and Developers). - character.locks.add("puppet:id(%i) or pid(%i) or perm(Developer) or pperm(Developer)" % - (character.id, account.id)) - - # If no description is set, set a default description - if not description: - character.db.desc = "This is a character." - else: - character.db.desc = description - - # We need to set this to have @ic auto-connect to this character - account.db._last_puppet = character + character, errors = self.model.create(charname, account, description=description) # Assign attributes from form [setattr(character.db, key, value) for key,value in self.attributes.items()] From 20af9ae238547868476fcdda9f3fd39a6797ad7d Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 20:24:41 +0000 Subject: [PATCH 37/48] Updates AccountCreateView to use typeclass create method. --- evennia/web/website/views.py | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index c044623e8d..d16383357a 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -294,26 +294,17 @@ class AccountCreateView(AccountMixin, ObjectCreateView): password = form.cleaned_data['password1'] email = form.cleaned_data.get('email', '') - # Create a fake session object to intercept calls to the terminal - from mock import Mock - session = self.request - session.address = self.request.META.get('REMOTE_ADDR', '') - session.msg = Mock() - # Create account - from evennia.commands.default.unloggedin import _create_account - permissions = settings.PERMISSION_ACCOUNT_DEFAULT - account = _create_account(session, username, password, permissions) + account, errs = self.model.create( + username=username, + password=password, + email=email,) # If unsuccessful, get messages passed to session.msg if not account: - [messages.error(self.request, call) for call in session.msg.call_args_list] + [messages.error(self.request, err) for err in errs] return self.form_invalid(form) - # Append email address if given - account.email = email - account.save() - messages.success(self.request, "Your account '%s' was successfully created! You may log in using it now." % account.name) return HttpResponseRedirect(self.success_url) From 59cbbb3e15a5d208baee9ea4d388fbfbd82e2e12 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 21:08:11 +0000 Subject: [PATCH 38/48] Adds puppet activation url method to base object typeclass. --- evennia/typeclasses/models.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/evennia/typeclasses/models.py b/evennia/typeclasses/models.py index 61dddc0c80..9e27885e01 100644 --- a/evennia/typeclasses/models.py +++ b/evennia/typeclasses/models.py @@ -817,6 +817,38 @@ class TypedObject(SharedMemoryModel): kwargs={'pk': self.pk, 'slug': slugify(self.name)}) except: return '#' + + def web_get_puppet_url(self): + """ + Returns the URI path for a View that allows users to puppet a specific + object. + + ex. Oscar (Character) = '/characters/oscar/1/puppet/' + + For this to work, the developer must have defined a named view somewhere + in urls.py that follows the format 'modelname-action', so in this case + a named view of 'character-puppet' would be referenced by this method. + + ex. + url(r'characters/(?P[\w\d\-]+)/(?P[0-9]+)/puppet/$', + CharPuppetView.as_view(), name='character-puppet') + + If no View has been created and defined in urls.py, returns an + HTML anchor. + + This method is naive and simply returns a path. Securing access to + the actual view and limiting who can view this object is the developer's + responsibility. + + Returns: + path (str): URI path to object puppet page, if defined. + + """ + try: + return reverse('%s-puppet' % self._meta.verbose_name.lower(), + kwargs={'pk': self.pk, 'slug': slugify(self.name)}) + except: + return '#' def web_get_update_url(self): """ From 73456a3d8c450ab1ae71c35d1927f26126af158c Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 21:09:22 +0000 Subject: [PATCH 39/48] Fixes serialization/deserialization issue with puppet context. --- evennia/web/utils/general_context.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/evennia/web/utils/general_context.py b/evennia/web/utils/general_context.py index 117036e772..8fd52eec2e 100644 --- a/evennia/web/utils/general_context.py +++ b/evennia/web/utils/general_context.py @@ -71,7 +71,9 @@ def general_context(request): if request.user.is_authenticated(): account = request.user puppet = None - if request.session.get('puppet'): puppet = request.session['puppet'] + if account and request.session.get('puppet'): + pk = int(request.session.get('puppet')) + puppet = next((x for x in account.characters if x.pk == pk), None) return { 'account': account, From f083cf61c3aff2f50f7c412a934c2fe3924c400c Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 21:11:17 +0000 Subject: [PATCH 40/48] Adds puppet quick links to dropdown menu, implements views and adds tests. Converts index view to CBV. --- .../web/website/templates/website/_menu.html | 10 +++- evennia/web/website/tests.py | 23 +++++++++ evennia/web/website/urls.py | 3 +- evennia/web/website/views.py | 47 +++++++++++++------ 4 files changed, 65 insertions(+), 18 deletions(-) diff --git a/evennia/web/website/templates/website/_menu.html b/evennia/web/website/templates/website/_menu.html index e82db1ca58..18fc6ec3a5 100644 --- a/evennia/web/website/templates/website/_menu.html +++ b/evennia/web/website/templates/website/_menu.html @@ -41,13 +41,19 @@ folder and edit it to add/remove links to the menu. {% block navbar_user %} {% if account %}
  • - +
    Create Character Manage Characters
    {% for character in account.characters|slice:"10" %} - {{ character }} + {{ character }} {% empty %} No characters found! {% endfor %} diff --git a/evennia/web/website/tests.py b/evennia/web/website/tests.py index 6a6c6ae7e1..daf8614b28 100644 --- a/evennia/web/website/tests.py +++ b/evennia/web/website/tests.py @@ -136,6 +136,29 @@ class CharacterCreateView(EvenniaWebTest): # Make sure the character was actually created self.assertTrue(len(self.account.db._playable_characters) > 1, 'Account only has the following characters attributed to it: %s' % self.account.db._playable_characters) +class CharacterPuppetView(EvenniaWebTest): + url_name = 'character-puppet' + unauthenticated_response = 302 + + def get_kwargs(self): + return { + 'pk': self.char1.pk, + 'slug': slugify(self.char1.name) + } + + def test_invalid_access(self): + "Account1 should not be able to puppet Account2:Char2" + # Login account + self.login() + + # Try to access puppet page for char2 + kwargs = { + 'pk': self.char2.pk, + 'slug': slugify(self.char2.name) + } + response = self.client.get(reverse(self.url_name, kwargs=kwargs), follow=True) + self.assertTrue(response.status_code >= 400, "Invalid access should return a 4xx code-- either obj not found or permission denied! (Returned %s)" % response.status_code) + class CharacterManageView(EvenniaWebTest): url_name = 'character-manage' unauthenticated_response = 302 diff --git a/evennia/web/website/urls.py b/evennia/web/website/urls.py index 604ac1af6c..9076046dff 100644 --- a/evennia/web/website/urls.py +++ b/evennia/web/website/urls.py @@ -9,7 +9,7 @@ from django import views as django_views from evennia.web.website import views as website_views urlpatterns = [ - url(r'^$', website_views.page_index, name="index"), + url(r'^$', website_views.EvenniaIndexView.as_view(), name="index"), url(r'^tbi/', website_views.to_be_implemented, name='to_be_implemented'), # User Authentication (makes login/logout url names available) @@ -19,6 +19,7 @@ urlpatterns = [ # Character management url(r'^characters/create/$', website_views.CharacterCreateView.as_view(), name="character-create"), url(r'^characters/manage/$', website_views.CharacterManageView.as_view(), name="character-manage"), + url(r'^characters/puppet/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterPuppetView.as_view(), name="character-puppet"), url(r'^characters/update/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterUpdateView.as_view(), name="character-update"), url(r'^characters/delete/(?P[\w\d\-]+)/(?P[0-9]+)/$', website_views.CharacterDeleteView.as_view(), name="character-delete"), diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index d16383357a..cc62878d2e 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -15,8 +15,9 @@ from django.core.exceptions import PermissionDenied from django.db.models.functions import Lower from django.http import HttpResponseBadRequest, HttpResponseRedirect, Http404 from django.shortcuts import render -from django.urls import reverse_lazy +from django.urls import reverse, reverse_lazy from django.views.generic import View, TemplateView, ListView, DetailView, FormView +from django.views.generic.base import RedirectView from django.views.generic.edit import CreateView, UpdateView, DeleteView from evennia import SESSION_HANDLER @@ -102,20 +103,6 @@ def _gamestats(): return pagevars -def page_index(request): - """ - Main root page. - """ - - # handle webclient-website shared login - _shared_login(request) - - # get game db stats - pagevars = _gamestats() - - return render(request, 'index.html', pagevars) - - def to_be_implemented(request): """ A notice letting the user know that this particular feature hasn't been @@ -149,6 +136,20 @@ def admin_wrapper(request): # Class-based views # +class EvenniaIndexView(TemplateView): + # Display this HTML page + template_name = 'website/index.html' + + # Display these variables on it + def get_context_data(self, **kwargs): + # Call the base implementation first to get a context object + context = super(EvenniaIndexView, self).get_context_data(**kwargs) + + # Add game statistics and other pagevars + context.update(_gamestats()) + + return context + class EvenniaCreateView(CreateView): @property @@ -324,6 +325,22 @@ class CharacterMixin(object): # Return a queryset consisting of those characters return self.model.objects.filter(id__in=ids).order_by(Lower('db_key')) +class CharacterPuppetView(LoginRequiredMixin, CharacterMixin, RedirectView, ObjectDetailView): + + def get_redirect_url(self, *args, **kwargs): + # Get the requested character, if it belongs to the authenticated user + char = self.get_object() + next = self.kwargs.get('next', reverse('character-manage')) + + if char: + self.request.session['puppet'] = int(char.pk) + messages.success(self.request, "You become '%s'!" % char) + else: + self.request.session['puppet'] = None + messages.error(self.request, "You cannot become '%s'." % char) + + return next + class CharacterManageView(LoginRequiredMixin, CharacterMixin, ListView): paginate_by = 10 From a5d066973425a8230fd10c1cde99336f70dcd6c2 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 22:52:33 +0000 Subject: [PATCH 41/48] Fixes links. --- .../website/templates/website/character_manage_list.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evennia/web/website/templates/website/character_manage_list.html b/evennia/web/website/templates/website/character_manage_list.html index c65314bc8e..ffb401e315 100644 --- a/evennia/web/website/templates/website/character_manage_list.html +++ b/evennia/web/website/templates/website/character_manage_list.html @@ -17,12 +17,12 @@ {% for object in object_list %}
    - +

    {{ object.db_date_created }} -
    Delete -
    Edit

    -
    {{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}
    +
    Delete +
    Edit

    +
    {{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}

    {{ object.db.desc }}

    From 524df146e20751e04c14dff112a8f3cb35fa2371 Mon Sep 17 00:00:00 2001 From: Johnny Date: Wed, 24 Oct 2018 22:53:04 +0000 Subject: [PATCH 42/48] Fixes redirect bug after character update, updates tests. --- evennia/web/website/tests.py | 8 ++++++++ evennia/web/website/views.py | 14 +++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/evennia/web/website/tests.py b/evennia/web/website/tests.py index daf8614b28..f2b321b652 100644 --- a/evennia/web/website/tests.py +++ b/evennia/web/website/tests.py @@ -182,6 +182,14 @@ class CharacterUpdateView(EvenniaWebTest): response = self.client.get(reverse(self.url_name, kwargs=self.get_kwargs()), follow=True) self.assertEqual(response.status_code, 200) + # Try to update char1 desc + data = {'db_key': self.char1.db_key, 'desc': "Just a regular type of dude."} + response = self.client.post(reverse(self.url_name, kwargs=self.get_kwargs()), data=data, follow=True) + self.assertEqual(response.status_code, 200) + + # Make sure the change was made successfully + self.assertEqual(self.char1.db.desc, data['desc']) + def test_invalid_access(self): "Account1 should not be able to update Account2:Char2" # Login account diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index cc62878d2e..a993a8258e 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -233,6 +233,10 @@ class ObjectUpdateView(LoginRequiredMixin, ObjectDetailView, EvenniaUpdateView): model = class_from_module(settings.BASE_OBJECT_TYPECLASS) access_type = 'edit' + def get_success_url(self): + if self.success_url: return self.success_url + return self.object.web_get_detail_url() + def get_initial(self): """ Override of Django hook. @@ -273,7 +277,7 @@ class ObjectUpdateView(LoginRequiredMixin, ObjectDetailView, EvenniaUpdateView): # Do not return super().form_valid; we don't want to update the model # instance, just its attributes. - return HttpResponseRedirect(self.success_url) + return HttpResponseRedirect(self.get_success_url()) # # Account views @@ -317,6 +321,7 @@ class CharacterMixin(object): model = class_from_module(settings.BASE_CHARACTER_TYPECLASS) form_class = CharacterForm + success_url = reverse_lazy('character-manage') def get_queryset(self): # Get IDs of characters owned by account @@ -330,7 +335,7 @@ class CharacterPuppetView(LoginRequiredMixin, CharacterMixin, RedirectView, Obje def get_redirect_url(self, *args, **kwargs): # Get the requested character, if it belongs to the authenticated user char = self.get_object() - next = self.kwargs.get('next', reverse('character-manage')) + next = self.kwargs.get('next', self.success_url) if char: self.request.session['puppet'] = int(char.pk) @@ -353,12 +358,11 @@ class CharacterUpdateView(CharacterMixin, ObjectUpdateView): template_name = 'website/character_form.html' class CharacterDeleteView(CharacterMixin, ObjectDeleteView): - success_url = reverse_lazy('character-manage') + pass class CharacterCreateView(CharacterMixin, ObjectCreateView): - + template_name = 'website/character_form.html' - success_url = reverse_lazy('character-manage') def form_valid(self, form): # Get account ref From 38e8b54b5a64d7509940300387546f4760dfad4f Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:19:38 +0000 Subject: [PATCH 43/48] Fixes redirect bug where character quickselect would always return browser to character management page. --- evennia/web/website/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/web/website/views.py b/evennia/web/website/views.py index a993a8258e..9a33fd0e6d 100644 --- a/evennia/web/website/views.py +++ b/evennia/web/website/views.py @@ -335,7 +335,7 @@ class CharacterPuppetView(LoginRequiredMixin, CharacterMixin, RedirectView, Obje def get_redirect_url(self, *args, **kwargs): # Get the requested character, if it belongs to the authenticated user char = self.get_object() - next = self.kwargs.get('next', self.success_url) + next = self.request.GET.get('next', self.success_url) if char: self.request.session['puppet'] = int(char.pk) From 428b3730af6f7dddb704344114d9f860eec2f180 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:26:27 +0000 Subject: [PATCH 44/48] Cosmetic fix. Adjusts margins on character management page to be consistent with index. --- .../website/character_manage_list.html | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/evennia/web/website/templates/website/character_manage_list.html b/evennia/web/website/templates/website/character_manage_list.html index ffb401e315..c8845f7165 100644 --- a/evennia/web/website/templates/website/character_manage_list.html +++ b/evennia/web/website/templates/website/character_manage_list.html @@ -7,28 +7,26 @@ {% block content %} {% load addclass %} -
    -
    -
    -
    -
    -

    {{ view.page_title }}

    -
    +
    +
    +
    +
    +

    {{ view.page_title }}

    +
    - {% for object in object_list %} -
    - -
    -

    {{ object.db_date_created }} -
    Delete -
    Edit

    -
    {{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}
    -

    {{ object.db.desc }}

    -
    + {% for object in object_list %} +
    + +
    +

    {{ object.db_date_created }} +
    Delete +
    Edit

    +
    {{ object }} {% if object.subtitle %}{{ object.subtitle }}{% endif %}
    +

    {{ object.db.desc }}

    - {% endfor %} - -
    +
    + {% endfor %} +
    From 59610ffffe00fc1b66336344aed5efc3e3c9f70b Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:29:12 +0000 Subject: [PATCH 45/48] Adds padding to the Evennia Admin page to make layout more consistent with rest of site. --- evennia/web/website/templates/website/evennia_admin.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evennia/web/website/templates/website/evennia_admin.html b/evennia/web/website/templates/website/evennia_admin.html index 8e88d9cc50..80e22e2f2a 100644 --- a/evennia/web/website/templates/website/evennia_admin.html +++ b/evennia/web/website/templates/website/evennia_admin.html @@ -6,7 +6,7 @@
    -
    +

    Admin

    Welcome to the Evennia Admin Page. Here, you can edit many facets of accounts, characters, and other parts of the game. From df7cf0903de3f08c15b0edd3fba85878b58066fe Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:32:13 +0000 Subject: [PATCH 46/48] Adjusts margins to make layout more consistent with rest of site. --- evennia/web/website/templates/website/character_form.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evennia/web/website/templates/website/character_form.html b/evennia/web/website/templates/website/character_form.html index 964f4e6aa4..20ad71e261 100644 --- a/evennia/web/website/templates/website/character_form.html +++ b/evennia/web/website/templates/website/character_form.html @@ -7,10 +7,10 @@ {% block content %} {% load addclass %} -

    +
    -
    -
    +
    +

    {{ view.page_title }}

    @@ -47,5 +47,5 @@
    -
    + {% endblock %} From 659ce7c87915230698c3848c8c0c7e4a8d584ce8 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:39:16 +0000 Subject: [PATCH 47/48] Adjusts margins and adds missing password change completion page. --- .../registration/password_change_done.html | 27 +++++++++++++++++++ .../registration/password_change_form.html | 3 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 evennia/web/website/templates/website/registration/password_change_done.html diff --git a/evennia/web/website/templates/website/registration/password_change_done.html b/evennia/web/website/templates/website/registration/password_change_done.html new file mode 100644 index 0000000000..8869d8d69c --- /dev/null +++ b/evennia/web/website/templates/website/registration/password_change_done.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} + +{% block titleblock %} +Password Changed +{% endblock %} + +{% block body %} + +{% load addclass %} +
    +
    +
    +
    +
    +

    Password Changed

    +
    + +

    Your password was changed.

    + +

    Click here to return to the index.

    + +
    +
    +
    +
    +
    +{% endblock %} diff --git a/evennia/web/website/templates/website/registration/password_change_form.html b/evennia/web/website/templates/website/registration/password_change_form.html index bae8c90962..1911b83cf0 100644 --- a/evennia/web/website/templates/website/registration/password_change_form.html +++ b/evennia/web/website/templates/website/registration/password_change_form.html @@ -7,10 +7,9 @@ Password Change {% block content %} {% load addclass %} -
    -
    +

    Password Change

    From ed1f9f05702615b4d2bedbfdfd9abd6fcb3a30f7 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 26 Oct 2018 00:43:58 +0000 Subject: [PATCH 48/48] Fixes margins on paginator to be more consistent with rest of site. --- .../website/templates/website/pagination.html | 52 +++++++++---------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/evennia/web/website/templates/website/pagination.html b/evennia/web/website/templates/website/pagination.html index e2cb6bed73..c89d4ee473 100644 --- a/evennia/web/website/templates/website/pagination.html +++ b/evennia/web/website/templates/website/pagination.html @@ -1,32 +1,30 @@ {% if page_obj %} -