From f930c028fa20c19453cde93984d042521b0e41e5 Mon Sep 17 00:00:00 2001 From: Prabhakar Mishra Date: Wed, 8 Feb 2023 02:33:33 +0530 Subject: [PATCH 1/3] Integrated allauth for a working user authentication system --- College/__pycache__/__init__.cpython-310.pyc | Bin 158 -> 147 bytes College/__pycache__/settings.cpython-310.pyc | Bin 2285 -> 2748 bytes College/__pycache__/urls.cpython-310.pyc | Bin 591 -> 364 bytes College/__pycache__/wsgi.cpython-310.pyc | Bin 561 -> 550 bytes College/settings.py | 39 ++++++- College/urls.py | 10 +- db.sqlite3 | Bin 143360 -> 233472 bytes home/__pycache__/__init__.cpython-310.pyc | Bin 155 -> 144 bytes home/__pycache__/admin.cpython-310.pyc | Bin 302 -> 291 bytes home/__pycache__/apps.cpython-310.pyc | Bin 430 -> 419 bytes home/__pycache__/models.cpython-310.pyc | Bin 1024 -> 1013 bytes home/__pycache__/urls.cpython-310.pyc | Bin 621 -> 653 bytes home/__pycache__/views.cpython-310.pyc | Bin 2014 -> 2117 bytes .../__pycache__/0001_initial.cpython-310.pyc | Bin 767 -> 756 bytes ...r_data_desc_alter_data_img.cpython-310.pyc | Bin 682 -> 671 bytes .../0003_alter_data_img.cpython-310.pyc | Bin 631 -> 620 bytes .../0004_studentdata.cpython-310.pyc | Bin 890 -> 879 bytes ...ta_class_10_marks_and_more.cpython-310.pyc | Bin 800 -> 789 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 166 -> 155 bytes home/urls.py | 17 ++- home/views.py | 2 + templates/account/account_inactive.html | 11 ++ templates/account/base.html | 42 +++++++ templates/account/email.html | 74 ++++++++++++ .../email/account_already_exists_message.txt | 13 +++ .../email/account_already_exists_subject.txt | 4 + templates/account/email/base_message.txt | 7 ++ .../email/email_confirmation_message.txt | 7 ++ .../email_confirmation_signup_message.txt | 1 + .../email_confirmation_signup_subject.txt | 1 + .../email/email_confirmation_subject.txt | 4 + .../email/password_reset_key_message.txt | 9 ++ .../email/password_reset_key_subject.txt | 4 + .../account/email/unknown_account_message.txt | 12 ++ .../account/email/unknown_account_subject.txt | 4 + templates/account/email_confirm.html | 31 +++++ templates/account/login.html | 107 ++++++++++++++++++ templates/account/login1.html | 46 ++++++++ templates/account/logout.html | 21 ++++ .../messages/cannot_delete_primary_email.txt | 2 + .../messages/email_confirmation_sent.txt | 2 + .../account/messages/email_confirmed.txt | 2 + templates/account/messages/email_deleted.txt | 2 + templates/account/messages/logged_in.txt | 4 + templates/account/messages/logged_out.txt | 2 + .../account/messages/password_changed.txt | 2 + templates/account/messages/password_set.txt | 2 + .../account/messages/primary_email_set.txt | 2 + .../messages/unverified_primary_email.txt | 2 + templates/account/password_change.html | 16 +++ templates/account/password_reset.html | 24 ++++ templates/account/password_reset_done.html | 16 +++ .../account/password_reset_from_key.html | 19 ++++ .../account/password_reset_from_key_done.html | 9 ++ templates/account/password_set.html | 15 +++ templates/account/signup.html | 80 +++++++++++++ templates/account/signup1.html | 21 ++++ templates/account/signup_closed.html | 11 ++ .../account/snippets/already_logged_in.html | 5 + templates/account/verification_sent.html | 12 ++ .../account/verified_email_required.html | 23 ++++ templates/dashboard.html | 10 +- templates/index.html | 4 +- templates/login.html | 71 +++++++----- templates/openid/base.html | 1 + templates/openid/login.html | 18 +++ .../socialaccount/authentication_error.html | 11 ++ templates/socialaccount/base.html | 1 + templates/socialaccount/connections.html | 54 +++++++++ templates/socialaccount/login.html | 21 ++++ templates/socialaccount/login_cancelled.html | 15 +++ .../messages/account_connected.txt | 2 + .../messages/account_connected_other.txt | 2 + .../messages/account_connected_updated.txt | 1 + .../messages/account_disconnected.txt | 2 + templates/socialaccount/signup.html | 22 ++++ .../socialaccount/snippets/login_extra.html | 3 + .../socialaccount/snippets/provider_list.html | 45 ++++++++ templates/tests/test_403_csrf.html | 2 + 79 files changed, 971 insertions(+), 53 deletions(-) create mode 100644 templates/account/account_inactive.html create mode 100644 templates/account/base.html create mode 100644 templates/account/email.html create mode 100644 templates/account/email/account_already_exists_message.txt create mode 100644 templates/account/email/account_already_exists_subject.txt create mode 100644 templates/account/email/base_message.txt create mode 100644 templates/account/email/email_confirmation_message.txt create mode 100644 templates/account/email/email_confirmation_signup_message.txt create mode 100644 templates/account/email/email_confirmation_signup_subject.txt create mode 100644 templates/account/email/email_confirmation_subject.txt create mode 100644 templates/account/email/password_reset_key_message.txt create mode 100644 templates/account/email/password_reset_key_subject.txt create mode 100644 templates/account/email/unknown_account_message.txt create mode 100644 templates/account/email/unknown_account_subject.txt create mode 100644 templates/account/email_confirm.html create mode 100644 templates/account/login.html create mode 100644 templates/account/login1.html create mode 100644 templates/account/logout.html create mode 100644 templates/account/messages/cannot_delete_primary_email.txt create mode 100644 templates/account/messages/email_confirmation_sent.txt create mode 100644 templates/account/messages/email_confirmed.txt create mode 100644 templates/account/messages/email_deleted.txt create mode 100644 templates/account/messages/logged_in.txt create mode 100644 templates/account/messages/logged_out.txt create mode 100644 templates/account/messages/password_changed.txt create mode 100644 templates/account/messages/password_set.txt create mode 100644 templates/account/messages/primary_email_set.txt create mode 100644 templates/account/messages/unverified_primary_email.txt create mode 100644 templates/account/password_change.html create mode 100644 templates/account/password_reset.html create mode 100644 templates/account/password_reset_done.html create mode 100644 templates/account/password_reset_from_key.html create mode 100644 templates/account/password_reset_from_key_done.html create mode 100644 templates/account/password_set.html create mode 100644 templates/account/signup.html create mode 100644 templates/account/signup1.html create mode 100644 templates/account/signup_closed.html create mode 100644 templates/account/snippets/already_logged_in.html create mode 100644 templates/account/verification_sent.html create mode 100644 templates/account/verified_email_required.html create mode 100644 templates/openid/base.html create mode 100644 templates/openid/login.html create mode 100644 templates/socialaccount/authentication_error.html create mode 100644 templates/socialaccount/base.html create mode 100644 templates/socialaccount/connections.html create mode 100644 templates/socialaccount/login.html create mode 100644 templates/socialaccount/login_cancelled.html create mode 100644 templates/socialaccount/messages/account_connected.txt create mode 100644 templates/socialaccount/messages/account_connected_other.txt create mode 100644 templates/socialaccount/messages/account_connected_updated.txt create mode 100644 templates/socialaccount/messages/account_disconnected.txt create mode 100644 templates/socialaccount/signup.html create mode 100644 templates/socialaccount/snippets/login_extra.html create mode 100644 templates/socialaccount/snippets/provider_list.html create mode 100644 templates/tests/test_403_csrf.html diff --git a/College/__pycache__/__init__.cpython-310.pyc b/College/__pycache__/__init__.cpython-310.pyc index ea03b3776acfebc0bb2ef098a5f469cf8433ea42..a42924d81115c3740cd4ad800c8ec4488df228f8 100644 GIT binary patch delta 67 zcmbQoIGK?~ol#!U7Sfrm>o}a8AQIL~glnSGq P^K)`i(^K^))+qo0uj&># delta 107 zcmbQtIFFG#pO=@50SKP`Rh-Ce6Yl726%$&VT2vfUnOK}r7UQ3n>Qay zUl5a$m6(^F9}`iKlV6k?2KczG$)s7KpY%vp% HU||3Nn*1Xn diff --git a/College/__pycache__/settings.cpython-310.pyc b/College/__pycache__/settings.cpython-310.pyc index f5ab8b07b49f0ec71b4642e23b07e2ab69136a95..bb49408c6ab94c9fcbcc7be6c0769255604837ee 100644 GIT binary patch delta 682 zcmZusF>ljA7|orX#E_ZlYN%!4*`o8zx_v7lv>O3o#FXzPBdh^wb z7GBTa09zl{D_~<8ulTUHgm3q5;yd^*UiBfqhu0{;3RaIK3VOHj{oXQ`IyrSctAkfy zKKlfYEBF}-eWrOVOd{IXVwz+_czwdlV~Tx}xXGBHgP0dl5TL_kkY1U6G~{{gFig_w zIT16DqTrlfy^z*M5qnNCiDJ!X%nyiKOgCl`h7{v~j8R0i_~ZzFgN2INGu_TU=hsf& z=WC$G3vq%H>haRFKBWPPQ#Cu5uTA>MJ0KyBwOxiuP@kgo!Fh^VEbVLu_kXV;5DA5% zP-Wq4=sOg)yfDqjiz4xv56_b!q5&@nB@)MO@?u1IfrSALi7N5Ue8+V5EM7A9yW8%b z(KdEFyy8sJj%m48%cwW4Mq1J_iU)m$BCM+`*_Xl&;3sMkf(fskbz7~jZ5mzMX}NX7 z+_74X4lj1>uI1VdUh6ofZ8QzjboN_acdzX{wi{MkI5nL|cFS#B4ZCfbU3b6Te3y$J zibeiCzc%#&8xnmKq5c3Jph%}<=IKvH0gK42T+&Sz1jHwL#+1dymtuAnI n7iCF?N?xgEZO}WWF9Nvsk zn`dw^F~+ZCDAER61txwuI$Onr7N-^!$5bX3XOzYG=cT$7WtOGJxTF?mm*f}3q+})L zrRT>)6y)R=rN%ht=j5cOr^XbgmXu`Xr5EcJRNmsS$<0qG%}KRm1e#i$Fxi$%f{}Z2 K7?%eV2O|J@QbeEt diff --git a/College/__pycache__/urls.cpython-310.pyc b/College/__pycache__/urls.cpython-310.pyc index c883b8f7891e621ad7a267d83d05331f1af25744..12cda41a9e634a2b90a992a744ca664e771191a7 100644 GIT binary patch literal 364 zcmYj~OG?Es7=@EIw-4JZZljY1oH!8?oH%mgL^{h&LLcT)(iXAPyBgQvPBIa6klphzAt{u@WRE=I1*|y^|SP3 z;}oFq^(>v4UXUxor66DDH1O%@*r8*O%+dbIa{4eT>*U|Mu}aBS(m<-mXP;eaD;6cM SFc78^q(o=9Bqc6!_Wc8cYh#T7 literal 591 zcmZXQ!D<^Z6h);O&3J5&9rp(UU3%m0OIr%bx?Pl(A_k0Ny^iH*q(Racl5M^w`+kkK zg+M-_n?j*)oCE}w(9_Y?<8mdtSj-5Hhrh3P-!ejejfZqB@$eCs|A|EsNj2#xr*z~@ zXI;+o6X%+B1uwdimy|#u8RUn_p}NbE3n*oIM^8LSxJr1M@GRkZ!ga!ngqI1Qy>L6{ zQ@Q#=)~_BhIa$-l_O=7u3n4pY)>&k|2>UouW~T=Ux8+HH6Ups#?A#1a`&ek(D#NRO zaJ#+m5Gx0*@&O#$3%|dz!b!gHAn<9vBe?L`ZbNo#(stKIC-3HaudRdT!fFjIG^6RJzlqhm Z&dNc<2a0C?97|1Vx}r6!>Ho9({SOG^qRapQ diff --git a/College/__pycache__/wsgi.cpython-310.pyc b/College/__pycache__/wsgi.cpython-310.pyc index f2db07929fc137ea082d66d762216ff02eb92554..e1009049be5515dee0ddd33e179144065ca2e224 100644 GIT binary patch delta 71 zcmdnUvW$f{pO=@50SL|nKS*xh$a|7e$4EaTKQ~pspeQjZBQZO%NI$bYKUqJbASb^l T6-GJd=j5cOr|M7UWl{kEG4dCb delta 82 zcmZ3+vXO;1pO=@50SKP`RZO0~k@qB{xvjHROlWaxQE^OVVsS=UjDKFLOHpQ7YK%*2 kadt_5K};VXX0P+73gzLZqU;qsMz~Jxo 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 Uu$*G<>AYj-UL;ppIVR|L01HeO`v3p{ diff --git a/home/__pycache__/__init__.cpython-310.pyc b/home/__pycache__/__init__.cpython-310.pyc index 5a9ccfbe345cd96684e9789e8a966a9a7cb754c7..1bbb2f209358224ea92fb8c202e786e3857e7796 100644 GIT binary patch delta 64 zcmbQuIDwHnpO=@50SL|nKbXjEqiL+4k)NBYUr>~ol#!U7Sfrm>o}a8AQIL~glnSH3 JDkfGd003-86&L^j delta 75 zcmbQhIGd3>pO=@50SKP`Rh-CeV`ArQ6%$&VT2vfUnOK}r7UQ3n>Qay dUl5a$m6(^F9}`iKlV6k?laZgB8Z)s#0RW0u8esqc diff --git a/home/__pycache__/admin.cpython-310.pyc b/home/__pycache__/admin.cpython-310.pyc index a7af6e5acdfea6aa49c563c7f4e63f678bd614a4..c1343936555c669910b3e4a2b1114746811dd4f6 100644 GIT binary patch delta 82 zcmZ3-w3vxEpO=@50SL|nKS*9Wk++TU*2F26#vq|05b?`EKO;XkRllGpF)1T4JF!SV XvphdpKcXNfzbF+(fmKZAW>f|M{yZ7% delta 92 zcmZ3?w2p~4pO=@50SKP`RZLzpk++R8YT^`2J5HcT5s3I@?Q9hjTAW%`98;NCoKY6z rpO@-Vlv$P<CBr6{v3HO3{i hIJ+djASNX%F)uwoCZZrGzbG{(BR@AaX0jb)DggB+8-oA< diff --git a/home/__pycache__/models.cpython-310.pyc b/home/__pycache__/models.cpython-310.pyc index dcfc833e55962bf799dd8e369ba9039281874a0c..2bc25a3b8df6f45cec46a88390906e77392f1c22 100644 GIT binary patch delta 135 zcmZqR_{z?k&&$ij00d`(A0)5Y$XmduX{eu(pPQ;*P?VUIk(ixWq@P)ypR6BIkdt4O z3ZuX(Hg9CiVzj-*<(64gToUh>n45Zw(Velf!U delta 146 zcmey$-oU||&&$ij00hteDkdM?$Xmc@V&iNT6Iz^FR2);8Se#K7PyS-ZY{`At%b`LW-PY>PdgjAQw~7*-Y?Yffx~x0lqZjLv zerL9ov`YAR@4CdOvbKXV7~H!q1!=2|mIj1R-h4N+N@4}!r>~AnZ)!EHds$-1x z=nf+x8F$zl{j+Y=+NxowyV44O@G;~fD{turneWSmpTo86N`1C7jWswtW+IXR#Yc4q z>fX#K5R)V%G;5!~_O&+3?wY}5l*mbF)@DIR=2#M64S%?^znM9v1j&CP=?DzK96!Sq~z}&@g1D%AV|YCr#2by1s)i;mtSj zS#lKwU%-PPSmpFVOvp$5>I+F#Vyh|_G`|0Sy#Krq;v2)iqb7Jx%YP*S0kRi^+)Byu zqF)TrHu@V!eLN)FL<)=`#^iPh2`oQFL@S~dtY%7yQb=dYh%(4#%87EwXDWyaC}*mO zN~mV4i7KdPS`*cPL&MbN+XgOPi_L={RK3{9kSG|mp&%aBbl}8E<9i=Oh!1u^ zHjElDB)#pl3F&xr`-AcrQiq-P6S|Or@`oF%9DH1PROCMi%X1L2JB`zBR2_yGtijNX z&c4$5$+)yEWfT^T(xgJI^W(?W2g3& z!E2{a*j}T*o9x)0OKRVay>-~~Gqqga<#->`r-OxKkIy8X4K zoU8vs0`!vhAMLR{<(yM{>I_#>9ixT3i=FvM4rhksH(Xh-S1o)Fe*Gi<-M6eisd4pj zu<;Fk>NgbJ;w-iLrDlDGZ9BCyr|&T8b5b|+`W|AJd#RrV{lH)!ao7)yO^{ZyYQKs& zP>!+zmIy0vqP)B`v&v1dTmxTQaMcW0f?Wc2?+k06+VcZ3wXoO0u9`6BORe$ zJJeGyay@UdpJFmtJcMa84)A+Rd#0@!ZpVdxCE`?dCeI7cIHh23Z4^}o4OIV|7F2N5 zBx9ERZ!$nGOcJH2W3%v#5kXid(L}M@b$v30coZqI!h5)|Be!LMjhh7kF-(*euqwd9 zZgUx+h3Kr=jpA5NbFI2&fn7Y=N=bn!q^lR$;E@^~$q4w01S(6z9gM5Y0oky1eUU^4 z4?p6KdW>RbjgdDeHrz+VUfSG##m?D`!9DGa-LW@g+__}uw)T-htyre17>Yq2WnwT$VwvkG$<*Ye7v@ zZPr(~9NB-i)02Biek>u2bRzRTE%($&p0>ln&x9UH4%?V|;S7Zaye6z7kVj(?YgPEi zNs6ZhF7|*EY6RVsg zqFjury#FM-u^CLFq4<1>c(2 z?Y~$C{P23f06XY2q#Gkxl5YPU(v<{skbw5Q-$m@qv4_~5V;`}nof(_iGiT<`JRV$n z=l;xp>Atd%lpc~bG?!teSGbRVJbY4AjuTLtI9P;fG)JDuq9iSXEP@mDV1EG~w!NbI z9oY|hG@+tBND_i zpgk#EvM_vY2PIKIrm;^*7eWrwV4oALIxaa6b? zttZ7UA4mC6cBl*?IqF1HJ?d}~ONg`t1$1*1&AAa)9q4$fRasDeCb>wJskt)yg&{xc z%*R5UZ+;Bs3J1Dofs!+Kk*Ogds>2=$qKe7!%DPN-ntww075bc};%oZbDcX_H3YROa PvCvt(Rl;l3syY7vjSImh literal 2014 zcma)7-ESL35Wl@IpFiU`O;Tt97f>Z56s3IxgpiWL3v!E6q{^~nT|686ocl1l>y%iR zr|{Z0{($ze|I)r9A@!LjkdTgti20Z-MU%YGP=!SW&OU^~F}2knKja$M%6jjrwP zyb__ypZCTpi3RNihA9dD(~L{?))G}5`RmJrFZw@9E@b~al;gAh)07{I=#2Ldxja?b zv=5Uo9cBF&(>N2nKh6@~Ka2QFxi>x6p7CF%;N-r-L><-tW+(!jHF?F^C`$j$OOOkb zPa$g9)t)gTC>kU-P^@=dpU%W^97?{%d$6=4w?%;F?E(lsilpLVU4W%sYZYMgRskA- z2XUN*0@g$*uMD?WAt>0jO(J%9*oYzW8H(JRAVW@V@emPvZG-)WU9g;q`^uTP6EA1r zykZx&@{vg{c)1<1OXtW^CGam9vx@P^qA{?LXQi%ozI*aqd&nzs-eJAnVHU@H#0P1Z z@WCJ&W~mCJRL)zHhj=&x!R0JgW_8*H_53|YzEVC#6O`_44?1c&O2o3Ixf3p z^Kj+(gIhV?o{9|jjt?YPDoRIk4cnSG?K`W0AKnaD!U1ZAbQ1(C((PX(T|qzx31~0I zUBu1;dx+fy_7Qu^$ysjaPVVL&lwNrke(t|^-&jaW56K#sYp>kZ?z5*y&vp4E5>gQd zbr6RO5W@a ze1_wnW0O?r#MtHAvIADJ&3tFeIMVJ|sVV+=%niPW1trvQreskoev$!?r75Q(v85p# z?=9x&49%5pE?+@KBIptm=1!yX5X53Zj1$BH6aGrdrtr*d9(;v9XEFbpYDl(G1Xi$0 MK5(wQRl+srAK`YOI{*Lx diff --git a/home/migrations/__pycache__/0001_initial.cpython-310.pyc b/home/migrations/__pycache__/0001_initial.cpython-310.pyc index 8e85794c906350a51bee16421630bb533900253e..c3d9c2fbcf580da454a12db1768c77c9fb4e1bfa 100644 GIT binary patch delta 79 zcmey*`h}G@pO=@50SL|nKS*xe$ZN=C;-sIEpPQ;*P?VUIk(ixWq@P)ypR6BIkdt4O Y3ZuX(ax>G55=%1k^NRH+*D^H$02!kj)c^nh delta 90 zcmeyu`k$3IpO=@50SKP`RZO0-k=KyP-q+bGCbT%Us5quFu{fhF#y>CBr6{v3HO3{i sIJ+djASNX%F)uwoCZZrGzbG{(BR@AaCO0#^D6u3nKd(4uauHJ#0F)acVgLXD diff --git a/home/migrations/__pycache__/0002_alter_data_desc_alter_data_img.cpython-310.pyc b/home/migrations/__pycache__/0002_alter_data_desc_alter_data_img.cpython-310.pyc index b02a78f0325ee16cdc6773af3b54ba45f88421d7..1aa98ffce23c848dad9ed9a6d9cedee06bce6cbe 100644 GIT binary patch delta 79 zcmZ3*I-iv{pO=@50SL|nKS(y*$a|2{BvL;kKQ~pspeQjZBQZO%NI$bYKUqJbASb^l Y6-I$oH8CbT%Us5quFu{fhF#y>CBr6{v3HO3{i sIJ+djASNX%F)uwoCZZrGzbG{(BR@AaCO0#^D6u3nKd(4uG85BW0B#&0xc~qF diff --git a/home/migrations/__pycache__/0003_alter_data_img.cpython-310.pyc b/home/migrations/__pycache__/0003_alter_data_img.cpython-310.pyc index 94707b0f5ee755300154f52a587ea3d3b6bad8ef..04782f90483bb3be276b5bc44884a38c4c884388 100644 GIT binary patch delta 114 zcmey)@`i;spO=@50SL|nKS-WCk@q;`t%+B!*@*!~ia^9KPyLMi+*JL7qQs<(#O%Z( u{mkVo7FxUUAIimyD5G haMQp>7Ks7Py~SaZo1apelWNBZ~WCW&mAMEWiK& diff --git a/home/migrations/__pycache__/0004_studentdata.cpython-310.pyc b/home/migrations/__pycache__/0004_studentdata.cpython-310.pyc index 738c4d33cb2d05f366bf639464394cfca52dd86e..1e07663abe6596fb9f357f308516fa24c4f31c04 100644 GIT binary patch delta 133 zcmeyx_MVM5pO=@50SL|nKS&PT$Scptcx$pQ<3dLM$>$lB*#v#0x?0v zFE{;+{M=Oif}+HvjKu83BK^$r{AB%zf}H%KR2T(Tk(-%blvt9PpI59u`2$me0Ne<$ LIYr8o6PTp{U6Ln3 delta 166 zcmaFQ_KS@-pO=@50SKP`RZPy@$Scpt7&Td!aUmn$?1OlWaxQE^OVVsS=UjDKFLOHpQ7YK%*2adt_5K}#B00{vmF=ha8+%MGt diff --git a/home/migrations/__pycache__/0005_alter_studentdata_class_10_marks_and_more.cpython-310.pyc b/home/migrations/__pycache__/0005_alter_studentdata_class_10_marks_and_more.cpython-310.pyc index 1f07757480577511cfed5c3428bf6acaf315a65e..935a5bab85568a96235731edf4b98ebf7cb6561b 100644 GIT binary patch delta 162 zcmZ3$HkFMxpO=@50SL|nKS*xa$jiwnd`rNRMu#3KF7^894|h=QE_qEr|KR*{>TUX)mpnV(mz nKRJbIk`~+uusKCiK*Mfv*yQG?l;)(`F#>tTEI>klNsJi)q4+J9 delta 151 zcmbQrwt$T{pO=@50SKP`RZL#Ek(ZNEI7-04z`!KFxTG{CHLoNku_Q5SvL<6TBm3m3 zjBTFcK($36;#a=2RZM7cYEf}aWnytgS&V;Ps!LI3S!#?+YH@Z+enCu1R$^XyeoRC` pPJU5pOh$fgYD{isdQoCYW`16A%;ZR>Ndj=wz(y8HO#aOz1pv&GFDd{4 diff --git a/home/migrations/__pycache__/__init__.cpython-310.pyc b/home/migrations/__pycache__/__init__.cpython-310.pyc index 60100dc2b6b5a3cfcb7d549622146c01efc0e67f..3b6e09e801c5c0ad421bd16d197875e93d0821fd 100644 GIT binary patch delta 75 zcmZ3+IGd3>pO=@50SL|nKbXjEV`8VDk)NBYUr>~ol#!U7Sfrm>o}a8AQIL~glnSH3 UDsnT^ixNvR^Ye=JC$=d70DE&8y8r+H delta 86 zcmbQuxQvlIpO=@50SKP`Rh-CeWAEu~6%$&VT2vfUnOK}r7UQ3n>Qay oUl5a$m6(^F9}`iKlV6k?laZgB8k3uuUX)mpnV(l2GqG9$0M@u4F#rGn diff --git a/home/urls.py b/home/urls.py index 5590f51..87dce55 100644 --- a/home/urls.py +++ b/home/urls.py @@ -1,16 +1,15 @@ -from django.contrib import admin from django.urls import path from home import views urlpatterns = [ path("", views.index , name ="home"), - path("login", views.login , name ="login"), - path("purchase", views.purchase , name ="purchase"), - path("register", views.register , name ="register"), - path("dashboard", views.dashboard , name ="dashboard"), + path("login/", views.login , name ="login"), + path("purchase/", views.purchase , name ="purchase"), + path("register/", views.register , name ="register"), + path("dashboard/", views.dashboard , name ="dashboard"), path("search/", views.search_result , name ="search"), - path("kiet_page", views.kiet_page , name ="kiet_page"), - path("done", views.done , name ="done"), - path("profile_settings", views.profile_settings , name ="profile_settings"), - path("save", views.save , name ="save"), + path("kiet_page/", views.kiet_page , name ="kiet_page"), + path("done/", views.done , name ="done"), + path("profile_settings/", views.profile_settings , name ="profile_settings"), + path("save/", views.save , name ="save"), ] diff --git a/home/views.py b/home/views.py index cef7d77..9e2c57d 100644 --- a/home/views.py +++ b/home/views.py @@ -1,5 +1,6 @@ import email import http +from django.contrib.auth.decorators import login_required from django.shortcuts import render from .models import Data from .models import StudentData @@ -18,6 +19,7 @@ def purchase(request): def register(request): return render(request , 'register.html') +@login_required(login_url="/accounts/login/") def dashboard(request): return render(request , 'dashboard.html') diff --git a/templates/account/account_inactive.html b/templates/account/account_inactive.html new file mode 100644 index 0000000..3347f4f --- /dev/null +++ b/templates/account/account_inactive.html @@ -0,0 +1,11 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Account Inactive" %}{% endblock %} + +{% block content %} +

