From 8e9d7482102ce7bf9e7e63c9426d311d149d809f Mon Sep 17 00:00:00 2001 From: Drew Date: Tue, 1 Nov 2022 13:31:39 +0100 Subject: [PATCH 1/6] CSS Grid Headings --- dashboard_static/index.html | 12 +++++++++--- dashboard_static/style/style.css | 10 +++++++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dashboard_static/index.html b/dashboard_static/index.html index bc976ac..68a75a8 100644 --- a/dashboard_static/index.html +++ b/dashboard_static/index.html @@ -86,10 +86,16 @@ -->
-
-
+
+

LATEST CLUCCS

+
+
+

FILTERED CLUCCS

+
-
+
+

SPORTS POPULARITY CHART

+
diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index 802992c..16d5e83 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -23,6 +23,9 @@ body { .container { background-color: var(--main-bg); color: white; + display: block; + margin-left: auto; + margin-right: auto; padding: 16px 32px; } @@ -143,4 +146,9 @@ body { border-radius: 16px; height: 400px; margin: 40px; -} \ No newline at end of file +} + +.colheader { + font-size: 38px; + padding-left: 30px; +} From 413895b8d57964a59cce66730d8d204e3a066f5d Mon Sep 17 00:00:00 2001 From: Drew Date: Tue, 1 Nov 2022 17:41:21 +0100 Subject: [PATCH 2/6] Buttons --- dashboard_static/index.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/dashboard_static/index.html b/dashboard_static/index.html index f9b2b58..1269f40 100644 --- a/dashboard_static/index.html +++ b/dashboard_static/index.html @@ -68,7 +68,6 @@

SPORTS POPULARITY CHART

-<<<<<<< HEAD -->
@@ -82,8 +81,6 @@

SPORTS POPULARITY CHART

-======= ->>>>>>> 552191335378d5d4fcc19eee637d115ec515d385
From 87df4ec2f56d1e357927c2cd0cc738ca9e88b167 Mon Sep 17 00:00:00 2001 From: Drew Date: Wed, 2 Nov 2022 12:42:30 +0100 Subject: [PATCH 3/6] idk bro help me --- dashboard_static/index.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dashboard_static/index.html b/dashboard_static/index.html index 68148e7..f473571 100644 --- a/dashboard_static/index.html +++ b/dashboard_static/index.html @@ -90,17 +90,17 @@
- Filtered Cluccs +

FILTERED CLUCCS

- - - - -
-
-

SPORTS POPULARITY CHART

+ + + + +
+
+

SPORTS POPULARITY CHART

