From 85beae6554834ea89089560b25c163669ea71459 Mon Sep 17 00:00:00 2001 From: msoliman3 Date: Thu, 3 Nov 2022 12:43:57 +0100 Subject: [PATCH 1/9] light/dark mode pt.3 --- dashboard_static/style/style.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index c580b0c..4207dbe 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -7,7 +7,9 @@ --column-color: #1E1E1E; --secondary: #1D9BF0; } - +body { + overflow: hidden; +} body, html, .container { width: 100%; height: 100%; @@ -195,6 +197,7 @@ body { .leftcol, .centercol, .rightcol, .searchcontainer, .popchart { background-color: var(--column-color); + overflow: hidden; } .rightcol { From a6e3a127619830d8c16fd0fb0075c04cf09a686a Mon Sep 17 00:00:00 2001 From: msoliman3 Date: Thu, 3 Nov 2022 14:23:49 +0100 Subject: [PATCH 2/9] twitter hour help me lol --- dashboard.py | 2 +- dashboard_static/js/code.js | 3 +++ dashboard_static/style/style.css | 21 ++++++++++++++++----- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dashboard.py b/dashboard.py index fa975ac..7196e39 100644 --- a/dashboard.py +++ b/dashboard.py @@ -13,7 +13,7 @@ root_content_path = 'dashboard_static' # the action will be called with the context and the event @event('init') def setup(ctx, e): - start_offline_tweets('sports1.txt', event_name="tweet", time_factor=0.1) + start_offline_tweets('sports1.txt', event_name="tweet", time_factor=0.01) ctx.count = 0 # fire('sample', {'previous': 0.0}) diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index 43be3fd..91a3ed4 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -25,6 +25,8 @@ function showFeeds() { } function tweetCell(tweet) { + const date = new Date(tweet.created_at); + console.log(new Intl.DateTimeFormat('en-GB').format(date)); var cell = document.createElement("div"); cell.innerHTML = `
@@ -33,6 +35,7 @@ function tweetCell(tweet) {
${tweet.user.name} @${tweet.user.screen_name} +

${date.getHours()}:${date.getMinutes()}

${tweet.text}
diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index 3b04eee..691191b 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -7,9 +7,7 @@ --column-color: #1E1E1E; --secondary: #1D9BF0; } -body { - overflow: hidden; -} + body, html, .container { width: 100%; height: 100%; @@ -95,6 +93,7 @@ body { .tweet { display: flex; + gap: 10px; background-color: var(--tweet-color); border-radius: 16px; padding: 16px; @@ -112,6 +111,12 @@ body { padding-left: 16px; } +.tweet-name { + display: flex; + gap: 1.5%; + +} + .tweet-interactions { display: flex; margin-top: 8px; @@ -152,6 +157,13 @@ body { opacity: 0.8; } +.tweet-date { + color: var(--main-light); + text-decoration: none; + justify-self: flex-end; + opacity: 0.8; +} + .filters-search input { height: 28px; width: 100%; @@ -197,7 +209,6 @@ body { .leftcol, .centercol, .rightcol, .searchcontainer, .popchart { background-color: var(--column-color); - overflow: hidden; } .rightcol { @@ -280,4 +291,4 @@ body { .radius-bottom { border-bottom-left-radius: 16px; border-bottom-right-radius: 16px; -} \ No newline at end of file +} From 71fea5aef9f7361727ceacc8f1a60dfdf53c742d Mon Sep 17 00:00:00 2001 From: Tim Wijma Date: Thu, 3 Nov 2022 14:37:31 +0100 Subject: [PATCH 3/9] flexbpox --- __pycache__/dashboard.cpython-310.pyc | Bin 1562 -> 1562 bytes dashboard_static/js/code.js | 8 +++++--- dashboard_static/style/style.css | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc index 8e88d6080d3215bc1a15d6c85dbf30afd3dd732c..52532bb389045f8607b3aac5917967b06d3703c8 100644 GIT binary patch delta 35 pcmbQmGmD2epO=@50SIaiCnp
- ${tweet.user.name} - @${tweet.user.screen_name} -

${date.getHours()}:${date.getMinutes()}

+ + ${date.getHours()}:${date.getMinutes()}
${tweet.text}
diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index 691191b..8115c53 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -109,12 +109,17 @@ body { .tweet-content { padding-left: 16px; + width: 100%; } .tweet-name { display: flex; gap: 1.5%; + justify-content: space-between; +} +.tweet-date { + align-self: flex-end; } .tweet-interactions { From 52b51e828e25ca3bf565e840642f92bec06c65c0 Mon Sep 17 00:00:00 2001 From: "youri.apell@gmail.com" Date: Thu, 3 Nov 2022 16:34:38 +0100 Subject: [PATCH 4/9] made the tweet text link to the original tweet --- __pycache__/dashboard.cpython-310.pyc | Bin 1575 -> 0 bytes dashboard_static/js/code.js | 2 +- dashboard_static/style/style.css | 4 ++++ eca/__pycache__/arff.cpython-310.pyc | Bin 10610 -> 0 bytes eca/__pycache__/generators.cpython-310.pyc | Bin 3913 -> 0 bytes 5 files changed, 5 insertions(+), 1 deletion(-) delete mode 100644 __pycache__/dashboard.cpython-310.pyc delete mode 100644 eca/__pycache__/arff.cpython-310.pyc delete mode 100644 eca/__pycache__/generators.cpython-310.pyc diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc deleted file mode 100644 index 986186a6cd646aeb53e2fb7475c0e923fb29ab99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1575 zcmah}OK&7K5caEkI-O)T3kwUJ76B3sBBR_mL;-16;sSFCD?|%4a@wAxH$Cmf_T;6` zDY^0kKpYZo`3d|7eu1x?a^|)Npvsfo&91bqZn z@=IFgyF@MjPRnJrqE=yN1#S%C#vQd5Z>%c5O^UnMV3QOy&`*Heb6#3MG1F;Nw|e3a zwf1gYt|{sEc8s)Y0tb9u1yQ%PuNdCFX~;uxB)pD0w&Y( z$+GK=^=@O`ANi0(GrPb3g6)ql3RdR&K(~I<%9$>geLd5YsjR%QmV(}bS$wdNRA%1# zf(2grqd@f)u}iT2^y|@Mr>z^ArasViua$oENV|P+y3u2>)OtPoUQ4?%`o^evqc=wW zu=ZZt&pKbBq^Y0ROvAvuuET!&=db=pS%7X%9?h^nc(w}Er`xNFqD0n-Wp;k!?Z ztjrHg)9B+J*)(M~HO5CS-;r)#FZc|29amGY+qQP)pt5xZ+hyuZRcTu$cD}oFT;a1m zYiJ7Nc?iRO4#blS+LKFqNKmNIiu-C*zkCqY+fTjfyiMJ-Hy4 zAlelW3Tp4bbOnWY`06`kn~j|9D7p0kocJ4cWaQ-jp|Q%XZ#JfqjoSidapwPQdUEi> zW>|7i7g3Xa6ZF1f*}es9AL2S@;q{s^08BZci|z{uosF;2O+XZHbo*M>AHkWJ+Z9rX zFz6)KVGA|aHMPfb=|VcK8(4(u8O*eEa#x4cYBz8EE53##hVeeC#OlfEFm^%h0}w6N z=SzUaa!z5yL~jAp()g$ub@RY+2fZ6k&L!8N!sr0va?x$gd z^ zg!O_%SPXY{tF81m|5E|G4z;E%7i&~dMsu3~BmT7?!(uTETvxIj0$IPgXsla&A*q$E zGPA&}4tFhJXi^#YAK>eORP2Q$enS!N5qe=znORpi+P;S#-AD2O2^zZPW%M_?nr+VF eC$oi*;P6&PR%pgDDny#(G#lhe#xtH~L;4@~Aze)X diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index 64747fb..a05d79c 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -35,7 +35,7 @@ function tweetCell(tweet) {