{% trans "Account Inactive" %}

+ +

{% trans "This account is inactive." %}

+{% endblock %} diff --git a/templates/account/base.html b/templates/account/base.html new file mode 100644 index 0000000..cf58393 --- /dev/null +++ b/templates/account/base.html @@ -0,0 +1,42 @@ + + + + + + {% block head_title %}{% endblock %} + {% block extra_head %} + {% endblock %} + + + {% block body %} + + {% if messages %} +
+ Messages: +
    + {% for message in messages %} +
  • {{message}}
    • + {% endfor %} +
+
+ {% endif %} + +
+ Menu: + +
+ {% block content %} + {% endblock %} + {% endblock %} + {% block extra_body %} + {% endblock %} + + diff --git a/templates/account/email.html b/templates/account/email.html new file mode 100644 index 0000000..373cd66 --- /dev/null +++ b/templates/account/email.html @@ -0,0 +1,74 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "E-mail Addresses" %}{% endblock %} + +{% block content %} +

{% trans "E-mail Addresses" %}

+{% if user.emailaddress_set.all %} +

{% trans 'The following e-mail addresses are associated with your account:' %}

+ + + +{% else %} +

{% trans 'Warning:'%} {% trans "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}

+ +{% endif %} + + {% if can_add_email %} +

{% trans "Add E-mail Address" %}

+ +
+ {% csrf_token %} + {{ form.as_p }} + +
+ {% endif %} + +{% endblock %} + + +{% block extra_body %} + +{% endblock %} diff --git a/templates/account/email/account_already_exists_message.txt b/templates/account/email/account_already_exists_message.txt new file mode 100644 index 0000000..e2733a7 --- /dev/null +++ b/templates/account/email/account_already_exists_message.txt @@ -0,0 +1,13 @@ +{% extends "account/email/base_message.txt" %} +{% load i18n %} + +{% block content %}{% autoescape off %}{% blocktrans %}You are receiving this e-mail because you or someone else tried to signup for an +account using e-mail address: + +{{ email }} + +However, an account using that e-mail address already exists. In case you have +forgotten about this, please use the password forgotten procedure to recover +your account: + +{{ password_reset_url }}{% endblocktrans %}{% endautoescape %}{% endblock %} diff --git a/templates/account/email/account_already_exists_subject.txt b/templates/account/email/account_already_exists_subject.txt new file mode 100644 index 0000000..481edb0 --- /dev/null +++ b/templates/account/email/account_already_exists_subject.txt @@ -0,0 +1,4 @@ +{% load i18n %} +{% autoescape off %} +{% blocktrans %}Account Already Exists{% endblocktrans %} +{% endautoescape %} diff --git a/templates/account/email/base_message.txt b/templates/account/email/base_message.txt new file mode 100644 index 0000000..46f04f3 --- /dev/null +++ b/templates/account/email/base_message.txt @@ -0,0 +1,7 @@ +{% load i18n %}{% autoescape off %}{% blocktrans with site_name=current_site.name %}Hello from {{ site_name }}!{% endblocktrans %} + +{% block content %}{% endblock %} + +{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}Thank you for using {{ site_name }}! +{{ site_domain }}{% endblocktrans %} +{% endautoescape %} diff --git a/templates/account/email/email_confirmation_message.txt b/templates/account/email/email_confirmation_message.txt new file mode 100644 index 0000000..7f922d8 --- /dev/null +++ b/templates/account/email/email_confirmation_message.txt @@ -0,0 +1,7 @@ +{% extends "account/email/base_message.txt" %} +{% load account %} +{% load i18n %} + +{% block content %}{% autoescape off %}{% user_display user as user_display %}{% blocktrans with site_name=current_site.name site_domain=current_site.domain %}You're receiving this e-mail because user {{ user_display }} has given your e-mail address to register an account on {{ site_domain }}. + +To confirm this is correct, go to {{ activate_url }}{% endblocktrans %}{% endautoescape %}{% endblock %} diff --git a/templates/account/email/email_confirmation_signup_message.txt b/templates/account/email/email_confirmation_signup_message.txt new file mode 100644 index 0000000..9996f7e --- /dev/null +++ b/templates/account/email/email_confirmation_signup_message.txt @@ -0,0 +1 @@ +{% include "account/email/email_confirmation_message.txt" %} diff --git a/templates/account/email/email_confirmation_signup_subject.txt b/templates/account/email/email_confirmation_signup_subject.txt new file mode 100644 index 0000000..4c85ebb --- /dev/null +++ b/templates/account/email/email_confirmation_signup_subject.txt @@ -0,0 +1 @@ +{% include "account/email/email_confirmation_subject.txt" %} diff --git a/templates/account/email/email_confirmation_subject.txt b/templates/account/email/email_confirmation_subject.txt new file mode 100644 index 0000000..b0a876f --- /dev/null +++ b/templates/account/email/email_confirmation_subject.txt @@ -0,0 +1,4 @@ +{% load i18n %} +{% autoescape off %} +{% blocktrans %}Please Confirm Your E-mail Address{% endblocktrans %} +{% endautoescape %} diff --git a/templates/account/email/password_reset_key_message.txt b/templates/account/email/password_reset_key_message.txt new file mode 100644 index 0000000..5871c1e --- /dev/null +++ b/templates/account/email/password_reset_key_message.txt @@ -0,0 +1,9 @@ +{% extends "account/email/base_message.txt" %} +{% load i18n %} + +{% block content %}{% autoescape off %}{% blocktrans %}You're receiving this e-mail because you or someone else has requested a password for your user account. +It can be safely ignored if you did not request a password reset. Click the link below to reset your password.{% endblocktrans %} + +{{ password_reset_url }}{% if username %} + +{% blocktrans %}In case you forgot, your username is {{ username }}.{% endblocktrans %}{% endif %}{% endautoescape %}{% endblock %} diff --git a/templates/account/email/password_reset_key_subject.txt b/templates/account/email/password_reset_key_subject.txt new file mode 100644 index 0000000..6840c40 --- /dev/null +++ b/templates/account/email/password_reset_key_subject.txt @@ -0,0 +1,4 @@ +{% load i18n %} +{% autoescape off %} +{% blocktrans %}Password Reset E-mail{% endblocktrans %} +{% endautoescape %} diff --git a/templates/account/email/unknown_account_message.txt b/templates/account/email/unknown_account_message.txt new file mode 100644 index 0000000..e4e89d0 --- /dev/null +++ b/templates/account/email/unknown_account_message.txt @@ -0,0 +1,12 @@ +{% extends "account/email/base_message.txt" %} +{% load i18n %} + +{% block content %}{% autoescape off %}{% blocktrans %}You are receiving this e-mail because you or someone else has requested a +password for your user account. However, we do not have any record of a user +with email {{ email }} in our database. + +This mail can be safely ignored if you did not request a password reset. + +If it was you, you can sign up for an account using the link below.{% endblocktrans %} + +{{ signup_url }}{% endautoescape %}{% endblock %} diff --git a/templates/account/email/unknown_account_subject.txt b/templates/account/email/unknown_account_subject.txt new file mode 100644 index 0000000..6840c40 --- /dev/null +++ b/templates/account/email/unknown_account_subject.txt @@ -0,0 +1,4 @@ +{% load i18n %} +{% autoescape off %} +{% blocktrans %}Password Reset E-mail{% endblocktrans %} +{% endautoescape %} diff --git a/templates/account/email_confirm.html b/templates/account/email_confirm.html new file mode 100644 index 0000000..ac0891b --- /dev/null +++ b/templates/account/email_confirm.html @@ -0,0 +1,31 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% load account %} + +{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %} + + +{% block content %} +

