From 11acfc621c3dcfe171bf6508d8c21c5f861a6e6a Mon Sep 17 00:00:00 2001
From: Amanda Cruz Lima <amandacruzlima.ac@gmail.com>
Date: Thu, 12 Dec 2024 17:12:40 -0300
Subject: [PATCH] resolvendo o problema do modal

---
 .../__pycache__/__init__.cpython-312.pyc      | Bin 181 -> 170 bytes
 .../Users/__pycache__/admin.cpython-312.pyc   | Bin 2449 -> 2444 bytes
 .../Users/__pycache__/apps.cpython-312.pyc    | Bin 485 -> 474 bytes
 .../Users/__pycache__/forms.cpython-312.pyc   | Bin 1993 -> 1982 bytes
 .../Users/__pycache__/models.cpython-312.pyc  | Bin 1851 -> 1840 bytes
 .../Users/__pycache__/views.cpython-312.pyc   | Bin 4584 -> 4524 bytes
 mamutes/Users/static/scripts/openModal.js     |  25 ++++++++++++++++--
 mamutes/Users/templates/recoverAccount.html   |   6 ++---
 mamutes/Users/views.py                        |  25 ++++++++----------
 mamutes/db.sqlite3                            | Bin 176128 -> 176128 bytes
 mamutes/mamutes/urls.py                       |   6 ++---
 11 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/mamutes/Users/__pycache__/__init__.cpython-312.pyc b/mamutes/Users/__pycache__/__init__.cpython-312.pyc
index a69dd068b058145b77776a2a5028aee65da68d90..df16278e01d5ce837f8b55f13aec669b681d2b1c 100644
GIT binary patch
delta 98
zcmdnWxQdbcG%qg~0}!mViJHi5?Ct4n6%$&VT2vg9n46fF662qj>Qa<hmKx)dpIn-o
vnpcuv9Aji)WTI!J>sXYTS{##`m|I!`q#>H(<1_OzOXB183My|+oT3N-6dxjK

delta 109
zcmZ3*xRsInG%qg~0}ymgi<ro592TOVk)NBYpPZPPubWbuSX81Po?nz*T#%TYs&5kP
z>gyUD66C7y>k_PAP?VpgZ)9L(qGzP*Sd^Jste=~hTUr97LyJ?3iuL2;GxIV_;^XxS
KDt}GvR0IG>=_GOh

diff --git a/mamutes/Users/__pycache__/admin.cpython-312.pyc b/mamutes/Users/__pycache__/admin.cpython-312.pyc
index 65e18ac083d326c3390fa4ba14f02709416e0f56..39e0a0e60588eeefc0ed54ef10d181510a299dbc 100644
GIT binary patch
delta 147
zcmbOz+#}3;nwOW00SH#wM5UkK$lJth@8)b36Iz^FR2-9-o0yjp<DZx6Qj}Si8sn0m
zT$-DjSCU^GV`N}tqGzP*Sd^Js9Fv=vTUr97A(}SdWd6vgV*)g?f#C+faDQcI<qqck
u+&j7V^Y7%pV&QpN((9sy=Zdr$YV-AH>tC?&ytw%TD<d=Gt;wG_<^uqMnKj!0

delta 135
zcmeAXo+!+FnwOW00SLOLMWip?$lJv16{w$)pPQ<moS2!fn^KxsRH7fAUzA;3keHmR
zZxZb4>lz#q<f`xM60BcPl%J(<WME{XXQb;`l$lzrpPQIlS^}g)i&Kk=^*5hm{>aFv
mH~9do82@Dp&ufxiE7E4D&DWo;e`)h;Rz_yVUz6W*%m)CNt1kHf

