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

dashboard_static/js/events.js

@@ -1,11 +1,16 @@
 // Selected = is clicked sport selected or not, BOOL
 // Sports = all selected sports, ARRAY
 $(".sport").on("selected", function(e, selected, sports) {
-    console.log(selected, sports);
+    filters.sports = sports;
+    $(window).trigger("filter");
 })
 
 window.addEventListener('DOMContentLoaded', (event) => {
     window.sessionStorage.setItem('tweets', JSON.stringify([]));
+    // run code every 5 seconds
+    setInterval(function() {
+        $(window).trigger("filter");
+    }, 1000);
 });
 
 $(".sport").on("click", function() {
@@ -40,12 +45,6 @@ $(".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);
 })
 
 let root = document.querySelector(":root")
@@ -73,10 +72,46 @@ $(".logo").on("click", function() {
     }
 })
 
+$(window).on("filter", function() {
+    var parent = document.querySelector("#filtered")
+    parent.replaceChildren();
+
+    tweets = window.sessionStorage.getItem('tweets');
+    tweets = JSON.parse(tweets);
+    tweets = filterTweets(tweets, filters.blockedWords, filters.searchedWords.concat(filters.sports), filters.sorted, filters.order);
+    tweets = sortTweets(tweets, [filters.sorted, filters.order]);
+    var displayTweets = tweets.reverse().slice(0, 20).reverse();
+    for (i = 0; i < 19; i++){
+        parent.prepend(tweetCell(displayTweets[i]));
+    }
+})
+
+
 $(".order-btn").on("click", function() {
     if($(this).html() == "arrow_downward") {    // Descending to ascending
         $(this).html("arrow_upward")
+        filters.order = 'asc'
     } else {    // Ascending to descending
         $(this).html("arrow_downward")
+        filters.order = 'desc'
     }
-})
+    $(window).trigger("filter")
+})
+
+function updateSearched(searched){
+    searched = searched.split(",");
+    filters.searchedWords = searched;
+    $(window).trigger("filter");
+}
+
+function updateBlocked(blocked){
+    blocked = blocked.split(",");
+    filters.blockedWords = blocked;
+    $(window).trigger("filter");
+}
+
+function updateSort(sort){
+    sortarray = []
+    filters.sorted = sort;
+    $(window).trigger("filter");
+}