{% trans "Confirm E-mail Address" %}

+ +{% if confirmation %} + +{% user_display confirmation.email_address.user as user_display %} + +

{% blocktrans with confirmation.email_address.email as email %}Please confirm that {{ email }} is an e-mail address for user {{ user_display }}.{% endblocktrans %}

+ +
+{% csrf_token %} + +
+ +{% else %} + +{% url 'account_email' as email_url %} + +

{% blocktrans %}This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request.{% endblocktrans %}

+ +{% endif %} + +{% endblock %} diff --git a/templates/account/login.html b/templates/account/login.html new file mode 100644 index 0000000..14af0da --- /dev/null +++ b/templates/account/login.html @@ -0,0 +1,107 @@ +{% if not user.is_authenticated %} +{% load widget_tweaks %} +{% load account socialaccount %} +{% load i18n %} +{% block content %} +{% get_providers as socialaccount_providers %} + + + + + + + + + + + + + {% if messages %} +
+ Messages: +
    + {% for message in messages %} +
  • {{message}}
    • + {% endfor %} +
+
+ {% endif %} +
+
+ +
+

Brand

+

Welcome back!

+ {% if socialaccount_providers %} + {% include "socialaccount/snippets/provider_list.html" with process="login" %} + + {% include "socialaccount/snippets/login_extra.html" %} + + {% endif %} + +
+ + or login with email + +
+ + + + + + {% endblock %} +
+
+ +
+ + +{% endif %} diff --git a/templates/account/login1.html b/templates/account/login1.html new file mode 100644 index 0000000..17bc3a6 --- /dev/null +++ b/templates/account/login1.html @@ -0,0 +1,46 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% load account socialaccount %} + +{% block head_title %}{% trans "Sign In" %}{% endblock %} + +{% block content %} + +

