From 8e177f4460b3ef48b4723c9502300f733a8c8765 Mon Sep 17 00:00:00 2001 From: RohanShrothrium Date: Sat, 1 Dec 2018 22:12:52 +0530 Subject: [PATCH] 'FinalCommit' --- blood/blog/__pycache__/views.cpython-36.pyc | Bin 3583 -> 3923 bytes blood/blog/static/blog/donors-script.js | 29 ++++++--- blood/blog/static/blog/index.css | 3 + blood/blog/templates/blog/donors.html | 35 ++++++++--- blood/blog/templates/blog/home.html | 15 +++-- blood/blog/views.py | 14 ++++- .../blood/__pycache__/settings.cpython-36.pyc | Bin 2685 -> 2689 bytes blood/blood/__pycache__/urls.cpython-36.pyc | Bin 1167 -> 1336 bytes blood/blood/settings.py | 2 +- blood/blood/urls.py | 9 +-- blood/db.sqlite3 | Bin 163840 -> 163840 bytes blood/users/__pycache__/models.cpython-36.pyc | Bin 1363 -> 1418 bytes blood/users/__pycache__/tokens.cpython-36.pyc | Bin 0 -> 654 bytes blood/users/__pycache__/views.cpython-36.pyc | Bin 2501 -> 3324 bytes .../0002_profile_current_event_id.py | 18 ++++++ ...02_profile_current_event_id.cpython-36.pyc | Bin 0 -> 584 bytes blood/users/models.py | 1 + .../templates/users/acc_active_email.html | 5 ++ blood/users/templates/users/profile.html | 8 ++- blood/users/tokens.py | 10 ++- blood/users/views.py | 59 ++++++++++++------ 21 files changed, 159 insertions(+), 49 deletions(-) create mode 100644 blood/users/__pycache__/tokens.cpython-36.pyc create mode 100644 blood/users/migrations/0002_profile_current_event_id.py create mode 100644 blood/users/migrations/__pycache__/0002_profile_current_event_id.cpython-36.pyc create mode 100644 blood/users/templates/users/acc_active_email.html diff --git a/blood/blog/__pycache__/views.cpython-36.pyc b/blood/blog/__pycache__/views.cpython-36.pyc index 85b548df158e375144231e1bb5fe85af62e7c7ac..0971e121df999990618c166b77593240e0fceb63 100644 GIT binary patch delta 1974 zcmZuyO>7%Q6rR~Xuf6M^IDc-FrfEV5Zkwb~sZIfCX&ouRB?M-Jl zp)G6q;BupfYAy&>MdASB)H@uxqe|TN2AsGeBt#_y@2yi3qIxyoy!m-E@4b27^FJd$ zjZGfSW;5oazps^Yg#1c&{B)4dKntEenEdht%dz}Da&_-H!V0YK9$|gl>Z(^qU|eMV zFz)9zj7MQSzy@JF$TgnrY7d@{+H4&d)#TE2E>E} z8UUdsDu$u2qY3ykwp!xD?=a~3Abv#qUGSidwyWTiB0dW>kad_#)?{AE(?@c@GTl+! zlxruN`C4DEcZ*#@Nu>1pu%D@2x=32ZQ0tPOzH7j0sz$=Jn{fxa#2sWBL`;vAh%#eM zXGTOzgry$pZ9N={2s0zSt1c3j{=Y_p9^SP9!<<=&wab?lKY%DI4R$w;v6;E)H@SSG zT$~sIPs_t%0J^x)2x`tocoRb3s5>ENq93N^8FkPofgtwCYieau^x}VA_B7e|=Lzn@(&J#yq?ijSd1Td+VeBuabR!+Z+`(Hsgih$27UPXA`K__70 zb!Y)*vq{AX`HQ|ur{opmymbhbFiv7zJ~pNgjDiR;P1kC5h(%DVZ96F5fVGPJ(>Q4D zxLzJkjV<8Sv2mlpJr*R};_TJ|b;#vshoEg`D&B-nV8p~p06cVuhc*=_<>#sDbYj@H zH%WwbXT{$L&!GmoLa3-p&3wD_BFM=DifNEyjX8G$aDv|65su_SeED~wJyXZ=e_YAK zAO$Vq${!$vz;;)Ge5SVtB05i&?Y0uCkIcb_FsvPkByrg*m4kIh&d2+_h$UwT%IB zenYa9wb)qa{<_Bnrc|72@*r?lxj<^(Eg)UzfM>o4W^aZ~uiP(eyk-KSjDThAYO&hn zVwJb*cdAXN;hptGQ|!mpgt-Smift%^meb;_26sDRQa;X1RbtI+1YxW;o%J3!4x$p~ zOgS$wvtk`fZ_vwpG*Dn#i1P>+5H8Asb^O>OifFMwO79MW(R1J;ECt9#l91e%x2*9j zEh!4c&s4;+{KC3o^v;rhSyS(Adzlayldfl+o){;#uf2{-&%4{c01j4L!uLGR)}(I_ zL#ZWXp*$h)+fV3Oc|AMx3C2*&Az&>LSO*f$i7HC?ykZ#vHFr3dur48-d8+BN4UeD3 j|C8V)fC7}T0u(fp4k$LrSlklS%*ldL(2Az1!Z-FW)>)g# delta 1662 zcmZuxO-v+36t3$3>FI%C0QU#j@Ds#=g;h6MHU!bg!mh63Caecol1VdF3)A#WkJSY( zrYA&)7%v_+6>pn(G)4~|JSg$%!Nh}!iHD9i6HPpNCvR8 zbw+nIv8R62hUiD?Pi^7=XLScXZ9+++b=pQr8g0_b`~nMl?Fx~(zzs@m67({?O_`Bs z31#Mv$;^aaB+PnZwoKWV5N0Q4TVEy2`M*bvo*O5Sd2S`m8~5H?ye`mwCAsFC>^vA@UFm&WkHGdQ^)AT^p%EK@`BdNZ}FQA6@a@^d1lVC=ZO zIJfaOq!Dl2;$a97@5rdRu^C1YL)_ZftMPZ^ndW|KY)5t84NmbS0HF?bsjIov1FeKQ zXs&Ki&*-8WRaebComMx^4cezZG22w=xwkLnE>ZXF;0-Ia8rW z#jFaPrHL%D|Ej_Hsp)SVKM%wP$p~}=iX=b+Bn{0-^MOQ4X&I4dptp(mFrk4Fm`cRhTb*aYg-}AD^Vc2-1) tr[i].style.display = ""; @@ -117,9 +128,13 @@ function myFunction() { if(td[j].innerHTML.toUpperCase().indexOf(filter)>-1) tr[i].style.display = ""; } - if(filter=="") + + if(td[td.length-1].innerHTML != eventId.innerHTML){ + tr[i].style.display = "none"; + } + if(filter=="" && eventId.innerHTML==0 ) tr[i].style.display = ""; } - //after the fiter call form, but tell it not to change the state of the + editTable(); } \ No newline at end of file diff --git a/blood/blog/static/blog/index.css b/blood/blog/static/blog/index.css index 2294365..69f590d 100644 --- a/blood/blog/static/blog/index.css +++ b/blood/blog/static/blog/index.css @@ -229,3 +229,6 @@ nav{ padding: 10px; } +#eventFilter{ + border-radius: 0 .25rem .25rem 0; +} \ No newline at end of file diff --git a/blood/blog/templates/blog/donors.html b/blood/blog/templates/blog/donors.html index e4cf4e4..2ecdf94 100644 --- a/blood/blog/templates/blog/donors.html +++ b/blood/blog/templates/blog/donors.html @@ -32,26 +32,45 @@

