From 25254cd2fcecc43d8be314952ba91644e3867933 Mon Sep 17 00:00:00 2001
From: Tim Wijma <tim.wijma@gmail.com>
Date: Thu, 3 Nov 2022 15:54:23 +0100
Subject: [PATCH] sort by

---
 __pycache__/dashboard.cpython-310.pyc      | Bin 1575 -> 1561 bytes
 dashboard_static/index.html                |   6 ++-
 dashboard_static/js/events.js              |  22 ++++++-----
 dashboard_static/style/style.css           |  44 ++++++++++++++++-----
 eca/__pycache__/arff.cpython-310.pyc       | Bin 10610 -> 10596 bytes
 eca/__pycache__/generators.cpython-310.pyc | Bin 3913 -> 3899 bytes
 6 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc
index ab7ebca5d192afbbc21ac33e12aff0df021f0b95..66600d3ba265eaae9c231c26081dc0874f78cd80 100644
GIT binary patch
delta 80
zcmZ3^Gn0oepO=@50SGP}NlrFo+sK#5Xl&<f6%$&VT2vfUl9^kc8RL?lT$-DjS5h3~
io1apeld51CQ&OH;Qj%JvTTqmrm6}`<vv~t!IST;vARB!E

delta 94
zcmbQqvz&)7pO=@50SFcyN>2X8x{)uD(a}dgv^ce>SU*1}vn;hJBQLQ;-zBv;yClCr
wKeVJgHLoO9KQcA3$WY%mKczG$)lk2rJhP-EwMe(1C_gJTxkP{SBF1tS0J-8Iz5oCK

diff --git a/dashboard_static/index.html b/dashboard_static/index.html
index 757132f..9e26092 100644
--- a/dashboard_static/index.html
+++ b/dashboard_static/index.html
@@ -99,15 +99,17 @@
                     <div class="searchcontainer column">
                         <input class="searchbar" onchange="updateSearched(this.value)" type="text" placeholder="Search Cluccs">
                         <input class="blockedwords" onchange="updateBlocked(this.value)" type="text" placeholder="Blocked words (separated by comma)">
-                        <div class="button sort-btn">
-                            <span class="sortby">Sort By <span class="material-symbols-outlined">arrow_drop_down</span></span>
+                        <div class="sort-by">
+                            <span class="sort-by-title">Sort By</span> 
                             <div class="sort-dropdown">
                                 <ul class="sort-dropdown-list">
+                                    <li class="current-sort">Time</li>
                                     <li onclick="updateSort('time')">Time</li>
                                     <li onclick="updateSort('likes')">Likes</li>
                                     <li onclick="updateSort('retweets')">Retweets</li>
                                     <li onclick="updateSort('replies')">Replies</li>
                                 </ul>
+                                <span class="material-symbols-outlined sort-btn">arrow_drop_down</span>
                             </div>
                         </div>
                         <span class="material-symbols-outlined order-btn">arrow_downward</span>
diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js
index 8a49af8..d78e71d 100644
--- a/dashboard_static/js/events.js
+++ b/dashboard_static/js/events.js
@@ -38,15 +38,6 @@ $(window).on("load", function() {
     showFeeds()
 })
 
-$(".sortby").on("click", function() {
-    $(".sort-dropdown").toggle()
-    // $(".sort-btn").toggleClass("radius-bottom")
-}) 
-
-$(".sort-dropdown-list li").on("click", function() {
-    $(".sort-dropdown").toggle()
-})
-
 let root = document.querySelector(":root")
 
 $(".logo").on("click", function() {
@@ -87,6 +78,19 @@ $(window).on("filter", function() {
     }
 })
 
+$(".current-sort").on("click", function() {
+    $(".sort-dropdown-list li:not(:first-of-type)").toggle()
+}) 
+
+$(".sort-btn").on("click", function() {
+    $(".sort-dropdown-list li:not(:first-of-type)").toggle()
+}) 
+
+$(".sort-dropdown-list li:not(:first-of-type)").on("click", function() {
+    $(".sort-dropdown-list li:not(:first-of-type)").toggle()
+    $(".current-sort").html($(this).html())
+})
+
 
 $(".order-btn").on("click", function() {
     if($(this).html() == "arrow_downward") {    // Descending to ascending
diff --git a/dashboard_static/style/style.css b/dashboard_static/style/style.css
index 9b27667..0796aa3 100644
--- a/dashboard_static/style/style.css
+++ b/dashboard_static/style/style.css
@@ -248,33 +248,57 @@ body {
 	user-select: none;
 }
 
-.sort-btn {
+.sort-by {
 	user-select: none;
-	position: relative;
+	display: flex;
+	padding: 8px;
+}
+
+.sort-by-title {
+	font-size: 24px;
+	font-weight: 500;
+	margin-right: 8px;
 }
 
 .sort-dropdown {
-	display: none;
+	display: flex;
+	align-items: flex-start;
+	position: relative;
 }
 
 .sort-dropdown-list {
 	/* position: absolute; */
-	width: 100%;
 	list-style-type: none;
     padding: 0;
     margin: 0;
-	margin-left: -8px;
-	background-color: var(--main-light);
-	border-radius: 0 0 16px 16px;
+	background-color: white;
+	width: 150px;	
+	border-radius: 16px;
+}
+
+.material-symbols-outlined.sort-btn {
+	position: absolute;
+	right: 0;
+	top: 5px;
+	color: black;
+	font-size: 26px;
+}
+
+.sort-dropdown-list li:not(:first-of-type) {
+	display: none;
+}
+
+.sort-dropdown-list li:not(:first-of-type):hover {
+	background-color: rgb(215, 215, 215);
 }
 
 .sort-dropdown-list li {
+	color: #1E1E1E;
 	font-weight: 500;
 	font-size: 22px;
 	padding: 0 8px;
 }
 
-.radius-bottom {
-	border-bottom-left-radius: 16px;
-	border-bottom-right-radius: 16px;
+.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
index 1516621a59785020207256a2be42150d073cc160..dab7427d1e834bcde8ccb59363edf0b65174b18e 100644
GIT binary patch
delta 98
zcmewq^dyKcpO=@50SN3L#3x_Y*vQApY;Nmp6%$&VT2vfUl9^kc8RL?lT$-DjS5h3~
zo1apeld51CQ&OH;Qj%JvTTqmrm6}`<lbW0uvpI%2mX-0>=3N}I!azzwCW;pTiyb1`

delta 112
zcmaD7^eKohpO=@50SL;sh9?KBZ{*`-cJ<Z|Elw>e*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<wG&eP`q&UVm
lKczG$RlzW(q&%~vB(+GlpeR2pHMt}vH90Y6^B1O29srox9rFMH

delta 97
zcmdljcT$cwpO=@50SL;sh9~=O<Xyz%8mJ#yoLW?@pP!RimRgjNmsq0jl3JWyl3$=7
zT2h{xSCXn9nVMK+sPCJfQks)$s9#c^SyGZ(q+3vwpOu<iqMw?asK5CcQz#DrDxo3#