diff --git a/dashboard.py b/dashboard.py index 6fb5a52..1478963 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}) @@ -40,7 +40,58 @@ def words(message): @event('tweet') def generate_tweet(ctx, e): - tweet = e.data + tweet = dict(e.data) + try: + try: + tweet.pop("id_str") + except KeyError: + pass + try: + tweet.pop("display_text_range") + except KeyError: + pass + try: + tweet.pop("in_reply_to_status_id") + except KeyError: + pass + try: + tweet.pop("in_reply_to_status_id_str") + except KeyError: + pass + try: + tweet.pop("in_reply_to_user_id") + except KeyError: + pass + try: + tweet.pop("in_reply_to_user_id_str") + except KeyError: + pass + try: + tweet.pop("in_reply_to_screen_name") + except KeyError: + pass + try: + tweet.pop("geo") + except KeyError: + pass + try: + tweet.pop("coordinates") + except KeyError: + pass + try: + tweet.pop("place") + except KeyError: + pass + try: + tweet.pop("contributors") + except KeyError: + pass + try: + tweet.pop("is_quote_status") + except KeyError: + pass + except: + pass # base sample on previous one # sample = clip(-100, e.data['previous'] + random.uniform(+5.0, -5.0), 100) # emit to outside world diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index 8f97723..bf2dca8 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -24,18 +24,20 @@ function showFeeds() { } function tweetCell(tweet) { + const date = new Date(tweet.created_at); var cell = document.createElement("div"); cell.innerHTML = `
- ${tweet.user.name} - @${tweet.user.screen_name} - -

${tweet.created_at}

+
+ ${tweet.user.name} + @${tweet.user.screen_name} +
+ ${date.getHours()}:${date.getMinutes()}
- ${tweet.text} + ${tweet.text}
favorite @@ -123,7 +125,7 @@ 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'){ tweets.sort(function(a,b){return Date(b.created_at)-Date(a.reply_count)}) } else{ diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js index 5fe6f95..8c5f63e 100644 --- a/dashboard_static/js/events.js +++ b/dashboard_static/js/events.js @@ -43,7 +43,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'); @@ -66,16 +65,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]); + tweets = sortTweets(tweets, {"sortby":filters.sorted, "order":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/dashboard_static/style/style.css b/dashboard_static/style/style.css index 0796aa3..af837df 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -93,6 +93,7 @@ body { .tweet { display: flex; + gap: 10px; background-color: var(--tweet-color); border-radius: 16px; padding: 16px; @@ -108,6 +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 { @@ -143,6 +155,10 @@ body { font-weight: bold; } +.tweet-text { + color: white; + text-decoration: none; +} .tweet-username { color: var(--main-light); @@ -150,6 +166,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%; @@ -301,4 +324,4 @@ body { .current-sort { line-height: 36px; -} \ No newline at end of file +} diff --git a/eca/__pycache__/arff.cpython-310.pyc b/eca/__pycache__/arff.cpython-310.pyc deleted file mode 100644 index dab7427..0000000 Binary files a/eca/__pycache__/arff.cpython-310.pyc and /dev/null differ diff --git a/eca/__pycache__/generators.cpython-310.pyc b/eca/__pycache__/generators.cpython-310.pyc deleted file mode 100644 index 01498c6..0000000 Binary files a/eca/__pycache__/generators.cpython-310.pyc and /dev/null differ 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,