{% trans "Sign In" %}

+ +{% get_providers as socialaccount_providers %} + +{% if socialaccount_providers %} +

{% blocktrans with site.name as site_name %}Please sign in with one +of your existing third party accounts. Or, sign up +for a {{ site_name }} account and sign in below:{% endblocktrans %}

+ +
+ +
    + {% include "socialaccount/snippets/provider_list.html" with process="login" %} +
+ + + +
+ +{% include "socialaccount/snippets/login_extra.html" %} + +{% else %} +

{% blocktrans %}If you have not created an account yet, then please +sign up first.{% endblocktrans %}

+{% endif %} + + + +{% endblock %} diff --git a/templates/account/logout.html b/templates/account/logout.html new file mode 100644 index 0000000..2549a90 --- /dev/null +++ b/templates/account/logout.html @@ -0,0 +1,21 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Sign Out" %}{% endblock %} + +{% block content %} +

{% trans "Sign Out" %}

+ +

{% trans 'Are you sure you want to sign out?' %}

+ +
+ {% csrf_token %} + {% if redirect_field_value %} + + {% endif %} + +
+ + +{% endblock %} diff --git a/templates/account/messages/cannot_delete_primary_email.txt b/templates/account/messages/cannot_delete_primary_email.txt new file mode 100644 index 0000000..de55571 --- /dev/null +++ b/templates/account/messages/cannot_delete_primary_email.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}You cannot remove your primary e-mail address ({{email}}).{% endblocktrans %} diff --git a/templates/account/messages/email_confirmation_sent.txt b/templates/account/messages/email_confirmation_sent.txt new file mode 100644 index 0000000..7a526f8 --- /dev/null +++ b/templates/account/messages/email_confirmation_sent.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Confirmation e-mail sent to {{email}}.{% endblocktrans %} diff --git a/templates/account/messages/email_confirmed.txt b/templates/account/messages/email_confirmed.txt new file mode 100644 index 0000000..3427a4d --- /dev/null +++ b/templates/account/messages/email_confirmed.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}You have confirmed {{email}}.{% endblocktrans %} diff --git a/templates/account/messages/email_deleted.txt b/templates/account/messages/email_deleted.txt new file mode 100644 index 0000000..5cf7cf9 --- /dev/null +++ b/templates/account/messages/email_deleted.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Removed e-mail address {{email}}.{% endblocktrans %} diff --git a/templates/account/messages/logged_in.txt b/templates/account/messages/logged_in.txt new file mode 100644 index 0000000..f49248a --- /dev/null +++ b/templates/account/messages/logged_in.txt @@ -0,0 +1,4 @@ +{% load account %} +{% load i18n %} +{% user_display user as name %} +{% blocktrans %}Successfully signed in as {{name}}.{% endblocktrans %} diff --git a/templates/account/messages/logged_out.txt b/templates/account/messages/logged_out.txt new file mode 100644 index 0000000..2cd4627 --- /dev/null +++ b/templates/account/messages/logged_out.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}You have signed out.{% endblocktrans %} diff --git a/templates/account/messages/password_changed.txt b/templates/account/messages/password_changed.txt new file mode 100644 index 0000000..bd5801c --- /dev/null +++ b/templates/account/messages/password_changed.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Password successfully changed.{% endblocktrans %} diff --git a/templates/account/messages/password_set.txt b/templates/account/messages/password_set.txt new file mode 100644 index 0000000..9d224ee --- /dev/null +++ b/templates/account/messages/password_set.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Password successfully set.{% endblocktrans %} diff --git a/templates/account/messages/primary_email_set.txt b/templates/account/messages/primary_email_set.txt new file mode 100644 index 0000000..b6a70dd --- /dev/null +++ b/templates/account/messages/primary_email_set.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Primary e-mail address set.{% endblocktrans %} diff --git a/templates/account/messages/unverified_primary_email.txt b/templates/account/messages/unverified_primary_email.txt new file mode 100644 index 0000000..9c9d0d8 --- /dev/null +++ b/templates/account/messages/unverified_primary_email.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}Your primary e-mail address must be verified.{% endblocktrans %} diff --git a/templates/account/password_change.html b/templates/account/password_change.html new file mode 100644 index 0000000..108cced --- /dev/null +++ b/templates/account/password_change.html @@ -0,0 +1,16 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Change Password" %}{% endblock %} + +{% block content %} +

