Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-12-22 22:12:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add username validation to signup page

Browse Source
This commit is contained in:
rubenwardy 2021-02-22 23:45:20 +00:00
parent 3ed73c4145
commit 77dcb85912
5 changed files with 20 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/blueprints/users/account.py
View File

@ -100,7 +100,8 @@ def logout():
class RegisterForm(FlaskForm): class RegisterForm(FlaskForm):
username = StringField("Username", [InputRequired()]) username = StringField("Username", [InputRequired(),
Regexp("^[a-zA-Z0-9._ -]+$", message="Only a-zA-Z0-9._ allowed")])
email = StringField("Email", [InputRequired(), Email()]) email = StringField("Email", [InputRequired(), Email()])
password = PasswordField("Password", [InputRequired(), Length(6, 100)]) password = PasswordField("Password", [InputRequired(), Length(6, 100)])
submit = SubmitField("Register") submit = SubmitField("Register")

47
app/templates/users/claim_forums.html
View File

@ -5,22 +5,22 @@ Create Account from Forums User
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1>{{ self.title() }}</h1> <h1>{{ self.title() }}</h1>
<h2>{{ _("Confirm Your Account") }}</h2> <h2>{{ _("Confirm Your Account") }}</h2>
<p> <p>
You'll need to use prove that you have access to your forum account using one of the options below.<br> You'll need to use prove that you have access to your forum account using one of the options below.<br>
This is so ContentDB can link your account to your forum account. This is so ContentDB can link your account to your forum account.
</p> </p>
<p> <p>
Don't have a forums account? Don't have a forums account?
You can still <a href="{{ url_for('users.register') }}">sign up without one</a>. You can still <a href="{{ url_for('users.register') }}">sign up without one</a>.
</p> </p>
<div class="row mt-5"> <div class="row mt-5">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<span class="badge badge-pill badge-dark mr-2">Option 1</span> <span class="badge badge-pill badge-dark mr-2">Option 1</span>
@ -48,9 +48,9 @@ Create Account from Forums User
<input class="btn btn-primary" type="submit" value="Next: log in with GitHub"> <input class="btn btn-primary" type="submit" value="Next: log in with GitHub">
</form> </form>
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="card"> <div class="card">
<div class="card-header"> <div class="card-header">
<span class="badge badge-pill badge-dark mr-2">Option 2</span> <span class="badge badge-pill badge-dark mr-2">Option 2</span>
@ -91,23 +91,6 @@ Create Account from Forums User
<input class="btn btn-primary" type="submit" value="Next"> <input class="btn btn-primary" type="submit" value="Next">
</form> </form>
</div> </div>
</div>
{# <div class="col-sm-4">#}
{# <div class="card">#}
{# <div class="card-header">#}
{# Email/password sign up#}
{# </div>#}
{##}
{# <div class="card-body">#}
{# <p>#}
{# If you have a forum account, please use one of the other two#}
{# options.#}
{# </p>#}
{##}
{# <a class="btn btn-primary" href="{{ url_for('users.register') }}">Register</a>#}
{# </div>#}
{# </div>#}
{# </div>#}
</div> </div>
</div>
{% endblock %} {% endblock %}

4
app/templates/users/register.html
View File

@ -7,13 +7,13 @@ Register
{% block content %} {% block content %}
{% from "macros/forms.html" import render_field, render_checkbox_field, render_submit_field %} {% from "macros/forms.html" import render_field, render_checkbox_field, render_submit_field %}
<div class="card"> <div class="card w-50 text-left" style="margin: 2em auto;">
<h2 class="card-header">{{ _("Register") }}</h2> <h2 class="card-header">{{ _("Register") }}</h2>
<form action="" method="POST" class="form card-body" role="form"> <form action="" method="POST" class="form card-body" role="form">
{{ form.hidden_tag() }} {{ form.hidden_tag() }}
{{ render_field(form.username) }} {{ render_field(form.username, pattern="[a-zA-Z0-9._ -]+", title="Only a-zA-Z0-9._ allowed") }}
{{ render_field(form.email) }} {{ render_field(form.email) }}
{{ render_field(form.password) }} {{ render_field(form.password) }}

1
requirements.lock.txt
View File

@ -33,7 +33,6 @@ gitdb==4.0.5
GitHub-Flask==3.2.0 GitHub-Flask==3.2.0
GitPython==3.1.12 GitPython==3.1.12
gunicorn==20.0.4 gunicorn==20.0.4
idna==3.1
importlib-metadata==3.4.0 importlib-metadata==3.4.0
iniconfig==1.1.1 iniconfig==1.1.1
itsdangerous==1.1.0 itsdangerous==1.1.0

2
utils/start.sh
View File

@ -6,4 +6,4 @@
# docker-compose directly: docker-compose up --build # docker-compose directly: docker-compose up --build
# #
sudo docker-compose up --build -d --scale worker=2 docker-compose up --build -d --scale worker=2