From 66db3e030886a80b1ffa9262b2cb46b5185ed11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Hn=C3=A1t?= Date: Wed, 2 Nov 2022 13:06:18 +0100 Subject: [PATCH 4/6] Added sort tweets --- dashboard_static/js/code.js | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index 6acacf9..f98c27e 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -76,7 +76,7 @@ function tweetCell(tweet) { return cell } -function filter(tweets, bannedWords=[], searchWords=[], likesTop=null, likesBottom=null, retweetsTop=null, retweetsBottom=null, repliesTop=null, repliesBottom=null) { +function filterTweets(tweets, bannedWords=[], searchWords=[], likesTop=null, likesBottom=null, retweetsTop=null, retweetsBottom=null, repliesTop=null, repliesBottom=null) { if(bannedWords.length > 0){ tweets = filterBannedWords(bannedWords, tweets) } @@ -153,3 +153,24 @@ function filterReplies(repliesTop, repliesBottom, tweets){ } return tweets } + +function sortTweets(tweets, likesDes=null, retweets=null, replies=null){ + if(likesDes && likesDes!=null){ + tweets.sort(function(a,b){return b.favorite_count-a.favorite_count}) + } else if (!likesDes && likesDes!=null){ + tweets.sort(function(a,b){return a.favorite_count-b.favorite_count}) + } + if(retweets && retweets!=null){ + tweets.sort(function(a,b){return b.retweet_count-a.retweet_count}) + } else if (!retweets && retweets!=null){ + tweets.sort(function(a,b){return a.retweet_count-b.retweet_count}) + } + if(replies && replies!=null){ + tweets.sort(function(a,b){return b.reply_count-a.reply_count}) + } else if (!replies && replies!=null){ + tweets.sort(function(a,b){return a.reply_count-b.reply_count}) + } + return tweets +} + +var tweets = [{"likes": 2},{"likes": 3},{"likes": 5},{"likes": 1}] From f145b22ce0d7798e2f1e6b4a18eaf4aab6e96cf3 Mon Sep 17 00:00:00 2001 From: Drew Date: Wed, 2 Nov 2022 13:24:54 +0100 Subject: [PATCH 5/6] Redirect to Twitter --- __pycache__/dashboard.cpython-310.pyc | Bin 819 -> 834 bytes dashboard_static/js/code.js | 4 ++-- eca/__pycache__/arff.cpython-310.pyc | Bin 10596 -> 10609 bytes eca/__pycache__/generators.cpython-310.pyc | Bin 3899 -> 3912 bytes 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc index fa27820446057a79adfd6ff7111686db9eb9ffa2..203374c5872cdedd6b9076d80800f075be3e7fa0 100644 GIT binary patch delta 91 zcmdnYc8HBTpO=@50SGw5k~VTXF*^D>Tg8MHrxq2*B<7Z7SH}3~rMeVlmZiqHq!wqF o15rSSkb*p1`Ffk{8MiP3008VB$N&HU delta 76 zcmX@awwaAPpO=@50SGoJCT`?*Vl=XIwu%WYPAw{qDap(&&x~=&PcF?(%_}L6@y$;u e%}G@-j43J4EGbDX(k&>;&q_@$+1$stg%JRI92wsL diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index 6acacf9..2629b36 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -53,8 +53,8 @@ function tweetCell(tweet) {
- ${tweet.user.name} - @${tweet.user.screen_name} + ${tweet.user.name} + @${tweet.user.screen_name}
${tweet.text}
diff --git a/eca/__pycache__/arff.cpython-310.pyc b/eca/__pycache__/arff.cpython-310.pyc index dab7427d1e834bcde8ccb59363edf0b65174b18e..3c2dc7f4e3ebeacacd090179e0a9de1bf11234eb 100644 GIT binary patch delta 73 zcmaD7^f8D#pO=@50SK13C2Zv8Vb=F@wu%WYPAw{qNz5(Fu8i@|OLZyAEK7}XNiEJU b$uEcrPfg8Muv7>r%FjwoF4=6!tgQwBV=ovx delta 60 zcmewu^dyKopO=@50SN3L#Bb#0VOFwrwu%WYPAw{qDap(&&x~=&PcF?(%_}L6@y$;u O%}G@--0a4ztp)%@>=T~= diff --git a/eca/__pycache__/generators.cpython-310.pyc b/eca/__pycache__/generators.cpython-310.pyc index 01498c6c8ba1f70d9813f18b01d362c22d8e231b..c467613178055e0ae9d3f7ec17ee4e1aacd3f665 100644 GIT binary patch delta 73 zcmdljcS4RkpO=@50SK13C2Ztg!lWPIY!wq)oLW>IlbBnUT^Zw_m+DfKS(X~(l3JWy bl3x%Lo|>AiV5tyLl%JKFT(bEhQx*>ZQ?eM^ delta 60 zcmX>hw_A=opO=@50SN3L#BbzY!ldNvY!wq)oLW>IQ<9lmo*CnkpIn-onpaXB Date: Wed, 2 Nov 2022 13:50:29 +0100 Subject: [PATCH 6/6] Redirecting to Twitter and stylizing --- dashboard_static/js/code.js | 6 +++--- dashboard_static/style/style.css | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index 2629b36..953ada1 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -50,11 +50,11 @@ function tweetCell(tweet) { var cell = document.createElement("div"); cell.innerHTML = `
- +
- ${tweet.user.name} - @${tweet.user.screen_name} + ${tweet.user.name} + @${tweet.user.screen_name}
${tweet.text}
diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index 258ca21..8053e3a 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -122,10 +122,20 @@ body { } .tweet-nickname { + color: white; + text-decoration: none; + font-weight: bold; +} + +.tweet-nickname:active { + color: white; + text-decoration: underline; font-weight: bold; } .tweet-username { + color: white; + text-decoration: none; opacity: 0.8; }