${tweet.created_at}

- ${tweet.text} + ${tweet.text}
favorite diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index 9b27667..530e2dd 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -143,6 +143,10 @@ body { font-weight: bold; } +.tweet-text { + color: white; + text-decoration: none; +} .tweet-username { color: var(--main-light); diff --git a/eca/__pycache__/arff.cpython-310.pyc b/eca/__pycache__/arff.cpython-310.pyc deleted file mode 100644 index 1516621a59785020207256a2be42150d073cc160..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10610 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 TA3r#L(0|H5=#Tiv#*h3TQ@q@9 diff --git a/eca/__pycache__/generators.cpython-310.pyc b/eca/__pycache__/generators.cpython-310.pyc deleted file mode 100644 index 155bc4d8708199018b99b564bcb0b143f7aecc2c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3913 zcmZ`+TaO$^6|U;bbWhJ^$Cuc-7}7~t$7Ap=h6p0dN{npFSl~ruomg&xTJ5QtonH5J zud8aj*>MjttR))>6JC)(nw5C*6HmPI&R-~aLrC~9@IW}HdS>?G(4(%d>#1}5&N)-G zS^{SmOB1o9>x(WBbrR9<_wb5?&q5vFfmu#a1(C%lh}}fNfjNh{ ztoDRNF7ucV-_AZ(=FY;{*dSD2G6-jR3XNLAcW@!dB|}-+?X$fBgti$%qP+! z5BsCMr?8`n`82PN$*?bqp`n!IJ0S?nMV@4#EJmWoSImNT)i&p<=Nyp7g}w#vkKmPO zp($xeVp7`B($a#~DjjHT*NJp>w4Oo>ozc~$9Xd3y1o!Vw-?A=*hcX=W%uHGuxDB~Ab6<8Z|abZgoo4lu1c`sRAuq9Wv zcC;VIX`ZS$J`NX11VfEhzcwA8K5VR&`Q9En+WbKUqF-EvSH202BAcMbP4J87bV5ry zwf6`(yao2R#~&MGpv~7+A{3gq(hFL3kmM}mp%{UU2dSJ}xe%2J@f5gb4Gw~DuXP=9 z46f6)+eWe4hI87LNVaQRBBO|f756a6i{ zMt<&3sPbU!mvk56+JjSfz;q6A$gW)(@gkAuw}BS^?(Q4*UkmAP<`0Ye94yH9Wv(!* zz}gaZllM5Pgd^tVO0YP38?8R%YEZCnE0HDy%tHhC$6=D&gS0mYx6>>O?{T23@RHkN z#24h!{*fbcP>eDb0wjhhpog!7H-|&cQs^!wF~R^Bd7(l9yh12t`|dYB{mCfL0mDb* z)mpc%Ygw_e!G(4izc<TD|G7P}6`fk8y+2{F;=tXJnU(KbOtV0DidR!3XfQ#a~N%+QxtckaZW3b=O}R1BCx}2*R+Z+ZjJM z!1+nPpQSnA0n;TwU@J>@W)Qud+&4)X3XY_oLZt2&VwgaNVE{ul2rteKZE+DIjc3#lXo%Hkbpbghy~JKIUBUeL&A zBdAp%EWEH0+Ca=;MK_S+xS#Z(j@eHx+A~|YxQwhK)KAe49lu>vYK@Ir<;vx(0MX?~ zE3@6NNQ+V2NQ?M-My6yB@U%_@f(nyhDq{$F;=CDF;9a0q*VB1ey8`Pba|Cq!&i~_K zv3pHZF?L6)f8j$cEFn%8Sg;6GzW|7n@#<9*L96JPun@~cV{4<}%4g1jPGyl_3Lj0n z+6A49WPJX}xoRhb+DDU1k0#;4BT>);0^n3}qQ<9}lW_T7xXi-kA6{C%b!mA$TpowZ zce_j4DYken>cEwDvLa#H*@RoQi+!mbG`4Q7L-xE0@!l9v2cIR`h+h{1EEeKHmz(}M z=nK@i_N5YAXjt7+g-S9|GSqoM&+TP}<8N3v=>k z&{&T<^`_Ht9Ls^c5zsb#9qPl+vI6K?vA6x(RZRc^Dp2S%gbzD5@TX4e0 ziqL`)Q2D#{jd%YcuHp5VZ?tFFhY^VK4MiE9mFs4a@GXy*B>vYLc7OYzj1}AzqDDVKGuN zWv0ML!da2N(zUCy`eR_G%DtXIF7=7ELfss0WqgSBGpl?9Lybvnm7pk!Ns?VxEC@tC z{9iJeR=kGmrgS&9*~j5Y!)AQgLK1e*Ds8mJ*FpQ@2FyV<@IHL7C`8SQ>o|9!s&O6k z72~1edoZnMMFdJv)ft9k!>0j+houPq)v)Cb{Plox`NyU<5txsS>mLvgFaN5ful>ta b`S20qUt+1?6W=(^8PobSu-jH}wteM)+B(zY From 1793dd4175e769b25bd1fc74517b374f015abac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= Date: Thu, 3 Nov 2022 16:35:06 +0100 Subject: [PATCH 5/9] Added checking if filtered tweets has changed --- __pycache__/dashboard.cpython-310.pyc | Bin 1575 -> 2351 bytes dashboard.py | 55 +++++++++++++++++++++++++- dashboard_static/js/code.js | 2 - dashboard_static/js/events.js | 12 +++--- sports.json | 15 ------- 5 files changed, 60 insertions(+), 24 deletions(-) diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc index 986186a6cd646aeb53e2fb7475c0e923fb29ab99..719b88d5dd17ac810ec7e16c2fbc7956d7674b4a 100644 GIT binary patch literal 2351 zcmcgt&2Jnv6t_K|*~#o?oAfIbP6!ZMDzfUWhpIwqIUpdHQdPC6R+F)lOfx&4+TMI= zD|D zPl!krKU$F4F%{V+k=)gl@09;vkUe={6816lJkdNWJ1)qHnh=YqrCL_t8MsS6A zN=8%?P?@Y9bZw)Jv)5MLp7U`~^Mb;j0TY?pQMDV@`B;grE5~ZIkrz%IGg~)kEFTwo zQo8~3QQ`JHRnLe)6aVwg@UB(H4s})TD6>`PZg^YSZKs>zUC>fHHN3BKb8YyomXk_d z8@k=nIb}X?jDDyJH+*%`)n?zvR=G*j2f>yD>9dTQ9xw%-;q*cN)xDQs;K-CXI;B%~ z2=5*8jIQB9$N3(RvK~Y}uJo=lKHkZziSqHJX_N`)pOG#I@w}+Y<}z>=4ZB3m1^69A z-`~4BNJX}zt4i&!=T#-r4Xs_^vi00MhyhbR*BAfx^8 za%ynSV0^Zc6~h_b5FGs%cn5AkAJRkmm>v9n(3!F$aQ88#|cTSyGB?Oq4-`{6G@3>+=%nCgka0}M^5dzk;&^#B`%fq$f%}*NgZna#EwcSuFRbdQZAfb znn3kM{K}lkfNm|=!YEbGN`17cwCENZ61#-5t*nUQY=siNLf6ie>l5e!R-7yC=+Q(w zb#k~6+MeSLMAVeZN4bcoU)gUy-SY& zkbw4#FQIOl(d=LT(p-f@4f;M(MK1b4R!kDnjcM3gj%1W6J&?4CEXLSY@ov~7|S1?t2V;mapO>6}AeIP06(Uhf>^CZq_ O+R5THN~0w0)BgZ=xDa>% delta 494 zcmZvYze@u#6vyu+>91>hme#5jkq!<$T6Gr?ildVap{{guJYw*SU=Dy1*y&b_WW2k>X3Xg6q{tpi-d-y1jtY zkQcsEHH2;Jz!_kDf+-QWkB2~GO+@22W8JAktv$<4?DCj)QADsav5&iLrm#op8|bEs zRNV7LJLvG7DTyM~6W*aB?4&Jt+05ZkaF_6e&Uw ${tweet.user.name} @${tweet.user.screen_name} - -

${tweet.created_at}

${tweet.text}
diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js index 015b661..42f5928 100644 --- a/dashboard_static/js/events.js +++ b/dashboard_static/js/events.js @@ -51,7 +51,6 @@ let root = document.querySelector(":root") $(".logo").on("click", function() { if (root.style.getPropertyValue("--main-bg") === 'snow') { - console.log("IM here") var audio = new Audio("../media/Chicken.mp3"); audio.play(); root.style.setProperty('--main-medium-dark', '#1E1E1E'); @@ -74,16 +73,19 @@ $(".logo").on("click", function() { $(window).on("filter", function() { var parent = document.querySelector("#filtered") - parent.replaceChildren(); + var lastTweet = parent.firstChild tweets = window.sessionStorage.getItem('tweets'); tweets = JSON.parse(tweets); tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order); tweets = sortTweets(tweets, [filters.sorted, filters.order]); var displayTweets = tweets.reverse().slice(0, 20).reverse(); - for (i = 0; i < Math.min(19, displayTweets.length); i++){ - tweet = displayTweets[i]; - parent.prepend(tweetCell(tweet)); + if(tweetCell(displayTweets[0]) != lastTweet){ + parent.replaceChildren(); + for (i = 0; i < Math.min(19, displayTweets.length); i++){ + tweet = displayTweets[i]; + parent.prepend(tweetCell(tweet)); + } } }) diff --git a/sports.json b/sports.json index c0c9900..9b86beb 100644 --- a/sports.json +++ b/sports.json @@ -1,19 +1,9 @@ { "created_at":"Sat Nov 16 12:51:41 +0000 2019", "id":1195685871556710402, - "id_str":"1195685871556710402", "text":"@BobGreenburg @ONeill_Coffee Congrats to the excellent football program at Wilmington. One classy organization!", - "display_text_range":[ - 29, - 111 - ], "source":"Twitter for iPhone<\/a>", "truncated":false, - "in_reply_to_status_id":1195545633685475333, - "in_reply_to_status_id_str":"1195545633685475333", - "in_reply_to_user_id":483881032, - "in_reply_to_user_id_str":"483881032", - "in_reply_to_screen_name":"BobGreenburg", "user":{ "id":774718832212606976, "id_str":"774718832212606976", @@ -55,11 +45,6 @@ "follow_request_sent":null, "notifications":null }, - "geo":null, - "coordinates":null, - "place":null, - "contributors":null, - "is_quote_status":false, "quote_count":0, "reply_count":0, "retweet_count":0, From 7cee44e43d4c8a34b9ced982206fd5e11eb522a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= Date: Thu, 3 Nov 2022 16:40:16 +0100 Subject: [PATCH 6/9] changed time --- __pycache__/dashboard.cpython-310.pyc | Bin 2351 -> 2355 bytes dashboard.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc index 719b88d5dd17ac810ec7e16c2fbc7956d7674b4a..429bc762c526141578c0f150fd166140f72c23be 100644 GIT binary patch delta 335 zcmZ24v{{HZpO=@50SLA{NKRh7kynzDGkw-f5ZGxyS)0+Ck#ll7V;Up(+?+sl zMPPz!vLTZwqtIk`rfV`hKv7M`B7PvXlJOQ}IYb3inI&_C0Yt$q&f=2%g7W;Ll;R>` zxIqwQAg(BoPysQ-CLd(B6~(G#vM`GyiYww-OTOA$NBbPf=~3L->61hSW|uzxY<1_=rQiCgT+`MCv|IjKcb VAR%!Op#UPZK?Fh@)Sv%33;^6FLh%3q delta 379 zcmdliv|flepO=@50SIF6CMPf4$ScXn`jQdIovhDj&B!%5n=y@%XYwV+2t|;hA~3-X zWZhy(&dDqg1G0*lfP?^Jk?>@1rfV|1K#nG3kpPfd$#{#g9HIlFZL%$MgfT?HEzaVS z{DSiQqLkty5ujRRWgsrdU=+Dbi#q;sCOXI6(v} zh!6!4NVZJA!T!aZ2P7yAByO=M=jRq==A;%$gM=hN1jw)=Z4iOb24- Date: Thu, 3 Nov 2022 16:46:13 +0100 Subject: [PATCH 7/9] cache --- __pycache__/dashboard.cpython-310.pyc | Bin 2355 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 __pycache__/dashboard.cpython-310.pyc diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc deleted file mode 100644 index 429bc762c526141578c0f150fd166140f72c23be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2355 zcmcgty^kC<6t_K|*}2)h&E=a=1pz`!#I4e$hyqeVfq-j56vYCq=ElCw|Pm+FsW-+Bkc8)$KSR2Q}kwzQ*?R`vWF2wWVq|s`H5wT~|)jXd^G2Him-S z0W)YY9~XLBy8-i2;dVS#kBM1=`M*9H-m=Qrp{~j;W$xCw8{SZM)9Ge-3pCYE4ezMj zTpoU^<+M_lhin^jStt7nlOi@Vp`a@7-5m z;K+<=A&G{5~6=oBs>bkU|Q<$=VWsz82 z6v~L$OvmfH1)BAFLsfX6>+stvKpZ)sGjd2DP{+`t56O(~GZ;nS+v6ktVl<=R=Xk9p z7?q&#nHv#b{%1FuH`E6~aUAZT zsHjr)D@DHznBdzU8F1fea*V?oVy>x5hvCxrWTUKL5~8OwQP$>T5Faf-#4UtafJj=1%>{@~3o%=ONLz?U3lK{! z#CHo2ka>?;?8gO&ZVU0t0z|Kc`0Y3Xe8HcO9hb|PU?_3%jLH55h`$@;i~fTMRv^o} zWEMe0p4?#a)VBe5|4B%|r`JSMVk$S{lq@0G^4*bBJ8oq1daT6RvK|@LR4}PSzMtAr zDaD0_(?QDV<4aS>zKB1+U^1Xv3$`#y)$>#zjg=PNLc_x@A#E!wVmMo&M6b}bGv)de zYJe3dN;|qg)lMB9E`+w{cmokNrSefOIHPGNi_<8LlC)3%0cU9yCIA2c From 21064b3d240c4a72301111920bb6b72bee54fb3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= Date: Thu, 3 Nov 2022 16:55:45 +0100 Subject: [PATCH 8/9] maybe working sort --- dashboard_static/js/code.js | 5 ++++- dashboard_static/js/events.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index df51121..faa2d2a 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -93,6 +93,7 @@ function searchForWords(searchWords, tweets){ } function sortTweets(tweets, sort){ + console.log(sort) if(typeof sort.sortby == 'undefined'){ return tweets } @@ -121,10 +122,12 @@ function sortTweets(tweets, sort){ tweets.sort(function(a,b){return a.reply_count-b.reply_count}) } } - if (sort.sortby == "date"){ + if (sort.sortby == "time"){ if(sort.order == 'asc'){ + console.log("asc") tweets.sort(function(a,b){return Date(b.created_at)-Date(a.reply_count)}) } else{ + console.log("desc") tweets.sort(function(a,b){return Date(a.created_at)-Date(b.reply_count)}) } } diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js index 42f5928..50d0ea4 100644 --- a/dashboard_static/js/events.js +++ b/dashboard_static/js/events.js @@ -78,7 +78,7 @@ $(window).on("filter", function() { tweets = window.sessionStorage.getItem('tweets'); tweets = JSON.parse(tweets); tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order); - tweets = sortTweets(tweets, [filters.sorted, filters.order]); + tweets = sortTweets(tweets, {"sortby":filters.sorted, "order":filters.order}); var displayTweets = tweets.reverse().slice(0, 20).reverse(); if(tweetCell(displayTweets[0]) != lastTweet){ parent.replaceChildren(); From 8fb0b7d8f71c7af4acb319e9313178092f05d608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= Date: Thu, 3 Nov 2022 17:00:16 +0100 Subject: [PATCH 9/9] Fixed sort --- dashboard_static/js/code.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index f427f81..4759d6e 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -25,7 +25,6 @@ function showFeeds() { function tweetCell(tweet) { const date = new Date(tweet.created_at); - console.log(new Intl.DateTimeFormat('en-GB').format(date)); var cell = document.createElement("div"); cell.innerHTML = `
@@ -98,7 +97,6 @@ function searchForWords(searchWords, tweets){ } function sortTweets(tweets, sort){ - console.log(sort) if(typeof sort.sortby == 'undefined'){ return tweets } @@ -129,10 +127,8 @@ function sortTweets(tweets, sort){ } if (sort.sortby == "time"){ if(sort.order == 'asc'){ - console.log("asc") tweets.sort(function(a,b){return Date(b.created_at)-Date(a.reply_count)}) } else{ - console.log("desc") tweets.sort(function(a,b){return Date(a.created_at)-Date(b.reply_count)}) } }