{% trans "Change Password" %}

+ +
+ {% csrf_token %} + {{ form.as_p }} + + {% trans "Forgot Password?" %} +
+{% endblock %} diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html new file mode 100644 index 0000000..de23d9e --- /dev/null +++ b/templates/account/password_reset.html @@ -0,0 +1,24 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% load account %} + +{% block head_title %}{% trans "Password Reset" %}{% endblock %} + +{% block content %} + +

{% trans "Password Reset" %}

+ {% if user.is_authenticated %} + {% include "account/snippets/already_logged_in.html" %} + {% endif %} + +

{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}

+ +
+ {% csrf_token %} + {{ form.as_p }} + +
+ +

{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}

+{% endblock %} diff --git a/templates/account/password_reset_done.html b/templates/account/password_reset_done.html new file mode 100644 index 0000000..d947d79 --- /dev/null +++ b/templates/account/password_reset_done.html @@ -0,0 +1,16 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% load account %} + +{% block head_title %}{% trans "Password Reset" %}{% endblock %} + +{% block content %} +

{% trans "Password Reset" %}

+ + {% if user.is_authenticated %} + {% include "account/snippets/already_logged_in.html" %} + {% endif %} + +

{% blocktrans %}We have sent you an e-mail. If you have not received it please check your spam folder. Otherwise contact us if you do not receive it in a few minutes.{% endblocktrans %}

+{% endblock %} diff --git a/templates/account/password_reset_from_key.html b/templates/account/password_reset_from_key.html new file mode 100644 index 0000000..7da153b --- /dev/null +++ b/templates/account/password_reset_from_key.html @@ -0,0 +1,19 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% block head_title %}{% trans "Change Password" %}{% endblock %} + +{% block content %} +

