From 37765c755a609f56506bd9323fd665e5184cfce2 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 9 Jul 2019 13:40:33 +0200 Subject: [PATCH 1/4] Rename profile to account and enable password change. --- app/auth/views.py | 14 ++++++++------ .../auth/{profile.html.j2 => account.html.j2} | 3 ++- app/templates/base.html.j2 | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) rename app/templates/auth/{profile.html.j2 => account.html.j2} (88%) diff --git a/app/auth/views.py b/app/auth/views.py index b09c1f5d..48b861b6 100644 --- a/app/auth/views.py +++ b/app/auth/views.py @@ -125,9 +125,9 @@ def password_reset(token): title='Password Reset') -@auth.route('/profile', methods=['GET', 'POST']) +@auth.route('/account', methods=['GET', 'POST']) @login_required -def profile(): +def account(): form = ChangeProfileForm() if form.validate_on_submit(): flash('It is just a test, nothing changed.') @@ -138,8 +138,10 @@ def profile(): current_user.email = form.email.data current_user.confirmed = False db.session.add(current_user) + resend_confirmation() + if form.password.data: + current_user.password = form.password.data db.session.commit() - resend_confirmation() - return redirect(url_for('auth.profile')) - return render_template('auth/profile.html.j2', form=form, - title='Profile') + return redirect(url_for('auth.account')) + return render_template('auth/account.html.j2', form=form, + title='Account') diff --git a/app/templates/auth/profile.html.j2 b/app/templates/auth/account.html.j2 similarity index 88% rename from app/templates/auth/profile.html.j2 rename to app/templates/auth/account.html.j2 index 5d81a6c3..0b5c33b7 100644 --- a/app/templates/auth/profile.html.j2 +++ b/app/templates/auth/account.html.j2 @@ -4,13 +4,14 @@
- Change profile + Change account information
{{ form.hidden_tag() }}
email {{ form.email(type='email', placeholder=current_user.email) }} {{ form.email.label }} + When changing your e-mail adress you will have to reconfirm it. {% for error in form.email.errors %} {{ error }} {% endfor %} diff --git a/app/templates/base.html.j2 b/app/templates/base.html.j2 index d34c0e25..735fa99c 100644 --- a/app/templates/base.html.j2 +++ b/app/templates/base.html.j2 @@ -20,7 +20,7 @@
    {% if current_user.is_authenticated %} -
  • personProfile
    • +
  • personAccount
  • chevron_leftLog out
    • {% else %} From b85c1e96a1fbe1dc0ca878d9e930d831218f9898 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 9 Jul 2019 13:43:20 +0200 Subject: [PATCH 2/4] Delete data_dev.sqlite --- data_dev.sqlite | Bin 36864 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 data_dev.sqlite diff --git a/data_dev.sqlite b/data_dev.sqlite deleted file mode 100644 index 8a3e610a6b97a748290f0ecd83c8e1928f148cb4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36864 zcmeI4O>7&-6@ZtbB$E2!rbts3O;ivujhJxk&d$uv>;^Sp+NB+#vJ}&@9lHl%W@pBt zMT!zBSx$k%RSFa++G~69xyJ&%208T9b5Ni_&|`Dyp_dlup+FDq+ZAa`3{@aKq=@hq z;{LqZnfKl|?=7)!SG;q3rM+jXuGjCXy(;rw@p3uuYPITl-V%ID@EI-X{`BYowz*^b zr|m9zm*4p9;^L3J;{2zczvzEd{%-lR`A-+$Uif73FQ;`vITAnuNB{{S0VIF~kN^@u z0$+&0;r>jaQmN#Avb?8s$LfM!_Two2#kp z!ca%O+G^ftwwkNgn|G?IY>=HjSN}m_w(^}y?pb@=*r)BM8<~UII<+`EDh>(UU0uF? zw+U{4ulauUbEj6pof>4HkEItXUWUew?RVRQLA$p-7)9!7@iLs)3+cG^xq5wiwsNJC^D@^5yB)aQ z-B9~`z3g}+Gj1cuHZzCyT%mIDV(!CI=8)>xu5KqAPat_f@z~+i2`9%I)0`T1+t}Xk zz6gCr>n9TI`r7K9^;QFNuR1ou#?Dq!J&_K_#sjymOwCqqUp&pN@xg*IK_0@Wn1<3K zd~*KZJov)}2_OL^fCP{L5wmvi73-v6JG z$wfDi01`j~NB{{S0VIF~kN^@u0!RP}3<>!8^QGhW|LOC8c|f0ut+_7{J(xU}%gg>TG1pa0g}FXrY;&!7<(B!C2v01`j~NB{|(4FZR`a?uN4 z_YRj!YOrVf?Wb4w`tUntm%8?H((5*kWIKAxIQq_DQ_)bo6NChoTBGx@e~%yBt1%uL z<7})|B&9Q}6oJ(!!s(xZS zMm=c{PS|lwKG7B~w)%JbyZu^hs0$1=p(2(D9Y`Vt6JRz0tEo-mKqwoDSW)Q$O|=NQ z(}pRkxsJKe&lUhj1xzV!*(dGokrD6T65@z4n%N+vHncHMU<<}*YZ6PC;5;x&sl)mCqSr`a6n894$PW+fBegeX$FY`) z*4X&&z1!i+jT)r^kuI_{j070K9SyijB&Re9oQ~m$#4d;@K#$M5GDf^GZtDB2N0f#AQ2@I zOalXJAQB0UB{XnCMI^Psh1 z^=om>SrSl71H(9Arj(f|a)jtmI}-;91;$p8Fw%-qWvrl52nmU#bQl5OuZa;ayJ$SDchsqj8tO`OWNX$eOILZ}gkqm_Z7%p;L z1xhGK!EML^kw_&hHI|Bi@PpZc_g0z_d*Js~NW``R)wj~^M8)=oeMtM8ts09Hh#{$% zVpc=!g@%MNA&I6`!Sz6gPEr*JFvf-niFnMzFjjCnHIR-%AIuzAoNDKwINMHCytTF> z9^BsyYb1fpH$=uUC!x?9!iejXzUD?sq8&t{(vh)@YAIu9B4?Ax1tN)U7{p?K8Wg87 zmwBA7SmyE5iE6DPtGgdiQ?m&JwH9DH2H{4PvMiR8S_T#*AzW{0;uv*~C`)vrBOwy1 zLIxoqR0=vj?k^qsOD8H051RC0_ok?ExW>iAD4B$e!DY@x5cHI22qmi_nnaL<<(dUi6j38X zNG7=2Da(PZ){uT-lvoi%urWss0k;j+EIBOX3SMIg^zK}KY`6CY$>!DZ2;UhtOtfUJ zC&c<=)`4qon%Wk=Qw+oyL_2&H5t#LeNdr4PCRREE(I{OQBynsbLO6|SVj>yERHx7X z%jJ)~^2g=Bm;dNr^FQfAE-;roRFl2nduXfv}Tfj zC4c^CoU|7Rrk3)J(&<%(?Ec@ko^So%`+xEe{aydp{&WB5{y+SW;NJhQ{-6C%zM}Dg zW+MS4fCP{L5Tp|BzT4E@r;|yQGDQ5deC5A$JX7*OfY`T|~3ue+jx75?=k%Z=p`PZ_xsrmd; pY4mmh{{R1%8w#im2_OL^fCP{L5 Date: Tue, 9 Jul 2019 14:13:56 +0200 Subject: [PATCH 3/4] Implement cards the correct way. card-action outside of card-content --- app/templates/auth/account.html.j2 | 18 +++++++------- app/templates/auth/login.html.j2 | 29 +++++++++++++--------- app/templates/auth/register.html.j2 | 18 +++++++------- app/templates/auth/reset_password.html.j2 | 30 +++++++++++------------ 4 files changed, 50 insertions(+), 45 deletions(-) diff --git a/app/templates/auth/account.html.j2 b/app/templates/auth/account.html.j2 index 0b5c33b7..50c3e90c 100644 --- a/app/templates/auth/account.html.j2 +++ b/app/templates/auth/account.html.j2 @@ -2,10 +2,10 @@ {% block page_content %}
    -
    -
    - Change account information - +

    Change account information

    +
    + +
    {{ form.hidden_tag() }}
    email @@ -40,11 +40,11 @@ {{ error }} {% endfor %}
    -
    - {{ form.submit(class='btn right') }} -
    - -
    +
    +
    + {{ form.submit(class='btn') }} +
    +
    {% endblock %} diff --git a/app/templates/auth/login.html.j2 b/app/templates/auth/login.html.j2 index 68710ccd..0d865f03 100644 --- a/app/templates/auth/login.html.j2 +++ b/app/templates/auth/login.html.j2 @@ -9,29 +9,34 @@

    Sign in into an exisiting account or register a new one!

    -
    -
    - Register -
    +
    +
    + Register
