From b33d051ced2cceafc275c1fc26e8620d33533c50 Mon Sep 17 00:00:00 2001 From: Tim Wijma Date: Wed, 2 Nov 2022 17:18:51 +0100 Subject: [PATCH 1/4] margin under tweets --- dashboard_static/index.html | 2 +- dashboard_static/style/style.css | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dashboard_static/index.html b/dashboard_static/index.html index efb5e90..471a822 100644 --- a/dashboard_static/index.html +++ b/dashboard_static/index.html @@ -95,7 +95,7 @@
- +
Sort By arrow_drop_down
diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index 7632c17..b636fe8 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -44,6 +44,7 @@ body { padding: 16px; background-color: var(--main-medium-dark); border-radius: 16px; + cursor: pointer; } .logo img { @@ -93,6 +94,7 @@ body { background-color: var(--main-dark); border-radius: 16px; padding: 16px; + margin-bottom: 8px; } .tweet-profilepicture { @@ -208,6 +210,7 @@ body { box-sizing: border-box; display: flex; flex-wrap: wrap; + margin-bottom: 32px; } .popchart { @@ -238,10 +241,10 @@ body { } .button { - color: var(--main-dark); + color: var(--main-bg); cursor: pointer; background-color: var(--main-light); - border-radius: 30px; + border-radius: 16px; border: none; } @@ -255,7 +258,7 @@ body { } .sort-dropdown-list { - position: absolute; + /* position: absolute; */ width: 100%; list-style-type: none; padding: 0; From 07030ab3d3e95fe7ca3a4ffcc7377d5ba287e3cd Mon Sep 17 00:00:00 2001 From: Tim Wijma Date: Wed, 2 Nov 2022 17:25:18 +0100 Subject: [PATCH 2/4] cache? idk --- __pycache__/dashboard.cpython-310.pyc | Bin 1572 -> 1562 bytes eca/__pycache__/arff.cpython-310.pyc | Bin 10610 -> 10596 bytes eca/__pycache__/generators.cpython-310.pyc | Bin 3913 -> 3899 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc index 7a0a8628cf0b125c1ea27feb05fdcce8f1915948..8e88d6080d3215bc1a15d6c85dbf30afd3dd732c 100644 GIT binary patch delta 403 zcmZ3&GmD2WpO=@50SMX~lah_tHu6a@a;DFk2?9IqCu=iWTW|s;f7v-(#e^2878S>o zWagG<#<=7sm*%GCl@!PL=BJeAq$(K3l$2+dl%y8v78K=Yr6!leOkTsN$jCkU9AgAG z$cQ2^!8O^CNt97&vOCi?86KdhCSwslkXp%ji?JM{0;O$nGC{D@7Zq=@10<*89A8P%-0F) zOAeBWB);V^90iIUb9t>q%K9qfBgNST51`9VMKn%$m#HjPio=3N}I!azzwCW;pTiyb1` delta 112 zcmaD7^eKohpO=@50SL;sh9?KBZ{*`-cJe*3Zw$EK4oQ$V)8IcS$YIF3B&@ z4=pKA%_~XOk4#N0GSv6YPbtkwHPkOD&nziPEz&J0%FjwoF40d-PSoG*#~jPbcx&?- Nj#yzJ#U&HP3jk99CVl__ diff --git a/eca/__pycache__/generators.cpython-310.pyc b/eca/__pycache__/generators.cpython-310.pyc index 155bc4d8708199018b99b564bcb0b143f7aecc2c..01498c6c8ba1f70d9813f18b01d362c22d8e231b 100644 GIT binary patch delta 83 zcmX>pw_A=kpO=@50SN3L#3vu!$h(Ni+}YVGCbT%Us5qu1Gq*f5#w9 Date: Wed, 2 Nov 2022 19:18:26 +0100 Subject: [PATCH 3/4] dark light mode pt.2 --- dashboard_static/js/events.js | 15 +++++++++++++-- dashboard_static/style/style.css | 16 +++++----------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js index 7e0b801..9efef3f 100644 --- a/dashboard_static/js/events.js +++ b/dashboard_static/js/events.js @@ -51,9 +51,20 @@ $(window).on("test", function(e, filter) { let root = document.querySelector(":root") $(".logo").on("click", function() { - if (root.style.getPropertyValue("--main-bg") === 'ghostwhite') { + if (root.style.getPropertyValue("--main-bg") === 'snow') { + console.log("IM here") + root.style.setProperty('--main-medium-dark', '#1E1E1E'); root.style.setProperty('--main-bg', '#292929'); + root.style.setProperty('--main-light', ' #ffffff' ); + root.style.setProperty('--main-dark', '#ffffff'); + root.style.setProperty('--tweet-color', '#000000') + root.style.setProperty('--column-color', '#1E1E1E') } else { - root.style.setProperty('--main-bg', 'ghostwhite'); + root.style.setProperty('--main-medium-dark', '#1D9BF0'); + root.style.setProperty('--main-bg', 'snow'); + root.style.setProperty('--main-light', '#000000'); + root.style.setProperty('--main-dark', ' #000000'); + root.style.setProperty('--tweet-color', 'whitesmoke'); + root.style.setProperty('--column-color', 'rgba(112, 128, 144, 0.388'); } }) \ No newline at end of file diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index 7632c17..a071b35 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -3,6 +3,8 @@ --main-light: #ffffff; --main-medium-dark: #1E1E1E; --main-dark: #000000; + --tweet-color: #000000; + --column-color: #1E1E1E; --secondary: #1D9BF0; } @@ -90,7 +92,7 @@ body { .tweet { display: flex; - background-color: var(--main-dark); + background-color: var(--tweet-color); border-radius: 16px; padding: 16px; } @@ -189,12 +191,8 @@ body { grid-row: 1/ -1; } -.leftcol { - background-color: red; -} - -.centercol { - background-color: green; +.leftcol, .centercol, .rightcol, .searchcontainer, .popchart { + background-color: var(--column-color); } .rightcol { @@ -203,16 +201,12 @@ body { } .searchcontainer { - background-color: blue; padding: 8px; box-sizing: border-box; display: flex; flex-wrap: wrap; } -.popchart { - background-color: rgba(255, 0, 255, 0.344); -} .colheader { display: block; From 876cd1569d6ffd2b21fd6d8c077c505f37a8aff1 Mon Sep 17 00:00:00 2001 From: Tim Wijma Date: Thu, 3 Nov 2022 12:38:54 +0100 Subject: [PATCH 4/4] ORDER ARROW --- dashboard_static/index.html | 2 +- dashboard_static/js/events.js | 8 ++++++++ dashboard_static/style/style.css | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dashboard_static/index.html b/dashboard_static/index.html index 471a822..3cd4c9c 100644 --- a/dashboard_static/index.html +++ b/dashboard_static/index.html @@ -107,7 +107,7 @@
- + arrow_downward
Sports Popularity Chart diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js index 9efef3f..2627449 100644 --- a/dashboard_static/js/events.js +++ b/dashboard_static/js/events.js @@ -67,4 +67,12 @@ $(".logo").on("click", function() { root.style.setProperty('--tweet-color', 'whitesmoke'); root.style.setProperty('--column-color', 'rgba(112, 128, 144, 0.388'); } +}) + +$(".order-btn").on("click", function() { + if($(this).html() == "arrow_downward") { // Descending to ascending + $(this).html("arrow_upward") + } else { // Ascending to descending + $(this).html("arrow_downward") + } }) \ No newline at end of file diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css index c580b0c..9b27667 100644 --- a/dashboard_static/style/style.css +++ b/dashboard_static/style/style.css @@ -242,6 +242,12 @@ body { border: none; } +.material-symbols-outlined.order-btn { + line-height: 52px; + font-weight: 600; + user-select: none; +} + .sort-btn { user-select: none; position: relative;