From 08ff82094dfb9fa1e77cc579884c61eab565fb0c Mon Sep 17 00:00:00 2001 From: vilmibm Date: Thu, 14 Feb 2019 23:45:45 +0000 Subject: [PATCH 1/3] add some new signup questions --- ttadmin/users/forms.py | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/ttadmin/users/forms.py b/ttadmin/users/forms.py index 5d1a20c..af40557 100644 --- a/ttadmin/users/forms.py +++ b/ttadmin/users/forms.py @@ -53,31 +53,65 @@ class TownieForm(Form): validators=(validate_username,), help_text='lowercase and no spaces. underscore ok', label='username') + email = EmailField( help_text='only used to message you about your account and nothing else.', label='e-mail') + displayname = CharField( validators=(validate_displayname,), help_text='100% optional. pseudonyms welcome.', label='display name', required=False) + reasons = CharField( widget=Textarea, - required=False, + required=True, label='what interests you about tilde.town?', - help_text='This is a totally optional place for you to tell us what excites you about getting a ~ account. This is mainly just so we can all feel warm fuzzies.') + help_text=""" + What about this intentional community intrigues you and makes you want to be a part of it? + """.strip()) + + plans = CharField( + widget=Textarea, + required=True, + label='what sort of things do you want to do on tilde.town?', + help_text=""" + Do you want to socialize? Make something? Learn stuff? + """.strip()) + + community = CharField( + widget=Textarea, + required=True, + label='what is an intentional community?', + help_text=""" + Just a quick definition is fine, no need for an essay or anything. + """.strip()) + + socials = CharField( + widget=Textarea, + required=False, + label='where else are you online?', + help_text="""Optional, but if you're comfortable sharing with us some links to other online + spaces you're in (like twitter, mastodon, neocities, or whatever) we'd love to get to know + you when reviewing your application. + """.strip()) + captcha = CaptchaField() + pubkey = CharField( widget=Textarea, validators=(validate_pubkey,), label='SSH public key', help_text='if this is not a thing you are familiar with, that\'s okay! you can make one here or read our guide to learn more.') + pubkey_type = ChoiceField( choices=SSH_TYPE_CHOICES, label='SSH public key type', help_text="unless you know what you're doing you can leave this be.") + aup = BooleanField( - label='i super agree to our acceptable use policy', + label="i agree to the town's acceptable use policy", help_text='please read our code of conduct and click this box if you agree.') def clean(self): From 92177e7a66023c6c7e20eada98934c85ba704929 Mon Sep 17 00:00:00 2001 From: vilmibm Date: Tue, 16 Apr 2019 01:23:35 +0000 Subject: [PATCH 2/3] add referral and remove community question --- ttadmin/users/forms.py | 13 +++++-------- ttadmin/users/models.py | 3 +++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ttadmin/users/forms.py b/ttadmin/users/forms.py index af40557..ae843e7 100644 --- a/ttadmin/users/forms.py +++ b/ttadmin/users/forms.py @@ -64,6 +64,11 @@ class TownieForm(Form): label='display name', required=False) + referral = CharField( + required=False, + label='did a townie refer you? put their handle here.', + help_text="this is optional and just helps us when reviewing your application.") + reasons = CharField( widget=Textarea, required=True, @@ -80,14 +85,6 @@ class TownieForm(Form): Do you want to socialize? Make something? Learn stuff? """.strip()) - community = CharField( - widget=Textarea, - required=True, - label='what is an intentional community?', - help_text=""" - Just a quick definition is fine, no need for an essay or anything. - """.strip()) - socials = CharField( widget=Textarea, required=False, diff --git a/ttadmin/users/models.py b/ttadmin/users/models.py index fe33ef9..f406e17 100644 --- a/ttadmin/users/models.py +++ b/ttadmin/users/models.py @@ -45,6 +45,9 @@ class Townie(User): shell = CharField(max_length=50, default="/bin/bash") reviewed = BooleanField(default=False) reasons = TextField(blank=True, null=False, default='') + plans = TextField(blank=True, null=False, default='') + socials = TextField(blank=True, null=False, default='') + referral = CharField(max_length=100, null=True) displayname = CharField(max_length=100, blank=False, null=False) @property From 677f5ff2ee5330ef5cf1fd6c44a0584d0d7984e1 Mon Sep 17 00:00:00 2001 From: vilmibm Date: Tue, 16 Apr 2019 01:27:08 +0000 Subject: [PATCH 3/3] some migrations --- .../migrations/0011_auto_20190416_0126.py | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 ttadmin/users/migrations/0011_auto_20190416_0126.py diff --git a/ttadmin/users/migrations/0011_auto_20190416_0126.py b/ttadmin/users/migrations/0011_auto_20190416_0126.py new file mode 100644 index 0000000..4df03eb --- /dev/null +++ b/ttadmin/users/migrations/0011_auto_20190416_0126.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2019-04-16 01:26 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0010_auto_20190119_1828'), + ] + + operations = [ + migrations.AddField( + model_name='townie', + name='plans', + field=models.TextField(blank=True, default=''), + ), + migrations.AddField( + model_name='townie', + name='referral', + field=models.CharField(max_length=100, null=True), + ), + migrations.AddField( + model_name='townie', + name='socials', + field=models.TextField(blank=True, default=''), + ), + ]