-
- Log In -
+ +
+ Log In {{ form.hidden_tag() }}
person {{ form.login(class='validate') }} {{ form.login.label }} + {% for error in form.login.errors %} + {{ error }} + {% endfor %}
vpn_key {{ form.password(class='validate') }} {{ form.password.label }} + {% for error in form.password.errors %} + {{ error }} + {% endfor %}
Forgot Password? -
- {{ form.submit(class='btn right') }} -
- -
+
+
+ {{ form.submit(class='btn right') }} +
+
{% endblock %} diff --git a/app/templates/auth/register.html.j2 b/app/templates/auth/register.html.j2 index 52070a1a..ab72f1db 100644 --- a/app/templates/auth/register.html.j2 +++ b/app/templates/auth/register.html.j2 @@ -2,10 +2,10 @@ {% block page_content %}
-
-
- Register -
+
+ +
+ Register {{ form.hidden_tag() }}
account_circle @@ -39,11 +39,11 @@ {{ error }} {% endfor %}
-
- {{ form.submit(class='btn right') }} -
- -
+
+
+ {{ form.submit(class='btn') }} +
+
{% endblock %} diff --git a/app/templates/auth/reset_password.html.j2 b/app/templates/auth/reset_password.html.j2 index e545e464..d73b533e 100644 --- a/app/templates/auth/reset_password.html.j2 +++ b/app/templates/auth/reset_password.html.j2 @@ -2,18 +2,18 @@ {% block page_content %}
-
-
- Reset Your Password -
+
+ +
+ Reset Your Password {{ form.hidden_tag() }} - {% if form.email is defined %}
{{ form.email(class='validate', type='email') }} {{ form.email.label }} + {% for error in form.email.errors %} + {{ error }} + {% endfor %}
- {% endif %} - {% if form.password is defined %}
{{ form.password(class='validate', type='password') }} {{ form.password.label }} @@ -21,18 +21,18 @@ {{ error }} {% endfor %}
- {% endif %} - {% if form.password2 is defined %}
{{ form.password2(class='validate', type='password') }} {{ form.password2.label }} + {% for error in form.password2.errors %} + {{ error }} + {% endfor %}
- {% endif %} -
- {{ form.submit(class='btn right') }} -
- -
+
+
+ {{ form.submit(class='btn right') }} +
+
{% endblock %} From 7f76e7884f63eb2c0602a888d8389a2da91ca7a2 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 9 Jul 2019 14:53:17 +0200 Subject: [PATCH 4/4] Rename account form. --- app/auth/forms.py | 2 +- app/auth/views.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/auth/forms.py b/app/auth/forms.py index 3c92c7ed..0e54ebf7 100644 --- a/app/auth/forms.py +++ b/app/auth/forms.py @@ -47,7 +47,7 @@ class PasswordResetRequestForm(FlaskForm): submit = SubmitField('Reset Password') -class ChangeProfileForm(FlaskForm): +class ChangeAccountForm(FlaskForm): email = StringField('Email', validators=[Optional(), Length(1, 64), Email()]) username = StringField('Username', validators=[ diff --git a/app/auth/views.py b/app/auth/views.py index 48b861b6..5480753c 100644 --- a/app/auth/views.py +++ b/app/auth/views.py @@ -2,7 +2,7 @@ from flask import flash, redirect, render_template, request, url_for from flask_login import current_user, login_required, login_user, logout_user from . import auth from .. import db -from .forms import ChangeProfileForm, LoginForm, PasswordResetForm, PasswordResetRequestForm, RegistrationForm +from .forms import ChangeAccountForm, LoginForm, PasswordResetForm, PasswordResetRequestForm, RegistrationForm from ..email import send_email from ..models import User @@ -20,7 +20,7 @@ def login(): if next is None or not next.startswith('/'): next = url_for('main.index') return redirect(next) - flash('Invalid username or password.') + flash('Invalid username or password.') return render_template('auth/login.html.j2', form=form, title='Log in') @@ -128,7 +128,7 @@ def password_reset(token): @auth.route('/account', methods=['GET', 'POST']) @login_required def account(): - form = ChangeProfileForm() + form = ChangeAccountForm() if form.validate_on_submit(): flash('It is just a test, nothing changed.') if form.username.data: