diff --git a/app/auth/forms.py b/app/auth/forms.py index 2657fa2..2bcc6e3 100644 --- a/app/auth/forms.py +++ b/app/auth/forms.py @@ -7,45 +7,45 @@ from ..models import User class LoginForm(FlaskForm): - email = EmailField('Електронна Поща', [validators.DataRequired(), validators.Length(1,64), validators.Email()]) - password = PasswordField('Парола', [validators.DataRequired(), validators.Length(1,128)]) - remember_me = BooleanField('Запомни ме') + email = EmailField('E-Mail', [validators.DataRequired(), validators.Length(1,64), validators.Email()]) + password = PasswordField('Password', [validators.DataRequired(), validators.Length(1,128)]) + remember_me = BooleanField('Remember me ?') #recaptcha = RecaptchaField() - submit = SubmitField('Вход') + submit = SubmitField('Login') class TwoFAForm(FlaskForm): token = StringField('Token', [validators.DataRequired(), validators.Length(6, 6)]) - submit = SubmitField('Потвърди кода') + submit = SubmitField('Confirm') class RegistrationForm(FlaskForm): - email = StringField('Електронна Поща', [validators.DataRequired(), validators.Length(6,35), validators.Email()]) + email = StringField('E-Mail', [validators.DataRequired(), validators.Length(6,35), validators.Email()]) def validate_email(self, field): if User.query.filter_by(email=field.data).first(): - raise ValidationError('Грешка. Опитайте пак с друг email адрес.') - password = PasswordField('Парола', [validators.DataRequired(), validators.EqualTo('confirm', message='Паролите трябва да съвпадат')]) - confirm = PasswordField('Повторете паролата', [validators.DataRequired()]) - accept_tos = BooleanField('Приемам Условията за Използване на услугата', [validators.DataRequired()]) + raise ValidationError('Error. Please try again.') + password = PasswordField('Password', [validators.DataRequired(), validators.EqualTo('confirm', message='Both passwords must be equal')]) + confirm = PasswordField('Your password again', [validators.DataRequired()]) + accept_tos = BooleanField('I accept the Terms of Service', [validators.DataRequired()]) recaptcha = RecaptchaField() - submit = SubmitField('Регистрация') + submit = SubmitField('REGISTER') class ChangePasswordForm(FlaskForm): - old_password = PasswordField('Стара парола', [validators.DataRequired()]) - password = PasswordField('Нова Парола', [validators.DataRequired(), validators.EqualTo('confirm', message='Паролите трябва да съвпадат')]) - confirm = PasswordField('Повторете паролата') - submit = SubmitField('Обнови паролата') + old_password = PasswordField('Old Password', [validators.DataRequired()]) + password = PasswordField('New Password', [validators.DataRequired(), validators.EqualTo('confirm', message='Both passwords must be equal')]) + confirm = PasswordField('Your password again') + submit = SubmitField('Renew Password') class PasswordResetRequestForm(FlaskForm): - email = EmailField('Електронна Поща', [validators.DataRequired(), validators.Length(1,64), validators.Email()]) + email = EmailField('E-Mail', [validators.DataRequired(), validators.Length(1,64), validators.Email()]) recaptcha = RecaptchaField() - submit = SubmitField('Възстановяване на парола', [validators.DataRequired()]) + submit = SubmitField('Reset password', [validators.DataRequired()]) class PasswordResetForm(FlaskForm): - email = EmailField('Електронна Поща', [validators.DataRequired(), validators.Length(1,64), validators.Email()]) - password = PasswordField('Парола', [validators.DataRequired(), validators.EqualTo('confirm', message='Паролите трябва да съвпадат')]) - confirm = PasswordField('Повторете паролата', [validators.DataRequired()]) - submit = SubmitField('Промяна на паролата') + email = EmailField('E-Mail', [validators.DataRequired(), validators.Length(1,64), validators.Email()]) + password = PasswordField('Password', [validators.DataRequired(), validators.EqualTo('confirm', message='Both password fields must be equal')]) + confirm = PasswordField('Your password again', [validators.DataRequired()]) + submit = SubmitField('Change password') def validate_email(self, field): if User.query.filter_by(email=field.data).first() is None: - raise ValidationError('Грешка. Опитайте пак с друг email адрес.') + raise ValidationError('Error. Please try again.') diff --git a/app/panel/forms.py b/app/panel/forms.py index 057c7c3..e885844 100644 --- a/app/panel/forms.py +++ b/app/panel/forms.py @@ -6,9 +6,9 @@ from wtforms.fields.html5 import EmailField, DecimalRangeField from .. import db class OrderForm(FlaskForm): + alias = StringField('Machine Alias:', [validators.Regexp(message='ex.: myservice1.com, myservice2.local', regex='^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,3})$'), validators.Length(6,64)]) cpu = DecimalRangeField('Processor Cores', default=2) memory = DecimalRangeField('Memory', default=512) - storage = DecimalRangeField('Storage', default=20) - alias = StringField('Machine Alias:', [validators.Regexp(message='ex.: myservice1.com, myservice2.local', regex='^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,3})$'), validators.Length(6,64)]) + storage = DecimalRangeField('Storage', default=10) submit = SubmitField('Create') diff --git a/app/panel/routes.py b/app/panel/routes.py index e05162a..6dfca79 100644 --- a/app/panel/routes.py +++ b/app/panel/routes.py @@ -17,12 +17,13 @@ def after_request(response): current_app.logger.warning('Slow query: %s\nParameters: %s\nDuration: %fs\nContext: %s\n' % (query.statement, query.parameters, query.duration, query.context)) return response -@panel.route("/submitorder", methods=['POST']) +@panel.route("/ordervm", methods=['GET', 'POST']) @login_required def order(): + form = OrderForm() if form.validate_on_submit(): pass - return redirect('main.index') + return redirect('main.dashboard') #DASHBOARD @panel.route("/dashboard", methods=['GET', 'POST']) diff --git a/app/templates/panel/order.html b/app/templates/panel/order.html deleted file mode 100644 index 041a743..0000000 --- a/app/templates/panel/order.html +++ /dev/null @@ -1,11 +0,0 @@ -{% block page_content %} -