diff --git a/mamutes/Users/__pycache__/apps.cpython-312.pyc b/mamutes/Users/__pycache__/apps.cpython-312.pyc
index ff50487664e714875c09f80dac8bce51eaf2cc8b..b6e35df2679d81f599c5c8b5a42c7ce71cc6fb96 100644
GIT binary patch
delta 96
zcmaFLe2ba)G%qg~0}!mViAtZek(Zg#-qqPECbT%Us5mAuH!&|I#y>CBr6{v3HO3`B
tximL5uOz=X#>l|PM9)aqu_!aOI3_nSx3mOELo`i}VvJ(EHF+ze0RZ8PAm9K1

delta 107
zcmcb`{FIsZG%qg~0}ymgi%9R?$ji*=6`-GypPQ<moS2!fn^KxsRH7fAUzA;3keHmR
zZxZb4>lz#q<f`xM60BcPl%J(<WME{XXQb;`l$lzrpPQIlS^}g)i&Kk=^(Xr?Mlt@H
Iyo%8P02vV?*#H0l

diff --git a/mamutes/Users/__pycache__/forms.cpython-312.pyc b/mamutes/Users/__pycache__/forms.cpython-312.pyc
index 900e690a3420ce72b3fe1756bbf0173c6b947d66..b72af95c3d00601f01ac51b5fdb85ccad569344f 100644
GIT binary patch
delta 97
zcmX@fzmK2yG%qg~0}!mViArCyk(ZU(-p$!6CbT%Us5mAuH!&|I#y>CBr6{v3HO3`B
uximL5uOz=X#>l|PM9)aqu_!aOI3_nSx3mOELo{uUVOC;cyfwL=-3tKy0U)^m

delta 108
zcmdnTf0Cc~G%qg~0}ymgi%9R>$ji#?6{w$)pPQ<moS2!fn^KxsRH7fAUzA;3keHmR
zZxZb4>lz#q<f`xM60BcPl%J(<WME{XXQb;`l$lzrpPQIlS^}g)i&Kk=^*0AHE3q*C
Jnq0!}1pq6yB9s6C

