From 8ccf556bcf2a57debf891509ca0efea8c94395cc Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Fri, 26 Apr 2024 21:00:12 +0300
Subject: [PATCH] new

---
 .../__pycache__/views.cpython-310.pyc         | Bin 12535 -> 12670 bytes
 .../templates/invoice-payment.html            |   2 +-
 .../templates/products/osicard-plans.html     |   7 +-
 osinaweb/customercore/views.py                |   7 +-
 osinaweb/db.sqlite3                           | Bin 1204224 -> 1204224 bytes
 .../__pycache__/urls.cpython-310.pyc          | Bin 4120 -> 3992 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 16063 -> 17092 bytes
 .../osinacore/templates/customer_index.html   |  26 ++---
 .../osinacore/templates/customer_main.html    |   1 +
 .../forgot_password_email.html                |  54 ++++++++++
 .../forgot-password-confirmation.html         |   6 +-
 .../templates/forgot-password-sent.html       | 100 ++++++++++++++++++
 .../osinacore/templates/forgot-password.html  |  31 +++++-
 osinaweb/osinacore/urls.py                    |  10 +-
 osinaweb/osinacore/views.py                   |  63 +++++++++--
 osinaweb/static/dist/output.css               |  17 +--
 16 files changed, 276 insertions(+), 48 deletions(-)
 create mode 100644 osinaweb/osinacore/templates/email_templates/forgot_password_email.html
 create mode 100644 osinaweb/osinacore/templates/forgot-password-sent.html

diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc
index 58c47d0ab4b5dda189df17888d2ad053c0a81226..a5c2155bc17e6ac61ef8b047aabad5a94e26ea2e 100644
GIT binary patch
delta 2169
zcmaKtYiv_x7{~jb({`6$cInzNwz6h7=*D0fMht<usWb4w5gCzfQA*cywzO_*d3(5x
zZd35aWr92(Fo+02&?-2VK{UZ23VeW|pn#E0BqWMP#25k50pj~VE&D*!CjIq!|L47(
z|NA^|Z~FgkwTErCbc6Wp8mwqr*f3~sw$7~<&6pu%2(cbnlR|RH7?TyINd3}wlOpe6
zJx0YCGX`0YNi)X`iYaDVEjJpx<_4ZGM#d#xBz|~>z^GgqRA|5&W_~KPO-pw%qtSTR
zYUIk$)3z8h@kOE&U9fLv0a}u=ZDJ4uLqHV}5oob=_@kO{Nks8$Dqjql(~L}wMQI@O
zgriLeUWqqCw+qbY?X*5?xibKv<DSa95QQl(yV|aaaM+xjZ;9B}I9i-NgLTuM?CUH}
zI~)fb@l^gO2FwIz0i6`g@s58E;q$;MU^Vap@S;A=(VPeRUKY&&6S(&=i@+qlbHz7`
z2{qwsNYede+vObw;js~laNHC!3#Vnp*e?r@O-YYagvaKj$0-e?wz-XS9<7`AnCFo?
z5%8Fpaz5`7#D188+|CJQFNvnt%(J0B0W=7-*uv3Zz|R$5t6v0swZ7^3&g`rxG9X(P
zrz7j9vxfFr3drJ0qfO3vmK5<id?998o7DZ5tTAm}QghI5SA!*gOkYoTU9G9TVwhLv
zy%fw<Eokt5;8iR=DJ9}x(W!Q6Rbo&yQ|MO7&Ww^IOH5+sJ61D)O^5-B>{2dOjXRrF
zi;gfflet(r<6DNDdDA4ek>=#rvfiP!`Q;MprNJDBC2eNA+NCa!@S0V0#(lYFgBUby
z39JZosJ;jf22|cEl;qjsnJvr}l?OGo(-&1Wz6_dKQ9D$TbW7>x1eNWlX9}A#_hQ&a
z;4Pq+jujS}cOpDaR|_9z2dUCCiOr^`JVADG=&<J+GjA17yBE-CK@Ht3DrLvXU0lls
zXkl>y+es^n8!ekLJOg;0&KEbaBUD|oXx1SJhk=g;x-Ip~18PJIhP!5Xyyc1QBb|61
zumv~?oCc22sgf$zyQ#Fk?`_c@PK|23O$&CadW|I3x`K|s05!l>zzcj1^Z|PPl!>S%
z!>=g5VAs;Hu+A4z+BlAjp8}BF{40TBS*+r9B(m-t)Z+$2u7RIL=md11E+HDBkx~yk
zPq$0!ok)veo632Z`#RNV)Zec1?{JC~EOW38)Km5>Gf~W2K&FY8`hLLh%fOGoPr%QB
z{sO-uS_%9H;6CC$KrfTHF|h?b5&wX!zveYW-vieL9_PO!yde;G^FI;)1&ji>rh~VE
zI{>bn|F%=lG5wI1($-1trZGPgiKj0<8#Cx9r~Cc|nlLw>mM~J3w1G1~0(1+{qmzuL
z{w5=o<t<?+=s|BiOBY7DnVGhDYyJQ4(kqzc-(2E)!NZi6l;mA=zcD-&i>Fb2d5Pr)
zLJMFet-N2dG4hBzHNPUmF<BDznkpu;O39lgV`x@IGkfR_ti2U@6W9jWF-0k&UBGVO
z9pGIcF3?>?r}Eu&WpbYLJ!tO(dw>ss0m`d%SMEbN2n+!S0M{6D5q&7oDz?TyqCjOe
z#Vg%?{1ZGl415ZFCg9CU9B&PTBfwGM7*GeuKog*!ipX}uu)ST?eBzSTd|FuZciexn
zdc~Z^kS~G#fXQI+B`V09ojCI|koB_B%jjz~i-5g=Zj=pfjV;T+!GmF71o#%X02~Ao
z)wFZUcs895O<BOQ$ThW@outTAPbQ&*{&sqn-=ghPmp!RKi~`*N{?zyyU@fo?SP$TS
gPTV~g5t*>5bifK^0Qx_LOE2e@Rn5#s=c<bS0iGxehyVZp

delta 1995
zcmaLXe{54#6bJC$*B|TFwJY7aj*POpvCY?|Zh{Gk!ertMMnz==7%_HT`-UCcT5jKv
z&5oh+V*-nsW56F#z#m9O6jA|Wj7W3=6$BMTOGrQoC^4Xj&Y$4@-r^F8x<5WU@7(*|
zz3;qxda-pl<cQhrc?R(}l&Wc)b;mYGbN;kCahWu<8`@c)QCHfH?WUwL!XnC`vfjMG
z&}WJmlcp%^GwYV5A!16JA2v1_RP%IRD(*`uyj=X_H3Hg^A7d@l;wqtfdud(~Gnq`6
z@=ZLP4%?H=+-nR(BXrWSmbFr{;JNDia9<Q)13V^}YwHLl^k8>964EsuM|uG@ICaM9
znAJ<4IkyyQBB?6831beyOx{K`YLUAYiTQtLc_*SS^0~%45+cl4E<aNj+nd39DDAqy
zRN7Ryy->CCshB(oOa>hkFH%buBkTuDz=Pl+0qu5=r2|EEY$+`%uB0VyFYPNHO-J3X
z9DXk*EtC0*;u$s*6PGf#T;%#}j*;sX;<}b5dZyb-Msfr6n5Wg66pv7iJW0QKG#f7X
zBVZ-Unwt|3^>k`odVp4yjJ6Dlfv`dj#Y4MG4vm^Do|LeNoRbx^JjU0gH;$g5u+@|)
zox+mo(lLIeOg^v}50rRBl*yemPwUba#d&={MaG`0UxlPC+!OB5f^i-VYdnM-vZcY8
zJ;oy%kLp@yFrn#uA##?8)}e`S)=dLt8rw=|%jP&!xNS9f1|(^guiUZ@;SeqM-N<&*
zJHD$~Bc1j|+0pdfSN+H=Pm0mr*|f@APXiT|Y=~Z~n8G&Gxr#At9p#T}vJq}C08dc+
zxH)VWy*I99@>@u}4c-*=+8P&ywYVOQbzSdM{n_nL!e|3n1NMS_U>CJi*0Cf#UfI~c
zUL-QsgwEUaXs0I6S9Y<}nE4H;2j2n}d;t1@JbP6lnp+TxM1s+-g)vdPU_8>sof!WJ
zn8C+_j8Uwj7IGI7pMW8Q!DHYD5xRja)G<UysH4iq4%1*&qZ=PEW7jy3@nENxNQCBT
zJVU3es>FA8RL^IO?EW#druszx3EcV>_!^u9r-0o28AQF{JAhW^LGXZJX3CUZULKe8
zNXu6|hv+!?UT_OPi|_|Q%F8bx{t5gHh9|;bz^?$U`roCL2TXpUZVIU0=8;-vPn}$R
z8lE6Oo2>bVxI|%7x!EHAfyAHSB9P@fjOY@OZ*s&y`~78R(LvpNXph>+ETURorcjN4
zO8@_ss@HyJ)2&k*X58$%sX+w)S~PBCVj<LMZqDV|SJsKkUj#Ge$^MhbCUnwqzteUe
zBRRlIzxxN3Tt*?6r=nowFlF0cRYa#-#X|Xt$tZtfZRz)Gn%RW4cvbWee+oPe^6<Dy
zL>s{K;05p^c!}-`+~D4b@MW+GyaG1U`hYj^D#9(`b+8TmbL%`UazU{p{sx^1j4#}d
zDLcSUfQF>fYsU7gMcG3j8)z4X-UYis12BR)Kz=*X4~C3mo~8%GA+87Ym>%l5^83r4
zl3lzX_iY6uEvCA%2jc*;2XBM2(LO~~4pKnYCl^H;S(YEdz~|ry_yT+h<SS*!QyXB{
zQDg0FW~XOso7r9(uJt(|#SHmovJZx-y6*nl!$@+_1D1kiU^!R;1^|A{vp-Eo5ixAY
T0<6FW>~yAX0n4L%t}Xuyzqar%

diff --git a/osinaweb/customercore/templates/invoice-payment.html b/osinaweb/customercore/templates/invoice-payment.html
index 7501569a..7faf664e 100644
--- a/osinaweb/customercore/templates/invoice-payment.html
+++ b/osinaweb/customercore/templates/invoice-payment.html
@@ -39,7 +39,7 @@
 
                     <div class="w-full bg-osiblue py-3 px-3 flex justify-between items-center text-white mt-5">
                         <p>Due Date: <span class="font-semibold">{{invoice.order.due_date}}</span></p>
-                        <p>Invoice <span class="font-semibold">${{invoice.invoice_number}}</span></p>
+                        <p>Invoice <span class="font-semibold">{{invoice.invoice_number}}</span></p>
                     </div>
 
                     <div class="w-full p-5">
diff --git a/osinaweb/customercore/templates/products/osicard-plans.html b/osinaweb/customercore/templates/products/osicard-plans.html
index d840ca9c..7e225d1e 100644
--- a/osinaweb/customercore/templates/products/osicard-plans.html
+++ b/osinaweb/customercore/templates/products/osicard-plans.html
@@ -14,7 +14,7 @@
 
         <!-- PRICING ON DESKTOP -->
         <div class="w-full hidden l:grid grid-cols-3 mt-10">
-            <div class="w-full h-full border border-gray-200 p-9 flex flex-col gap-5 items-center">
+            <div class="w-full h-full border border-gray-200 p-9 flex flex-col gap-5 items-center  {% if active_order_item_basic %} bg-black bg-opacity-20 {% endif %}">
                 <p class="text-secondosiblue uppercase font-poppinsBold text-2xl text-center">Basic</p>
 
                 <div class="w-full flex flex-col justify-center items-center">
@@ -22,12 +22,17 @@
                     <p class="text-gray-500">monthly/individual</p>
                 </div>
 
+                {% if not active_order_item_basic %}
                 <a href="{% url 'buyfreeosicard' %}">
                     <button
                         class="w-fit px-9 py-2 bg-secondosiblue border border-secondosiblue text-white uppercase hover:bg-white hover:text-secondosiblue duration-300">Get
                         Started
                     </button>
                 </a>
+                {% else %}
+                <button
+                    class="w-fit px-9 py-2 bg-white border border-green-700 text-green-700 uppercase cursor-default">Currently Subscribed</button>
+                {% endif %}
 
                 <div class="w-full flex flex-col gap-3 mt-5">
                     <h1 class="text-gray-500 text-[17px] font-light">Features:</h1>
diff --git a/osinaweb/customercore/views.py b/osinaweb/customercore/views.py
index 00d93885..ac37baed 100644
--- a/osinaweb/customercore/views.py
+++ b/osinaweb/customercore/views.py
@@ -144,7 +144,7 @@ def all_products(request, *args, **kwargs):
 @customer_login_required
 def customer_orders(request, *args, **kwargs):
     customer = request.user.customerprofile
-    orders = Order.objects.filter(customer=customer, status='Completed').order_by()
+    orders = Order.objects.filter(customer=customer, status='Completed').order_by('-id')
 
     
     context = {
@@ -248,9 +248,12 @@ def osimenu_plans(request, *args, **kwargs):
 
 @customer_login_required
 def osicard_plans(request, *args, **kwargs):
+
+    osicard_basic = Item.objects.filter(title='OSICARD BASIC').first()
+    active_order_item_basic = OrderItem.objects.filter(order__customer=request.user.customerprofile, item=osicard_basic, active=True)
     
     context = {
-        
+        'active_order_item_basic': active_order_item_basic,  
     }
 
     return render(request, 'products/osicard-plans.html', context)
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 35959cd992f4579c4e4e26540019f1c9e253ca23..18bf813f018ee06e1c43cbb25ddd1456e2be1ea8 100644
GIT binary patch
delta 927
zcmaixOH30%9L9I2-R_p%&VN@8N<~->>Vb#bQrfjKv4|QlHK-I!)I(LENR<-Bhy)`F
ziU%JU4r31_HGq%A7!8KuU<@h;F(#mgMvx|8JZMaeuY-@6IK@N{CVKeI|1$G^-~XGA
z(Ta}Iik_u>>&5IczV&u^Up^o2eVp&+XL^6+*YVDwy#@Qru*YBQ^Lxx9)A0E`W@jqa
zor>`c#IP`|41r-|hzyBgr>R)R%7lU;!NE7U30EOOuqv;iK~)X`wpn;&LnJ*Aiqo69
za*e)30^nc{9zZ{wh6t2H5da>?<3tb01;hx*RvHY*53x17%PA7IQeH&Dm9l`md9<if
zPO41c5eHx4BfN!Ikb)#kz#}$OL=UG0!fAo9+zw*eHxD`KL`*KZm5ZT=gD>zNUc)Rr
zhe`Hm6h`10+=2vL0^-t@r6iy$3f-hD8$lH<EVL7m`I&{{B(X}V&B1UZz3OLp$8=u8
z46~nv$8ZnEnAQ!V8;Xb47)lK&f`vnf%%5>OvQ`P|mTIAmieaTn$jPYWbhqL56dEOk
zE<<<yZr^2iO@p@9DQ7d-qLY7njlmevo0S3*P}7SxD_vllH*t0+k1I5J+))&^e6UXw
zan|u2*{3O*b0j5p#g6zHI{U^E7}EEcO~zrfwyF4lul{gdtU20bxEg$h(GcBh)J58A
zX`m0^N3t!>l?!DYyntbX6ZkxmjtyzgPFU%(LEO$;rDASHci$Dv0NQs&jZEcWJixJD
zCSVx)pbMg~4OWAW-+_pec!261+DV+9d1|qp;}Ms~adsPW{;I)K==Nrw$|9rZwJ0yq
zf(zPn)#8%;L`-PAk>sbE%1?@x<(<38iR)VCf<KKJrpITl=-f%3Ue^}W_G{W1F;fx-
zImeK4E+b&i!c(><!l3v`j<E2xR=XVGR|=aut4j&XuG6b`v~k;i8zHx?!a}lYM7vzE
zx#5UEwyt#j_QvAU5~J!sLrbV7w8h=*YV&Sw3A#g}P;iI0@!*E)#-sI3X7nGweD1Dx
GsQ)Kpf*L#k

delta 874
zcmaizOGs2v7{||j%-or|=icvL%E}&gL8^s1ow+lU%@8ytl$ujgIgl-y8XuW4BU(6x
zRAyz1UJ`PO5C)>Gjc8WKMTM1%ioj|y6eVc5C<3v^q6a}|XxAnVzq2`fzw`eeILAgS
zj*V7aSR^ER7MBT$p?Fh~(0lP&kuAKv_`9fH$RAD=?=REsa4-<|1--T%vID-ZiB$JQ
zO5lhbi6e6y94ANNxHxV$k@Bp_cr@ro@Dm20pBjd`hE*DB40ME0Txds5Nf1S`mklgc
zW7Yx%ya=Y?5nP2+&<N$=)t}}TwIXUUB@tC-RT1^E?)-+977B=dj;eE<gcNWY^KMbI
z1~-f&_yJ$w6HLPdWMQ1|d{HZ&GsJU-xY_{<A6Z=>8f-kJ1_ui?xP;(4%)$qlgxBx_
zp1>%KzzrCL3|ykb!i#Cd!kATBcmo)=&Bv3-tw=n4zSv7MD{&o{+{zXG1~Xjq9^UcW
zU%)eX0ApNrixPsD(+I&jixC_Hj8Khm5IH22>p!v<S6NcbQOlG#-sYeSKMNk(bH|*^
z()IX^hxf|<>mK9YF>1BoVj3}Wy;|@IaPnY8G`h1#G0Ps+ym4vPJxP^G?H7}$w5+SA
z+C^vc44F-T)Yc4J4ar1fOR}!Tmu^k0Dm_^0Yw(f%O{BE7p(&jzJ#d&s`t*mQ=JKNo
zM;U^*aMyX6;*5T7*nHI~vnAK`4nbZfMaAyE>pBNm-*uz$O@XH0NBj}S;V$&S3226`
z5CTh|0Y%U1_nB!3S9EFK$virG&TJMCD?V?&HYDQOLzRrVJ9qw5k(PJuq%Uup^I69Y
z^RzP0EgwPJFh1*vxbyWl&gYJ6%2)Xa4^k()j~8|lN3^SE9pyPJ)_>c4>ilmxIwU*h
z(3K-*n{uF&$k9W8r>pDzB<yP=RqHl~Ynu-R)2-{%yHbIeU7g;ZY%kwYS>jK&x9tlB
uH}0+66sy{ot}AbjMcZv+2TDk=#78V2|1P00@p}XQ!0J$toxNwaUHt<?!5J0+

diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-310.pyc
index b00485a7be2c955d42bd8d5ac04c21393e553aad..1a7d79e07f8b85ade1ea4fe084135a808c9f4cbb 100644
GIT binary patch
delta 902
zcmX}q$xl;J6u{xWQ%V)zyDcJ6=uGE{&MiZ&6V3=Cjul1pJV<LoNn6ro7p%Kz-a^){
z-F4^E1gC|%a6}Vz>qd?K0iI|)H+eVtemQ4#-?nSpsZ<rEPe-TyEwb9|D0a!#i8QPV
z_O<mLNd*+Dp`xIPZSFiwx6C-mVVDN`(ZU`f@5fQLl{|npww-(c9c(9g5M69Hc?ieY
z9`Z1H**?|Ks#ws^AwUBo7-WaYqZnpK$X1N9V`LkSv*TntCfG@`15@lY*@+o;R&5z7
zF3fSr(|{W%*puWjoMKOtJy>8LBzv*QK1BB6VfGQSACIz+kpnoxKHj1b#1kA&l0$fk
zeVQD`GwieE2+p$4sd}8-lD6RQ3(u3zvld7fSc|k7#f!Xoi5$Z_mpNRaFpgK**T``!
zv9FU8xWv9ePU6jfE~V6zYE<`D()49;xea+;DTTKdb)l8+l3v#D+3l^D*VZ>Tw5Bnu
z>5a2mx!2=%)zrG$h;6LY>&<En<Au#K-p*x;@j|0|S6wg0wK-#``@ndwN6Kn5as_Jp
zG)Zwtvi4aXvX)G%)!JIMvHX9(rqJ(S6LfVQN&=)u+Po<<Aj5B=z%OBfpTZ13L_d7j
z?weu@PWUQZ@I`pxlkmYu;fGxjfDa-F??njSi7>ns5qKk_@LEp5D>(@-<rKUSIe0Ge
V@Jvj=Q!xoo#1uRh(>*(u;vb%W@e2R|

delta 1050
zcmaLW%TE(g6bIn;7TO3icLWqlX=#B{XkjSOmV)9N---`>V11OKXTYh@f$0dbn^~}C
z(ab_NY&5Q1vhxq{z3{O!(YVr;CO+35K~Hp{liZtpzkANiNp5B(xDpa|QLJ*{bLVbs
z>U~)ZIJ?VTW)p|1Wmnm$GLY2Dya=1gHRXE=OM(UpyjV~JjbtCX7MjR@bR7i9&FC!<
zB!|#jp@rOvu7@^q7~KHv<cL~n<-O2BK_?b8LX;ds`=E>5jcx*&+=KQ*oZO2JKp(ju
z-3$qG5*>sTc|f%)^C3u6Fo*>$Fht&lZiVgSVRRepAn!znVHbHfx*hhA_o5@Pk353z
zfc@kH76zSgkb*<#C>$mqLC4@I`53wjj*~~x-Ee|@Qgy+pCFc@bzwy(kG13{-S<*S|
zl)*Yrt>YN<zy)#!9fynLOXyy>OumBdgDiOh-4Du!GYK`Jdelw%B(4-pF0-^FlYrcq
zBMQnqb2#*(R!|nz+v6^m{nj0}0#mv%t()?kQY<d&2FN+RFr^u@imB;^c*+02<5%vY
zHeI+rSMsW}iZ=6Ct6WqIX1vt!kCT#5$(h=MVz0VK?1-n+o^YquMm;wxoCEf|>U>{D
z+W2tx_gtA@lTeWTb5Nt&o)_w)hJe4JA^zMrZW(Xxs+zl&U7sPVEZ~gFq&B0OH`Z<m
zz07&ve#w);D)yaMvu|8rU%AM>aLzt+iGAX=>?5yZA8el_ds^8W-o{?rqmn-&^spB~
goIS@kJmX3Bl&9DeKENLHG<(Dc*+V{5@xVL$17wIVM*si-

diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index 2b77ba0fbab5c07efbbc3f87e5f202e988e22ba1..46efd8e416c7ef2ec21ee8bde8e1bf61019e0749 100644
GIT binary patch
delta 4742
zcma)93s79u8QydE?q%5rEYAf3VR>!1Ag?6k0eNB6BnCEwki?May4iDqC9q4+y@=4o
zos?LkV{DV7qp6RA)ljVUF=U+jtgUv^G12;{k6Ek6*4AmPwU3#$CMN0spA8roGb0Qi
z-~G>j{&UX%f9KqDe>w8<%_Jq_blObtbM{na=U2N9rsR`<JXz@{G0jfBbiqE;DCt<N
z)zfmS3cdt*1+5f(De%i^mEg;OSJN87mjkb*b%HklUq}}T-Uxg#trvU+@FjGq;46VI
zqss+f1-yYa?u+5TtKne<T`3yY0AEE{3*H2L4Q&$qa^RQKwSun&eg(Z!@GF2{Mb`;_
zCGhohgWy*IznX3od>!y++9LRR;6A!Z@C{mhjJDFv;^As&Xro&M-w3>&ZWX*4_%^y-
z@D||L&>e#NfOpWHf^P!8i(V^uEAZ>6U+~SqucraQ+ko$;LBY3B6Q#ZL``SBl+lh&4
zv~!=SV=L{V-SB@K4Q(;0JyV(HDrIV&?Z1Sq=c^qCndC<ur<JRrhHN80>Z~C?{)ux~
zX+gt!PE(3AT7kwL!2!m!u;JH3h8E|CQ&vI$_fon@7hjY5YxhocuS7?sDQJXl&{!cn
zoaVW%MPw^)akba(z(!kO!07h(M!G^_X2vcK099dS*r*JI=<X$p8IH#`@i$x*B*wpT
zl@XoSC1>&_X=`Pburl71o5Al$v!)#aKV1Q^68vQbpGbQ(?Vf3?Lb8d~%mxmXX7a=7
zBY8Jq*sTaf2*n5`2!p&fqnV8Hk&Ik2G<A1|EZIlVz7OGMek99Fe#T$Tnn*nc23-b_
zC5M^a&PTJ~g&FR250MY}+wRrm5b*qJ#<Aa>2<ZrSA(YR6itKKHKOwn?`*V89E&N2z
zF7hL;=B_XL9hmiO0ITFO!$2h4>@sJXQ_QkiKJSp(7$-_5Kax8Fy(&C;WSo-{cMcne
z9-qVCzpVf+>4Nh(59jSp{U6%Jyv-2cp+lwl{7l}U`#~_XTM#4w)hw#OCKB-`z$6iv
z%7u867<}STX#qLH-<j8RiQbcm-jmSV4!tj)jfG84U7Np@kiGn_f)(Yrf=fK9l|_2A
zppmG?*Ao(Tae@cCjel9d$>aRM{33EQe|&z3<nY|WM)EYIA&2)B`t3KNTMS_@f48uv
z6a%wV1X1E|4vLw32Ird3o&nb;Tq$bNDrHK=)2V(2Gj*qD85H?dPesx9XJU%!Ex^ZF
z>EmlWMYgu-q-FDnCzs!pXXUhLJA`<y=n8TxC&k&`Ia9g~14#g?oG5{a`~u7_*GmJT
z-XTBJ`XkKH{TMn092H5C(n(ID%4YT=R3-U{2;gHe{$TO?OH}7q5Yw9xnNt`udueun
z>q~r>2=E&Ski$PHab*loFB3#6%jX;lJ2pFrw{+trg8Wtl87ob-?}s4lWnBI%vpb(G
ztt)Cr`<xPrEL{-laR}pfvE$%&2;)40{>Nv>iIvqTiEQ(tvMT!n==T%!JHeaOd~WqF
zBfEK%_euqK9osD?_K??=@gz73?K&hmq5RkRG4CUF2f<C1;!YzJ+@l%(fqoh=G=}wR
zhyC+=41y1FnP~y4O6)EE;DX&tQ6zC&yXeyf4Z?>FqIV;LSXJT>WN)J3ErfS?V|fjE
zmhUMqAn(I;3&?AHqP*4p)0r+8<njkJd?4oTRbBQIxX3rq_96DldJU*5`&1IQ>PDcm
z(;uSjd9JIMD<7fL^Vrej5KUAwKyUin5JBvFSUny(W_FT0EAx43MYHoM?1Q^)Qesc>
z?h0Q%u1+jr(vpy`IM{^WU&N$NRXE%qVMyFy4k?pJW{D^$nNtw9Am?K+tBQ~P5d(dK
zAa?Vgp)hW~qcU6h6m5SM=l=f6bob}8Vo4&Fg?%>lWTl;~#vm%`u=hto@Urq70euft
z<_BPnC-sHG1BRx@lXNW@2~(XNz`#F8cnrIlVMS*yyAEDh9aX;N_hKJKhmEJvxCP#N
zeR^D`fgzpYIU833{ry^)CW@DK@yhwfRf~#nMD{lX;cYV_MxfVkg!(l0ceH-N>#N(O
zFA2Z3dNDc8U#Q;eJc@Q)I!xp!Z?4(U@B~_12*n8E*b(U#N72Qy`3l=bfV0TXiNt?e
zlbW9oUOI-r#AiyFdPvw=Nd9>fKin{nSJlSs)!@V)#*Pv{SeMC<*CrQCSLKIb2JOgN
ze<+xkoy5%ipSA0XW(uz+3Lj5GAC#9FD#T>MU$1fV{yLj`6;5JK^({<+u_7hiIP7<E
z5Gk>MIy8(Rh+Ke`mn^Jo6uBryvv`M#170M=iMF|OVP7XCDKU?+g>KT!f3dJYvJy^8
z=kb3nY%CF8XD|Tn?6}1U8NC|A6slI1xG?b6MOBLMJBtb|uy<-ku-lJI)vv{M;SIzg
zWfK=+4nDQ$jO#ft3|q@KG?cY?%KF)3{DsAxS@(hQqAH3re?MPdzijoF*ph~T8B*;D
zDLEm99d_82#(<uX%>&Tdk%|iP(@<xp2Dh=G#!~nb^~FjmCj3VJUVQ`U<QYpAk?g5;
zOCBayxxo&3y&t15M5sZ)Y_li=rWxA5hg{?x{7s2%aR;))2zbT$_Sc$6At!LHi7vb6
z8XH85TLa-RXdf<(=9a*XtaN6m{~%j{Ad;~d+045;ZV5&P!UnUWbtM9BM<%j(3-4X7
zy7Mr&4fb&u?hm0zII&1Ke{}guZw|CE%oqDHKu2mX46no0Rb*4sSuVEU$Wt3uko~;5
zVIwKzX|?$hGx4VyR6_X4hKj9E<2uBi@PIe$fO)L}T_21v+NSB6(H_~Oh1Y3ejRlMd
z3xdncPcpD1_*)BqI?6U`>M>EWM`By}6Y2S}5h*IM79(lYG-i!T<7C8aBuC+cWkfb?
zhCM3vI7SIPS)%g2CMriQfR?Bk@qT4Qp~^^-;iO4XDXLKGebT5jVl`5tNl~kj+T()W
zX<a00rO5{@#AKvLP1H6jZ7~@cW0}D1;}VG_%nmfGP9M7rX2|9v6aWmnY8bAss{g`j
zYfh7z;S8~6&roE5d8QkNE3`g%TlnE%>=y~H>5Q<hh~b}h@Qe29ZlkXkG=`Oq+aPuu
zyf}M9;XQ0K4wswgG&5Y44j&n!&#>x?cmhG815Zfzz<eUX5LA+S217=-$LI!QVhHX}
z&W@>BY$>intmm8V`9gX{So#k1b0f?{$V1qPAhux+vRs5+2qHBg1{2FdSOuUaCpM{Q
z5)y7TK`$0WhfN42I1ELm@q^yX*qqe70`c@>XtogtNhdO(m88HS0=Eq~pCw{Fmm@=)
zWFxE;LIus>JN<*&!hIq1g=hY7s$q(PWX8z23B)Azn0w@?nUVt_sqLn)OE$#}i=h}v
z&}8kDhYE=af2nCi-eC%pK~q#_+l*w;qb(|fA|<vBBx|P<NOm(Y$Cymbpi|2QE(2Gh
zmZ$>l%~5&G8MTZP0#U|N#v!he3QDsG)ge=Wf##;E$#Bu6Q3Bet`j|NUv0!mWSR0&C
zPTU3ix--Q3W-P;NJ6R-bzzer#npAx)JfYYb-#G%VqLHwo2}$uclS^YgFr1pk@^Ms!
z!cBl`7kv>5;q*cq>q7`5L=c2<`jO43Ebf4fGBYg0FI;gQNF3xz35_tcwju~&Ebt>O
zLwR@+%JETv3M`&7dnq4J>qHVdfe%_DoliHTYCtid4lA({n`D!$5>p|ZPu<SvHTuYR
zcu%8BuAjQIQ72hlIE0R1APgW3aqr5)*zHKi5XKQ6LYP39M0gqjzmC|m2rnYMgm4Vu
z6$HF|vl9rfBfO9BA;L+7QwX0SoJKg0fZvo%L9mhqfDWYD2%t(6!?QM#YLvZL6Dt=t
azb{s%kQe#6l?{Bws=ZdofWs;~-2VsQ>4850

delta 3589
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
b-qWegK$9VK3fQbFW0W}xs%C9bV%dKIN+Woo

diff --git a/osinaweb/osinacore/templates/customer_index.html b/osinaweb/osinacore/templates/customer_index.html
index ba9e17ef..41f048f8 100644
--- a/osinaweb/osinacore/templates/customer_index.html
+++ b/osinaweb/osinacore/templates/customer_index.html
@@ -13,31 +13,33 @@
             {% if subscription.item.item_type.name == 'OSIMENU' %}
                 <a href="{% url 'redirectosimenu' %}">
                     <div class="flex flex-col justify-center items-center shadow-md rounded-md cursor-pointer hover:scale-105 transition-transform duration-300 relative">
-                        <div class="w-full py-8 px-3 bg-gray-50 flex justify-center items-center rounded-t-md relative h-[150px]">
+                        <div class="w-full py-8 px-3 bg-gray-50 flex justify-center items-center rounded-t-md relative h-[130px]">
                             {% if subscription.item.item_type.name == 'OSIMENU' %}
                             <img src="{% static 'images/ositcom_logos/osimenublue.png' %}" class="w-[80%] h-auto">
                             {% endif %}
 
                         </div>
-                        <div class="w-[80%] absolute bottom-[-35px] left-1/2 -translate-x-1/2 bg-white border border-gray-100 shadow-md flex justify-center items-center p-3">
-                            <p class="text-secondosiblue text-[17px]">Expires: <span class="font-semibold">{{subscription.end_at}}</span>
+                        <div class="w-full  bg-white border border-gray-100 shadow-md flex justify-start items-center p-3">
+                            <p class="text-secondosiblue text-[17px]">Expires:{% if subscription.end_at %} <span class="font-semibold">{{subscription.end_at}} {% else %} <span class="font-semibold">No Expiry {% endif %}</span>
                             </p>
                         </div>
                     </div>
                 </a>
-
             {% elif subscription.item.item_type.name == 'OSICARD' %}
             <a href="{% url 'redirectosicard' %}">
-                    <div class="flex flex-col justify-center items-center shadow-md rounded-md cursor-pointer hover:scale-105 transition-transform duration-300 relative">
-                        <div class="w-full py-8 px-3 bg-gray-50 flex justify-center items-center rounded-t-md">
+                <div class="flex flex-col justify-center items-center shadow-md rounded-md cursor-pointer hover:scale-105 transition-transform duration-300 relative">
+                    <div class="w-full py-8 px-3 bg-gray-50 flex justify-center items-center rounded-t-md relative h-[130px]">
+                            {% if subscription.item.item_type.name == 'OSICARD' %}
                             <img src="{% static 'images/ositcom_logos/osicardblue.png' %}" class="w-[80%] h-auto">
-                        </div>
-                        <div class="w-[80%] absolute bottom-[-35px] left-1/2 -translate-x-1/2 bg-white border border-gray-100 shadow-md flex justify-center items-center p-3">
-                            <p class="text-secondosiblue text-[17px]">Expires: <span class="font-semibold">{{subscription.end_at}}</span>
-                            </p>
-                        </div>
+                            {% endif %}
+
                     </div>
-                </a>
+                    <div class="w-full  bg-white border border-gray-100 shadow-md flex justify-start items-center p-3">
+                        <p class="text-secondosiblue text-[17px]">Expires:{% if subscription.end_at %} <span class="font-semibold">{{subscription.end_at}} {% else %} <span class="font-semibold">No Expiry {% endif %}</span>
+                        </p>
+                    </div>
+                </div>
+            </a>
             {% endif %}
             {% endfor %}
 
diff --git a/osinaweb/osinacore/templates/customer_main.html b/osinaweb/osinacore/templates/customer_main.html
index 24d3b47c..827b2fb3 100644
--- a/osinaweb/osinacore/templates/customer_main.html
+++ b/osinaweb/osinacore/templates/customer_main.html
@@ -432,6 +432,7 @@
                                 <path class="cls-1" d="M502.56,144.47c-58.22,0-105.67,47.44-105.67,105.67v2.88c1.44,56.97,48.34,102.79,105.67,102.79s105.67-47.44,105.67-105.67-47.44-105.67-105.67-105.67ZM502.56,239.89c21.38,0,38.82,17.43,38.82,38.82,0,17.79-12.22,32.89-28.57,37.56v13.48c0,5.75-4.67,10.24-10.24,10.24s-10.24-4.67-10.24-10.24v-13.48c-16.53-4.49-28.57-19.59-28.57-37.56,0-5.75,4.67-10.24,10.24-10.24s10.24,4.67,10.24,10.24c0,10.06,8.27,18.33,18.33,18.33s18.33-8.27,18.33-18.33-8.27-18.33-18.33-18.33c-21.38,0-38.82-17.43-38.82-38.82,0-17.79,12.22-32.89,28.57-37.56v-13.48c0-5.75,4.67-10.24,10.24-10.24s10.24,4.67,10.24,10.24v13.48c16.53,4.49,28.57,19.59,28.57,37.56,0,5.75-4.67,10.24-10.24,10.24s-10.24-4.67-10.24-10.24c0-10.06-8.27-18.33-18.33-18.33s-18.33,8.27-18.33,18.33,8.09,18.33,18.33,18.33Z"/>
                                 <path class="cls-1" d="M196.34,476.02h295.8v-99.92c-31.45-2.52-59.66-16.71-80.33-38.1H82.23c-5.75,0-10.24-4.67-10.24-10.24s4.67-10.24,10.24-10.24h313.41c-10.06-15.99-16.71-34.32-18.69-54.09H82.23c-5.75,0-10.24-4.67-10.24-10.24s4.67-10.24,10.24-10.24h294.18c1.08-19.59,6.83-37.92,15.81-54.09H82.23c-5.75,0-10.24-4.67-10.24-10.24s4.67-10.24,10.24-10.24h324.37c21.03-24.62,51.4-40.97,85.54-43.67V30.17H16.64v454.48c0,23,8.99,44.57,25.34,60.92,16.35,16.35,37.92,25.34,60.92,25.34,46.54,0,83.2-37.2,83.2-84.46,0-5.93,4.67-10.42,10.24-10.42ZM82.23,93.25h195.34c5.75,0,10.24,4.67,10.24,10.24s-4.67,10.24-10.24,10.24H82.23c-5.75,0-10.24-4.67-10.24-10.24-.18-5.57,4.49-10.24,10.24-10.24ZM82.23,412.77c-5.75,0-10.24-4.67-10.24-10.24s4.67-10.24,10.24-10.24h344.5c5.75,0,10.24,4.67,10.24,10.24s-4.67,10.24-10.24,10.24H82.23Z"/>
                               </svg>
+                              
                         </div>
                         <div
                             class="w-[60px] h-[60px] bg-white border-2 rounded-full border-secondosiblue flex justify-center items-center">
diff --git a/osinaweb/osinacore/templates/email_templates/forgot_password_email.html b/osinaweb/osinacore/templates/email_templates/forgot_password_email.html
new file mode 100644
index 00000000..e7ceb25f
--- /dev/null
+++ b/osinaweb/osinacore/templates/email_templates/forgot_password_email.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Account Activation</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            line-height: 1.6;
+            margin: 0;
+            padding: 0;
+            background-color: #f9f9f9;
+            text-align: center;
+        }
+        .container {
+            max-width: 600px;
+            margin: 0 auto;
+            padding: 20px;
+            background-color: #ffffff;
+            border-radius: 8px;
+            box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+        }
+        h2 {
+            color: #20336b;
+        }
+        p {
+            color: #374a7a;
+        }
+        .btn {
+            display: inline-block;
+            padding: 10px 20px;
+            background-color: #20336b;
+            color: #ffffff;
+            text-decoration: none;
+            border-radius: 5px;
+            transition: background-color 0.3s ease;
+        }
+        .btn:hover {
+            background-color: #374a7a;
+        }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h2>Reset your account password at Ositcom</h2>
+        <p>Hello {{ user.first_name }},</p>
+        <p>You recently requested to reset your password for your account. Click the button below to reset it.</p>
+        <p><a class="btn"href="{{ reset_link }}">>Reset Password</a></p>
+        <p>If you did not request a password reset, please ignore this email. Your account is safe, don't worry.</p>
+        <p>Regards,<br>The Ositcom Team</p>
+    </div>
+</body>
+</html>
diff --git a/osinaweb/osinacore/templates/forgot-password-confirmation.html b/osinaweb/osinacore/templates/forgot-password-confirmation.html
index 7bd51f27..3e6f45ec 100644
--- a/osinaweb/osinacore/templates/forgot-password-confirmation.html
+++ b/osinaweb/osinacore/templates/forgot-password-confirmation.html
@@ -77,7 +77,7 @@
 
 
                 <!-- LOGIN FORM -->
-                <form id="forgotPasswordConfirmationForm" method="POST" action=""
+                <form id="forgotPasswordConfirmationForm" method="POST" 
                     class="w-full s:w-fit flex flex-col gap-5 justify-center items-center relative">
                     {% csrf_token %}
 
@@ -91,11 +91,11 @@
                         <div class="w-full s:w-[550px] h-fit bg-slate-50 rounded-md shadow-md p-5 s:p-9">
                             <p class="text-secondosiblue text-center font-light text-base s:text-[17px]">Enter your new password.</p>
 
-                            <input type="password" placeholder="Password" name="password1"
+                            <input type="password" placeholder="Password" name="new_password"
                                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-8"
                                 required>
 
-                            <input type="password" placeholder="Password Confirmation" name="password2"
+                            <input type="password" placeholder="Password Confirmation" name="confirm_password"
                                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-3"
                                 required>
 
diff --git a/osinaweb/osinacore/templates/forgot-password-sent.html b/osinaweb/osinacore/templates/forgot-password-sent.html
new file mode 100644
index 00000000..dab8cd85
--- /dev/null
+++ b/osinaweb/osinacore/templates/forgot-password-sent.html
@@ -0,0 +1,100 @@
+{% load static %}
+
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Osina</title>
+
+    <link rel="stylesheet" type="text/css" href='{% static "dist/output.css" %}'>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css">
+
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+</head>
+
+
+<body class="font-poppinsLight">
+    <div class="w-full h-fit xlg1:h-[100vh] grid grid-cols-1 xlg1:grid-cols-2 gap-5">
+        <!-- SIDE BANNER -->
+        <div
+            class="bg-gradient-to-b from-gray-100 to-blue-950 p-5 s:p-9 overflow-hidden w-full h-full border-r border-gray-100 duration-500 hidden xlg1:block relative">
+            <div class="relative w-full h-full flex justify-center items-center">
+                <div
+                    class="absolute top-0 left-32 w-[400px] h-[400px] bg-slate-800 mix-blend-multiply filter blur-xl opacity-70 animate-blob animation-delay-2000">
+                </div>
+                <div
+                    class="absolute top-20 right-0 w-[400px] h-[400px] bg-osiblue mix-blend-multiply filter blur-xl opacity-70 animate-blob animation-delay-2000">
+                </div>
+                <div
+                    class="absolute bottom-0 left-10 w-[400px] h-[400px] bg-blue-900 mix-blend-multiply filter blur-xl opacity-70 animate-blob animation-delay-2000">
+                </div>
+                <div
+                    class="absolute bottom-0 right-36 w-[400px] h-[400px] bg-gray-400 mix-blend-multiply filter blur-xl opacity-70 animate-blob animation-delay-2000">
+                </div>
+            </div>
+
+
+            <div class="absolute w-full h-full hidden xlg1:flex justify-between items-center m-auto inset-0 z-10 p-9">
+                <div class="flex flex-col">
+                    <p class="text-white text-[30px] lg:text-[48px] xll:text-[70px] font-poppinsExtraBold">
+                        PROVIDING
+                        OPTIMAL
+                        <br />SOLUTIONS<br />
+                    </p>
+                    <div class="flex justify-start items-center gap-2 mt-5">
+                        <div class="w-[30px] h-[3px] bg-blue-500"></div>
+                        <img src="{% static 'images/ositcom_logos/ositcomwhite.png' %}" class="w-[120px] h-auto">
+                    </div>
+                </div>
+                <div class="absolute w-[400px] lg:w-[480px] xll:w-[550px] h-auto -right-40 bottom-5 animate-bouncePop">
+                    <img src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}" class="w-full h-auto">
+                </div>
+            </div>
+        </div>
+
+
+        <!-- FORGOT PASSWORD FORM -->
+        <div class="w-full h-[100vh] xlg1:h-full flex justify-center py-9 px-0 s:px-5 relative overflow-hidden xlg1:overflow-visible bg-gradient-to-b from-gray-100 to-blue-950 xlg1:from-white xlg1:to-white"
+            id="loginRegisterContainer">
+
+            <!-- Background blobs -->
+            <div class="relative w-full flex justify-center items-center">
+                <div
+                    class="absolute top-0 left-32 w-[400px] h-[400px] bg-slate-800 mix-blend-multiply filter blur-xl opacity-70 animate-blob animation-delay-2000 block xlg1:hidden">
+                </div>
+                <div
+                    class="absolute top-20 right-0 w-[400px] h-[400px] bg-osiblue mix-blend-multiply filter blur-xl opacity-70 animate-blob animation-delay-2000 block xlg1:hidden">
+                </div>
+                <div
+                    class="absolute bottom-0 left-10 w-[400px] h-[400px] bg-blue-900 mix-blend-multiply filter blur-xl opacity-70 animate-blob animation-delay-2000 block xlg1:hidden">
+                </div>
+                <div
+                    class="absolute bottom-0 right-36 w-[400px] h-[400px] bg-gray-400 mix-blend-multiply filter blur-xl opacity-70 animate-blob animation-delay-2000 block xlg1:hidden">
+                </div>
+
+
+                <!-- EMAIL CONFIRMATION MESSAGE -->
+                <div class="w-full s:w-fit flex flex-col gap-5 justify-center items-center relative">
+
+                    <!-- OSINA LOGO ON DESKTOP -->
+                    <img src="{% static 'images/ositcom_logos/osinablue.png' %}" class="w-[250px] h-auto hidden xlg1:block">
+
+                    <!-- OSINA LOGO ON MOBILE -->
+                    <img src="{% static 'images/ositcom_logos/osinawhite.png' %}" class="w-[220px] h-auto block xlg1:hidden">
+
+                    <div class="w-full flex justify-center items-center px-5 s:px-0">
+                        <div class="w-full s:w-[550px] gap-5 h-fit bg-slate-50 rounded-md shadow-md p-5 s:p-9">
+                            <p class="text-secondosiblue font-light text-center text-base s:text-[17px]">We’ve emailed you instructions for resetting your password. You should receive them shortly.</br></br>
+                                If you don’t receive an email, please make sure you’ve entered the address you registered with, and check your spam folder.</p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/forgot-password.html b/osinaweb/osinacore/templates/forgot-password.html
index 53e9fb66..5fafd77e 100644
--- a/osinaweb/osinacore/templates/forgot-password.html
+++ b/osinaweb/osinacore/templates/forgot-password.html
@@ -77,7 +77,7 @@
 
 
                 <!-- LOGIN FORM -->
-                <form method="POST" action=""
+                <form method="POST" action="{% url 'forgot-password' %}"
                     class="w-full s:w-fit flex flex-col gap-5 justify-center items-center relative">
                     {% csrf_token %}
 
@@ -92,7 +92,16 @@
                             <p class="text-secondosiblue text-center font-light">Enter your email address below, and
                                 we'll email you instructions for setting a new password.</p>
 
-                            <input type="email" placeholder="Email" name=""
+                            <div id="error-message"
+                                class="messages opacity-0 absolute top-20 w-[85%] s:w-fit left-0 right-0 mx-auto px-9 s:px-14 py-3 rounded-md bg-red-500 bg-opacity-80 text-white text-center rounded-t-md shadow-md text-xl z-10 pointer-events-none">
+                                {% for message in messages %}
+                                <p
+                                    class="{{ message.tags }} text-white text-base s:text-[17px] font-light text-center">
+                                    {{ message }}</p>
+                                {% endfor %}
+                            </div>
+
+                            <input type="email" placeholder="Email" name="email"
                                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-8"
                                 required>
 
@@ -105,6 +114,24 @@
                 </form>
             </div>
         </div>
+
+        <script>
+            function showError() {
+            const errorMessage = document.getElementById('error-message');
+            errorMessage.classList.add("show-message");
+
+            // Automatically hide the message container after 10 seconds
+            setTimeout(() => {
+                errorMessage.classList.add("hide-message");
+            }, 10000);
+        }
+
+        // Check if error messages are present in the rendered HTML
+        const errorMessages = document.querySelectorAll('.messages p');
+        if (errorMessages.length > 0) {
+            showError();
+        }
+        </script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/osinaweb/osinacore/urls.py b/osinaweb/osinacore/urls.py
index 36b3c2aa..99f3dd78 100644
--- a/osinaweb/osinacore/urls.py
+++ b/osinaweb/osinacore/urls.py
@@ -23,15 +23,17 @@ urlpatterns = [
     path('api/', include('osinacore.api.urls')),
     path('login/<str:email>/<str:key>/', views.login_with_email, name='login_with_email'),
     path('login', views.signin, name='signin'),
-    path('forgot-password/', views.forgot_password, name='forgot-password'),
-    path('forgot-password-confirmation/', views.forgot_password_confirmation, name='forgot-password-confirmation'),
     path('signup', views.signup, name='signup'),
-    path('email-confirmation-sent/', views.confirmation_sent, name='email-confirmation-sent'),
+    path('check-email-availability/', views.check_email_availability, name='check-email-availability'),
     path('activate/<uidb64>/<token>/', views.activate, name='activate'),
     path('confirmation-sent/', views.confirmation_sent, name='activation_sent'),
+    path('forgot-password/', views.forgot_password, name='forgot-password'),
+    path('reset-password/<uidb64>/<token>/', views.forgot_password, name='forgot-password'),
+
+
     path('go_online/', views.go_online, name='go_online'),
     path('logout/', views.signout, name='signout'),
-    path('check-email-availability/', views.check_email_availability, name='check-email-availability'),
+   
     path('', views.home, name='home'),
     path('statusmobilemodal/', views.status_mobile_modal, name='statusmobilemodal'),
     path('userrecentativities/<int:user_id>', views.user_recent_activities_modal, name='userrecentativities'),
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index e776d1a8..a21ac80a 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -69,16 +69,6 @@ def confirmation_sent(request, *args, **kwargs):
     return render(request, 'email-confirmation-sent.html', context) 
 
 
-def forgot_password(request):
-
-    return render(request, 'forgot-password.html')
-
-
-def forgot_password_confirmation(request):
-
-    return render(request, 'forgot-password-confirmation.html')
-
-
 def signup(request):
     form = CreateUserForm()
     reference = Reference.objects.get(name='Osina')
@@ -713,3 +703,56 @@ def recent_activities_page(request):
 
     return render(request, 'recent-activities-page.html', context)
 
+
+
+
+
+from django.contrib.auth.tokens import PasswordResetTokenGenerator
+
+
+
+def forgot_password(request):
+    if request.method == 'POST':
+        email = request.POST.get('email')
+        user = User.objects.filter(email=email).first()
+        if user:
+            token = PasswordResetTokenGenerator().make_token(user)
+            current_site = get_current_site(request)
+        
+            uid = urlsafe_base64_encode(force_bytes(user.pk))
+            reset_link = f"{current_site}/reset-password/{uid}/{token}/"
+
+            mail_subject = 'Reset your password'
+            message = render_to_string('email_templates/forgot_password_email.html', {
+                'user': user,
+                'reset_link': reset_link,
+            })
+            send_mail(mail_subject, message, settings.EMAIL_HOST_USER, [user.email], html_message=message)
+            return render(request, 'forgot-password-sent.html')
+        else:
+            messages.error(request, 'No account is associated with this email.')
+    return render(request, 'forgot-password.html')
+     
+
+def reset_password(request, uidb64, token):
+    try:
+        uid = urlsafe_base64_decode(uidb64).decode()
+        user = User.objects.get(pk=uid)
+    except (TypeError, ValueError, OverflowError, User.DoesNotExist):
+        user = None
+
+    if user and PasswordResetTokenGenerator().check_token(user, token):
+        if request.method == 'POST':
+            new_password = request.POST.get('new_password')
+            confirm_password = request.POST.get('confirm_password')
+
+            if new_password == confirm_password:
+                user.set_password(new_password)
+                user.save()
+                return render(request, 'frontend/frontend-templates/reset_password/reset-password-done.html')
+            else:
+                return render(request, 'forgot-password-confirmation.html')
+        else:
+            return render(request, 'forgot-password-confirmation.html')
+    else:
+        return HttpResponse('Activation link is invalid!')
\ No newline at end of file
diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css
index db5f0549..346a700f 100644
--- a/osinaweb/static/dist/output.css
+++ b/osinaweb/static/dist/output.css
@@ -758,10 +758,6 @@ video {
   bottom: 1.25rem;
 }
 
-.bottom-\[-35px\] {
-  bottom: -35px;
-}
-
 .left-0 {
   left: 0px;
 }
@@ -770,10 +766,6 @@ video {
   left: 0.25rem;
 }
 
-.left-1\/2 {
-  left: 50%;
-}
-
 .left-10 {
   left: 2.5rem;
 }
@@ -1092,6 +1084,10 @@ video {
   height: 12px;
 }
 
+.h-\[130px\] {
+  height: 130px;
+}
+
 .h-\[13px\] {
   height: 13px;
 }
@@ -1448,11 +1444,6 @@ video {
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
-.-translate-x-1\/2 {
-  --tw-translate-x: -50%;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
 .-translate-y-1 {
   --tw-translate-y: -0.25rem;
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));