From 683325aada591a7e423a9e56eae357e0263857b4 Mon Sep 17 00:00:00 2001 From: nataly Date: Wed, 15 May 2024 16:32:10 +0300 Subject: [PATCH] Fixes. --- .../add/__pycache__/urls.cpython-312.pyc | Bin 1070 -> 1070 bytes .../add/__pycache__/views.cpython-312.pyc | Bin 12211 -> 12211 bytes osinaweb/db.sqlite3 | Bin 1269760 -> 1273856 bytes .../__pycache__/models.cpython-312.pyc | Bin 23712 -> 23840 bytes .../add/__pycache__/views.cpython-312.pyc | Bin 27109 -> 27014 bytes .../edit/__pycache__/views.cpython-312.pyc | Bin 26258 -> 26539 bytes .../0081_status_task.cpython-312.pyc | Bin 0 -> 1030 bytes osinaweb/osinacore/templates/main.html | 3 +- osinaweb/static/dist/output.css | 36 +++++++----------- osinaweb/static/js/projects-filtering.js | 6 ++- osinaweb/static/js/side-bar.js | 9 +++-- 11 files changed, 24 insertions(+), 30 deletions(-) create mode 100644 osinaweb/osinacore/migrations/__pycache__/0081_status_task.cpython-312.pyc diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc index 06afd0475f57c3ea119f47cfa02e4ba73cd6d3d9..a57ddb756117c73d3c1d8905e6838cdf89daf001 100644 GIT binary patch delta 20 acmZ3-v5tfLG%qg~0}w3V=(3SpnFRngt_0=) delta 20 acmZ3-v5tfLG%qg~0}$N5>$s6ynFRnjF9k;c diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc index d7ea02c4627dd29f6191f2086ffc8bb636dd546c..b7b7328da84831a704fc3c6808778681b69f55ea 100644 GIT binary patch delta 20 acmdlSzd4@!G%qg~0}wdublJ$gLLUG^JO%Fn delta 20 acmdlSzd4@!G%qg~0}v=aaNNkfLLUG^J_Ymu diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index a2962fc2da18ecf53eb7db996dd55538c9621c79..fb1d5610d89906ac9a1958049b523f69294d188f 100644 GIT binary patch delta 2045 zcmah~+i%lW822S{fAfkPc-RoA_&TywCsf&=j;dPxo_X9(KXNEd(q0ZTc$Ucd){6~(YDi1 z_bj9K<@4`6Mr)|nM!W~DEPjaXL~Wj`z) zjJ%70CtwZSRm{I(-vdLf4f-%UR;jH0gKdWmA0psy@F#fqg&F@DH0y8!YFAaesy0iU zLcj%Z3fxl64fqv6wd(Z9E*kAh74rvqkCT%;V5^g6|T@9;(Rm}UUXekvasjAIVknkF$3<<|^NVraiVkqQm ztE?TsRl@(h;e*dx*|a8Bt>Nw$u-^xd6muS8udTr`6c$k)E#QrDBW`+vfE(r?O;0{; zFxnOG3jU30VKKS5s}4D`&}8tV;k1xVSb`}zE#xc?i#RirmpfdpQmN$RRhKh4optf) zsgx@bq>9XVCYPT{j-~rTqvL&~9Lu?^L7&wh)-Y3>*jLi$Bo_Ts?tUoGCWS@g<<5MY~ zC99XZImUDc<#kd%n)Z^m#lqswI^<}x%99iLS)LO(Uf>pT8JWvvBu>bP8BP}APLxG1 zBgwod$sBKyGNLH+8E6uDk%Nyc@);PxOE3{0C3x0s65Ok27;AxhUX97f5{!mn8CVro zf?1*^18tnS~>2nY%)NrR@A&+wu}=2Wi=q;1m6Cph9I z-c$!kI2oFyJYHMn#vOd~C#ubArC}AfDehJLYf!Jp4H&Yd>CcXDtm9C0Q1no0pwucG z>vhHzIDHS)LH`{*s5D$Mz~oDY3&321qnHg@dbYsys|F}WW#j4=;|V;CZB%Lx)?dT0 zjpdf>7Ob)(S#Nrcec|K6GAzp=mybh-vLk8w^?lq|_qtNMY8pl{xS9CL^i@rb3Jq&h zntn0eQ}7Y|Y^C;$If>zC73qxGgWIflKUOGZ4wYFtEi-w-J4Hwd!CRgcNQs{>ax9Zd zz!sO!nV|qE4a((nTi>fkE2mqo%L_A$-Map=|5X)IG|@rIOej3pF&FTTxapa`fwI?= znBzVEo+8;r`+&g2VJ$0p33l@#`Ey1?;&6v z`~mK%^?m@A{3kjcX4fg}>y2CUM)fm}nr|ZJo2q-oya2g$t6X0B5}m2&+`CdJ6f33u zgF~qUU6dFc^iL1;u^z9O-5=^cG?ecdF34qiikjqlBa;VMhUuFhOBeG)bIeF@Jmf9T z%f&*eIM??pUwCdgXzx>{K*5 u+Y=SS6Z~LVD#jyxsJAOJ5lKz?>{5Y~Cw<`oe|97=I$C|3|GRT-(EkN3>|v(> delta 1433 zcmZ{iT}&KR6vyYz-JNCE-MO&DVx_giF0e{rdgo(jW;Zb{(k6@AcAIUYXdBtx*$G>q zU?Ba95sW7IP!%L*UQB4xH(v}{b!x%`zDQzXOB13mCEcbkZA`#W#JI-jnU!K8IGJ;2 zGV?p<{Qu|P@$&KU`Qwv~-X9qTX;Z>scoAQFdDi^?1rG1OgbyS8_MOn)Qg>Skp~&=K z2TLecnr&Z4oD>P;Ze+iAm3g&AFC!fsp zpLo5eXQWwrJ8l}Mibqc$>pXSk4O2g8riv%c^Qp_(o>xv}uB4P#4c*dmN2N;_UzDk= zcF=f-qzICpjLS)y5Di(UhEZA`iU~C#GRJ`CeWl>!mjrdbKQ}WmH-ntH88$@&ELmsB zI;oHc4!_8ji2!Ig(B#Dk9f-MWQ)>u5v1E-Qe~>j&cK9;8Orp=gAC7DHN*)IJV_xb$ zHpvx+{7zQLJ%|65{h9a?YK}mK24t`N&F+DQ8w~lAY>@S@d3>Mj4|}1R2m4XXU0Orr z4mA6eAva)Q9KIIcBr>EoA5c)&(BSYuVYFawIhF)Ulhr#G*r8IuRh3O#o6o~}5Y(5d zk5>9G3AQU>9Bfm(X}hV-H5`-N^)dEXtivCvs^x%jg-Y(SSqcoVfMqb8#;)P!$bn76 zZ(-N)e-rNAYPGN0q@~)hd7Ji!4nGXqeN02OjI%a|!)XqYC59}0RvTz{v_{B8rleT9L6p{Ql$v-#|H9B5e) zRYO-a*iDpvg5E_m&{T#qtWm`PIo5`KQ3Cjs zt3?>RES%2{7KGx6Fp?c84({qjR+6&riqmAU!hGfWPC>7nW#%kvhY`hmEUyX)BguciDaCLRF`FgGK{@+7gN~w3Y=5Bwv1bC zp^Q04E8`m^$T0ODsK zLf>*z=^Cf;LFl1_GkC%FUE}l4z%@ROr_;U9Pb^&LAqYgRvv9rcOmI3}{>9;E>o#uU zhTvJ-Hy%C&O=3aZ@z>% diff --git a/osinaweb/osinacore/__pycache__/models.cpython-312.pyc b/osinaweb/osinacore/__pycache__/models.cpython-312.pyc index 1c3e695e09c2c9a263222c20bed6dad38f2ab4c5..2ab8a9a1e0b33251ad3fd1915916801b8239bc59 100644 GIT binary patch delta 346 zcmZ3mlX1Z=M!wU$yj%=G;Iq*st=M8CpI;CY2jk>G6R*kVf_Nuy4a%H+CrEPgX;}$r z#uUaB_BCv)SwYGf7^3)7I9eE@1S&Z-xh87_n+n|GD@sjEElSNxPK_@~EY6q4`V};4{ytyWS3RdB{12mwh3q-ImPHr$3pR5(a$5=D@y|?(}fDjk? z8{9G-X4ko8E^^Dv2w4%fK7M8V0h1FY7m|vua2GeYY@QNg&&VYSHWo+(PQDuGh zAk2Z0QG9Y?xH`WqNDf3q0&#H!)L^^Gf5Lf~WEm$LdPq!Gir6iv2$a=iy2b9FmX?#5 zms+GW`CUW~mjXyLh)A5A5*f*;FnM3(KW?yXU}F^~ACHn{)ZF|us*F*9ol&wQtUsnR P<_iOm`9)-Mc8nYizA?#y_jSeCmVW5OkNbRTTlTg zqserO-9IfYCo?a#NO5vrWDb`+NF#_ynEWI%l2LxLUDQ8ruuWhiO Z6kubN>5Tcp0Azj9HxTo`iPSG|yppW_aeu%=RX{*aZEHrYVA_ z>DI)fud^-vc@m$+L$Hc9c>(_=KfqfYKbyx_qCz{VkC1i}e%cq8cz_4F!d0%lQ{6ys z+SIv@hBPE`y?Pq=`M*2QMTvHA%v*d~wkF>^vLf_CO+ zuA?-Za@|?5%TA>etkmrPE*Gdzd5iT)ztsHlm^v8+Ad1`PW^mLR4Mx3b(i57CF??gi z;WxV0Ulu!q@5i#Zl@05OR690!pvh5XMeZ7Om~|QaAva$DF!0ClCpbmx1xtn$eZF*C zf+wV18Ia^v?~jHG*vb#m^w>)gTJ&@Lp#IBMh!md3G0|L^Jbk24y;bPYpqxE-#i&zy_^UwwQSlCShL`SiH-8+pW^mrDZq* D?0k;o delta 558 zcmXv|O=uHA7@co+yW1??Y&M%s$d8iPZnw1!RGLE%jRY*MmP)iK#f#+7RzxtCB$vuW zy!dk{D0~+W9t4k(N*KH<6ug*=wwIi&f>P)yHG&5PooVnf^Z4H5dvE69K78MYVB0he zBG7)DzY#69f)CP0KuAU0-Y!=3GX6=wf%jNAGl5SOgCAzz!HKwM8-B1JlUWI-GK~!~ zgAFm01z(v>z3(?HW?@J@tupIY0*`eE{|=|Y!t_WPk8C3oVxc*5JxfT#W_As>wR)x> z6qPo!7{QO{T+?dG4+%8FEG+BrXvCThHKFg82m?l$vTi?D8cyBsyP|=thne#~TO#8Q zPI?yxs-9TDJ6(ODs<{3sT4IxhLqz;E&N zee%tW;5okYiWJMO7YBq@&*@5C}f{3^7cPDot!Sh*Phhe^vyQo5q@604s*ybN*TMBT_3TrCt@h@|)Dg5A17Y-=}%C{Di z3Uw)NEneaWmyZF?@=wJns-35V)HboAd02FV_<2U-h2<7#%hJCleV$s`p|Hl=t3v^( f^G^B70JQk{#sRgbVIF!4q0ugtW4FTNH*do~+y|5p diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc index ca2065a22305173f378d74b4355dcae1ea26d816..ab9f82aa201c63fbbdfb29db392763a7cf1fdd21 100644 GIT binary patch delta 1171 zcmchWOH30{6o%*AX*&*DUTt|yp@8yel}E7z0~i%4D5Y4+GX;cJ+9p=fScini5J49v z>caGh#%Lri4H_jkUAS^#T&N+S3ysEwMB~OsN;Gj{g3dq)8$}kzvpMJH+}!W{|GhUd z15>l0eX7;QF>*Mk?ZLpbwl@v3(V90-zofAM_i<53#k+zY#|n6wFI)pO81>krY@Q(Tl7g^9#uQd(8LWfG<0N7}|jj&KnJ>@PI-1Jt(0D(T5wX>PP2^!wT5g5ba zJtL%v#Rcai_H5^IvO20h;@3#3h%B^!@30`LLYr5nTg|sOOsO%}V%8iB`T6y3MwcT+ zHOh+x__@Xi7Ub=rboFbM7#I}8N9D8S@^F73Tql>|Av|j@0s}_v!!U%_rgXH|PH+)m zn3EAecbf?pYpD=pm@eWa-<1>~3(M&n!z2gM?d)BvE$nL`W&cICMVq(cn?Fus@t)d% zK}Q|van5VQw~j5czMqZ(jw;&5|An@wvl1@RdG|&_Bo*d(46J7Pw$SHEWqGj#t6fGY z#e=ST6gqAA%GI^x@oDavGDDU!!%M}y4$`f7+d+Jaw@Q+|jX#7F?gkkA4ZwoCy>V(z zVnfAfZgt?Sw-Fz-nwA6>BiB~LeN+JPe+3k^SCV#?E;vVkzVC2@N`8ff5w8K%SmD_Q z#dtGc$7;n=9Pt>zhF3ginM}Lf`IrMDlU^*@Nk93*u$G=5-SwpMPdIa; zxcYySWo=eG;2no_nRi@fRrxM(TNT!$b+Kq)-$O_$hyC!CWk^blC}m8fI|5zs3tJ&X A@c;k- delta 927 zcmbVJT}V@L6u;-*?aoc-+?UR6&aaibv$51P)DqK`A4@hrrnr&QF;)qEx?c1y2z!tS zEDt?MqR~^dLCT+k9)zTVpv;Dm6h#EFM-dVt2sWU)@*Yx?QHE3{J zEyIrn2hNGrc*USar?CnbjNLe?x1yWNz$tDYC@{{Ia3WsJv%DmjHN{30;mV|JvUn<} z~Nq#M8^@TIWN#jZ`7tiJHSeA1u z#w1rW$@hW+240ao^Ct-;$dA$u26D)TT?ep-UUm#4bNDWM11M_f z1jYmT_{>Sf>lCH(;LH(!YSJ}1A??4sj(2g2;vJTlK{G~LdqIs$0~IK97Gt^d9QzF=zY3WWvmLG<7)Xz@HL=d7ReB7zxkdTCW!0b?t{7!T3?^^OywVR*ZTY zC96rkZxq_vS5jn&?i#2kg*}V3D5eywrg=+o(xqYKVLP^Z4N!(5?%H}T2Ag7lKMwDJF3D2 zQU}Iv{TD#(02?Dr3{06)9U~K4q!uA{;?9l>QhSo`-uv$JyZhc}f1jK*ff$uftJ@d> z@Kcg}Xk&1)Ccpt8fIuGvunq%MM^JL)D|HotbwHFoKvW7lsah_Ot%pjs*0nyev|o}~ zh?_yX#k`~)g)zrLM5rHEn^|HuUm25=&jK6(3hI!6IwG(I>k0x?z3eQ4h}^@SssE)i zOjL10y;Hon(K{3w^^fx$z_~R8(z5aXa*y5uYw<)7xle#kSdg}b;vgDS=wTAD7J6sKW zzAv;xSJ+4s$_tG8UP6f*dI9Aqi7Z7JE=|rNY8uzJ+tepjYm)138h2f8x~|CU`BdP7 z>%QuFzRZ=3&@K&$xK5kKO!k!P4+&Y58cdbcToZM*Tj68c=a_W7P?Us7gX`(7M5np_ z)Y)*WwMvDXQJ0R}{{fsxTh9W!7E>16qRONh1@>yx>;*JTV!P@kp5K=np?4<}wnMs` z@-a>EE^TB<(qQ}F2WAVa@4A_}sg>n!pJ8!kI!y==zZBCR7-3-C9w}%Rzp0E&VBCCX z4)ytgK7Ty7a6B`2TwK~;9u}7d#ijS9j~ic}ecSxHIdp0Rr#5u92F}*dX$_p#2!LI< zj>J+y&(SFWS6`sh3Dq!13NGTekJw^*v98_G^@L3)zkQUA7=m vDs@YsGyQ(nxCg8xC=^dDGe!!8@DB#i`T-VCaRK6eb2wcZOqYHGK~jOgRhbIc literal 0 HcmV?d00001 diff --git a/osinaweb/osinacore/templates/main.html b/osinaweb/osinacore/templates/main.html index 15fc7636..13891b07 100644 --- a/osinaweb/osinacore/templates/main.html +++ b/osinaweb/osinacore/templates/main.html @@ -47,8 +47,7 @@ class="w-full h-full bg-black bg-opacity-40 z-20 fixed hidden justify-center items-center inset-0 p-5">
-

-

+

diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index e3999796..a12aef20 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -1056,6 +1056,10 @@ video { height: 2.5rem; } +.h-12 { + height: 3rem; +} + .h-14 { height: 3.5rem; } @@ -1234,10 +1238,6 @@ video { height: 100vh; } -.h-12 { - height: 3rem; -} - .max-h-\[50px\] { max-height: 50px; } @@ -1254,6 +1254,10 @@ video { width: 2.5rem; } +.w-12 { + width: 3rem; +} + .w-14 { width: 3.5rem; } @@ -1334,10 +1338,6 @@ video { width: 220px; } -.w-\[22px\] { - width: 22px; -} - .w-\[240px\] { width: 240px; } @@ -1447,10 +1447,6 @@ video { width: 100%; } -.w-12 { - width: 3rem; -} - .min-w-full { min-width: 100%; } @@ -2459,6 +2455,10 @@ video { --tw-gradient-to: #fff var(--tw-gradient-to-position); } +.fill-blue-600 { + fill: #2563eb; +} + .fill-osiblue { fill: #20336b; } @@ -2467,10 +2467,6 @@ video { fill: #374a7a; } -.fill-blue-600 { - fill: #2563eb; -} - .stroke-black { stroke: #000; } @@ -3650,8 +3646,8 @@ video { height: 70px; } - .md\:w-\[160px\] { - width: 160px; + .md\:w-\[250px\] { + width: 250px; } .md\:w-\[300px\] { @@ -3663,10 +3659,6 @@ video { width: fit-content; } - .md\:w-\[250px\] { - width: 250px; - } - .md\:grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); } diff --git a/osinaweb/static/js/projects-filtering.js b/osinaweb/static/js/projects-filtering.js index ebbdecdb..d9988451 100644 --- a/osinaweb/static/js/projects-filtering.js +++ b/osinaweb/static/js/projects-filtering.js @@ -19,10 +19,12 @@ document.addEventListener('DOMContentLoaded', function () { allProjectsContainer.classList.remove('hidden'); projectLoader.classList.add('hidden'); - // Check if "Pending" is selected - } else if (selectedStatus === 'Pending') { + // Check if "In Progress" is selected + } else if (selectedStatus === 'In Progress') { inProgressProjectsContainer.classList.remove('hidden'); + projectsByStatusContainer.classList.add('hidden'); projectLoader.classList.add('hidden'); + allProjectsContainer.classList.add('hidden'); } else { fetch('/projects/status/' + selectedStatus + '/') .then(response => response.text()) diff --git a/osinaweb/static/js/side-bar.js b/osinaweb/static/js/side-bar.js index 4e425307..44f394dd 100644 --- a/osinaweb/static/js/side-bar.js +++ b/osinaweb/static/js/side-bar.js @@ -72,13 +72,14 @@ document.addEventListener('DOMContentLoaded', function () { // TO DISPLAY THE USER PROFILE DROPDOWN ON MOBILE const mobileUserProfile = document.getElementById('mobileUserProfile'); var dropdown = document.getElementById('mobileUserProfileDropdown'); - var arrowDown = menuItem.querySelector('.angleDown'); - var arrowUp = menuItem.querySelector('.angleUp'); + const mobileArrowDown = document.querySelector('#mobileUserProfile .fa-angle-down'); + const mobileArrowUp = document.querySelector('#mobileUserProfile .fa-angle-up'); + mobileUserProfile.addEventListener('click', function () { dropdown.classList.toggle('active'); - arrowDown.style.display = arrowDown.style.display === 'none' ? 'inline' : 'none'; - arrowUp.style.display = arrowUp.style.display === 'none' ? 'inline' : 'none'; + mobileArrowDown.style.display = mobileArrowDown.style.display === 'none' ? 'inline' : 'none'; + mobileArrowUp.style.display = mobileArrowUp.style.display === 'none' ? 'inline' : 'none'; }); });