{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}

+ + {% if token_fail %} + {% url 'account_reset_password' as passwd_reset_url %} +

{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a new password reset.{% endblocktrans %}

+ {% else %} +
+ {% csrf_token %} + {{ form.as_p }} + +
+ {% endif %} +{% endblock %} diff --git a/templates/account/password_reset_from_key_done.html b/templates/account/password_reset_from_key_done.html new file mode 100644 index 0000000..85641c2 --- /dev/null +++ b/templates/account/password_reset_from_key_done.html @@ -0,0 +1,9 @@ +{% extends "account/base.html" %} + +{% load i18n %} +{% block head_title %}{% trans "Change Password" %}{% endblock %} + +{% block content %} +

{% trans "Change Password" %}

+

{% trans 'Your password is now changed.' %}

+{% endblock %} diff --git a/templates/account/password_set.html b/templates/account/password_set.html new file mode 100644 index 0000000..f561572 --- /dev/null +++ b/templates/account/password_set.html @@ -0,0 +1,15 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Set Password" %}{% endblock %} + +{% block content %} +

{% trans "Set Password" %}

+ +
+ {% csrf_token %} + {{ form.as_p }} + +
+{% endblock %} diff --git a/templates/account/signup.html b/templates/account/signup.html new file mode 100644 index 0000000..ab69892 --- /dev/null +++ b/templates/account/signup.html @@ -0,0 +1,80 @@ +{% load i18n %} + + + + + + + + + + + {% block content %} + + + {% if messages %} +
+ Messages: +
    + {% for message in messages %} +
  • {{message}}
    • + {% endfor %} +
+
+ {% endif %} +
+ +
+ + logo + +
+

+
+

+ Welcome to Xplore. +

+
+
+
+
+
+
+
+
+ Sign Up +
+
+ Register yourself to get started +
+
+ +
+ Already a member? + + + Login + + + +
+ +
+ {% endblock %} +
+
+
+
+ + diff --git a/templates/account/signup1.html b/templates/account/signup1.html new file mode 100644 index 0000000..8b53b44 --- /dev/null +++ b/templates/account/signup1.html @@ -0,0 +1,21 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Signup" %}{% endblock %} + +{% block content %} +

{% trans "Sign Up" %}

+ +

{% blocktrans %}Already have an account? Then please sign in.{% endblocktrans %}

+ + + +{% endblock %} diff --git a/templates/account/signup_closed.html b/templates/account/signup_closed.html new file mode 100644 index 0000000..bc83950 --- /dev/null +++ b/templates/account/signup_closed.html @@ -0,0 +1,11 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %} + +{% block content %} +

{% trans "Sign Up Closed" %}

+ +

{% trans "We are sorry, but the sign up is currently closed." %}

+{% endblock %} diff --git a/templates/account/snippets/already_logged_in.html b/templates/account/snippets/already_logged_in.html new file mode 100644 index 0000000..00799f0 --- /dev/null +++ b/templates/account/snippets/already_logged_in.html @@ -0,0 +1,5 @@ +{% load i18n %} +{% load account %} + +{% user_display user as user_display %} +

{% trans "Note" %}: {% blocktrans %}you are already logged in as {{ user_display }}.{% endblocktrans %}

diff --git a/templates/account/verification_sent.html b/templates/account/verification_sent.html new file mode 100644 index 0000000..3b2d7e5 --- /dev/null +++ b/templates/account/verification_sent.html @@ -0,0 +1,12 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} + +{% block content %} +

{% trans "Verify Your E-mail Address" %}

+ +

{% blocktrans %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. If you do not see the verification e-mail in your main inbox, check your spam folder. Please contact us if you do not receive the verification e-mail within a few minutes.{% endblocktrans %}

+ +{% endblock %} diff --git a/templates/account/verified_email_required.html b/templates/account/verified_email_required.html new file mode 100644 index 0000000..d8e5378 --- /dev/null +++ b/templates/account/verified_email_required.html @@ -0,0 +1,23 @@ +{% extends "account/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %} + +{% block content %} +

{% trans "Verify Your E-mail Address" %}

+ +{% url 'account_email' as email_url %} + +

{% blocktrans %}This part of the site requires us to verify that +you are who you claim to be. For this purpose, we require that you +verify ownership of your e-mail address. {% endblocktrans %}

+ +

{% blocktrans %}We have sent an e-mail to you for +verification. Please click on the link inside that e-mail. If you do not see the verification e-mail in your main inbox, check your spam folder. Otherwise +contact us if you do not receive it within a few minutes.{% endblocktrans %}

+ +

{% blocktrans %}Note: you can still change your e-mail address.{% endblocktrans %}

+ + +{% endblock %} diff --git a/templates/dashboard.html b/templates/dashboard.html index d75c29a..0e8b0e1 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -66,19 +66,19 @@ diff --git a/templates/index.html b/templates/index.html index e7bf0c9..261a905 100644 --- a/templates/index.html +++ b/templates/index.html @@ -68,12 +68,14 @@ href="#contactus">Contact Us - + {% if not user.is_authenticated %} + + {% endif %}
diff --git a/templates/login.html b/templates/login.html index 6a5a0c9..39931b5 100644 --- a/templates/login.html +++ b/templates/login.html @@ -1,3 +1,8 @@ +{% load i18n %} +{% load account socialaccount %} +{% block content %} +{% get_providers as socialaccount_providers %} + @@ -19,43 +24,53 @@

Brand

Welcome back!

- -
- - - - - - -
-

Sign in with Google

- + {% if socialaccount_providers %} + {% include "socialaccount/snippets/provider_list.html" with process="login" %} + + {% include "socialaccount/snippets/login_extra.html" %} + + {% endif %} +
or login with email
-
- - -
-
-
- - Forget Password? +
-
+
+
+ + Forget Password? +
+ +
+
-
-
- - or sign up - -
+
+
+ + or sign up + +
+
+ +
+ +
+ {% endblock %} + diff --git a/templates/openid/base.html b/templates/openid/base.html new file mode 100644 index 0000000..671d403 --- /dev/null +++ b/templates/openid/base.html @@ -0,0 +1 @@ +{% extends "socialaccount/base.html" %} diff --git a/templates/openid/login.html b/templates/openid/login.html new file mode 100644 index 0000000..b27ee37 --- /dev/null +++ b/templates/openid/login.html @@ -0,0 +1,18 @@ +{% extends "openid/base.html" %} + +{% load i18n %} + +{% block head_title %}OpenID Sign In{% endblock %} + +{% block content %} + +

{% trans 'OpenID Sign In' %}

+ + + + +{% endblock %} diff --git a/templates/socialaccount/authentication_error.html b/templates/socialaccount/authentication_error.html new file mode 100644 index 0000000..0300295 --- /dev/null +++ b/templates/socialaccount/authentication_error.html @@ -0,0 +1,11 @@ +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Social Network Login Failure" %}{% endblock %} + +{% block content %} +

{% trans "Social Network Login Failure" %}

+ +

{% trans "An error occurred while attempting to login via your social network account." %}

+{% endblock %} diff --git a/templates/socialaccount/base.html b/templates/socialaccount/base.html new file mode 100644 index 0000000..b64fd56 --- /dev/null +++ b/templates/socialaccount/base.html @@ -0,0 +1 @@ +{% extends "account/base.html" %} diff --git a/templates/socialaccount/connections.html b/templates/socialaccount/connections.html new file mode 100644 index 0000000..f7c2729 --- /dev/null +++ b/templates/socialaccount/connections.html @@ -0,0 +1,54 @@ +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Account Connections" %}{% endblock %} + +{% block content %} +

{% trans "Account Connections" %}

+ +{% if form.accounts %} +

{% blocktrans %}You can sign in to your account using any of the following third party accounts:{% endblocktrans %}

+ + +
+{% csrf_token %} + +
+{% if form.non_field_errors %} +
{{ form.non_field_errors }}
+{% endif %} + +{% for base_account in form.accounts %} +{% with base_account.get_provider_account as account %} +
+ +
+{% endwith %} +{% endfor %} + +
+ +
+ +
+ +
+ +{% else %} +

{% trans 'You currently have no social network accounts connected to this account.' %}

+{% endif %} + +

{% trans 'Add a 3rd Party Account' %}

+ +
    +{% include "socialaccount/snippets/provider_list.html" with process="connect" %} +
+ +{% include "socialaccount/snippets/login_extra.html" %} + +{% endblock %} diff --git a/templates/socialaccount/login.html b/templates/socialaccount/login.html new file mode 100644 index 0000000..0ce2ed9 --- /dev/null +++ b/templates/socialaccount/login.html @@ -0,0 +1,21 @@ +{% extends "socialaccount/base.html" %} +{% load i18n %} + +{% block head_title %}{% trans "Sign In" %}{% endblock %} + +{% block content %} +{% if process == "connect" %} +

{% blocktrans with provider.name as provider %}Connect {{ provider }}{% endblocktrans %}

+ +

{% blocktrans with provider.name as provider %}You are about to connect a new third party account from {{ provider }}.{% endblocktrans %}

+{% else %} +

{% blocktrans with provider.name as provider %}Sign In Via {{ provider }}{% endblocktrans %}

+ +

{% blocktrans with provider.name as provider %}You are about to sign in using a third party account from {{ provider }}.{% endblocktrans %}

+{% endif %} + +
+ {% csrf_token %} + +
+{% endblock %} diff --git a/templates/socialaccount/login_cancelled.html b/templates/socialaccount/login_cancelled.html new file mode 100644 index 0000000..8d76786 --- /dev/null +++ b/templates/socialaccount/login_cancelled.html @@ -0,0 +1,15 @@ +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Login Cancelled" %}{% endblock %} + +{% block content %} + +

{% trans "Login Cancelled" %}

+ +{% url 'account_login' as login_url %} + +

{% blocktrans %}You decided to cancel logging in to our site using one of your existing accounts. If this was a mistake, please proceed to sign in.{% endblocktrans %}

+ +{% endblock %} diff --git a/templates/socialaccount/messages/account_connected.txt b/templates/socialaccount/messages/account_connected.txt new file mode 100644 index 0000000..be6aa60 --- /dev/null +++ b/templates/socialaccount/messages/account_connected.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}The social account has been connected.{% endblocktrans %} diff --git a/templates/socialaccount/messages/account_connected_other.txt b/templates/socialaccount/messages/account_connected_other.txt new file mode 100644 index 0000000..e90f6cc --- /dev/null +++ b/templates/socialaccount/messages/account_connected_other.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}The social account is already connected to a different account.{% endblocktrans %} diff --git a/templates/socialaccount/messages/account_connected_updated.txt b/templates/socialaccount/messages/account_connected_updated.txt new file mode 100644 index 0000000..3f7174e --- /dev/null +++ b/templates/socialaccount/messages/account_connected_updated.txt @@ -0,0 +1 @@ +{% extends "socialaccount/messages/account_connected.txt" %} diff --git a/templates/socialaccount/messages/account_disconnected.txt b/templates/socialaccount/messages/account_disconnected.txt new file mode 100644 index 0000000..fd43f30 --- /dev/null +++ b/templates/socialaccount/messages/account_disconnected.txt @@ -0,0 +1,2 @@ +{% load i18n %} +{% blocktrans %}The social account has been disconnected.{% endblocktrans %} diff --git a/templates/socialaccount/signup.html b/templates/socialaccount/signup.html new file mode 100644 index 0000000..caa2de2 --- /dev/null +++ b/templates/socialaccount/signup.html @@ -0,0 +1,22 @@ +{% extends "socialaccount/base.html" %} + +{% load i18n %} + +{% block head_title %}{% trans "Signup" %}{% endblock %} + +{% block content %} +

