diff --git a/instance/app.db b/instance/app.db index a0bb521094a60d9b0848c589b5ab2a3ab07a2448..0f3cc401ba385b59245d15e7f42e4c0dec1acfdf 100644 Binary files a/instance/app.db and b/instance/app.db differ diff --git a/shop/forms.py b/shop/forms.py index 30d004473936fa9bbffc054e73c70269fdbfebed..79c1f73a219d4b102baafada4a3db76e583973cd 100644 --- a/shop/forms.py +++ b/shop/forms.py @@ -13,8 +13,8 @@ class SignupForm(FlaskForm): username = StringField('Username', validators=[input_required(), Length(1, 16)]) password = PasswordField('Password', validators=[input_required()]) verifyPassword = PasswordField('Verify password', validators=[input_required(), EqualTo('password', message='Passwords must match')]) - email = StringField('email', validators=[input_required(), Length(1, 16)]) - mobile = StringField('mobile', validators=[input_required(), Length(11, 11)]) + email = StringField('email', validators=[Regexp(regex="^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$", message = 'has to be a valid email'), input_required(), Length(1, 16)]) + mobile = StringField('mobile', validators=[Regexp(regex='^[+-]?[0-9]+$', message = 'only integers allowed'), input_required(), Length(11, 11)]) submit = SubmitField('Submit') class orderByForm(FlaskForm): diff --git a/shop/templates/signup.html b/shop/templates/signup.html index 64f88063bee7d6528aa644151b7543e5bca38417..2384018a649bb504c31b456d961478a2d27a689f 100644 --- a/shop/templates/signup.html +++ b/shop/templates/signup.html @@ -13,9 +13,19 @@ </p> <p class="login_field"> {{ form.email.label }} {{ form.email(class = "input_field") }} + {% if form.email.errors %} + {% for error in form.email.errors %} + <p class = "input_error">{{ error }}</p> + {% endfor %} + {% endif %} </p> <p class="login_field"> {{ form.mobile.label }} {{ form.mobile(class = "input_field") }} + {% if form.mobile.errors %} + {% for error in form.mobile.errors %} + <p class = "input_error">{{ error }}</p> + {% endfor %} + {% endif %} </p> <p class="login_field"> {{ form.password.label }} {{ form.password(class = "input_field") }}