diff --git a/mamutes/Users/__pycache__/models.cpython-312.pyc b/mamutes/Users/__pycache__/models.cpython-312.pyc
index 0bf68280ee6161027027179b9b2766024e836f7d..24f5df883bb64e6b7970e2d8280e3032fe35af4e 100644
GIT binary patch
delta 97
zcmdnZw}FrMG%qg~0}!mViAuNG$Xm~7@9u0B6Iz^FR2-9-o0yjp<DZx6Qj}Si8sn0m
uT$-DjSCU^GV`N}tqGzP*Sd^Js9Fv=vTUr97A(}Q{V-#d%yfyg+TQC6lnjw7v

delta 108
zcmdnMx0{dmG%qg~0}ymgi%3`6$Xn0o6{Me$pPQ<moS2!fn^KxsRH7fAUzA;3keHmR
zZxZb4>lz#q<f`xM60BcPl%J(<WME{XXQb;`l$lzrpPQIlS^}g)i&Kk=^*5hp6l7)m
JHTf=EFaRl=BVhml

diff --git a/mamutes/Users/__pycache__/views.cpython-312.pyc b/mamutes/Users/__pycache__/views.cpython-312.pyc
index 49edb0bbfed51cdae5897f0d50eb7d66ff0c49c3..0c559c35fb79ebbbfade98080201d12ebe0fed51 100644
GIT binary patch
delta 949
zcmaJ<O=uHA6rR~+f3tt7N!pr}^v6~rZIDnwBrQm5X+^YD+ryfJp}UlZ-K6YpS_+$3
zp`v&)9S;Rt&q^y);z0yYUIZ^eMPd|s5<GaQ=vkaiv$Q7%=DqK|_q~}n@6C_C-9F*H
zAaDS$ucJ2?URQ)p_^NU`e%l}w5&{*dKAkdXg>GWM&KRu18k`cqHmOoN|D0$cp@nFj
zH$+8j@)=z+WJPXbRu39&N?Q|i`UxYXgfI@Q1BFw0EW-rQXf3=0-C95#sKPqfX<`7B
zh$>=AyDDMXu_`Bmm7gcOhz37t+e<T=wN%JkT7$oA74n`{jls*r%*5D*%&euERwip?
z^J?Z=UK=+Tm$l4zVZLZ+dAnd`QfE`c$<)wAb5XN0M%F0WSRW=WFKR1Ra%t6MaUo41
zptrsQ*o9vDv;G7${ivNh1$$7MOu<iR5B3sY93=6HL6vAd1eBmnwVnZTjE9bNF0es`
z13r(Q6Hqr5?OC%WkK#3<L>xZ|Is8DI19$yiV#((axgdH(^^CN6sYkj*+F{Rf2j`HF
zfl51mESYW6j(D+L#|9O;wE%b79si*Z4~cUi<^{HWDz6G#M2WJa9^aw7`>z94RHgsL
zS3yF)YPw}qOY|8C8|W$X0HxX4$c+TiVDLDs?1E-AXsb9suUQtVuqru`5X}(!%VtQ^
zZ6i{+B+Hnsk)wxPZ)_O5`|-BI`0K2JIxXHS-zjfKKG5+x`o_JPl0keL)~09Qt<>hM
zTFkCT<G)B>hj@STPYB4d&B>2ae~sxsU_rbL>(Op6$Q=)!159`Id*BHHQ)pehB&6_-
z3Et$fG6&ITaSr>3q$}hoc8pca5(Qx=x+^CMlR|s)i}P-krW<?)%$SSa7B-l)QBaGz
lHfl~`)BXC^G!_Rw2;n{$+6O7L6&w+waNu`32D_S>{{WH?*0KNq

delta 1044
zcmaJ=O=#3W6rM>o+3Zh}-R{<ETU%*M%PQUIT0!s!tyZh}+gin-hjla5U6ai^N&O>h
z6$C{*D02}-FJ3IIdgwtff=5AwptnWQn|hIog6PSav{CWkgM9CsdEXn}yf>NY{@5+Q
zkmWd__Wj!7@eeoTCGgpezRpPq3}EmkusEFyc*GPeQ5OR)m{Cj8B`c=K=~^_RX5s-;
zF_v6ll9{k%T@LgyQ?XQC4S3v4S!q2T@Pyf9W%LZ?$xA?w88XEz2at#kWv3x43IId7
z1g7UH(3=gFN){O@iY;f;xu#DnlH(c@Mn)N<lG_k5su~FAU?Vx~y0sDH)a<H*rXY?`
z>1-R^$sOIV9k(r{m5OD%-<T+3S36|m6HcvILfXLS(C(qp10zG)?yaL*4cis1u(B|a
zFZ6H5W#nj9(VB3nA9E0Pv{Pkt+R4|>;ut+V0EIl}=U@l9A1QKJB(l&0yGTJOz|Z6n
zJh{x3SjEgLLD%Pbh!vUmVm3Jw32$FfNlI?*!WZ3is0o`<=l(v6e1^S~9-I-v%sTIJ
zl}woQ$9w#5Ma1JP**}qx)djaD<ZPs#a2pts7oixtBe;vhSfw>&3!c0arOEg->oYYv
z)r67sAWf6+@MTyRU4A|SfCmiD6Q>u}qfDv%Uy)PyVAg_j89HVA6vCTJC3~Xk=8wCU
z*$|LbESqfRvwNeR5dI{#bT!_PEL3%h<H#aEq%mT|j95;=?8Z1kUdE1)d^|5jOLo;o
zXIz5fUCUR~STFsYUi$hjfcH`5^7)JBZ#KV*cDzxWuaEnk1FzLJzO?2&xfg%Bs|lpr
z{Eof;zOm=0{ezC*?#}UCi*jZAHwk20Z}$1!YoGMJ&J6m=!8s|=)<c2#uV8j6ahHRu
z$gnabuc9U7k~qmKT|sUs2kHJ7WtXslZfu(!R7D6ElO3r%@lp@hv6?Z9Oaa`^cpHVE
w(t67_CQP&u57Q<4mz*&Qb3BCb9q4}xdftL=axA?;?Sxz4*G;e;E)CLu0l3HOQUCw|

diff --git a/mamutes/Users/static/scripts/openModal.js b/mamutes/Users/static/scripts/openModal.js
index bc54af4..7b994f0 100644
--- a/mamutes/Users/static/scripts/openModal.js
+++ b/mamutes/Users/static/scripts/openModal.js
@@ -2,11 +2,32 @@
     const btnModal = document.querySelector('#btnModal');
     const modal  = document.querySelector('#modal');
     const btnClose = document.querySelector('#btnClose');
+    const form = document.querySelector('#recoverAccountForm');
+    const mensagemContainer = document.querySelector('#mensagemContainer');
 
     btnModal.addEventListener("click", ()=>{
         modal.showModal();
     });
     btnClose.addEventListener("click", ()=>{
         modal.close();
-    })
-})()
\ No newline at end of file
+    });
+
+    form.addEventListener("submit", (event) => {
+        event.preventDefault();
+        const formData = new FormData(form);
+        fetch(form.action, {
+            method: 'POST',
+            body: formData,
+            headers: {
+                'X-Requested-With': 'XMLHttpRequest',
+            },
+        })
+        .then(response => response.json())
+        .then(data => {
+            mensagemContainer.textContent = data.mensagem;
+            if (data.success) {
+                form.reset();
+            }
+        })
+    });
+})();
\ No newline at end of file
diff --git a/mamutes/Users/templates/recoverAccount.html b/mamutes/Users/templates/recoverAccount.html
index 29f7b73..22f2491 100644
--- a/mamutes/Users/templates/recoverAccount.html
+++ b/mamutes/Users/templates/recoverAccount.html
@@ -14,15 +14,13 @@ <h1 class="titulo">Recuperar Conta</h1>
                     <h2 class="subtitulo">Preencha o formulário</h2>
                 </div>
             </div>
-            <form action="{% url 'recoverAccount' %}" method="POST" class="formLogin">
+            <form id="recoverAccountForm" action="{% url 'recoverAccount' %}" method="POST" class="formLogin">
                 <div class="divsFields">
                     <p class="tituloInputs">Email</p>
                     {% csrf_token %}
                     <input type="email" name="email" id="email" placeholder="Ex.: joao@gmail.com" class="inputForm">
-                    {% if mensagem %}
-                        {{ mensagem }}
-                    {% endif%}
                 </div>
+                <div id="mensagemContainer" class="mensagemContainer"></div>
                 <div class="botoesRecuperar">
                     <button type="submit" class="submitBotao" value="adicionar" style="border-radius: 8px; background: #1F1A99;">
                         <span class="addLabel">Enviar</span>
diff --git a/mamutes/Users/views.py b/mamutes/Users/views.py
index 2818763..be23f89 100644
--- a/mamutes/Users/views.py
+++ b/mamutes/Users/views.py
@@ -1,6 +1,5 @@
 from django.shortcuts import redirect, render
-from django.http import HttpResponse
-from django.shortcuts import render
+from django.http import HttpResponse, JsonResponse
 from django.contrib.auth.decorators import user_passes_test
 from django.contrib.auth import authenticate, login as login_django
 from .models import * 
@@ -36,10 +35,7 @@ def register(request):
      return render(request, 'register.html')
 
 def recoverAccount(request):
-    
-    if request.method == 'GET':
-        return render(request, 'recoverAccount.html')
-    else:
+    if request.method == 'POST':
         email = request.POST.get('email')
 
         if MembroEquipe.objects.filter(email__exact=email).exists():
@@ -55,18 +51,19 @@ def recoverAccount(request):
                 recipient_list=[email]
             )
 
-            
-            context = {
+            response = {
                 'mensagem': f'Enviamos um email de recuperação de conta para {email}, cheque em sua caixa postal.',
+                'success': True
             }
-
-            return render(request, 'recoverAccount.html', context)
-        
         else:
-            context = {
+            response = {
                 'mensagem': f'Este email não existe, é necessário que o email tenha registro no sistema para recuperá-lo.',
+                'success': False
             }
-            return render(request, 'recoverAccount.html', context)
+
+        return JsonResponse(response)
+
+
 def redefinePassword(request, username, token):
     user = MembroEquipe.objects.get(username=username)
     generator = PasswordResetTokenGenerator()
@@ -95,4 +92,4 @@ def redefinePassword(request, username, token):
             "token": token,
         })
 
-    return redirect("login") 
+    return redirect("login")
diff --git a/mamutes/db.sqlite3 b/mamutes/db.sqlite3
index e52602d09ab31644ce33dfb172e17a7250bc9c20..7dd900303c5ac8652701d604f2365bb0e6ecda55 100644
GIT binary patch
delta 1045
zcmaizO^6$17{~K&Hi`L~*OVf-R=TkjdP(-3$$TZUZ6_biZg#WT*=%By%QDF%lf+E&
zPCh1+fTT?oic(P)3A7gr1wAa(B|>htr3j0?cn}Jru;8r+J$Vp897<aY9)$Ps@Q3$(
z|IhRPJy(uhSB_nuz5%X(b}DAOZVBoiAIi3s*L|-!tt7~GE1mA1T2V`#c17#gam6*8
ztbBkxaSL1}Cf@sAhbKPsFH;`Z)r&4@xw<Mi{rj2bn`4P?>>xfTY>R0_t);>>_Od=e
zXZ0k_l~YKpks0BVxLHKnR+6sDgZ@ff+u4YAn$gR<?~0@`%6C^OM9~3~GS4y@j?jDr
zg@PnU)8UY$N-eqGE=$zYN-B5yqh?)|f>QaSqDu8<aQ{iueZstms7MG!XcVM)iVTHj
z4)v>rXF6rRiGnnb7>?e5&`vBKS>Vykg};T6u=>Hjf4Hta9?u_-L11~w2X9&6U+@q3
zEBpmMg5SY=a0b7Gx8be%sV~6$&~CE=VE0XL-vwo>4<1Y%UjzRFJec|M1lks@PT-p!
z-UHbs_re9>{l@c&yXJ}#KRN!i|7g3r_>r};aA79A>R&iFIpejZujK^9H_CczNTJq{
z(R2z|S<+D1n%3Y9q_L&a)PDp{j>Wc=>xZi4bTOqAaT2$4JuS~yI0*~7yr)+yRaRZ6
z$WEP9v#A8z-|W68$<=Np5l+R}1jjV=G9@vcc0U*1;M&Tb6pq(N+Z%zkKu8w5sl47Q
zk<C;rkP-B(%!#TpB$<SwBwEt;x{%o!H#gVnN-Nf4lnqKw$1#d`aVsAfq-Cwqz!9>y
ziG@@IBWg|5qXlIh$69%ViuLjVy0;~cXpD`)T4=9OABq*6&(`SY(NpZp(K9p~n!M#P
z2a^?ej_YxZfiW7O`S2mg+Q&WbVtOcqHKnICt46ri<WZMW!!;zcecoWSHi>m(R55ul
z4HXPAvMUt|flG~KCZi8IQq{MT`j*x+#9p*oW%wke6=_^7Nda7c*^r6UGjuqX;hD)9
z+tZ}<Y5I3?dfxaR+_YJJp7T@34`%e9^X7J(^pGn)rv;t{Uf>kMFUYdmpZEEKR1yUd
z6Efv_`)BaE)$S$|79uf!<rus}ynWW12LA_yci#97+yqN*;)Vr2gm>VFunNyXC-H=M
c1e3%8al<s!CZ-2}1Mi9dOxHU%_1(jN02?7XFaQ7m

delta 501
zcmZp8z}4`8Yl1Xm^+XwG)@la5vd)butoo7yVw}u|jG@J;MaA*Cskuo-`Kg7anFXnw
zo164o40v1__-*-`cn|Qh^SEwSR50e@YP9F%XK1u_<dmQ6mm^zWR25iMR-O|O7MUFs
z=pGeO>5&#y9-v}qROss$6lM`@9u%zaoR^d9?3<mKV(#e_7M_{pUKW*}X69+>o?Tp#
z>S}9bU}U0eXryakp<rNSWn^w;VyI_g0u(h%%uUQo$;?kq1Tzwoi%P3<GIJC45|bU$
za}zUj^pYpP&fyY*Xf!afGBMM$FfcbWFx||ayMjr`z)Zo&(8|cz%GgZL*u>n-$ZYb#
zd{>r}4E!fIa~164=V#z$mS==p!r6Sie*5)$MqLF70se&y{J;6X@;~Ok%YT~xDF1%`
z&HT&x7jBnZz*x&aF@R(G!u5>F%mVxyr?YQhRNSms(8)i2<9^0q2`=VTM&2zvecTyb
zPJFl6f3jU+UC+|RoVwXjz>|4<>S4xow#fkkWgJb)tgODxp^npi-ZLs}&pO38i<Mb`
zCx1Ho1(0zH?mXM`?=VhfX5r$?V%X00fYF){s7-x));q>oj1pXYYZ&+s^Dp6V<xk_+
f;OFFf#dn(Doo@|L;{?9xz5f__x9|MN=)MsETV|ak

diff --git a/mamutes/mamutes/urls.py b/mamutes/mamutes/urls.py
index ffb92ee..f63472b 100644
--- a/mamutes/mamutes/urls.py
+++ b/mamutes/mamutes/urls.py
@@ -5,9 +5,9 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path ('login/', login, name = 'login'),
-    path('register/', register, name = 'register'),
-    path('account_recovery/', recoverAccount, name = 'recoverAccount'),
+    path('login/', login, name='login'),
+    path('register/', register, name='register'),
+    path('account_recovery/', recoverAccount, name='recoverAccount'),
     path('redefine_password/<str:username>/<str:token>', redefinePassword, name="redefinePassword"),
     path('', index, name="index"),
     path('competition/', competition, name="competition"),