From 5bb00ddc7475b34ddc743dcf068b2561e41ffb2f Mon Sep 17 00:00:00 2001 From: Alanna Cao Date: Tue, 17 Sep 2024 16:02:07 -0400 Subject: [PATCH 01/18] Refactored public/src/client/account/blocks.js to remove deeply nested function --- public/src/client/account/blocks.js | 43 ++++++++++++++++------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/public/src/client/account/blocks.js b/public/src/client/account/blocks.js index 91b0745a19..7f38e6b28a 100644 --- a/public/src/client/account/blocks.js +++ b/public/src/client/account/blocks.js @@ -9,6 +9,7 @@ define('forum/account/blocks', [ const Blocks = {}; Blocks.init = function () { + console.log('ALANNA CAO'); header.init(); const blockListEl = $('[component="blocks/search/list"]'); const startTypingEl = blockListEl.find('[component="blocks/start-typing"]'); @@ -29,25 +30,7 @@ define('forum/account/blocks', [ searchBy: 'username', paginate: false, }, function (err, data) { - if (err) { - return alerts.error(err); - } - if (!data.users.length) { - noUsersEl.removeClass('hidden'); - return; - } - noUsersEl.addClass('hidden'); - // Only show first 10 matches - if (data.matchCount > 10) { - data.users.length = 10; - } - - app.parseAndTranslate('account/blocks', 'edit', { - edit: data.users, - }, function (html) { - blockListEl.find('[component="blocks/search/match"]').remove(); - html.insertAfter(noUsersEl); - }); + handleUserSearchResponse(err, data, blockListEl, noUsersEl); }); }, 200)); @@ -66,6 +49,28 @@ define('forum/account/blocks', [ }); }; + function handleUserSearchResponse(err, data, blockListEl, noUsersEl) { + if (err) { + return alerts.error(err); + } + if (!data.users.length) { + noUsersEl.removeClass('hidden'); + return; + } + noUsersEl.addClass('hidden'); + // Only show first 10 matches + if (data.matchCount > 10) { + data.users.length = 10; + } + + app.parseAndTranslate('account/blocks', 'edit', { + edit: data.users, + }, function (html) { + blockListEl.find('[component="blocks/search/match"]').remove(); + html.insertAfter(noUsersEl); + }); + } + async function performBlock(uid, action) { return socket.emit('user.toggleBlock', { blockeeUid: uid, From 3b7d956e53cdb292c07bc2b9d15ace10703b46ab Mon Sep 17 00:00:00 2001 From: Karen Gonzalez Date: Wed, 18 Sep 2024 21:23:18 -0400 Subject: [PATCH 02/18] Refactor code in src/controllers/mods.js --- dump.rdb | Bin 0 -> 54969 bytes src/controllers/mods.js | 68 +++++++++++++++++++++++++++++++--------- 2 files changed, 54 insertions(+), 14 deletions(-) create mode 100644 dump.rdb diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000000000000000000000000000000000000..a895d674b44a23631adb565b81ff3a053669c18d GIT binary patch literal 54969 zcmeHw349yJb@wbTlHdjKz9cL`Qluz?Hz^5K+$E{gmMvM5t;CWHEPw?G2?Ss)Ac?Ni zz?Ljo_hI=;?36y@=5Cs_ZjvS`WPWYa^iI>XO`LYEq>YpGh#P)&;-t~{W@Z<=SOFj< zSyK8n)(^6c-C4}OdGn6{J7(LuwVSs0_YVxbT@n`pA0dN&mjed@P%6-pZTRs_&CSz`Y zDB$jQ$Ks*=p|CJ1h;H(==-wX^4#@vK$GtYz>}X~XYCwl0{Ip7;c{W^Hatx*$-w{fL1*_B& zLuVz_=U5lvePJPBN6d+UAo}B>SRxdSl%<#x@LE10-Y^kOMiONv=Ezhi5D+3o40A-B z5fj2RTY`>qA7xKkiW%l{pcuEY^7d#bvQ2m(DToQN1~DgR>xwrE{C=SvF_-NN(89+@ z-1H~K_I8Aj0iD|rj{5j8duKEt#Q8)tE>_L^@Vfw!N-o>0lR(u0cQ6_bM-K=APa+f$ ztE8H&ttuPi7?yJvd%IaP*KN-t-8-?3 z4H?Q^>o&HnP#JSLFJn#tBShmfbKJMbS{Njjlx0#j%Vl!mtceRj#=j?6;?eN z=EVdM5hb`5L;3tvx*i?ls>}RXd|Mgj7}hnZG6TqYu8|Sq-U?$G19GNT*e^stl;B6Y z6H~&p;1Y#|Do5X>QUeRzQFY~WDYIlO9OVOUypHZ5=s86!El!&Es}CQ{%T}P66Ut-f zxVs8TI}>IM29_bGm@Z1Um}M#GPBo%R2{jT~7vcAZCV8v@-2zpN?*2LMQSN2O%dn;u z=uuGT3BhurPnF_jbSdqYXLs$IBnrztCGeoJdL_o`*t2KJQTa*5hZFInU_KV|Mjq}xMe z3k5@wfJ&ad-1{8wgIQa1DT8`So?ObHF_$uE%B$C!sb16Qt6WpN27PtaQzZJz&Qcm> z>noWm?!01NL)rZ7myGR?CWJZe(%4eRQjJi1iE5H8`>swS)abYlD$`aNT!SFfR)9={ zj~70(E3##pk;t@2woF?R$1<(|dS%+j*;6@X+CN<>)2uR&&wyAP+cI{>aRy#_89D?n z3u2AhsHesv5fCtb5F3$1rC5<=Lw-myH8-+gLGkfGC^E@n@dmkz3s!yzm-6plHajfZ!-Dd4QjCY9nM38s+lHu@FG#)8C>YJR1hNETi;-hWB06#SB zD}L0^RU!*p=|$FJDlE?o^zoAMqRDnF#>d&Oluv{LRuFeYG<*E)>&1yO#2m+*m@2O= zMa*Mhv=ZaD1TnD5V9Q!sYs?Sg-7EqmB{K}`B4sL97}Fm4s%TiIS? zt(CcK>r*%LLgJMCz#R93F_*)o;k%DuzSE6uCVZ!r#bj_dWxjsuEA#{N$sdmVJDUM_ zW1Yet%w|C6Lzn?a7R!M7ER9##^C|-tbQrXj#!wEGK-N{Uf%8}zx^dLf$Qr0x8bhk3 zfvt^MouyH6vn-8*MA51M-O7`N_fPQ|4aspFh<{Tq@h>|uxs{{pW7#ZJqs?(%?ttw8 zJgo{Hjex3JM~oP+6-}^KWJ+1lJ**YX31ZX}8{InVL_56o=HrCe-Ud`U+km!u8%)RW z{`1ze{l%w14uGq;X{*;}tT2Ff8&WrfZr#YMWi6Yk<_h{eWYKc_JhohF&Q5hm4Ikmd zGl`I2bPMq~IG*m|{$bfBnnx`cs0#{nw$^E}^DE&6TEt{XN7~2pKIFAm)Hd%v^k;@mmy9UO&6o ztI3aIhgu8)s^G>r#+;kmQoDsP;&VEsESW1RmLldw%4F;`n7*@ZXhX`5?v#+-*bXL- zt+ViZ5CkQ`Pl|KgKaJHoYBkdF`5e-*ns8EPkdsQqE-DqfKq|tAgO9f>TOv~5YbskJ zHifZ7bS+jQ=7UgPW{)pYBHGL3JwU9f(o!HQ*z@quWt&qaQ!cmw(4fE^_w_N0!=jIpGt@QeBq?SF}(M z1C<=(`pq)vXdcIm(Xd#?0CeX{(9wi(p8aexA8Tk~9^KB!<(OcfDbLQ(-A;D~zF*xL z7@f%MjBJrnP3(nRy)*1qRe{ZMo49v7-c3aD6MbOG3JI|<0z%j4>jgZpcduB-Fu#*- zFvkE^4n@)|Z21a{OPG%C4fUnWy^*x;}tApAcF+z-=ocP>Oqi3kHG4W$18XCIAg-j z>zqnVhn+oKby0v%@J`mvax5xI)w7PWHFO{w3cPE#GgVr&+sP8dfVEiw(MSOJ%Q{j` zMQp$o3=0QY&Q#~}N5jeK2+M~oZIUfe*4H-~N=zkvy#VI)rFN$+mdQ9Dn-crjx#C1TG>0FPT)z~R{gd?e8Y5Y>nRQT-N%sFvPFA*y}~ zQJsPp!+;hB&|T3A0#a3kqZp(bS?wDN^b?TEXaUShMX4?f_D!b#jBy1d^k=480#$8n zoXCQzNW_&AGQB zD4mW|p>%8+7J$;JCw8l$bbCGCL4y!u18YbQ(Rl{s*#915p*Xej_>yXGl4Jjzl z%?*f!*{iNZwmLh3FKq}h1au$?3p8E9#F*ia1^yJlpUZYTVQxrp$Yi0+t=)N7m7}Tx zp%0>5umgFuU^#ZK=Krsvxg}et0iM8iqW?;Fq8FvgEhb_arFv1j#Pp&MNp-ytTD{+t z5SGoqmG+>Qq`H1{9Ps*?4vFbQFGzKLMgWJ}B*rD#_EczDuVenl=~M7!s?UU@iu9I$ zO}UDc2(-lXqnD-1FQoddf#`t$?TXU-K61oV_km|gzo`IYn-NlF!f)T%omX*Jp%t%Hu4BO15b4bPqlV;$MM#)tP>c&a@O}3Sam69w*b=^Kkg#zl77Pt!%G z={qNt0@W`u=TJEz_p3jGNvo8uNPB&!CHwhH=F_MW=Ju9UIx-u)#JnY;LHL!@!51zf zTY4AFbQsUHT59MV=Osg@?<}6=$2h_~_wr*>Rqv}mL^bK7K+mfF7hvvvbdndPM%N>Q zkDNob=@XLe3wU1VF!|s=`yc6rdDp=V;D^32+xG@q2Z;t!9sepGF43WFax4_?L zlM%^0gzS=`8TP{D@;`^zeR`$IJ`dvl#3m((y@ZML%m1AXG4DA#nwPNzAa%DU}Y}M1ha{r`*_b1p}vZeos0G7peyM zb%gcN^HSxLB_i0Zd?FbaoZw;je=b$+Zi^Vj_WAqMC;ZPzrM=@DQpXV8T)Rzj){7Zu zz07;kyCqw%clW6t$nt1fyL*Lmam6QhkS9elXqkc$d$CE7jm=(D;-uV9Bf-RHKozL^e>z za=F2ULqyBLv4oG8e6pR(GU7_@&2}!EBUlCZE~tVRNJjZEdqP#fnq-uJxFT??b)|G~ zc8#u-4Zjxj8qN)DI|t1F$^zh??)F^Z9`>5^7?GEM zF<@_v4V`PH3%tJW_FS)znLW?zmk>t3J{vk8;I?=h+OFX`oyn-#!HV)$xbB8zNor%4 zI)qBQ=dLPW^BVJCDoCEHdoQHo0zjcLF?$sM;IdXi6qv1I$7Cp%A8cvNFCm&pNYz|| zpEk{Jj!trC8)1r`WCSp0qWnBl;k}}V0H3J;p{@tnnepnl0O+)5I*{X9EB3d+s~0_# zoSw}8;~@{iU&>SJu+ios!N^b;a!$Zmj|4-L=!Y}(M=+&aRR00y69%9}RIXJLL(@eN zT^E?`%J(p_>F9o(BS(-0R}vsymp>~>S=YkO~$d3brNg3Fr@M!+I zE&;tAnG{?~PL4~A#uGSGF9De~nV+Z>A=%m!k4C3ON(hO*X?a{Y07*FXOA*Q6)_^k) z0a{N)IN%Ej9+^1u#l}c90jmSQ2c-5u+HXV*lmE^Pw_#I){Fn#qV@x}FXszZ#1mGzl zYc6(j74jEFh)H>-F>U2>)mc|a;$r5SU3qal75_eXX=PNSa>WJim5X{D0T*Ed|6C9VY4NteX!z?8;a8MZji4)EZvhCC0|>Dvv~!N!lnW8 zCZZ=4p(`uj)vX8&Pi6;rg3-7~I0z|@@X8)}9Uz%X`Oz-AWjtXan1F2+rxO!Bd=Rz= zkOPuxJu&PiDFf=`0!^nR>G+s1E|Pq$TyIppR+pT2>5^ANo+Tz7p{l%C@=lSjvUCu< znm?QjU@4`T=pI7u%*-nTK-pwC;R!;@C~O^N0<{XW(b0)%e3;`%}UPfEh^sn{u%{GYF?$DBo6PzRfUe<`NAS6PoMZxG5QdniD<- zGANUH3w0cj87-n&dGnF|?g@r5U;1V|fMEk>uUv)Qi^Vayj3)|05tEhde&qr3Ej%t0 z@dV@1X-^Ug1>~zO+Naw8zC8%z*@=o9k#D)%&G(UZ7R9`NkK z0p*5TIor@9!ma~ROoOb-RXebd7!8N8%BC-?T&c%DP2buBatnSo`+7MMU69y{S64)5 zDcKs5G4d#iFVa|m2gf6o8>%NmKsQLaQ8#O5aDC<)_OjF)l(CsDB*M!8#j}695pz!@ z8S{Wf^=P$7=J~bc4k`{Q&*LqsJl#gG;uVJl2V`8ipsW?RoFI(?9&p`&jIb3j1yG8< zxLqrU#n6MmN%ECOoL?kU0;VNs#GHHw#biBHhiG0qbD5-flO3&I%{;$OSzx-dV3t5I z#Gkp`LN`@Lo)dB6kU!qq9d z*0Oel%!8;uBpVaT)A6!R!mYr?#Injfy^buXOedA>$}hBNBu9S25ahu_G==(z%uh66 z_EWZXDCU732Qz_*C_j?Dxhcz1eJoGEK5O@r8E0KDC$=951Z?)HkCitm7{VaVMR@lF z7!#8~J}+I+rLt{-Zvg3*1a83A7;JQE_Q|(ZX?Gdf<)ZQgx|N{_4I8)GSC@x2lC7RW zadO;I4;wK72#{7pg0RW*R+5%v3o8P9$`oD@9N-|&Db1a`ABx}Ju56+11%%gXhdNfJE- zufd-Ln`hdEgT2Z{!Ub5}U?B{a3D!qhbE_bB*A)+Kknh$a|5QbB^gS!ECe^&Y@^u_o zf|!J!10j&y^4B%-s1NK^*_m<4FDPHMD;yIA*+{Jm`ATId24P?SK1_S?KMpF7tIoVK zwI^YdM3rmJL}t05)F>>t0wJheO}HRN4dGLeO7e4;$r>~+VE+Jg3f<*Eq*y$P>wv(L z0jme~(|4^Tn}d*z(m?*cStFg5&7Lts<$Efq6`=nbOfg&rsY(v{_Ijf7VIpJ}5ElpA z8vBjPRP3@m$}E_OSb0H+j#l@X{B?^)+Y!r_yo+KVU3n9|CxkQUWR6jOpg|O%Mgi-3 z8pz3**2)cvVH1Js2|`sL(4Lyz$}LM|UgjeKYR^JYe=>=kD%b>>SE&d46bdgOwSdTU zaANjN^YML|>rRYtDxNeYB;9paQl%9X+;j+dk}d-=r4(gDSzMV~74;>-&>=V@(O_~qFu2w`aPLmf1$#Sf`vs!s9- z)IMl~DY>XbH@X`%R-RyrZV;_^CZkwO5yWCM!4w?2mxC!dpu#QB=CQX3#C{WkDFy3o zau#?D&v6fP&pDohXn3Z;0F;$oCt5h+S3suI- zlJ;6qJn0N0Uk9+PO*hH^t5i+pNjK3AE0k`6^SukCo79oG$gNH{(Pm~Bh{j=~b8$Tj zXlAw?#KXhX%xq2P5t^Buy@~H9m4w%qnVm1$YVn!b_DTRwpwI>9-w>-p&AZvFl+R~% z+{h(@Df{a4Zf<}C)|PJNQune1&Q@1bh1Atm*1|K5s2~?{m;qqAxit#*C1i7z^X zo6w~|=7;X~T$vx(GS8FwL2@&1dA+CID!a6x&{Ympb7-|jVXmE#QK672dNqPxJ5J3( z)(Cps(j%p7=TUmI1btygM$@+`7fGmjBO`BD(@i03pjvW-iBh0MmZr+x>JnKkpXAbh zvdK&IA2yY9w0+SHqXvO?oXRKIR+bHdTzs;J*vb(G3T9iB{Qax!`jXF7&g%M7m`yZQ zoeLPBd3*=mr~*};IKQqyRVOV>yFT9`Uy|A4eFvMSR#7K9sRk-gtEjs_XRRWZwRvh4 zNd+5w%WD-anEi1NpuVv!^;^J#YeA3UuQ1wBa%3NmLsmszyAdZlLCeDmCG)Igo@AV{ ztIA4_d-`+g}Ffw-Ilx~?64-hkV# zdE1T9b1loK)G>p`e7P#0@~WXn+Rfzzl zs|MWz%jWM@VFyhTYks|~Sh$OPrK>LICQM>;sQ{i%tr2e3`GRxY8)Kc0PEDZUH?dWw z8`+p^Xcq;6duiX5Ua*0bM3 z_N*FfD6AJX(1A|FX?Ai!m{B)O3mwpLs-=K6V*%*k7o#$9-?C-_ft( zn2%zP(G70V5L7#Q1!bB6T81$IOamV;d?eFAHpf&Fi~GUs@KoEcW0o0RkY(gLjC`il zXW7S9meJH`u_f9y_9n!ZGz@ZOp^iS)S(&)r|HsqUGH*|HJ7dy8fv=y1oIoEz_tA9n)&}K29CU z2SDhCQFWm;Z&Y=miAv>iEa~RI2~nwn8q{7XCxzk8=h%1P?!6c2Sd7jiSD6d#5|!iSO9!DD8s|<;X1@zpm|GS7P3+xSqo?OxCd)>wAZN?jbB*sItiD(hi+lohQ@f;?bm{|x)J_}#xcsZY+A{2BNuIfuC~O7z#(LH4ma|& zg)$ntqR@ltPpYMGT9c#z*HUI zN}b(Ou@gQRyy07HxtSvvaR{WI)DpU^NV)??Ta$j zuncq~pU**<HOPM3;HR%zG0+lTKHUu>mg>PqT31@Px3tpzDu{R05vGM225aAiO^UhGD@PT*N z7}!&q?2{U`EUQ$*d-=6BjppXbD$)(p0!#YzQH;?RhyneClt2q@@z>tjRnew2kzIL_qHcnC2O0?gMXrR z26J(%8pyb@tg7v@eI>gt&=yVJQu(0`outSQZD3Vg0NS7laJL%Tus0H=rDmnlz#Gon zD3A`DIj{1{)@QqDW`(A4buM|XgFQ0*@XiSH0uH+tWP1nnuI4oV1 zvmb5w@)q1K5Ov^Q4(^GG*ye*Hn`icoChyz8kA}o;$-teX<7@eq8)jDD=h?zN|7%V^ zlqH7*r~B8Oa565mhvdU|@(0Hz;hTZM{?()X_@5r9a4-hdaU%2vAM76-b`A8q`iFM( z_qzv1A;YG3)#`!!oITKW-M%w+FTZjB$h+^^>3nbI;2pfG>QM%|U{fxx z%j}E%fj-@^LjJ18Cdd`&d+TP|1lh__cesI8IqKd`Yixpi%IwC%cHA{08cV5@qQ~cy zA5}fBKD9BP#=_HSKQi^J5O43afvlA}xdiZ{rH*d!!cqrEmkUW9dZfm!mO9#Em|R?U zC4Ce|D4_ip)CF3wCD*UY+g}fx-GIP=wo)b+>(cjE@(A-(%IF3bu9U%6U!h7FTHtoe zD`j$p5?0P}&v2h{dl}Oo#K3R#ebIW_smIKg(&(I@H`&82a$9`H1qh!!#YmWQdF{8t% zNr?PFjuhH*vgmMo3(bIZ(zID8WI)1)b7n_2$kCqc?(A@BjTa|Bb}pFwxIn(_``N>4 z@?&8mKx2*TG!A(i($sMg5_rMJvN=PALv!4FxeJa9T9EY7KI{=$WQ_DleEw!>)W?UF z)4I79z)0&C!bsZ-V5F7z5{xupv>0IzFOUe4iB~B^cn5s61u!(K0_0$$^0N!HL%wP+ zjb@T-?5LcpPg+3~M9Or-3L#~h^tW6oSicxe8GiQdp})|2MJs3C<9hIpor!_|)eo*7 zy*s#h$GU;RyZLQ*?b|+@Ozho0R(!o)(a@;7f3$bB|JuBw9k>-OI7O=h{NO5I&@ZeW z9qRY{_|^W=)gvnh2mJ&7{=uPOaBx5v9_;TIMn^_RhWl5o^7{uzhgS`)4vY@39P$MQ zh0$SuU;wJRg9}EPBSFQ}K3a%XJhg0x|VeG)*=-}$1k(Ge~VX%MI%Au9P z{-NQaAs9CR&Q}R#TQNgrQZd`-fKh zhI!xM%At|LRY87`Uo|l3hpz^g&wr=rMcUf_!~Cki(7@oJZx!D^(m%4=KfG$yDDNNY z4+I0NVJ0x$(baG|*vRtv_7%|B0AzOd$pboXo=Q2w=LHg)b%XLJG-KDlKtl6P%O298 z!B-|Un=E*x+ymw!D5%1RM$C=<&bY>-W9b6 zgz<3}It3@ETdmd|AfQ;*V8-WhLDhes5jyR$+=?pvXf_NufyjnK`-EO-1Hjf-uvte6 z_i(!z*3Z@zVUn}Z)yq3tyt`9mNlRI_zb*jh&y$JuT6aWQ+Tt%H3fw9bPaQV)u#-{t zfcIU@t})4YKf_M2?(%pv%x>i)LU>PCZ*L!K@IGu@-pjsc_Q4wHffEYOz{zc4mKS4! zKOwTwpk(lH?=FiAJuGb?3|)`$NlFQ}*F;)3aw{qmQ=xdk1>N5gGjI-Ba*}lzd#%jsGBX@rwoMS(&lLFu(Q55xcRjz}v^MGoO#55jJ1X~dDaW-1qJFVA(i*bB z`JHfP+j4Hef}1Ho>kHOjygeDi-Ei6UV~5~GkJeA6SgB~Wacexfm;E~fwB>BQfI_VY z&H4cgsqyimQ{q(g07mY1aCMCp3!Nb~K@(DAVBQ6b{m zFm5>(jE=jwQqj zGjj$S#O{Mr043B`vWB@pgvvI-+nug&s9nR5Gwatvf6E!Gl{pKi79>J^cx$@4#BOEI z(C+!r8pmim$eiVd4C?}L?xDwMN6eEFvrIBJn(F_;W;oCFvOWW}sZ1X%u13r`(r4Ve z)3Om$i;IK$G#|dy4N)3Q56=m}j|Hy=9WMr*sKo zo}odMbqB}3WLyuuw8!>&`;1L5L!IpJwX&`MR*p+#dz?x*(7AQC+OVhdMX6}K_%7kV zJy12gO<-3sA^&(MBeqM9&FD8Eo@crfj>b&1e$oI%09+EWl4Bz}=X}5rnofHEvTQSH ziCb07oSWtkN|u_UH!r`>cpM^k&Oa#H0VaKEig|o?HCJKWD#Uk;*D^JTtxNriWU4cm znX|AfQbERUWZ~4w?%8T9=il3L zqebX=c@OO*UI{e}-cHa+xV!kegRS>Ze63Ebdp;JK?AaTe?D0*@-C9xR{B)OgXjQPYuy^BC%12jY~;#;+8Vr^j zm~%>d*GuTPO;u*-sKYKrYnOc%`6p+Wok5SYkq`Y4xnF)11=^oM=OzM195jYrT&Rkx zIr8%B=!ZyTYnW%mi$AxBZa8{fSljm7>+k1F45#44yR~b7)V9@FQNuu|E!)^&M=4ux zthF#_($U#&qs>Nwm z*MAAQCeL)fBB48sxSK3{$M}DE?|2>>jduRQ_%~5Q`|D{A`NtkhH=w$%SJMsc-$df_ z(ymuQ%p!h*LDO8-`geKX^E&EpeHXgG?Ki-=ifi9$Ewk((#{<-|`%?AXN6~ur>E~;i zIx9RT=^T>G4e0sQz?j4}7`8;#b}Sov=yh}%&KyJcB7SlVZCQSs1$yxB7wV3-e!=92 z^K*)4PeV7cwSR(YCA1Vh^@efH`VQoIcn{NXQUW$Cf4^ib_b%(&g5x=%W|pYB_2?-!Ox<`w88QpE~mTzDY4yw2pp{ggU(7^gz9Zppj~ zJuMZlYX8@bC8$v{cSN?>yZO09s+cz4-$~Em}41e$#)3#+}En}}~I|cu@?v6Alw;JY@?{wM* zjB}DZo31pL*D&W+I86ea7aIzk=QbLv2AQY1qvq}8*toV|=@QcYrp7_$anW0k)}Fjv zydBKZ@tK-q@t#h!|Mn2F_PoKZoOKvCMQkUgZ%3l{08@5BvMjOOoecT+)gA$GtLTqM zg@5}O=4TuB{?UJXo8B-KnHsv755|`LO6&LeiWT4Oc#9bewti*BD=5r<9XZzix)BP* z#6SG@oqueY=40)+;MY`d*tUIp$KB}E+HbH+y?2_#ii`7x)_Z?o+SvY9XH+s(wLVh> zttjd)zGXOjxZ8X$>8-!FyshT2jIuY9ePEKo>i6=VlF+{_S9dEDy zq;WkQ$-!;zcpJJzRHAj<+Me&AXEwYq-C`aS*M`KH>;AC^JEh|fq74)KjT^y7YW+X# zUeLN+W!KjX5T~5*@}2134WBnQG0d~<4`v6(-pkC~^>2np&EgV<`9Mf28AY3VUPAE| zr!6gOm^0uQw|*Jj`RX^2t?Omx1A(Kb&^B)qnt0?BXr}vhkXtRS%bs7==VY5uz4`({$C=tQ z-U`Mob_{fU!W4?zQp{{s$Nu(*+W(uaLdRx1%yGXp#hhO8Z38~5Da;-;R;B=MwbPDZ znx^6^Sfpw4sR1T+*bDJivje<0v8krkjV=&Kq&Z7-xtj&(#?e9%IRZ%ss%|vSB*@n+ zfTj`LC?9&!%>p!?s0siJG`{ruShJ&96GnLvbAxVFflgEyK`zjVs+xqFZgnRr=wb{0 zlSo2MwEGZb`$Eqd2L8zk!|C2T!`OMkaJt)bh2b!L@`T|iZEkfKPSa|1Xm0Gzv4LAs2tpj}2!2YDBu0AdUdvWmN+l}CM(6P5TtEoe8oYShOM`*O7# zJv!9q<6c=(j9ZNYR5}p~fUA9iY*%{r7r6Jwxpb;LPoq(2pt`6=qp5t2MxWI-8eLtm z(Wq6HB7g^~QdP}q*H(?{xJiovDy5%!sz!Aq7pNM=ELo^(lxC&e@~Tlyab+%jLn9md z^pJPFlwMoqtb-NF0+Fh0B3b~T|``&=cfM9LdJ}a0$QQ7fH9*RxqvZ)=~u{@ zp$+YBwJ}rLOcUC&LhhoQ9{y}KfHML%H+*dL98I@+b}sFVFvoq7yX3e8_b4@CXZ5$( z4~qtf1WMNWy5n?-aM-zYz6E<=IOXCPH>~u4EV&)$wB;=WOEGfUm)rtGt^3m04W^?w zSi{cb%WBisePJ(4Q`4*yqf`$RsA<;SpR=YJi`zUk&9t`TRyPB-SI9@Bx#>x1bKFbZ zcO2h=CAFasMj%)VP!7EVGGV7dErLT75Q<5#)&V`cW?OCKthEf*13}W+`q|Yb_)I#S zoLtXH#f?_*hwwpt^#%yp43*GhPhC(;!Zlm?u-Is1o|$d7$Y+{E6vx-0C+P3ba@NAId6~(^qjUbTnAD1$1+d2D9}RP9xP8TjPTc=eX~W zbvwE>V91AaZ?siBN@oR#qJAs^Tp0iU`GSGpkyhpRC@1@t{SeTJ*lxIf%1Av*z8t0 zbKLK9uQ^`R2r2z3T9`&?QYx;^7E#Trh#FKxRMC1&ji&3OhAg5EYoZ~^h+~voa6Rv3Ku>>5jnW`&27I1|pU6E)+upZ`W zky*0uB3ZHfj1~iI!v!q*-2QMuL;4ymdeWSMlzDPC~=8?AD#sU_3 zcB1pOSAA+-_`*gmMu&4WD$@*hgw43BDujZBeT1iS-3luTvZqJ3DVy&JBJ*8(H+-mf6kyT98AXA-}g4^=i zpa?CJSO61Q!1&gUT)_Cop^!qx_fJVx<*hcpwfkT9e$@0_DAiauD1WLkrbmHP;~x`p z+=TsKFx6NaFVp#2gdDQZPgyokyi7MP3kabD)p!~9(6WFKbUamLrOpX;Z*LR|vgml3 z=BO;)T5A|&fdW9?z`_N9m{AH90MZsE*Ozo^%!Br3C7o(GCC4ejnyMI`u)dO0RN?l{ zWAGY7K}TloJPJa0x^YL&Ngr zVlVz&qdeWmK7}Vo+@ou5^3~Qx{IAS;!a{(;Klb@gst;eFI*x>vv>i-FM&O|)ROq3Z z1Gaxl{h7I*0l7obl|C?6XQsyyr%Nre-FR)kqU~9zV-Uh0+77BW{1mZ|5$?LSQ^Xdi z{=AA)#5B6707W1_pHvCm`1%J*m1|T*3y>vC6%`Cr*tGQzOKJUsT#uTo(!r6x(gA8E zpwhwgKdRKBMJ{!K`i^(5)B*D4gkKgr{C`vIVA>plVxV7EJE+wTsG-C8zqHuF0EHg^ z8_FG=|1r@9IoWEt!+Ua<${kElqr2F8hpv~Q zVCDvtJ6LGB!#VbkT>of*YT?#x=$@^gc71B^ccK0v$o}Zx(fin`?(ahV!=FO^!~LO& z_6N|x+pSRl@SnY3f%=DK=yZDp)IapLz6a_b-XQf4QMLZzEq(oi8|ojvm8pMl(E5j$ zQ_n;F!|XZ_lzl{<4~0g)`Xs4;_#0gR;K|fKc%lAb&>VgP>K}d%^$(Xw{X-+Je@Nl_ zhp%SUKMWvR|G>CnP+}B~@Jju|`i@sK^$#c7&vjH~*FXH2)IU5d*FV^bNHcNw02d5` zr(A{(C!lWCe2hlhMIm7&$Lu2JkxtP(WGhdKH_w;VaVixf{j%7;z zt@9aN;E)gsm~bkDCOtowiw9vr=&b_@*CFU~lrz0ZH;M+N$S~Gi48wBbDc)|@%ynl& zSsy1Z?==D{3pjUI0jOv~o4QxK0tHYItwlj4wVF2Z?#z0sA+F5QT-LVvE-(cxuCkaJ zEVR@zzJVXRxTU6WC5mM`~fD~s8lYFQ&Yrm zaAG+HRj(_tJRhdI_{4JC0;r}o-G-ctFvtC1%;j)ta&29ZSc6`6uED+ZoWa8|(UjG{7>#x?$sDOegJOs=2mXHd|i}<6M63^2%3V_{!b2{|`QUf6f2^ literal 0 HcmV?d00001 diff --git a/src/controllers/mods.js b/src/controllers/mods.js index 4976dd9e82..05a4178160 100644 --- a/src/controllers/mods.js +++ b/src/controllers/mods.js @@ -18,6 +18,27 @@ const helpers = require('./helpers'); const modsController = module.exports; modsController.flags = {}; +function adminModCid(isAdminOrGlobalMod, moderatedCidsLength) { + return (!isAdminOrGlobalMod && moderatedCidsLength); +} + +function filtersCidInitialize(filters, res) { + if (!filters.cid) { + // If mod and no cid filter, add filter for their modded categories + return res.locals.cids; + } else if (Array.isArray(filters.cid)) { + // Remove cids they do not moderate + return filters.cid.filter(cid => res.locals.cids.includes(String(cid))); + } else if (!res.locals.cids.includes(String(filters.cid))) { + return res.locals.cids; + } +} + +function paginationFilterCheck(filters) { + return (Object.keys(filters).length === 1 && filters.hasOwnProperty('page')) || + (Object.keys(filters).length === 2 && filters.hasOwnProperty('page') && filters.hasOwnProperty('perPage')); +} + modsController.flags.list = async function (req, res) { const validFilters = ['assignee', 'state', 'reporterId', 'type', 'targetUid', 'cid', 'quick', 'page', 'perPage']; const validSorts = ['newest', 'oldest', 'reports', 'upvotes', 'downvotes', 'replies']; @@ -31,13 +52,22 @@ modsController.flags.list = async function (req, res) { const [isAdminOrGlobalMod, moderatedCids,, { sorts }] = results; let [,, { filters }] = results; - if (!(isAdminOrGlobalMod || !!moderatedCids.length)) { + const AdminModeratedCidVal = adminModCid(isAdminOrGlobalMod, moderatedCids.length); + if ((!(isAdminOrGlobalMod || !!moderatedCids.length))) { + console.log('KAREN GONZALEZ'); return helpers.notAllowed(req, res); } - if (!isAdminOrGlobalMod && moderatedCids.length) { + if (AdminModeratedCidVal) { res.locals.cids = moderatedCids.map(cid => String(cid)); } + // if (!(isAdminOrGlobalMod || !!moderatedCids.length)) { + // return helpers.notAllowed(req, res); + // } + + // if (!isAdminOrGlobalMod && moderatedCids.length) { + // res.locals.cids = moderatedCids.map(cid => String(cid)); + // } // Parse query string params for filters, eliminate non-valid filters filters = filters.reduce((memo, cur) => { @@ -54,24 +84,34 @@ modsController.flags.list = async function (req, res) { let hasFilter = !!Object.keys(filters).length; + // if (res.locals.cids) { + // if (!filters.cid) { + // If mod and no cid filter, add filter for their modded categories + // filters.cid = res.locals.cids; + // } else if (Array.isArray(filters.cid)) { + // // Remove cids they do not moderate + // filters.cid = filters.cid.filter(cid => res.locals.cids.includes(String(cid))); + // } else if (!res.locals.cids.includes(String(filters.cid))) { + // filters.cid = res.locals.cids; + // hasFilter = false; + // } + // } if (res.locals.cids) { - if (!filters.cid) { - // If mod and no cid filter, add filter for their modded categories - filters.cid = res.locals.cids; - } else if (Array.isArray(filters.cid)) { - // Remove cids they do not moderate - filters.cid = filters.cid.filter(cid => res.locals.cids.includes(String(cid))); - } else if (!res.locals.cids.includes(String(filters.cid))) { - filters.cid = res.locals.cids; + filters.cid = filtersCidInitialize(filters, res); + if (!res.locals.cids.includes(String(filters.cid))) { hasFilter = false; } } + console.log('KAREN GONZALEZ'); // Pagination doesn't count as a filter - if ( - (Object.keys(filters).length === 1 && filters.hasOwnProperty('page')) || - (Object.keys(filters).length === 2 && filters.hasOwnProperty('page') && filters.hasOwnProperty('perPage')) - ) { + // if ( + // (Object.keys(filters).length === 1 && filters.hasOwnProperty('page')) || + // (Object.keys(filters).length === 2 && filters.hasOwnProperty('page') && filters.hasOwnProperty('perPage')) + // ) { + // hasFilter = false; + // } + if (paginationFilterCheck(filters)) { hasFilter = false; } From 85db3214e37f9ed88f702651de1cb257c8e05e86 Mon Sep 17 00:00:00 2001 From: sschauk Date: Thu, 19 Sep 2024 09:46:44 -0700 Subject: [PATCH 03/18] add changes from starter task sschauk --- public/src/admin/manage/categories.js | 80 +++++++++++++++------------ 1 file changed, 44 insertions(+), 36 deletions(-) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 7342d0c1de..78402944e2 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -199,50 +199,57 @@ define('admin/manage/categories', [ function itemDidAdd(e) { newCategoryId = e.to.dataset.cid; } - + // asked chatgpt to help find out what function does and give + // suggestions on what a coder can do to reduce cognitive complexity + // this functions updates information once the user finishes drag/drop function itemDragDidEnd(e) { + console.log('Console Logging Saanika Chauk'); const isCategoryUpdate = parseInt(newCategoryId, 10) !== -1; - - // Update needed? - if ((e.newIndex != null && parseInt(e.oldIndex, 10) !== parseInt(e.newIndex, 10)) || isCategoryUpdate) { + if (shouldUpdate(e, isCategoryUpdate)) { const cid = e.item.dataset.cid; - const modified = {}; - // on page 1 baseIndex is 0, on page n baseIndex is (n - 1) * ajaxify.data.categoriesPerPage - // this makes sure order is correct when drag & drop is used on pages > 1 - const baseIndex = (ajaxify.data.pagination.currentPage - 1) * ajaxify.data.categoriesPerPage; - modified[cid] = { - order: baseIndex + e.newIndex + 1, - }; - + const modified = createModObject(e, cid, isCategoryUpdate); if (isCategoryUpdate) { - modified[cid].parentCid = newCategoryId; - - // Show/hide expand buttons after drag completion - const oldParentCid = parseInt(e.from.getAttribute('data-cid'), 10); - const newParentCid = parseInt(e.to.getAttribute('data-cid'), 10); - if (oldParentCid !== newParentCid) { - const toggle = document.querySelector(`.categories li[data-cid="${newParentCid}"] .toggle`); - if (toggle) { - toggle.classList.toggle('invisible', false); - } - - const children = document.querySelectorAll(`.categories li[data-cid="${oldParentCid}"] ul[data-cid] li[data-cid]`); - if (!children.length) { - const toggle = document.querySelector(`.categories li[data-cid="${oldParentCid}"] .toggle`); - if (toggle) { - toggle.classList.toggle('invisible', true); - } - } - - e.item.dataset.parentCid = newParentCid; - } + handleCatUpdate(e); } - newCategoryId = -1; api.put('/categories/' + cid, modified[cid]).catch(alerts.error); } } - + function shouldUpdate(e, isCategoryUpdate) { + return (e.newIndex != null && parseInt(e.oldIndex, 10) !== parseInt(e.newIndex, 10)) || isCategoryUpdate; + } + function createModObject(e, cid, isCategoryUpdate) { + const baseIndex = (ajaxify.data.pagination.currentPage - 1) * ajaxify.data.categoriesPerPage; + const modified = {}; + modified[cid] = { + order: baseIndex + e.newIndex + 1, + }; + if (isCategoryUpdate) { + modified[cid].parentCid = newCategoryId; + } + return modified; + } + function handleCatUpdate(e) { + const oldParentCid = parseInt(e.from.getAttribute('data-cid'), 10); + const newParentCid = parseInt(e.to.getAttribute('data-cid'), 10); + if (oldParentCid !== newParentCid) { + toggleExpand(newParentCid, oldParentCid); + e.item.dataset.parentCid = newParentCid; + } + } + function toggleExpand(newParentCid, oldParentCid) { + const newToggle = document.querySelector(`.categories li[data-cid="${newParentCid}"] .toggle`); + if (newToggle) { + newToggle.classList.toggle('invisible', false); + } + const children = document.querySelectorAll(`.categories li[data-cid="${oldParentCid}"] ul[data-cid] li[data-cid]`); + if (!children.length) { + const oldToggle = document.querySelector(`.categories li[data-cid="${oldParentCid}"] .toggle`); + if (oldToggle) { + oldToggle.classList.toggle('invisible', true); + } + } + } /** * Render categories - recursively * @@ -253,6 +260,7 @@ define('admin/manage/categories', [ */ function renderList(categories, container, parentCategory) { // Translate category names if needed + console.log('rendering categories in list'); let count = 0; const parentId = parentCategory.cid; categories.forEach(function (category, idx, parent) { @@ -310,4 +318,4 @@ define('admin/manage/categories', [ } return Categories; -}); +}); \ No newline at end of file From 6b5555b593eec119504ac83a593f47da11ff8229 Mon Sep 17 00:00:00 2001 From: Dhanya Shah Date: Fri, 20 Sep 2024 16:12:39 -0400 Subject: [PATCH 04/18] Refactored Code in public/src/admin/extend/widgets.js --- public/src/admin/extend/widgets.js | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/public/src/admin/extend/widgets.js b/public/src/admin/extend/widgets.js index 1238ee772b..f8805779fc 100644 --- a/public/src/admin/extend/widgets.js +++ b/public/src/admin/extend/widgets.js @@ -253,11 +253,23 @@ define('admin/extend/widgets', [ }); } - function setupCloneButton() { - const clone = $('[component="clone"]'); + function clone(location, template) { + console.log('Dhanya Shah'); + const widgets = $('#active-widgets .tab-pane[data-template="' + template + '"] [data-location="' + location + '"] [data-widget]'); + widgets.each(function () { + const widget = $(this).clone(true); + appendClonedWidget(widget, location); + }); + } + function appendClonedWidget(widget, location) { + $('#active-widgets .active.tab-pane[data-template]:not([data-template="global"]) [data-location="' + location + '"] .widget-area').append(widget); + } + + function setupCloneButton() { // all correct + const cloneContainer = $('[component="clone"]'); const cloneBtn = $('[component="clone/button"]'); - clone.find('.dropdown-menu li').on('click', function () { + cloneContainer.find('.dropdown-menu li').on('click', function () { const template = $(this).find('a').text(); cloneBtn.translateHtml('[[admin/extend/widgets:clone-from]] ' + template + ''); cloneBtn.attr('data-template', template); @@ -281,18 +293,9 @@ define('admin/extend/widgets', [ return currentAreas.indexOf(location) !== -1 ? location : undefined; }).get().filter(function (i) { return i; }); - function clone(location) { - $('#active-widgets .tab-pane[data-template="' + template + '"] [data-location="' + location + '"]').each(function () { - $(this).find('[data-widget]').each(function () { - const widget = $(this).clone(true); - $('#active-widgets .active.tab-pane[data-template]:not([data-template="global"]) [data-location="' + location + '"] .widget-area').append(widget); - }); - }); - } - for (let i = 0, ii = areasToClone.length; i < ii; i++) { const location = areasToClone[i]; - clone(location); + clone(location, template); } alerts.success('[[admin/extend/widgets:alert.clone-success]]'); From a888d45abaa1002daa418a3171b5289658ad1285 Mon Sep 17 00:00:00 2001 From: Sofian Syed Date: Sat, 21 Sep 2024 00:36:42 -0400 Subject: [PATCH 05/18] Refactor public/src/client/account/info.js to address SonarCloud warning --- public/src/client/account/info.js | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/public/src/client/account/info.js b/public/src/client/account/info.js index f044860cd6..831961507d 100644 --- a/public/src/client/account/info.js +++ b/public/src/client/account/info.js @@ -10,6 +10,20 @@ define('forum/account/info', ['forum/account/header', 'alerts', 'forum/account/s sessions.prepareSessionRevocation(); }; + function prependModerationNote(html) { + $('[component="account/moderation-note/list"]').prepend(html); + html.find('.timeago').timeago(); + } + + function handleSetModerationNote(noteEl, err, notes) { + console.log('Refactor by Sofian Syed'); + if (err) { + return alerts.error(err); + } + noteEl.val(''); + app.parseAndTranslate('account/info', 'moderationNotes', { moderationNotes: notes }, prependModerationNote); + } + function handleModerationNote() { $('[component="account/save-moderation-note"]').on('click', function () { const noteEl = $('[component="account/moderation-note"]'); @@ -17,17 +31,7 @@ define('forum/account/info', ['forum/account/header', 'alerts', 'forum/account/s socket.emit('user.setModerationNote', { uid: ajaxify.data.uid, note: note, - }, function (err, notes) { - if (err) { - return alerts.error(err); - } - noteEl.val(''); - - app.parseAndTranslate('account/info', 'moderationNotes', { moderationNotes: notes }, function (html) { - $('[component="account/moderation-note/list"]').prepend(html); - html.find('.timeago').timeago(); - }); - }); + }, handleSetModerationNote.bind(null, noteEl)); }); From 0f4507582e8bf100c7a309afe0fbfc0f6750459a Mon Sep 17 00:00:00 2001 From: Karen Gonzalez Date: Sat, 21 Sep 2024 13:14:18 -0400 Subject: [PATCH 06/18] added tpl files to test instructor only viewing restriction --- dump.rdb | Bin 54969 -> 61420 bytes public/scss/global.scss | 8 +- public/src/client/topic/threadTools.js | 7 ++ public/src/modules/pinButton.js | 34 ++++++++ .../category/filter-dropdown-content.tpl | 39 +++++++++ .../category/selector-dropdown-content.tpl | 37 ++++++++ src/views/partials/category/sort.tpl | 38 +++++++++ .../category/tools-dropdown-content.tpl | 79 ++++++++++++++++++ .../partials/category/tools-dropdown-left.tpl | 5 ++ .../category/tools-dropdown-right.tpl | 5 ++ src/views/partials/category/watch.tpl | 60 +++++++++++++ src/views/partials/data/topic.tpl | 2 +- .../groups/filter-dropdown-content.tpl | 25 ++++++ .../partials/tags/filter-dropdown-content.tpl | 38 +++++++++ .../partials/tags/filter-dropdown-right.tpl | 2 +- src/views/partials/tags/watch.tpl | 40 +++++++++ .../users/filter-dropdown-content.tpl | 23 +++++ 17 files changed, 439 insertions(+), 3 deletions(-) create mode 100644 public/src/modules/pinButton.js create mode 100644 src/views/partials/category/filter-dropdown-content.tpl create mode 100644 src/views/partials/category/selector-dropdown-content.tpl create mode 100644 src/views/partials/category/sort.tpl create mode 100644 src/views/partials/category/tools-dropdown-content.tpl create mode 100644 src/views/partials/category/tools-dropdown-left.tpl create mode 100644 src/views/partials/category/tools-dropdown-right.tpl create mode 100644 src/views/partials/category/watch.tpl create mode 100644 src/views/partials/groups/filter-dropdown-content.tpl create mode 100644 src/views/partials/tags/filter-dropdown-content.tpl create mode 100644 src/views/partials/tags/watch.tpl create mode 100644 src/views/partials/users/filter-dropdown-content.tpl diff --git a/dump.rdb b/dump.rdb index a895d674b44a23631adb565b81ff3a053669c18d..7962d10cfe2ac37ce4fc66025a45fa11ee568e3f 100644 GIT binary patch delta 10060 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

S0dN*hFV<#1c)XT2 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 XHQe@Y-L#1?j&Ip4>pJt3J8u79f*^*g delta 4013 zcmaJ^c~}!?9?mzBkekF1p#;egv>*Zji-L$6Q0ul{RP7!fH6siVg@h(SJOS4#6|9xM zJv|DjkKKAzoyA?ZS`lhn>na}TZtFfZPgh&(-F?{Ir|qunHFG?-v%i9ZHPnLbFg8I3-2>9dC^W8$!;`h+u&d@dY;QLsCTs)#k!OY5t4Hy)!Elykpgf-?BXFX@ ziq1_M>@QX0+!^sp7GbgPtR?Da;u2C6W`fJBFKK0@zQW`4*Xqm~845m(#OdEIW(@Yw zWCq{B^u56j# zRp`s%y>_m$=UvA7 z`KA8UB37^Qa(8HJ7Ye}vvAiJh4 z=GbB`l@hKtT5flZV>wem#s&udi;SBPV1DTw$vOf|7s<7+-YOf%eMz(SyZmKl-j-u) z);nJ2IvfLSO0r7LGP3!&vEeQ(c9mSNA^7}-RcPCglx~dfhe;4mOI$ve7{ZUCLR)DQ zfh_zY;s}9mhZd)giu6<9T+U#en_@=W5e2l3hrt-5O+Urn)uoBpctj!GX$%j;(-W=I zW~cEh#yC;}MBCAJ_>2CeM)eAP=d7U!&EFc zCE%Tcc;WLwo`HknJ^pqLN6oGMQQxCwrX=<$WdPtBf&dy9UjT$91Z;l|q zAu}?Q>u_Vsi;OW_5&_SQOnR~nc7+DVX2wW)>PPqHX~5{w8sYxdz2wn|plXQ-Uf|`q zqW4TYNYwS|f4gu$f+CgCpfU4mQoj z<7p2GlQkqvW9(%lTZ%}`a+}F!)rOJ~6{olTRIE!v8Q{Ksy72erXo42Cl{Vt4&8Q9% z_h-bq#}K4>dXox=r^L{3%sAIN2#ZrRP)vn3SJh9jz4f7|*Tr^l!Z>7JJ_ zhmbUF^sWYJr7{pj;BoMfYs zs`1UpnbZnI!Om*Zi&TLxw*hNPtQ#x@4`28=Sd2F;YWnIvih5P#tF)_V(5NYuJ zI^pQp(ePb=Otd>x9=ZXOP9%TOxUAq30>J(^v4N!IF?0HLWm!NSCkQOzW2VQs2#_f7^4Vps=uL|Mdees5ABuoHnjz5uhH2}t%vKx zb{yCehKo;8sVI0rXwD4@G~Y>JlOyqm_BF7#`xrXuNFh>III`1dpGF}~p%sqJ45wN$ zJBP#>Rnm|mPHX-B@1rytI>yVdh3~+bjtu3H;Z#?trr`d5TgZ+q!t+meF!XK_3125x)t4JFimwx<{CbWSgHOgNs4`M*hw-)vIf~x$sqtO$Vvsr(&Q2Z1>!L9JLM*bD zQ?6Yw;^fIj;V3_l#6(a-rvsT7WTB_h?eA+D5muMb$?4e-E~)7x>1eCf1?9TNYE*}0 zh?1*6r(R5}gtH%7=%h4Ki;bl#1luA#q0JT>+bbTuh@1tE&a$F7h;n5(HVUtny}?M{ zB=SLg&4otbKBo$sP5Jt$REq5JW~46<$Aj`#@dDw>DGedRLS)k5Gxs;Rvo1X1A=^;( zP~i)|m(ho#o_~|Zu^5-Pf4`gDaAfd&gMRYgF(!7Ti$Vh&-A508bC;q{e? z@-O7+ZtqIQkQN%R4Vdk_hnwCpnCQPGq3_AcdYX)AyZ!ULpP2CVRMWs8sf-?ZXBROB zO3qVBsGb-_<+c-h&ra(dMMR*UF$aN~xU>Z^*;=F@w}^Tnly_DU;iIMT3LLp5QxZ@NtvZ}87lCpfFP(S6aIrzY&-^j+JbCoroZrX~ z(BEUa=E(QczprjbJi$eqJ;O0}qz2X3^HqKKW6uDawBzpe*$=&SUW=EM&G$vo56(yyeL%YW;9c?D z3sNQaFLKaIM5CrE8I@mck?*GWDwM%{%Wm$Fo_k7y&x>zW|DOsOZ%>oz$lZ=5l+w3{ z>F8N>tV$xPw*wK0xOzLPW>+90)8OMdZ((Upp~vl~o}bvgr>$7FGcYJ4Od{^k0I|zj z0tUO%RpRFSm0sQ!AStpPfryj=Wu8K=j13Dbak+-c7}A=L$^Bf3FJMWNi!g3^ zni^bg)WtL-ak4;?JT23|Fp Var|D4ssBUIww|o^?H@m7{vRZS!E*or diff --git a/public/scss/global.scss b/public/scss/global.scss index ab7d569242..24931d29b6 100644 --- a/public/scss/global.scss +++ b/public/scss/global.scss @@ -36,4 +36,10 @@ html[data-dir="rtl"] { h5 { font-size: 1.125rem; } h6 { font-size: 1rem; } } -} \ No newline at end of file +} +.btn-link { + &:hover, &.active { + background-color: var(--btn-ghost-hover-color); + text-decoration: none; + } +} diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js index a66b293a73..7ec13770ab 100644 --- a/public/src/client/topic/threadTools.js +++ b/public/src/client/topic/threadTools.js @@ -146,6 +146,13 @@ define('forum/topic/threadTools', [ changeWatching('ignore'); }); + // CHATGPT SUGGESTED CODE TESTING AQUI + // require(['pinButton'], function (PinButton) { + // PinButton.init(function () { + // console.log('Button state changed'); + // }); + // }); + function changeWatching(type, state = 1) { const method = state ? 'put' : 'del'; api[method](`/topics/${tid}/${type}`, {}, () => { diff --git a/public/src/modules/pinButton.js b/public/src/modules/pinButton.js new file mode 100644 index 0000000000..9fdeaa5cfd --- /dev/null +++ b/public/src/modules/pinButton.js @@ -0,0 +1,34 @@ +// 'use strict'; +// // ALL CODE IN FILE WRITTEN BY CHATGPT +// define('pinButton', ['components'], function (components) { +// const PinButton = {}; + +// let pinButtonContainer; + +// // Initialize the button component +// PinButton.init = function (onPin) { +// pinButtonContainer = $('[component="pin/button"]'); + +// // Prevent text selection when clicking the button +// pinButtonContainer.on('selectstart', function (ev) { +// ev.preventDefault(); +// }); + +// // Handle button click +// pinButtonContainer.on('click', function (ev) { +// const buttonEl = $(this); +// togglePin(buttonEl); +// if (typeof onPin === 'function') { +// onPin(); +// } +// }); +// }; + +// function togglePin(buttonEl) { +// const isPinned = buttonEl.hasClass('pinned'); +// buttonEl.toggleClass('pinned', !isPinned); +// buttonEl.text(isPinned ? 'Pin' : 'Unpin'); // Change button text based on state +// } + +// return PinButton; +// }); diff --git a/src/views/partials/category/filter-dropdown-content.tpl b/src/views/partials/category/filter-dropdown-content.tpl new file mode 100644 index 0000000000..3b33b9ace0 --- /dev/null +++ b/src/views/partials/category/filter-dropdown-content.tpl @@ -0,0 +1,39 @@ + +

+
+ +
diff --git a/src/views/partials/category/selector-dropdown-content.tpl b/src/views/partials/category/selector-dropdown-content.tpl new file mode 100644 index 0000000000..96a4ed0017 --- /dev/null +++ b/src/views/partials/category/selector-dropdown-content.tpl @@ -0,0 +1,37 @@ + + +
+ +
diff --git a/src/views/partials/category/sort.tpl b/src/views/partials/category/sort.tpl new file mode 100644 index 0000000000..ec1730edf8 --- /dev/null +++ b/src/views/partials/category/sort.tpl @@ -0,0 +1,38 @@ +
+ + +
diff --git a/src/views/partials/category/tools-dropdown-content.tpl b/src/views/partials/category/tools-dropdown-content.tpl new file mode 100644 index 0000000000..c1277682e9 --- /dev/null +++ b/src/views/partials/category/tools-dropdown-content.tpl @@ -0,0 +1,79 @@ + + diff --git a/src/views/partials/category/tools-dropdown-left.tpl b/src/views/partials/category/tools-dropdown-left.tpl new file mode 100644 index 0000000000..e7adfc32ca --- /dev/null +++ b/src/views/partials/category/tools-dropdown-left.tpl @@ -0,0 +1,5 @@ +{{{ if showTopicTools }}} +
+ +
+{{{ end }}} diff --git a/src/views/partials/category/tools-dropdown-right.tpl b/src/views/partials/category/tools-dropdown-right.tpl new file mode 100644 index 0000000000..ed48f816b7 --- /dev/null +++ b/src/views/partials/category/tools-dropdown-right.tpl @@ -0,0 +1,5 @@ +{{{ if showTopicTools }}} +
+ +
+{{{ end }}} diff --git a/src/views/partials/category/watch.tpl b/src/views/partials/category/watch.tpl new file mode 100644 index 0000000000..32f7a59b83 --- /dev/null +++ b/src/views/partials/category/watch.tpl @@ -0,0 +1,60 @@ +{{{ if config.loggedIn }}} +
+ + +
+{{{ end }}} diff --git a/src/views/partials/data/topic.tpl b/src/views/partials/data/topic.tpl index 846d17eb40..ff72ba0373 100644 --- a/src/views/partials/data/topic.tpl +++ b/src/views/partials/data/topic.tpl @@ -1 +1 @@ -data-index="{posts.index}" data-pid="{posts.pid}" data-uid="{posts.uid}" data-timestamp="{posts.timestamp}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}"{{{ if posts.allowDupe }}} data-allow-dupe="1"{{{ end }}}{{{ if posts.navigatorIgnore }}} data-navigator-ignore="1"{{{ end }}} itemprop="comment" itemtype="http://schema.org/Comment" itemscope \ No newline at end of file +data-index="{posts.index}" data-pid="{posts.pid}" data-uid="{posts.uid}" data-timestamp="{posts.timestamp}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}"{{{ if posts.allowDupe }}} data-allow-dupe="1"{{{ end }}}{{{ if posts.navigatorIgnore }}} data-navigator-ignore="1"{{{ end }}} itemprop="comment" itemtype="http://schema.org/Comment" itemscope diff --git a/src/views/partials/groups/filter-dropdown-content.tpl b/src/views/partials/groups/filter-dropdown-content.tpl new file mode 100644 index 0000000000..a44d9a0730 --- /dev/null +++ b/src/views/partials/groups/filter-dropdown-content.tpl @@ -0,0 +1,25 @@ +
+ + +
diff --git a/src/views/partials/tags/filter-dropdown-content.tpl b/src/views/partials/tags/filter-dropdown-content.tpl new file mode 100644 index 0000000000..a792269157 --- /dev/null +++ b/src/views/partials/tags/filter-dropdown-content.tpl @@ -0,0 +1,38 @@ + + +
+ + + +
diff --git a/src/views/partials/tags/filter-dropdown-right.tpl b/src/views/partials/tags/filter-dropdown-right.tpl index daed15f46c..0d30e0e2b6 100644 --- a/src/views/partials/tags/filter-dropdown-right.tpl +++ b/src/views/partials/tags/filter-dropdown-right.tpl @@ -1,3 +1,3 @@ -
+
diff --git a/src/views/partials/tags/watch.tpl b/src/views/partials/tags/watch.tpl new file mode 100644 index 0000000000..52b9e0d6a6 --- /dev/null +++ b/src/views/partials/tags/watch.tpl @@ -0,0 +1,40 @@ +{{{ if config.loggedIn }}} +
+ + +
+{{{ end }}} diff --git a/src/views/partials/users/filter-dropdown-content.tpl b/src/views/partials/users/filter-dropdown-content.tpl new file mode 100644 index 0000000000..e3ab5116d4 --- /dev/null +++ b/src/views/partials/users/filter-dropdown-content.tpl @@ -0,0 +1,23 @@ + + From e790551c7e02ce6cd9b33239b602ef460c41a119 Mon Sep 17 00:00:00 2001 From: Karen Gonzalez Date: Sat, 21 Sep 2024 14:10:02 -0400 Subject: [PATCH 07/18] implemented logic for button to only appear to admin or moderators --- dump.rdb | Bin 61420 -> 61503 bytes public/src/modules/pinButton.js | 34 ------------------------------ src/views/partials/data/topic.tpl | 5 +++++ 3 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 public/src/modules/pinButton.js diff --git a/dump.rdb b/dump.rdb index 7962d10cfe2ac37ce4fc66025a45fa11ee568e3f..5ff847fd821a1ff31f9b7fba312cce256b0d6e02 100644 GIT binary patch delta 781 zcmXw%Ur19?9LLYOciVNly1C|dbxn5NP4my(pSwHVAH-W&Do9dV5+*KE6GJRTg@U|d zSw1BlLxvCa(36!S7kY7{C5HHrSPzx;(0r(e2%^|aLDX-GPv>_yKhF1aKELz*GyNh> z&-%>Uh97-@az;mbd#VR}2iN##E60Y7`U!c%x`7blNy6A+PqCD;IGsi;h2qIHW+}%U z6B7`{3o38ow3_pwoh}kB=r;!2{k4%mC?feiVyK3!6ui@iC0{`Fiy^-{Ykg~>Ub1RW z1y7y6BQM*QA;5t$aHsV?Mo5owMwyw)jj=ikXHcvn9};n*RS}Se=WyM;!XX{+#f#Gl z#{E+V^kaVc?C$8B2iP-ZujQXFU| zjc#iUnWVI)6sTL(-%NDOl2TXe1}KAkQtq^M0+o??WLp_93wy~jOI2;< z$2i0QiepY`R4>S17~106Aq`C)4S)PZA*pXKBKMk(Y%&9 z-^gQ;(N7)>l`K6eI~PwXoXlpEqdEpgn;nxE@C3lidWA0qd4~Nw4k(2^7B9-(r%OQ# zAhjX;0f_@hNGjnZa$^Ot-Y}8wQ!bS}ZN$`9icI#G5Z^;R8QRPvzk_Gg-lYyBHmJ!& gy#|)QDNNHB0Ti$I>tR3e`noIU)!|C#$JG3T|Et60z5oCK delta 688 zcmY+C-Afcv7{<>zv+K+_>$=l^y6oz(Yo+e@?##NgAWccFnV_H%(T7{8L?)z_L01zQ z6&OZG*hDfBF9O3=4s?^EMYl=x54c9%L>PuwhT73BsH^kBdC&X&-sd?>1?KxI^CT*+ zZLjxiakp-CcZK@8``*pX&L15x^8;Gmo(BMU@PheFSpf*hGs$}#Jm^d4qUL85H5r#gAQzy>%4)q53;L8v5hxOY z&03IupyeG!hnokzJqxY&|BZ;Cz5Shlqcr#4=mOx2-ef=-Eht|nFiQe*8^vry6VU0J zGWy;sWnj;S9syq3)BjV?fGS!9R`g!fMIEfcmrfkS*Ya*sdAm=9m1OwgVGnbDXNbI> zj%EHFR-TPK F{td&c$$J0* diff --git a/public/src/modules/pinButton.js b/public/src/modules/pinButton.js deleted file mode 100644 index 9fdeaa5cfd..0000000000 --- a/public/src/modules/pinButton.js +++ /dev/null @@ -1,34 +0,0 @@ -// 'use strict'; -// // ALL CODE IN FILE WRITTEN BY CHATGPT -// define('pinButton', ['components'], function (components) { -// const PinButton = {}; - -// let pinButtonContainer; - -// // Initialize the button component -// PinButton.init = function (onPin) { -// pinButtonContainer = $('[component="pin/button"]'); - -// // Prevent text selection when clicking the button -// pinButtonContainer.on('selectstart', function (ev) { -// ev.preventDefault(); -// }); - -// // Handle button click -// pinButtonContainer.on('click', function (ev) { -// const buttonEl = $(this); -// togglePin(buttonEl); -// if (typeof onPin === 'function') { -// onPin(); -// } -// }); -// }; - -// function togglePin(buttonEl) { -// const isPinned = buttonEl.hasClass('pinned'); -// buttonEl.toggleClass('pinned', !isPinned); -// buttonEl.text(isPinned ? 'Pin' : 'Unpin'); // Change button text based on state -// } - -// return PinButton; -// }); diff --git a/src/views/partials/data/topic.tpl b/src/views/partials/data/topic.tpl index ff72ba0373..9955e76091 100644 --- a/src/views/partials/data/topic.tpl +++ b/src/views/partials/data/topic.tpl @@ -1 +1,6 @@ data-index="{posts.index}" data-pid="{posts.pid}" data-uid="{posts.uid}" data-timestamp="{posts.timestamp}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}"{{{ if posts.allowDupe }}} data-allow-dupe="1"{{{ end }}}{{{ if posts.navigatorIgnore }}} data-navigator-ignore="1"{{{ end }}} itemprop="comment" itemtype="http://schema.org/Comment" itemscope +{{{ if privileges.isAdminOrMod }}} +
+ +
+{{{ end }}} From 742689b6a152d53526ad779df6a203e5ee9bb517 Mon Sep 17 00:00:00 2001 From: Karen Gonzalez Date: Mon, 23 Sep 2024 16:24:44 -0400 Subject: [PATCH 08/18] Restricted pin button to admin/mod --- .gitmodules | 3 +++ dump.rdb | Bin 61503 -> 62676 bytes nodebb-theme-quickstart | 1 + src/views/partials/data/topic.tpl | 5 ----- 4 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 .gitmodules create mode 160000 nodebb-theme-quickstart diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..260ff05272 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "nodebb-theme-quickstart"] + path = nodebb-theme-quickstart + url = https://github.com/sschauk/nodebb-theme-quickstart diff --git a/dump.rdb b/dump.rdb index 5ff847fd821a1ff31f9b7fba312cce256b0d6e02..c17568b17e8a3144c9fdd737c0e9d0a72a0663fe 100644 GIT binary patch delta 3945 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 delta 2828 zcmai$e~=U98OPsuck?@UN$$vnJMS)=`vJ%0a>;HsKMys>jZg()dI*eCB%5S&mxD_} zcF%*B^PTM|0`a_(@%Q9?`nV2xQA-J+tzShtTZwjVo>N$<< znZ3FWjW4jGH@j`nAiv*D6S{4YLk)+pBh5(dvM1o{%ku4jqHXZjr}H+Trrq%6sl1Ig z5ZKFnAJEb^V)qtPv`?9NJJz>OfI-3;N7;exP%K!|ose=mL)kxm+eEhB*&sC~H5PsA!_wA!V|r zR9p_1F25p;674%6Gi*cT-94MKiq%SE{DgXNFQ~`eE`_=T>W}X0eK` zE1wS*^UYwo1h!K8@-gmIeinG51ZGj;SVpQX!P($R{G%Eg6GX{eGB#18nY1)qBANgy zL0_~fat}K0ZqVp+!ca<-(7Wyy%?3hDNo^YW3-@FVVd1dS9mo}|LoekA<(F<7x>@mP zebFkFL4`rR>>lV)q1coiO$r+M)vrVeuDeBJlrd5ftbpvlKpcmYM3dj3QIEjK`4;$v#-X_i)!dWyM5hpq) znE=Q8LJ42c&v?DDIL|Ty&m`Cw$Ap+fA{MawVU@o}6#>E{Dpj}TA9kox`+St6s5aO7CpXHcfPn$Py ziL`5cAwSFZv~eY9(Qu)FkLhXi6)dDL zhUt)_duS^;x>}I>+p{LFh zPB<|k*Dqd6qPrt{%B>XW_N5Co^2~}FQnhsXQTx&7E%zE1QK^J(ciMB2h{aq{v(7cl z=Ww2GvOXEDg<-Li={!iKa^^fN)O9}4vAN?PbRC#3bgFW3eID*`en3d#IKQ6WDBmZ% zOK1!RoG%2B=MR4jb!=pyVE~Wy$Tc!olQ%#(WAP}}DQ_PcC)I*bS<|KMeczLEn^Nf^ zTFTJzoPZ;wC0sMgOl(Y&GHE)Q$2!`%9f*8r{}5f+ z(ABuR;4n+W!l-Z~5CFebuoXh`yj+o*+!Hz7aGi^J{aYF(zjXvG=cgYr77Zkb&ND0Z zv*(x<*AIy?g?VMbyfP@fYRA0ltKg|!0TsN?C!11aZeYMOm|<%{4YtNrHeLaig04PX zfY-rgr~4Fgx&KA3<-m@uF}ucz1ZGzk>Oa$kuI;tSe;&`OZ?n{nVJ0zQrT$WxwCMF# z)GhqKQgoC*z}*D(T%036_~2OrcBB4Zv?6zn6YV_1$m)mBk?oyMs}pag#_a*Ogc~yG z-@@UOO2>%WWc}145_Zai(}I@3SbeH!M>|ic(T@4eXxS1gIx)XNUb5?{nwz>nrHTFZ z*&nK?wF;dMzc2#j`7fSU=^nb#1&jw9@5g6U`A=d(?KzgWMGT5`eQFK<5(@s^Sl@Q6 zuktPO6?OGkCQN!8mbtwmrW+XPN@ply6D;X+&~#l%`3DCFA<7*RiH`_$WtRh8*{eZ^ zUo^?Bhb2mTJwu`VomV3iVQ$CyXh(;O6uPwChA!w#X!ZsxTJ_^YW{agF_S8B)C!~io z5IK&xZwj^2y+@8f3T^zI5$!E*fqI!fc{_#wqHnfB>-9eWX!Z3lqXRhm(L-9heB!5v zppM7-R8&WAf4@t9_GfFgXs1ns&QCWZ$J;+5^bk!BG@-w|{j9^N5G2iy3SpcK|LGLo z(}|me5YZ*Cb^IqEY0$}wA(Vf@jQTW_Z@^w6ZWplVP zUXpamoBwdcSal%$$uktTR@{3SMN&qzPPheS52(5=|+gS zIH$VYbMdLl2J*>^YFIfax~+Q9;@7&--It~-(aY~$YOb!f>Z+^bIwzXAypcSLUEBXy zb?(|@PPF;T^8X=%@rEQbmTtrgt!Ss2LTk2YQTNrR?wb}ZL%GaYRt#6MrLgIZ$UFV# z?B_68W`TXEe@kOfH_S^dWqi117u^MQ-z}Nunni)n#fQUjd?OIj(%kavMF#9InHg{{#8K-ram-ki3g19F%EyX3OXl9fDH31!#1hd94wOu53cV^N zPsGkr)BU8<-1e^^I?Bh3PnqpsTv(e($oT#OIS5^CU<(2jSj(g_KTe|J<6`%g*KLOmXoPhuU diff --git a/nodebb-theme-quickstart b/nodebb-theme-quickstart new file mode 160000 index 0000000000..fa9a846bb0 --- /dev/null +++ b/nodebb-theme-quickstart @@ -0,0 +1 @@ +Subproject commit fa9a846bb0469695d2d77932b4abf08aa23c08a0 diff --git a/src/views/partials/data/topic.tpl b/src/views/partials/data/topic.tpl index 9955e76091..ff72ba0373 100644 --- a/src/views/partials/data/topic.tpl +++ b/src/views/partials/data/topic.tpl @@ -1,6 +1 @@ data-index="{posts.index}" data-pid="{posts.pid}" data-uid="{posts.uid}" data-timestamp="{posts.timestamp}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}"{{{ if posts.allowDupe }}} data-allow-dupe="1"{{{ end }}}{{{ if posts.navigatorIgnore }}} data-navigator-ignore="1"{{{ end }}} itemprop="comment" itemtype="http://schema.org/Comment" itemscope -{{{ if privileges.isAdminOrMod }}} -
- -
-{{{ end }}} From 1fce51cd5095e001383ff7716c43c9d6e3fc8c1e Mon Sep 17 00:00:00 2001 From: Karen Gonzalez Date: Mon, 23 Sep 2024 16:47:00 -0400 Subject: [PATCH 09/18] Removed prior changes to get front end working (modeling nodeBB commits) --- dump.rdb | Bin 62676 -> 62681 bytes public/scss/global.scss | 6 -- .../category/filter-dropdown-content.tpl | 39 --------- .../category/selector-dropdown-content.tpl | 37 -------- src/views/partials/category/sort.tpl | 38 --------- .../category/tools-dropdown-content.tpl | 79 ------------------ .../partials/category/tools-dropdown-left.tpl | 5 -- .../category/tools-dropdown-right.tpl | 5 -- src/views/partials/category/watch.tpl | 60 ------------- .../groups/filter-dropdown-content.tpl | 25 ------ .../partials/tags/filter-dropdown-content.tpl | 38 --------- .../partials/tags/filter-dropdown-right.tpl | 2 +- src/views/partials/tags/watch.tpl | 40 --------- .../users/filter-dropdown-content.tpl | 23 ----- 14 files changed, 1 insertion(+), 396 deletions(-) delete mode 100644 src/views/partials/category/filter-dropdown-content.tpl delete mode 100644 src/views/partials/category/selector-dropdown-content.tpl delete mode 100644 src/views/partials/category/sort.tpl delete mode 100644 src/views/partials/category/tools-dropdown-content.tpl delete mode 100644 src/views/partials/category/tools-dropdown-left.tpl delete mode 100644 src/views/partials/category/tools-dropdown-right.tpl delete mode 100644 src/views/partials/category/watch.tpl delete mode 100644 src/views/partials/groups/filter-dropdown-content.tpl delete mode 100644 src/views/partials/tags/filter-dropdown-content.tpl delete mode 100644 src/views/partials/tags/watch.tpl delete mode 100644 src/views/partials/users/filter-dropdown-content.tpl diff --git a/dump.rdb b/dump.rdb index c17568b17e8a3144c9fdd737c0e9d0a72a0663fe..4c10d67a4c5e0c6d8c26798123453f8fa74ce5ed 100644 GIT binary patch delta 108 zcmV-y0F(dJ=>ys61CTHRh0?Jyn=S!3lg=)!NZ<&11u_!!=j4lkH2{g=0JH=O^k+1l zfD{0Y-~bc^I%02h4&VV80FU4S7zJl_Wpi{8;0ziBZEtRLXy5`G0F&SWHDDS*RI|P> O4#fybpBcUhLb1w4<0(-9 delta 103 zcmV-t0GR*T=>yd11CTHR(ao_kn=Sz}lg=)!LjZ~30G9*`^ylP@pe^746a+eAZ*&ge z0T|#2r~xt(-~k)}kKh3{1!r|-b94~k3>pM&Z*FvG-~t)|li&e0U>ZPiv%@bA#R%1I Ja)Bz=${c?WC^!HB diff --git a/public/scss/global.scss b/public/scss/global.scss index 24931d29b6..0cf6c8e8e7 100644 --- a/public/scss/global.scss +++ b/public/scss/global.scss @@ -37,9 +37,3 @@ html[data-dir="rtl"] { h6 { font-size: 1rem; } } } -.btn-link { - &:hover, &.active { - background-color: var(--btn-ghost-hover-color); - text-decoration: none; - } -} diff --git a/src/views/partials/category/filter-dropdown-content.tpl b/src/views/partials/category/filter-dropdown-content.tpl deleted file mode 100644 index 3b33b9ace0..0000000000 --- a/src/views/partials/category/filter-dropdown-content.tpl +++ /dev/null @@ -1,39 +0,0 @@ - - -
- -
diff --git a/src/views/partials/category/selector-dropdown-content.tpl b/src/views/partials/category/selector-dropdown-content.tpl deleted file mode 100644 index 96a4ed0017..0000000000 --- a/src/views/partials/category/selector-dropdown-content.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - -
- -
diff --git a/src/views/partials/category/sort.tpl b/src/views/partials/category/sort.tpl deleted file mode 100644 index ec1730edf8..0000000000 --- a/src/views/partials/category/sort.tpl +++ /dev/null @@ -1,38 +0,0 @@ -
- - -
diff --git a/src/views/partials/category/tools-dropdown-content.tpl b/src/views/partials/category/tools-dropdown-content.tpl deleted file mode 100644 index c1277682e9..0000000000 --- a/src/views/partials/category/tools-dropdown-content.tpl +++ /dev/null @@ -1,79 +0,0 @@ - - diff --git a/src/views/partials/category/tools-dropdown-left.tpl b/src/views/partials/category/tools-dropdown-left.tpl deleted file mode 100644 index e7adfc32ca..0000000000 --- a/src/views/partials/category/tools-dropdown-left.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{{{ if showTopicTools }}} -
- -
-{{{ end }}} diff --git a/src/views/partials/category/tools-dropdown-right.tpl b/src/views/partials/category/tools-dropdown-right.tpl deleted file mode 100644 index ed48f816b7..0000000000 --- a/src/views/partials/category/tools-dropdown-right.tpl +++ /dev/null @@ -1,5 +0,0 @@ -{{{ if showTopicTools }}} -
- -
-{{{ end }}} diff --git a/src/views/partials/category/watch.tpl b/src/views/partials/category/watch.tpl deleted file mode 100644 index 32f7a59b83..0000000000 --- a/src/views/partials/category/watch.tpl +++ /dev/null @@ -1,60 +0,0 @@ -{{{ if config.loggedIn }}} -
- - -
-{{{ end }}} diff --git a/src/views/partials/groups/filter-dropdown-content.tpl b/src/views/partials/groups/filter-dropdown-content.tpl deleted file mode 100644 index a44d9a0730..0000000000 --- a/src/views/partials/groups/filter-dropdown-content.tpl +++ /dev/null @@ -1,25 +0,0 @@ -
- - -
diff --git a/src/views/partials/tags/filter-dropdown-content.tpl b/src/views/partials/tags/filter-dropdown-content.tpl deleted file mode 100644 index a792269157..0000000000 --- a/src/views/partials/tags/filter-dropdown-content.tpl +++ /dev/null @@ -1,38 +0,0 @@ - - -
- - - -
diff --git a/src/views/partials/tags/filter-dropdown-right.tpl b/src/views/partials/tags/filter-dropdown-right.tpl index 0d30e0e2b6..daed15f46c 100644 --- a/src/views/partials/tags/filter-dropdown-right.tpl +++ b/src/views/partials/tags/filter-dropdown-right.tpl @@ -1,3 +1,3 @@ -
+
diff --git a/src/views/partials/tags/watch.tpl b/src/views/partials/tags/watch.tpl deleted file mode 100644 index 52b9e0d6a6..0000000000 --- a/src/views/partials/tags/watch.tpl +++ /dev/null @@ -1,40 +0,0 @@ -{{{ if config.loggedIn }}} -
- - -
-{{{ end }}} diff --git a/src/views/partials/users/filter-dropdown-content.tpl b/src/views/partials/users/filter-dropdown-content.tpl deleted file mode 100644 index e3ab5116d4..0000000000 --- a/src/views/partials/users/filter-dropdown-content.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - From 114f963f85d9066bf76ef81ffa720e1a30d0f9f7 Mon Sep 17 00:00:00 2001 From: sschauk Date: Mon, 23 Sep 2024 17:11:07 -0400 Subject: [PATCH 10/18] frontend pin resolved, UI committed to submodule --- nodebb-theme-quickstart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodebb-theme-quickstart b/nodebb-theme-quickstart index fa9a846bb0..d493d6120a 160000 --- a/nodebb-theme-quickstart +++ b/nodebb-theme-quickstart @@ -1 +1 @@ -Subproject commit fa9a846bb0469695d2d77932b4abf08aa23c08a0 +Subproject commit d493d6120a895435822d277d10325ffbba5bd357 From 068e129e75c3847d255a3bcee67cb000fd641783 Mon Sep 17 00:00:00 2001 From: sschauk Date: Mon, 23 Sep 2024 18:16:48 -0400 Subject: [PATCH 11/18] commit to ensure frontend works for all --- nodebb-theme-quickstart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodebb-theme-quickstart b/nodebb-theme-quickstart index d493d6120a..7cb42621dc 160000 --- a/nodebb-theme-quickstart +++ b/nodebb-theme-quickstart @@ -1 +1 @@ -Subproject commit d493d6120a895435822d277d10325ffbba5bd357 +Subproject commit 7cb42621dcb572bd2effd68d6672594e0702e0d2 From 3c7a7777db67062feecb57e14a2a332f412551cc Mon Sep 17 00:00:00 2001 From: sschauk Date: Tue, 1 Oct 2024 10:15:59 -0400 Subject: [PATCH 12/18] pins implemented in correct location, logic connected, old pin removed --- nodebb-theme-quickstart | 2 +- pidfile 2 | 1 + pidfile 3 | 1 + src/views/partials/data/topic.tpl | 2 ++ 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 pidfile 2 create mode 100644 pidfile 3 diff --git a/nodebb-theme-quickstart b/nodebb-theme-quickstart index 7cb42621dc..c9cedfd015 160000 --- a/nodebb-theme-quickstart +++ b/nodebb-theme-quickstart @@ -1 +1 @@ -Subproject commit 7cb42621dcb572bd2effd68d6672594e0702e0d2 +Subproject commit c9cedfd01523a7b327eb9b136af9fd087a0fb869 diff --git a/pidfile 2 b/pidfile 2 new file mode 100644 index 0000000000..950489a781 --- /dev/null +++ b/pidfile 2 @@ -0,0 +1 @@ +28408 \ No newline at end of file diff --git a/pidfile 3 b/pidfile 3 new file mode 100644 index 0000000000..df1cbadf6d --- /dev/null +++ b/pidfile 3 @@ -0,0 +1 @@ +43549 \ No newline at end of file diff --git a/src/views/partials/data/topic.tpl b/src/views/partials/data/topic.tpl index ff72ba0373..6b78529dab 100644 --- a/src/views/partials/data/topic.tpl +++ b/src/views/partials/data/topic.tpl @@ -1 +1,3 @@ data-index="{posts.index}" data-pid="{posts.pid}" data-uid="{posts.uid}" data-timestamp="{posts.timestamp}" data-username="{posts.user.username}" data-userslug="{posts.user.userslug}"{{{ if posts.allowDupe }}} data-allow-dupe="1"{{{ end }}}{{{ if posts.navigatorIgnore }}} data-navigator-ignore="1"{{{ end }}} itemprop="comment" itemtype="http://schema.org/Comment" itemscope + + From 2925dd6dff8dfff209a44c4041a9ab2637a45169 Mon Sep 17 00:00:00 2001 From: sschauk Date: Tue, 1 Oct 2024 10:22:03 -0400 Subject: [PATCH 13/18] add branch? --- nodebb-theme-quickstart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nodebb-theme-quickstart b/nodebb-theme-quickstart index 7cb42621dc..c9cedfd015 160000 --- a/nodebb-theme-quickstart +++ b/nodebb-theme-quickstart @@ -1 +1 @@ -Subproject commit 7cb42621dcb572bd2effd68d6672594e0702e0d2 +Subproject commit c9cedfd01523a7b327eb9b136af9fd087a0fb869 From 1dee3084cd7983f67d4b6f3c73fac8b09a1249f6 Mon Sep 17 00:00:00 2001 From: Karen Gonzalez Date: Tue, 1 Oct 2024 18:19:53 -0400 Subject: [PATCH 14/18] Prior issues with pushing changes with search bar, fixed and trying again --- dump.rdb | Bin 0 -> 63577 bytes nodebb-theme-quickstart | 1 + 2 files changed, 1 insertion(+) create mode 100644 dump.rdb create mode 160000 nodebb-theme-quickstart diff --git a/dump.rdb b/dump.rdb new file mode 100644 index 0000000000000000000000000000000000000000..57043376f154c0c82753863c19cbca5d67011964 GIT binary patch literal 63577 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 literal 0 HcmV?d00001 diff --git a/nodebb-theme-quickstart b/nodebb-theme-quickstart new file mode 160000 index 0000000000..fa9a846bb0 --- /dev/null +++ b/nodebb-theme-quickstart @@ -0,0 +1 @@ +Subproject commit fa9a846bb0469695d2d77932b4abf08aa23c08a0 From 8cf9e7c3fb503d79c67cd9c041526b8eab9ccb20 Mon Sep 17 00:00:00 2001 From: Alanna Cao Date: Wed, 9 Oct 2024 13:31:31 -0400 Subject: [PATCH 15/18] functional logging and manual testing of search + filter topic display, needs proper unit tests --- public/src/client/category.js | 79 +++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/public/src/client/category.js b/public/src/client/category.js index b4f0bb50cb..a7467ae747 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -50,10 +50,89 @@ define('forum/category', [ }, }); + initalizeCategorySearch(); + console.log("Search functionality initialized"); + hooks.fire('action:topics.loaded', { topics: ajaxify.data.topics }); hooks.fire('action:category.loaded', { cid: ajaxify.data.cid }); }; + function initalizeCategorySearch() { + const searchBox = $('#topicSearchInput'); + if (!searchBox.length) { + console.error("Search box element not found"); + return; + } + + const searchButton = $('.search-button'); + + // Perform search on input change + searchBox.on('input', function () { + const searchTerm = $(this).val().toLowerCase(); + console.log("Search term: " + searchTerm); + performTopicSearch(searchTerm); + }); + + // Perform search on enter key press + searchBox.on('keypress', function (e) { + if (e.key === 'Enter') { + const searchTerm = $(this).val().toLowerCase(); + console.log("Search term on enter key press: " + searchTerm); + performTopicSearch(searchTerm); + } + }); + + // Perform search when button is clicked + searchButton.on('click', function () { + const searchTerm = searchBox.val().toLowerCase(); + console.log("Search term on button click: " + searchTerm); + performTopicSearch(searchTerm); + }); + } + + function performTopicSearch(searchTerm) { + console.log("Performing topic search with term: ", searchTerm); + const term = searchTerm.toLowerCase(); + + const $topics = $('[component="category/topic"]'); + + // Filter the topics based on the search term + const $matchedTopics = $topics.filter(function () { + const topicText = $(this).find('h3[component="topic/header"]').text().toLowerCase(); // Get the topic text + const metaContent = $(this).find('meta[itemprop="name"]').attr('content') ? + $(this).find('meta[itemprop="name"]').attr('content').toLowerCase() : ''; // Get meta content if it exists + + console.log("Checking topic: ", topicText); + console.log("Meta content: ", metaContent); + + // True if either topic text or meta content includes search term + return topicText.includes(term) || metaContent.includes(term); + }); + + // Show matched topics and hide others + $topics.addClass('hidden'); + $matchedTopics.removeClass('hidden'); + + // Log visibility changes + $topics.each(function () { + const $this = $(this); + const isVisible = $this.is(':visible'); + console.log(`${isVisible ? "Showing" : "Hiding"} topic: `, $this.find('h3[component="topic/header"]').text()); + }); + + // Handle case where no topics match the search term + if ($matchedTopics.length === 0) { + if ($('[component="category/topic/no-matches"]').length === 0) { + $(`
No topics match the search term "${searchTerm}".
`) + .insertAfter('[component="category/topic"]:last'); + } else { + $('[component="category/topic/no-matches"]').removeClass('hidden'); + } + } else { + $('[component="category/topic/no-matches"]').addClass('hidden'); + } + } + function handleScrollToTopicIndex() { let topicIndex = ajaxify.data.topicIndex; if (topicIndex && utils.isNumber(topicIndex)) { From 453f05903609cba420e59e0d3b7ad12457a73f73 Mon Sep 17 00:00:00 2001 From: Alanna Cao Date: Wed, 9 Oct 2024 14:04:50 -0400 Subject: [PATCH 16/18] fixed linting issues to pass tests, failing 1 unrelated test --- public/src/admin/manage/categories.js | 2 +- public/src/client/category.js | 28 ++++++--------------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/public/src/admin/manage/categories.js b/public/src/admin/manage/categories.js index 78402944e2..65ecc94b56 100644 --- a/public/src/admin/manage/categories.js +++ b/public/src/admin/manage/categories.js @@ -318,4 +318,4 @@ define('admin/manage/categories', [ } return Categories; -}); \ No newline at end of file +}); diff --git a/public/src/client/category.js b/public/src/client/category.js index a7467ae747..14dbac8d11 100644 --- a/public/src/client/category.js +++ b/public/src/client/category.js @@ -51,7 +51,6 @@ define('forum/category', [ }); initalizeCategorySearch(); - console.log("Search functionality initialized"); hooks.fire('action:topics.loaded', { topics: ajaxify.data.topics }); hooks.fire('action:category.loaded', { cid: ajaxify.data.cid }); @@ -60,16 +59,14 @@ define('forum/category', [ function initalizeCategorySearch() { const searchBox = $('#topicSearchInput'); if (!searchBox.length) { - console.error("Search box element not found"); return; } const searchButton = $('.search-button'); - + // Perform search on input change searchBox.on('input', function () { const searchTerm = $(this).val().toLowerCase(); - console.log("Search term: " + searchTerm); performTopicSearch(searchTerm); }); @@ -77,7 +74,6 @@ define('forum/category', [ searchBox.on('keypress', function (e) { if (e.key === 'Enter') { const searchTerm = $(this).val().toLowerCase(); - console.log("Search term on enter key press: " + searchTerm); performTopicSearch(searchTerm); } }); @@ -85,41 +81,29 @@ define('forum/category', [ // Perform search when button is clicked searchButton.on('click', function () { const searchTerm = searchBox.val().toLowerCase(); - console.log("Search term on button click: " + searchTerm); performTopicSearch(searchTerm); }); } function performTopicSearch(searchTerm) { - console.log("Performing topic search with term: ", searchTerm); const term = searchTerm.toLowerCase(); - + const $topics = $('[component="category/topic"]'); - + // Filter the topics based on the search term const $matchedTopics = $topics.filter(function () { const topicText = $(this).find('h3[component="topic/header"]').text().toLowerCase(); // Get the topic text const metaContent = $(this).find('meta[itemprop="name"]').attr('content') ? $(this).find('meta[itemprop="name"]').attr('content').toLowerCase() : ''; // Get meta content if it exists - - console.log("Checking topic: ", topicText); - console.log("Meta content: ", metaContent); - + // True if either topic text or meta content includes search term return topicText.includes(term) || metaContent.includes(term); }); - + // Show matched topics and hide others $topics.addClass('hidden'); $matchedTopics.removeClass('hidden'); - - // Log visibility changes - $topics.each(function () { - const $this = $(this); - const isVisible = $this.is(':visible'); - console.log(`${isVisible ? "Showing" : "Hiding"} topic: `, $this.find('h3[component="topic/header"]').text()); - }); - + // Handle case where no topics match the search term if ($matchedTopics.length === 0) { if ($('[component="category/topic/no-matches"]').length === 0) { From 46fc82ac652e99c261ad0ccfb88d53c4be31f08a Mon Sep 17 00:00:00 2001 From: Alanna Cao Date: Wed, 9 Oct 2024 14:20:37 -0400 Subject: [PATCH 17/18] updated workflow to run lint adn test on PRs to sprint2-main --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index c4e8f090bd..3d6bce723c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -4,6 +4,7 @@ on: pull_request: branches: - f24 + - sprint2-main workflow_call: # Usually called from deploy defaults: From ab67337cb024b850b76580ca91b54169f13a2ac4 Mon Sep 17 00:00:00 2001 From: Alanna Cao <117230792+Alanna-Cao@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:40:16 -0400 Subject: [PATCH 18/18] Update workflow test.yaml --- .github/workflows/test.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3d6bce723c..7c2f1da030 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -3,7 +3,6 @@ name: Lint and test on: pull_request: branches: - - f24 - sprint2-main workflow_call: # Usually called from deploy