Skip to content

Commit 13ea658

Browse files
committed
Merge branch 'refactor_account_blueprint'
2 parents b21b089 + d3d8a65 commit 13ea658

File tree

3 files changed

+37
-18
lines changed

3 files changed

+37
-18
lines changed

app/account/__init__.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
from flask import Blueprint
2-
3-
account = Blueprint('account', __name__)
4-
5-
from . import views # noqa
1+
from app.account.views import account

app/account/forms.py

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
from flask import url_for
22
from flask_wtf import Form
33
from wtforms import ValidationError
4-
from wtforms.fields import (BooleanField, PasswordField, StringField,
5-
SubmitField)
4+
from wtforms.fields import (
5+
BooleanField,
6+
PasswordField,
7+
StringField,
8+
SubmitField,
9+
)
610
from wtforms.fields.html5 import EmailField
711
from wtforms.validators import Email, EqualTo, InputRequired, Length
812

9-
from ..models import User
13+
from app.models import User
1014

1115

1216
class LoginForm(Form):
@@ -43,7 +47,7 @@ def validate_email(self, field):
4347
if User.query.filter_by(email=field.data).first():
4448
raise ValidationError('Email already registered. (Did you mean to '
4549
'<a href="{}">log in</a> instead?)'.format(
46-
url_for('account.login')))
50+
url_for('account.login')))
4751

4852

4953
class RequestResetPasswordForm(Form):

app/account/views.py

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,33 @@
1-
from flask import flash, redirect, render_template, request, url_for
2-
from flask_login import current_user, login_required, login_user, logout_user
1+
from flask import (
2+
Blueprint,
3+
flash,
4+
redirect,
5+
render_template,
6+
request,
7+
url_for,
8+
)
9+
from flask_login import (
10+
current_user,
11+
login_required,
12+
login_user,
13+
logout_user,
14+
)
315
from flask_rq import get_queue
416

5-
from . import account
6-
from .. import db
7-
from ..email import send_email
8-
from ..models import User
9-
from .forms import (ChangeEmailForm, ChangePasswordForm, CreatePasswordForm,
10-
LoginForm, RegistrationForm, RequestResetPasswordForm,
11-
ResetPasswordForm)
17+
from app import db
18+
from app.account.forms import (
19+
ChangeEmailForm,
20+
ChangePasswordForm,
21+
CreatePasswordForm,
22+
LoginForm,
23+
RegistrationForm,
24+
RequestResetPasswordForm,
25+
ResetPasswordForm,
26+
)
27+
from app.email import send_email
28+
from app.models import User
29+
30+
account = Blueprint('account', __name__)
1231

1332

1433
@account.route('/login', methods=['GET', 'POST'])

0 commit comments

Comments
 (0)