Merge branch 'main' of https://github.com/olinpin/twitter-project into youri

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">
+                        <div class="sort-by">
-                            <span class="sortby">Sort By <span class="material-symbols-outlined">arrow_drop_down</span></span>
+                            <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>

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

dashboard_static/style/style.css

@@ -252,33 +252,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: white;
-	background-color: var(--main-light);
+	width: 150px;	
-	border-radius: 0 0 16px 16px;
+	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 {
+.current-sort {
-	border-bottom-left-radius: 16px;
+	line-height: 36px;
-	border-bottom-right-radius: 16px;
 }