From a40df668865459eb2154a054a7508d2b01b1bbb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Klepacki?= Date: Fri, 1 Jan 2021 17:51:25 +0100 Subject: [PATCH] =?UTF-8?q?edycja=20has=C5=82a?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../homepage/__pycache__/urls.cpython-37.pyc | Bin 1017 -> 1049 bytes .../homepage/__pycache__/views.cpython-37.pyc | Bin 8579 -> 9594 bytes .../templates/homepage/edit_user.html | 159 ++++++++++++++++++ .../homepage/templates/homepage/my_offer.html | 4 +- SocialHelper/homepage/urls.py | 1 + SocialHelper/homepage/views.py | 46 ++++- 6 files changed, 207 insertions(+), 3 deletions(-) create mode 100644 SocialHelper/homepage/templates/homepage/edit_user.html diff --git a/SocialHelper/homepage/__pycache__/urls.cpython-37.pyc b/SocialHelper/homepage/__pycache__/urls.cpython-37.pyc index 3b77f07bae3debbbfee55982184be3341292196b..00e518864983b047a99a1c58a85832d2fc610ea1 100644 GIT binary patch delta 159 zcmey#K9fV;iI8B=6ZS+c}aWKuYK znbU<*Ia1lOB!E~lMYfkooFPgoMJ|{@Q+{(AqX(n>EzZ=G%#!%h;?yEd##_88`N^fZ wsd**wMfv$9ewxyg4>3(=Dw3WY#;nDr478(2d2$=GE2GZjGtAm7e2fB20GSIVPXGV_ delta 129 zcmbQq@snNMiI)@Qt1?QZ3#M|UvSo<_u|$eY zFOxV!lw^u*FoUMt<`PB^MiEWMTf8ax$)&lec_r~h`S~S&no^T*Gfkgd&aBR+1T?2e SY4Q?gS4OSLub8!&1egE@W*!#+ diff --git a/SocialHelper/homepage/__pycache__/views.cpython-37.pyc b/SocialHelper/homepage/__pycache__/views.cpython-37.pyc index 14affb7d8ee3bfd68a35911c19eee86eec27ad8a..36c4abbcbc3c524444430a50657d1762c7baf8ee 100644 GIT binary patch delta 1062 zcmY+D+fUPQ6vzAPx~=QFF+e~r!cY`O6fYnO5ij5s6_I&Cje*8rg|X4Xubq?8v4n-h z7l}!qj4>I}#5WT{;uCMO7ykicZAU*Le6LT zD3=tOX-dVQ#ZhsEC!8tMK!L^mJXGstNh+qvz%aa~B zjs znxPnB-OyUri~SAiDLSJVMn-4Uku^25V@~gLXCA~ntP|fFA4etu=_hY+i80N;(OaitM z&CI3r2|c4|3ALH^;G#8?`m{QuOsFS!ci1s$PN!lOEQG5!BMx)+a)X>_88nv>*ed2l zxIGA?8b$~R4WT1O5OIVD5DT#u)c7H@ImA4|LgWx#h*< zpr^(l2#)wjHIaFV;9WsPA`_7p$j&Xnh;L6|Uf}E8DruWr@2~}X<UZ{&LX;35pl#7xI40jC*i467h z4{!{2adY?Z^7e^}a1L|w^NrdpC;607CW<{Jr!+mkI5~=?DlaiRiY2AADlv*BH!&wM zYO}m_Gb3ZhbMOqz>e0 zG8L%+sax!&#i>Q{nJHjF2%!NI=S)q>EQtq6<^T;T1{=y)R6Kcx;zppgUP{{-^CvSZ q?-8s8$+7`;Ffej4@-P;aY(A&#%*YLLNl`I~D48sy8qLhi!3O}NvO@^~ diff --git a/SocialHelper/homepage/templates/homepage/edit_user.html b/SocialHelper/homepage/templates/homepage/edit_user.html new file mode 100644 index 0000000..6195942 --- /dev/null +++ b/SocialHelper/homepage/templates/homepage/edit_user.html @@ -0,0 +1,159 @@ +{% extends 'base.html' %} +{% load static %} +{% block content %} + + + + + +
+
+
+

Zmień hasło

+
+
+
+ + + +
+ {% csrf_token %} + {{ form.media }} + {{ form.as_p }} + + +
+
+
+ + +
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+ + +
+
+
+ +
+
+
+ +
+
+
+ + +
+
+
+ + + + + + + + + + {% endblock %} diff --git a/SocialHelper/homepage/templates/homepage/my_offer.html b/SocialHelper/homepage/templates/homepage/my_offer.html index a7338ad..013ff42 100644 --- a/SocialHelper/homepage/templates/homepage/my_offer.html +++ b/SocialHelper/homepage/templates/homepage/my_offer.html @@ -62,7 +62,9 @@

No polls are available.

{% endif %} -
+
+ +
diff --git a/SocialHelper/homepage/urls.py b/SocialHelper/homepage/urls.py index 70791ff..d9246cb 100644 --- a/SocialHelper/homepage/urls.py +++ b/SocialHelper/homepage/urls.py @@ -24,5 +24,6 @@ urlpatterns = [ path('delete_user', views.delete_user, name='delete_user'), path('logout_user', views.logout_user, name='logout_user'), path('/delete_user', views.delete_user, name='delete_user'), + path('edit_user', views.edit_user, name='edit_user'), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/SocialHelper/homepage/views.py b/SocialHelper/homepage/views.py index 861ee1d..0d132ab 100644 --- a/SocialHelper/homepage/views.py +++ b/SocialHelper/homepage/views.py @@ -361,8 +361,50 @@ def delete_user(request): messages.success(request,'Konto skasowane!') return redirect(index) -def edit_user(request, user_id): - return True +def edit_user(request): + User = get_user_model() + instant = User.objects.filter(id=request.user.id).first() + if request.method == 'POST': + + oldpassword = request.POST['oldpassword'] + newpassword1 = request.POST['newpassword1'] + newpassword2 = request.POST['newpassword2'] + user = authenticate(request, username=instant.username, password=oldpassword, is_active=True) + if user is None: + messages.error(request,'Podałeś złe hasło') + return redirect('edit_user') + + dlugosc = 0 + znak = 0 + duza = 0 + mala = 0 + cyfra = 0 + for i in newpassword1: + if i in "1234567890": + cyfra = 1 + elif i in "QWERTYUIOPASDFGHJKLZXCVBNM": + duza = 1 + elif i in "qwertyuiopasdfghjklzxcvbnm": + mala = 1 + elif i in "!@#$%&*(){}[]<>?": + znak = 1 + if len(newpassword1) >= 8: + dlugosc = 1 + + if dlugosc+znak+mala+duza+cyfra != 5: + messages.error(request,'Podane hasło jest nieprawidłowe. Hasło musi zawierać conajmniej: 1 cyfre, 1 duza litere, 1 mala litere, 1 znak specjalny z zakresu !@#$%&*(){}[]<>?, oraz składać sie conajmniej z 8 symboli') + return redirect('edit_user') + + if newpassword1 != newpassword2: + messages.error(request,'Podane nowe hasła są różne') + return redirect('edit_user') + + instant.set_password(newpassword1) + instant.save() + messages.success(request,'Hasło zmienione, nastąpiło wylogowanie!') + return redirect('my_offer') + + return render(request , 'homepage/edit_user.html') def login(request): if request.method == 'POST':