From 07d5aecb0d68e5df839fd786a1bb81a199e664ce Mon Sep 17 00:00:00 2001 From: Tim Wijma Date: Wed, 2 Nov 2022 12:16:43 +0100 Subject: [PATCH 1/3] buttons --- dashboard_static/index.html | 8 ++++---- dashboard_static/style/style.css | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dashboard_static/index.html b/dashboard_static/index.html index 12a5c4c..971ecd0 100644 --- a/dashboard_static/index.html +++ b/dashboard_static/index.html @@ -94,10 +94,10 @@
- - - - + + + +

SPORTS POPULARITY CHART

diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index 258ca21..216afc4 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -187,12 +187,14 @@ body { .searchcontainer { background-color: blue; - /* height: 400px; */ + padding: 8px; + box-sizing: border-box; + display: flex; + flex-wrap: wrap; } .popchart { background-color: rgba(255, 0, 255, 0.344); - /* height: 400px; */ } .colheader { @@ -204,12 +206,18 @@ body { padding-left: 30px; } + +.searchbar { + width: 100%; +} + .searchbar, .button { font-weight: bold; - font-size: 32px; + font-size: 24px; border-radius: 50px; padding: 10px; - margin: 16px; + margin: 4px 8px; + border: none; } .button { From 97fd3918ec72fb3206273593d87225e9a5530a5b Mon Sep 17 00:00:00 2001 From: Tim Wijma Date: Wed, 2 Nov 2022 12:38:44 +0100 Subject: [PATCH 2/3] css --- dashboard_static/index.html | 16 +++++++++++++--- dashboard_static/style/style.css | 13 ++++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dashboard_static/index.html b/dashboard_static/index.html index 971ecd0..a234fd6 100644 --- a/dashboard_static/index.html +++ b/dashboard_static/index.html @@ -95,9 +95,19 @@
- - - +
+ SORT BY arrow_drop_down +
+
    +
  • Time
    • +
  • Likes
    • +
  • Retweets
    • +
  • Replies
    • +
+
+
+
BLOCKED WORDS
+
POPULARITY FILTER

SPORTS POPULARITY CHART

diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index 216afc4..56cd754 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -221,10 +221,21 @@ body { } .button { + color: black; + cursor: pointer; + background-color: white; border-radius: 50px; border: none; } /* .button:hover { background-color: ; -} */ \ No newline at end of file +} */ + +.sort-dropdown { + +} + +.sort-drop-list { + +} \ No newline at end of file From 9b041a0978a3517ac67ec07adb98fdf847be776b Mon Sep 17 00:00:00 2001 From: Tim Wijma Date: Wed, 2 Nov 2022 14:41:51 +0100 Subject: [PATCH 3/3] css grid and event --- __pycache__/dashboard.cpython-310.pyc | Bin 834 -> 819 bytes dashboard_static/index.html | 17 ++--------------- dashboard_static/js/code.js | 11 +++++++++++ dashboard_static/js/events.js | 10 ++++++---- eca/__pycache__/arff.cpython-310.pyc | Bin 10609 -> 10596 bytes eca/__pycache__/generators.cpython-310.pyc | Bin 3912 -> 3899 bytes 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc index 203374c5872cdedd6b9076d80800f075be3e7fa0..fa27820446057a79adfd6ff7111686db9eb9ffa2 100644 GIT binary patch delta 76 zcmX@awwaAPpO=@50SGoJCT`?*Vl=XIwu%WYPAw{qDap(&&x~=&PcF?(%_}L6@y$;u e%}G@-j43J4EGbDX(k&>;&q_@$+1$stg%JRI92wsL delta 91 zcmdnYc8HBTpO=@50SGw5k~VTXF*^D>Tg8MHrxq2*B<7Z7SH}3~rMeVlmZiqHq!wqF o15rSSkb*p1`Ffk{8MiP3008VB$N&HU diff --git a/dashboard_static/index.html b/dashboard_static/index.html index 4badbf4..ffb7f08 100644 --- a/dashboard_static/index.html +++ b/dashboard_static/index.html @@ -90,7 +90,7 @@
-

FILTERED CLUCCS

+ Filtered Cluccs
@@ -110,23 +110,10 @@
POPULARITY FILTER
-

SPORTS POPULARITY CHART

+ Sports Popularity Filter
- --> -
-
-

LATEST CLUCCS

-
-
-

FILTERED CLUCCS

-
-
-
-

SPORTS POPULARITY CHART

-
-
diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index d636592..bb61aa5 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -1,3 +1,14 @@ +let selectedSports = [] + +let filters = { + selectedSports: selectedSports, + searchedWords: [], + blockedWords: [], + popularityFilter: {}, + sorted: "time", + order: "desc" +} + function showFeeds() { if ($(window).width() < 1280) { if (selectedSports.length === 0) { diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js index 4b2d1cd..83ed769 100644 --- a/dashboard_static/js/events.js +++ b/dashboard_static/js/events.js @@ -8,9 +8,6 @@ window.addEventListener('DOMContentLoaded', (event) => { window.sessionStorage.setItem('tweets', JSON.stringify([])); }); - -let selectedSports = [] - $(".sport").on("click", function() { $(this).toggleClass("selected") @@ -43,5 +40,10 @@ $(".sortby").on("click", function() { $(".sort-dropdown-list li").on("click", function() { $(".sort-dropdown").toggle() - + filters.sorted = $(this).val() + $(window).trigger("test", filters) +}) + +$(window).on("test", function(e, filter) { + console.log(filter); }) \ No newline at end of file diff --git a/eca/__pycache__/arff.cpython-310.pyc b/eca/__pycache__/arff.cpython-310.pyc index 3c2dc7f4e3ebeacacd090179e0a9de1bf11234eb..dab7427d1e834bcde8ccb59363edf0b65174b18e 100644 GIT binary patch delta 60 zcmewu^dyKopO=@50SN3L#Bb#0VOFwrwu%WYPAw{qDap(&&x~=&PcF?(%_}L6@y$;u O%}G@--0a4ztp)%@>=T~= delta 73 zcmaD7^f8D#pO=@50SK13C2Zv8Vb=F@wu%WYPAw{qNz5(Fu8i@|OLZyAEK7}XNiEJU b$uEcrPfg8Muv7>r%FjwoF4=6!tgQwBV=ovx diff --git a/eca/__pycache__/generators.cpython-310.pyc b/eca/__pycache__/generators.cpython-310.pyc index c467613178055e0ae9d3f7ec17ee4e1aacd3f665..01498c6c8ba1f70d9813f18b01d362c22d8e231b 100644 GIT binary patch delta 60 zcmX>hw_A=opO=@50SN3L#BbzY!ldNvY!wq)oLW>IQ<9lmo*CnkpIn-onpaXBIlbBnUT^Zw_m+DfKS(X~(l3JWy bl3x%Lo|>AiV5tyLl%JKFT(bEhQx*>ZQ?eM^