This page is for admin only

-
+
Name
-
+
Email
-
+
Blood Group
-
+
Mobile number
-
+
Eligible by(days)
-
+
Everything
-
+
+ + +
+
+ Clear event filter +
+ + {% for post in posts %} +
+ {{post.title}} +
+ {% endfor %} +
+
+
+ @@ -60,6 +79,7 @@

This page is for admin only

+ {% for donor in people %} @@ -68,6 +88,7 @@

This page is for admin only

+ {% endfor %} diff --git a/blood/blog/templates/blog/home.html b/blood/blog/templates/blog/home.html index feb5483..f988953 100644 --- a/blood/blog/templates/blog/home.html +++ b/blood/blog/templates/blog/home.html @@ -45,31 +45,36 @@ }
- {% if isEle %} + {% if user.is_authenticated and not isEle and not user.is_staff %} {% endif %} + {% if user.is_staff %} + + {% endif %}

Upcoming Camps


{% for post in posts %}
- {{ post.author }} - {{ post.date_posted }} + Date and time: + {{ post.event_date }}

{{ post.title }}

Venue: {{ post.venue }}

-
+ {% csrf_token %} - {% if isELe %} + {% if isEle %}
diff --git a/blood/blog/views.py b/blood/blog/views.py index 89b83f9..446b4b8 100644 --- a/blood/blog/views.py +++ b/blood/blog/views.py @@ -11,6 +11,9 @@ from datetime import * from django.core.mail import send_mail from django.conf import settings +def cleanUser(user): + if user.profile.current_event_id>0 and Eli(user)>0: + user.profile.current_event_id = 0 def home(request): if request.user.is_authenticated: @@ -23,8 +26,10 @@ def home(request): post = Post.objects.get(id = form.instance.event) temp = post.event_date.date() request.user.profile.last_donated = temp + request.user.profile.current_event_id = form.instance.event request.user.profile.save() form.save() + return redirect('blog-home') else: # we come here first and..... form = EnrollForm() @@ -37,7 +42,7 @@ def home(request): 'form': form, 'isEle': isEle>=112, 'daysLeft': 112-isEle - } + } return render(request, 'blog/home.html', context) else: context = { @@ -70,6 +75,9 @@ def Eli(x): return (datetime.now().date() - x.profile.last_donated).days def donors(request): + users = User.objects.all() + for user in users: + cleanUser(user) form = EmergencyEmailForm() if request.method == 'POST': form = EmergencyEmailForm(request.POST) @@ -87,10 +95,12 @@ def donors(request): success_mssg = "" people = User.objects.all() people = list(map(lambda x:[x,Eli(x)], people)) + posts = Post.objects.all().order_by("-event_date")[:3] context = { 'people' : people, 'form' : form, - 'message' : success_mssg + 'message' : success_mssg, + 'posts' : posts, } return render(request, 'blog/donors.html', context) diff --git a/blood/blood/__pycache__/settings.cpython-36.pyc b/blood/blood/__pycache__/settings.cpython-36.pyc index c1c96b36fe79b8e707fac304847915647bde3016..d869417c9e0e38cb8e91d6b4e4ce7bf42ca6a15d 100644 GIT binary patch delta 39 vcmew>(kRMl%*)GVyPYX!;zmv`Mn=ueB84YZmY<*|OplSaD|Lih4B1|NotTF0%aD_+?JE9LN0jvlg~=gnpw-PaX7Q zn7NA)qKM)Ir8vM?=vq=sNkF6~iIS>;nreY2y^_qNdSF!A1Z`o&RH`x(+p%+21FbPD zcH=sop%eWaQ-hl41h56T0obO3Iu&)95zo?kU1Cg^;m9VvQH55(wdksFeJg0wwHL^{`A2*z4^PR6 zC*>+$FJs)*!7EvmvL9dZCp;OyI*5*n!TYFSo!gK0wnqbcc>mtcn@#`06F-Rj@!Qbf zzvIbXF+673rPlt3?s|9Y)c+qAUob?BJ!FXq?U&vi=DQM6*dY<)% z8%M+J-3DAS=QX%*-~z93!3T$&0GwJClraSeR|Qr_IpaCk%GYGO{6aqNa7Xl9xdgH& zQ2_^M`FF(Iq9Mv(|JlRvrC1mCSdu`=kBi|+__ViI?kdZk_^I+0C^oin1Ex)E+=StR K7H=^WY~p`e#-rx| delta 482 zcmYk%zfXfe6bJBoy`vNgl>S1kKa)-*MvX4UI2d(yF)rApdY487+8lK5P~+BU!XIIr zUHn_RIyoA3aq@u-LU?@NhxabwRe#VXd#0)T?EA8>67oj=T^8meeBv)GoNx$82p&L| zOF=259u1kt@}34tSoYK+S1@Zp1m#SCulv<$39}+p-{57g&M0;jq4}n7@rlOu8SrYs z267GA%+)HihO0KWi>@vhZ%iRSw2AX|oNwjx?P9_~ZJ;jXx>)EEY7@1S>++v=`3iCi zc{S&?j0d{c=IiIg-FU};C+RV4rjN8$abeD)ekjrqc3+<09`?^%$FsQKj|Ri7>tU40 zn=4tum3g(mu?%8KQ6$S)8OK7#Qb|AQp(4xK;oIzPXI{m*Q9nt9jN)e^oopd1Kkmsv p?;_jjor)m965l4nQToBwx;B1~J6H^`!2p9AV1a|Tg//', auth_views.PasswordResetConfirmView.as_view(template_name = 'users/password_reset_confirm.html'), name='password_reset_confirm'), path('password-reset-complete/', auth_views.PasswordResetCompleteView.as_view(template_name = 'users/password_reset_complete.html'), name='password_reset_complete'), - - + url(r'^activate/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', + user_views.activate, name='activate'), + path('register/', user_views.register, name='register'), + ] diff --git a/blood/db.sqlite3 b/blood/db.sqlite3 index 0ac4cde28a4dc483f03efb81ccd42d412c4ae538..67b0f398160782df26f40532f88a33abc44fb560 100644 GIT binary patch delta 6308 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 E2SHtE5dZ)H delta 1796 zcmbVNZ)_7~7{B+f|JL>HxsH*JZMbd%qu{!`UTy=_Da|4 zMo=~!f%u0AXKd6BBk_Zg$b=>|5F>%X7mXO?g9MQ%YKX+hG)g4S#JAnhEPgQh;mz-! zd;b6KeV!W~HI9xNUoI~}2MB^#iBAna6h7MyKHwnHf#W@I165jVQT41XTW!5*%vvgD zG>f$GJ)DOvkbtYu3@V5qW~;d}SOt3tx`e7iy@N_5m{5jNlo_a6lpYEvhk}Wu(k~B& z%@!>sAoZ+ik*d^N&{1_?{e4fca0xEqyu=bz!cw-s0|bN0V2CQEs5%rHkm3;~D1~Bj zJctvRXcJB)rBl&hK7n~LqU!G%#pFm*O36xmsPqJ<=_%Ej2t;=?(~QaV9>h$9vD+BV zdfD|xwfl8xi4+fZM3YJ?nv~PAq!LXJ%}HrB@aE!Dhv4BGJR)!Bm=DlNV$4Pus#W7e z#qLm7%f`@-K}Y9Cw{Ka!AdEO;(mH=fsC8}Y>gI4H(fYJ=*y&&I-6}N)9&dLI2ZmjN z$OfThO>;P$khTXO3AXbtj^jDb(eSV=r$SM?)MuCD4vufEu!Ql}a?9N7! z6GU7P!F5E zKDB}~QZPfn?>NT{4txW$Gq=r&T0;o|WE%laMy9={?ZxMfWkuiVx9Tf(do>3&UDQ#s ztw<)@@C98#<_sZZAa(ACbryeZhHXP-8Kn&lw^lqt!e z9ICNl=T?i&hQ|GcybIkHN>%s=q$dfd~-{4 zh5bCLALUu7Tqcy(3|_oU5-RHK?3(-&+n1cHYHv?#4Y2B5giE=Bp;sn!9Bu%aH-W zH3F_d4ij<=s+a#;?93NUqzyaWATYPn*y%J>RLyNnN8LX&X1)%P_iJ>_kS1r?MBW8G S+`)5y1&>t^`5PSRVgCfCzv_Gd diff --git a/blood/users/__pycache__/models.cpython-36.pyc b/blood/users/__pycache__/models.cpython-36.pyc index 969a5ec796c8c12f540a2f6b89fe146b1a2b618d..3e0444a43e0b0f02bfe427f19a61b02cbaf26ae5 100644 GIT binary patch delta 154 zcmcc2)y2(e%*)G_J^62R&_vEjj8Yrturf-e@@FZhD5Qw=GDfMSD5fa2Fhr@QC@bBPi`+6(b5f!Nl1qzpCurl(cD5NO1FhnV*CfjN5VhlUwJllHLnTl-R6<;G2@>28LRDL-x2h^|i6U8UY}o8Naqu{$MZIl* z2{-KMZ@0d;vUx_j`>57$Gdg~+0Cx0-GmZzSA;&w3CL57>&#H3%w?FOW(Lvv+v5mPYsOH2na9(7G?AgH$g#rzYD z{QLU&UG*7VP@NcS5nvfyUmcyCSC`f~T~QoVfrf{ozlpoDRZAo13g+@k*}>4dfq*4@ z{KvuL`HKJ5*m9go*{Rk@8F!>?ogOUlOv-PAvTKi@VZO1$4an$?D$&e9+n)0A`z)Wt zeZ5fKS69@o3%Ww5BS$Hm>^_4~45h_gC2uvU}k@kQ-!; zeVpA7?`!=!jQt>d0P+Ue{Kg1BA-Bi?-Xpp~w#fE3#?lNQlHi3g+IfdZH8NH3g_N_e zshAbHpd(9poaTgb<#S3BPGbo^?rFg@0fO^VP!8`tzMpa$$)v~+zz8}&qe4VyRJ?=p zHb!>k^ff(8grppu)XH;SoFZ38#OZ!x9J%E|ZL26*&dj ze0T_LQ@}bWS(Gp|3o2!jpWzz&XH-t&Ifs47iAW@Fstp^6>Ez^6QlVN^N7C04OdE5~ zM05(qNYKw7O=un$g#MqJP*mga)%i?hF%go(oS+*-aa_z{x+s>(g+3IpPiYReU?11` z`|50BJR1D<;Az0~6dv&qw55?6smc4&BIeS30T5l7#9mm$S=jJ6V7G}owf<)EKw{5b znhUpdQ*UW#T_g3==F&)8vJKiG?JP~=y)o17(pXrfMeM1=8EGuc{O@4z5sUb5%!Nm+ z(wp>4FYPT2(~v7AKxEMXkJWUIG(q;|I%zF2ZQ6^b+>o2#dus`6Ob0M>OKzpxr3Zd( zxkG}|D;w$UvQ@T8=dH7}7C}8y7d$%hqq12BW#`N!y*D=O$w_zhtm~wYGsrt+1@|r; z7}+hY(kxxF`qo}_<*+o!TG?IN0NwS&tL6zH+3%VN%lzkc?7SV!_|2R{;@LbnPko#=7L z=Q3j>M>%L#9w}h5T-o!4C|5_E--hMD+IngQIJutMwx2rj}BOLrX1K$cC}V5w(_RDTI3$TgD2BZ z#3Y)-V7W|U$U4FuRC^hf=LO*{=IOP> zJH*y0+aZpoEdvtN1%Bp_Utm^o7f*d+r4-Z_+=7q1k|DX9urB;N?&60IX1`{-@-yKv1(W?z(W@vO!1b5wBXxa&0YNiZea97)h20_pB1oGIn$sF`?W@#7hJ}3DfHTEvaf6$DMD@6j!0)bIT>Sd7-w*~ zVWMLGt?zTd7zmEQRNW8l+y`Y-i@caBL*r>|JvsG5B%Q$0Hh{+=Kufz literal 2501 zcmZuyUyt0j5f}Auwc6dgy+5`uF6t^k(O`{Yi`Gcm28PkZXQKvM$H<+LRykxri`-r5 zC}~S_&$)xtm(8m`LDLUVpdY1g1^U3(KKZ>*e(DUhx!6D?a5&@)hr{8_kM~BS_^1DV z^X0!{$N8`G*5?8LJ80^kK$ydba7vPr(oJ20V^?^kpZb>fL{NrlXn9}s$|#L2ABcV# zr!nv$>j}Rcq=Ryp4$DzGvhqmml)LG!<@;h>?xlN{kH!8e?lBMt=^^w(aihGM-n6oj zxK$pdN5Jo}-EW-qJ-*AvZ0{RqL(vEo|i)k0;sH+~~%J!lW1 zss90Cq$SL4UFNkOG{12QhxzBO{EsHUyBpF5O;C6n2WI>tD8h|X^mGJs{UY8F7Q7$O9D3v_Qb!;J^Gdh6+9i4if5@t=KmatfgeIL7SML~FRhib7O_ zV@_pqb?@hK{|hd%y5xzjlP6D3lj9|oFDd&#C7+7AX323~*&9!u)lyS2O|Cxrf+vs$ zLR=-oaGL_6}u9x#QcyKk2!Rg~=^6Bxj^MSA|Q>^kXtaEkf;B^Vj*7}aw%_s#F966 zAAWp>rJ>G_xe!3qxvp1d_5f!XaCLT(^OtJ6x-`*!LCY76KA50&XwKDbxviGzeNksr zs0YAwO7Z{{;QB^zUNKWpM3sgkAAXW$^}5nYhQ-L4J?0zoz6opzK@|p8Zu<7x9}BuL zK7^vYI z&>TEdXv-cT4H-KZRG4@!>vCqpllF8y6M$Eym({S~YyJJ*$|Ep@sMz5dx~x71;t+rP z$0Q~ZxdSb9BQo?O;^Oayu204!Bs*l^JG4@qk6igHSbYsxc+e1<1uO%M1t7hbPmI0;O+nqiK@eAY2OqnFAAxq2jW;|o65SNmQ5ZdXoi z`i^A+1|+=7+uZe0N#29889^FQQ0P7Pfn5l5XnbKtmrq${T9hDkz6B#%^vFr3e{a8jvJGGObSSjh{TXG@OwKj zbA+60lc!4*Jiz2f>6jI?TGUgu1o+L?T3Jsz-@{HOeNZ*Gw~Cm=GJi3pYrUM7HRD2c zMf~0mDPYKz#2hp`@5*fzc939Wi@{6pysOh~!gy9os%xp_5Dg8tN^70N-uNiX`#9g9 zud7VgHB4eG%y&nF)qIK%l&yX<_cS%_^SrD#!!Q zzB33wTrm*HSK_b81%&4;iykPKWr0g8wKQd?n%cU!Y5=vJ`_P-kc+=!yG}cX~)9GiaYSpPyyHRVJh0^FY z=DjgkcM^YlRA5LW%eWf>F3MhanINK`oUF?VT{vL0P^jS~3rs}W#xu>vE|EiylrEK$ zYI=?2Po(_Sm)h6)6JU!qU_Do8O+bY%*#|iE{fzL($x+?m63uYs(x%1NA>A?a!N2C= z@$BGB@xu!%W~eoRz3iH{_%=H&E_BmCF{m!yM_iEpZTTu&{;ztg{bT%RdL=d`NJJcl rJfJn)pJbsM!>X*8%@$k?ya%>J@SWC+_mS#d^7Ul`yIz#_LN~-SA$FZ5 literal 0 HcmV?d00001 diff --git a/blood/users/models.py b/blood/users/models.py index 9eacfee..687ae5e 100644 --- a/blood/users/models.py +++ b/blood/users/models.py @@ -27,6 +27,7 @@ class Profile(models.Model): date_of_birth = models.DateField(default = timezone.now) gender = models.CharField(max_length = 10, default = Male, choices = gender_choice) is_registered = models.BooleanField(default = False) + current_event_id = models.IntegerField(default = 0) def __str__(self): diff --git a/blood/users/templates/users/acc_active_email.html b/blood/users/templates/users/acc_active_email.html new file mode 100644 index 0000000..fa5f16d --- /dev/null +++ b/blood/users/templates/users/acc_active_email.html @@ -0,0 +1,5 @@ +{% autoescape off %} +Hi {{ user.username }}, +Please click on the link to confirm your registration, +http://{{ domain }}{% url 'activate' uidb64=uid token=token %} +{% endautoescape %} \ No newline at end of file diff --git a/blood/users/templates/users/profile.html b/blood/users/templates/users/profile.html index 7654c4e..7bf46ce 100644 --- a/blood/users/templates/users/profile.html +++ b/blood/users/templates/users/profile.html @@ -13,9 +13,6 @@ align-items: center; } - #profile-info { - margin-right: 100px; - } #profile-info th{ font-size: 1.1em; @@ -34,6 +31,11 @@ align-items: baseline; } + #profile-info { + width: 400px; + margin-right: 100px; + } + #register-mid{ padding-top: 0; max-width: 700px; diff --git a/blood/users/tokens.py b/blood/users/tokens.py index 463633e..06aee6a 100644 --- a/blood/users/tokens.py +++ b/blood/users/tokens.py @@ -1 +1,9 @@ -from django.auth.contrib.tokens import \ No newline at end of file +from django.contrib.auth.tokens import PasswordResetTokenGenerator +from django.utils import six +class TokenGenerator(PasswordResetTokenGenerator): + def _make_hash_value(self, user, timestamp): + return ( + six.text_type(user.pk) + six.text_type(timestamp) + + six.text_type(user.is_active) + ) +account_activation_token = TokenGenerator() \ No newline at end of file diff --git a/blood/users/views.py b/blood/users/views.py index 341ab2f..2babcf4 100644 --- a/blood/users/views.py +++ b/blood/users/views.py @@ -1,3 +1,4 @@ +from django.http import HttpResponse from django.shortcuts import render, redirect from django import forms from django.contrib.auth.models import User @@ -11,9 +12,18 @@ # these were added for email-verification from django.core.mail import send_mail from django.conf import settings +from django.contrib.sites.shortcuts import get_current_site +from django.utils.encoding import force_bytes, force_text +from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode +from django.template.loader import render_to_string +from .tokens import account_activation_token +from django.core.mail import EmailMessage + # Create your views here. def register(request): + if request.user.is_authenticated: + return redirect('blog-home') emailFlag = False count = 0 tempUser = '' @@ -25,27 +35,22 @@ def register(request): if count > 0: emailFlag = True else: - form.save() + user = form.save(commit=False) + user.is_active = False + user.save() + current_site = get_current_site(request) username = form.cleaned_data.get('username') - + print("before sending") #this is for sending email - sentences=[ - "Dear ", str(username), - ",\n\tWelcome to IIT Dharwad's Blood Donation Portal. ", - "We really appreciate your initiative to donate blood. ", - "We look forward to see you take part in our blood donation camps." - "\n\nYours faithfully", - "\nIITDh BDP Team\n" - ] - subject = "Thank you for signing up at the Blood Donation Portal" - ddklal = ft.reduce(lambda x,y: x+y, sentences) - from_email = settings.EMAIL_HOST_USER - to_list = [form.cleaned_data.get('email')] - send_mail(subject, ddklal, from_email, to_list, fail_silently=False) - #email is sent - - messages.success(request, f'Account created for {username}!') - return redirect('login') + mail_subject = "Activate your BDP account" + uid = urlsafe_base64_encode(force_bytes(user.pk)).decode() + token = account_activation_token.make_token(user) + message = render_to_string('users/acc_active_email.html', {'user': user,'domain': current_site.domain,'uid':uid,'token': token, }) + to_email = form.cleaned_data.get('email') + email = EmailMessage(mail_subject, message, to=[to_email]) + email.send() + print("after sending") + return HttpResponse('Please confirm your email address to complete the registration') form = UserRegisterForm() context = { 'count': count, @@ -54,6 +59,22 @@ def register(request): } return render(request, 'users/register.html',context) + +def activate(request, uidb64, token): + try: + uid = force_text(urlsafe_base64_decode(uidb64)) + user = User.objects.get(pk=uid) + except(TypeError, ValueError, OverflowError, User.DoesNotExist): + user = None + if user is not None and account_activation_token.check_token(user, token): + user.is_active = True + user.save() + # return redirect('home') + return HttpResponse('Thank you for your email confirmation. Now you can login your account.') + else: + return HttpResponse('Activation link is invalid!') + + @login_required def profile(request): if request.method == 'POST':
Blood Group Mobile number Last donated (Days ago)Current Event
{{ donor.0.profile.blood_group }} {{ donor.0.profile.mobile_number}} {{ donor.1 }}{{ donor.0.profile.current_event_id }}