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] 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,