{% trans "Sign Up" %}

+ +

{% blocktrans with provider_name=account.get_provider.name site_name=site.name %}You are about to use your {{provider_name}} account to login to +{{site_name}}. As a final step, please complete the following form:{% endblocktrans %}

+ + + +{% endblock %} diff --git a/templates/socialaccount/snippets/login_extra.html b/templates/socialaccount/snippets/login_extra.html new file mode 100644 index 0000000..307def4 --- /dev/null +++ b/templates/socialaccount/snippets/login_extra.html @@ -0,0 +1,3 @@ +{% load socialaccount %} + +{% providers_media_js %} diff --git a/templates/socialaccount/snippets/provider_list.html b/templates/socialaccount/snippets/provider_list.html new file mode 100644 index 0000000..495e8e0 --- /dev/null +++ b/templates/socialaccount/snippets/provider_list.html @@ -0,0 +1,45 @@ +{% load socialaccount %} + +{% get_providers as socialaccount_providers %} + +{% for provider in socialaccount_providers %} +{% if provider.id == "openid" %} +{% for brand in provider.get_brands %} + +
  • + {{brand.name}} +
    • + +{% endfor %} +{% endif %} + +{% comment %} check if the provider is gogole {% endcomment %} + +{% if provider.name == "Google" %} +{% comment %} {% endcomment %} +
    + {% csrf_token %} + +
    +{%else%} +
  • + {{provider.name}} +
    • +{% endif %} + +{% endfor %} diff --git a/templates/tests/test_403_csrf.html b/templates/tests/test_403_csrf.html new file mode 100644 index 0000000..86f9aea --- /dev/null +++ b/templates/tests/test_403_csrf.html @@ -0,0 +1,2 @@ +{% load socialaccount %} +Sign In From e676786ddae97e2b550f7f39b2b107e456dc9c18 Mon Sep 17 00:00:00 2001 From: Prabhakar Mishra Date: Wed, 8 Feb 2023 02:35:34 +0530 Subject: [PATCH 2/3] updated requirements.txt --- requirements.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/requirements.txt b/requirements.txt index f9b9813..60b2d61 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,20 @@ asgiref==3.5.2 +certifi==2022.12.7 +cffi==1.15.1 +charset-normalizer==3.0.1 +cryptography==39.0.0 +defusedxml==0.7.1 Django==4.1.1 +django-allauth==0.52.0 +django-jazzmin==2.6.0 +django-widget-tweaks==1.4.12 +idna==3.4 +oauthlib==3.2.2 +pycparser==2.21 +PyJWT==2.6.0 +python3-openid==3.2.0 +requests==2.28.2 +requests-oauthlib==1.3.1 sqlparse==0.4.2 tzdata==2022.2 +urllib3==1.26.14 From e9dc27ef90434b46dd1f63bd763ccabf70fa5658 Mon Sep 17 00:00:00 2001 From: Prabhakar Mishra Date: Thu, 9 Feb 2023 01:28:30 +0530 Subject: [PATCH 3/3] Fixed authenication issues --- College/__pycache__/settings.cpython-310.pyc | Bin 2748 -> 2886 bytes College/settings.py | 7 +- db.sqlite3 | Bin 233472 -> 233472 bytes home/__pycache__/views.cpython-310.pyc | Bin 2117 -> 2214 bytes home/views.py | 4 +- static/avatar.png | Bin 0 -> 16785 bytes templates/account/login.html | 4 +- templates/account/signup.html | 150 ++++++++++++------ templates/dashboard.html | 23 +-- templates/index.html | 18 ++- .../socialaccount/snippets/provider_list.html | 4 +- 11 files changed, 143 insertions(+), 67 deletions(-) create mode 100644 static/avatar.png diff --git a/College/__pycache__/settings.cpython-310.pyc b/College/__pycache__/settings.cpython-310.pyc index bb49408c6ab94c9fcbcc7be6c0769255604837ee..a3adbb8044321d0754024abe4c47bbc94b054cdc 100644 GIT binary patch delta 207 zcmdlZdQ6NrpO=@50SJ8lK2H8Vkyn<{ZKJjoqo8(_Qi@KLatcS3N(yr@gQo80EXD_H z7FBvFS&4b+`FhFuMX7qZiJ3WiNr}nXsd*{IK%uXw7h}_8TdrCT7G4%67Df&x0FZ}2TmS$7 delta 69 zcmX>mwnvmVpO=@50SK%XJxVT`$SccewNcxOk(D`^K~sBk8RG*sCQYTyeH?QcIae|i X*#H$5*-S3u@?xx+e2}Y_iGvpaX($o9 diff --git a/College/settings.py b/College/settings.py index e160748..deff15f 100644 --- a/College/settings.py +++ b/College/settings.py @@ -168,4 +168,9 @@ } } -LOGIN_REDIRECT_URL = '/dashboard/' \ No newline at end of file +LOGIN_REDIRECT_URL = '/dashboard/' + +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' +ACCOUNT_EMAIL_VERIFICATION = "none" + +ACCOUNT_LOGOUT_ON_GET = True diff --git a/db.sqlite3 b/db.sqlite3 index 7e1aea88351c961a92bc1b3d5e83141cb4808e42..a1ce6952ede09b7e4e4500639c2c81f2385cc8dd 100644 GIT binary patch delta 1354 zcmaizYe-vX7{||>)0*pfAC`u7ZeO~~x58j-Y%tb-84TuN`&5vfM5Xou`*5BE@AEw8 z`MuBof7VNQy@ao{pd0T!*Mn|+F_X5`>03{deW!_ISx(;c_G}~py{D#J`VZ{`&(dE=MQ=Nscecb|7HZuf+zg1w$0j!)$~ zeB*K#OS4=j&34kFnUNg4cd(3u6)ZfMEv!Wp1)5>Y*W)jv zhMER8-a!k>mn5DO3%d!sir6ZQ)NdAUE~KjkTva5Fwg{}9XZZ5zHWX43DN|-4Hw{bkRe^EFQI9uJ5C~W%v6*=L+_9#I9F7Ej;ty;r=Ys`lccG5 z@itl~P1;mZ{gsl`rj*Homa&?>MWALI@pkVRezp#(0Y)*p!_y%)zyekz}Rx9SWTy zG4@r|yXX~M9Nk0hjcj%IHrhec7Ks)Ws~aned+3AKMm5|elq}s?ngW+_S1$hm{690k@z8Kf^lAgAeS=EzB_ZtiF!WXi+DA{O4)X)e`O0 zqsBF9YsXf@6OJjaUshdI=6DIX53_IwF2M?11FteifYU~@6Fojc-$=ICBz|Z+T@z_N z6#L<+wsPsJD*u~Nt)3waCH=IH)84}0YPQrfbuX1i>UDK0bf)s!n`9Sy(PljEy^weQ zpX$Zkcgb%CLLQeRH#O_yQu&;?6cW#-R9m+INHO zuaonske=+42Oe?HQZFdsK1thT$dBp!nfL(HjTXZ#@jklMH7ktR1EVD^ zbKQ`w$}shen%PV#ZYmH=+3CI}T zRV{<=;pUJW{B-g!nn0Cd8H;#^YS8P`1Xjyoulku@X$jOk{R^dKa_%0y+73BdBI0}c zH-#*-5()etG&Q8f#B89S(se;&D*B3->(I4ep+n2b=q0q7lKqR{Xe-ry1no3WmKApx zw&CLlj!K_{=dAFW!gYpU*hL+i>U{x0eVso&iHE`s7WKO(j9g?}d=EGD$0v2Q6NowDby6sq0mKGFKKDzeW*h!ZUp({ zT>T%Cqc8nIyyld1PAyQNGh9h^Lo8v;qTGE?;}>StoJmz{Bv;f z0}lBY5^iypSp9;tKEt`4*s0TZ7_B*pn|ggO_4_`~UG62NH0TFL_E9eP%SNx1RMKj{ zigLiqZ>)ZeS9le9o!59Bd4o6j8uB&a@FrhBXS~HX-dJa>-{hNo3wPG}Hs3+s;&=F6 zUen+7CZq%vP_>bR)@!aW(+)$211P+qU*WWL$s_aEeQj`oK^Z zRox#$6(X-5s3{kjT1?q*5h*NxB-7D6!y)e>nOkFP%pg!UXJ_bKIdeRmGaJKjdb4Vm zhjMh7hrqkDN{pWW?2J^Jv|a5^C5F+AcPzeq$8U=E3!E}iN7gAkVP{);j z_Pe7z72OGhhokT~gl>G2N8R5iNe*JkjK-^2oXF1Pwf2lpx@zeo30S}?4AxM*Hm#4O ztuQf6h|;iovx+%J6Zr)*!9f+3Oi%@B;8c4?jf{V^k)Wd%vTGed6L-mceKLh;6iQ({ zz&bAful-=DM`mGz$R?6oH~=w>r4n$HgQecq$^l8UW;cwYe3~iQH7RxxC*=ZKQ%G+1 z-&mpGh5*Vd#XIO%np3o4=W3D!4-bby;R_T9g`6GR@E9fb*5>v*cFN`qc9k=B$KITA z=bW9|%ExQP0-f72J97}NCGMXwW)-L!6Y1tuP79Q$IotOo#)w2V0TI9o0Z|uZ)JFE z0y&nUtm9S_S(2Y@8fo}g3&=ml55PD)W@=l)yworR$E5UhdeLFJxyU;KLTQkRcnkcu#m%OyhCLO@nMJFkPa774x!3H0(B1ETqt4Hfr_R| z7Ok6J7%ah@i$t2jD^gf$^TWPnOo^JO lA@~k$P80DxJ)n|w1AL5XSe8YqffIN*@Lyp_t0dK&{{Ta(+{*v} delta 1038 zcmah{J#W)c6wR}p_#?6NU79o`E#)gzWMhFMP!SRnKOjpKdS4R@=YwkpA(jqQVq%E= z7Z6fGVt|pEow4!;e}NSV?lrQDBBa>zx#zuie6HVlepmila%Q$|W$1eF_Q&Ce+|p@@ z_shNRvB-c1SuZ!y`+CfC#Erf|JOjFCPOQE~+yL_=)6atid8!2{fKAl~2Z~f3sX__L zZv<4JdXjl1`bDTgomNV)0T-y2VG|luE6{{3s#R#gMXI8y2|61mNy%@)ALu6 zw~d7qY+_M17BR&lLy0{erXKcufrsOvFW1-@iLR77l~Y1pAueHt{jpn259NlTqRWZ*ES&EwsD?!=5 z98weml>WjCn&Ee?A=62}$FC4rN#OvL9Y!qqX7kxkcrS}dT t5@Y-;m6`FoSYv22bQrc7b{M$DKW*c4vqR5lwUb_kn%tHkmgiAH{R4Rv(Gmav diff --git a/home/views.py b/home/views.py index 9e2c57d..79c31f6 100644 --- a/home/views.py +++ b/home/views.py @@ -1,13 +1,15 @@ import email import http from django.contrib.auth.decorators import login_required -from django.shortcuts import render +from django.shortcuts import render, redirect from .models import Data from .models import StudentData from django.db.models import Q # Create your views here. def index(request): + if request.user.is_authenticated: + return redirect('/dashboard/') return render(request , 'index.html') def login(request): diff --git a/static/avatar.png b/static/avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..e9e1a2d0b62865749a5eaaf1305ab7181f990ffa GIT binary patch literal 16785 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
    -

    Brand

    +

    Xplore

    Welcome back!

    {% if socialaccount_providers %} {% include "socialaccount/snippets/provider_list.html" with process="login" %} @@ -45,7 +45,7 @@

    Brand

    - or login with email + or login with username
    diff --git a/templates/account/signup.html b/templates/account/signup.html index ab69892..b6e38d9 100644 --- a/templates/account/signup.html +++ b/templates/account/signup.html @@ -1,5 +1,5 @@ {% load i18n %} - +{% load widget_tweaks %} @@ -7,71 +7,125 @@ + - {% block content %} - - {% if messages %} -
    - Messages: -
      - {% for message in messages %} -
    • {{message}}
      • - {% endfor %} -
    -
    - {% endif %} -
    -
    - - logo - -
    -

    -
    -

    - Welcome to Xplore. -

    -
    -
    -
    +
    +
    + +
    + + logo + +
    +
    Sign Up
    Register yourself to get started
    -
    - -
    - Already a member? - - - Login - - +
    +
    + Username + {% render_field form.username class="form-control" %} + + +
    +
    + Email + {% render_field form.email class="form-control" %} + + +
    +
    + Password + {% render_field form.password1 class="form-control" %} + + +
    +
    + Password Confirm + {% render_field form.password2 class="form-control" %} + +
    + + +
    + + +
    + Already a member? + + + Login + +
    - +
    - {% endblock %}
    diff --git a/templates/dashboard.html b/templates/dashboard.html index 0e8b0e1..f661b12 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -12,7 +12,7 @@ {% load static %} - + @@ -60,16 +60,12 @@
    +
    - @@ -190,6 +186,15 @@
    Sign Out
    + {% if messages %} +
    +
      + {% for message in messages %} +

      {{message}}

      + {% endfor %} +
    +
    + {% endif %}
    @@ -881,7 +886,7 @@

    - logo + logo diff --git a/templates/index.html b/templates/index.html index 261a905..4f5f2d1 100644 --- a/templates/index.html +++ b/templates/index.html @@ -81,7 +81,17 @@
    -
    +
    + {% if messages %} +
    + Messages: +
      + {% for message in messages %} +
    • {{message}}
      • + {% endfor %} +
    +
    + {% endif %}
    @@ -89,7 +99,7 @@

    Navigating Lives

    Providing an easy way to apply to your dream college

    -     + @@ -588,7 +598,7 @@

    - + @@ -791,7 +801,7 @@

    Get started with Xplore and make the trip to your dream college easier.

    -     + diff --git a/templates/socialaccount/snippets/provider_list.html b/templates/socialaccount/snippets/provider_list.html index 495e8e0..234a170 100644 --- a/templates/socialaccount/snippets/provider_list.html +++ b/templates/socialaccount/snippets/provider_list.html @@ -20,10 +20,10 @@ {% if provider.name == "Google" %} {% comment %} {% endcomment %} -
    + {% csrf_token %}