From 615b8c17805a4a765a010d5ee094815583130fac Mon Sep 17 00:00:00 2001 From: Tim Wijma Date: Thu, 3 Nov 2022 17:15:58 +0100 Subject: [PATCH] filters feed --- __pycache__/dashboard.cpython-310.pyc | Bin 1561 -> 1561 bytes dashboard_static/js/code.js | 2 +- dashboard_static/js/events.js | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/__pycache__/dashboard.cpython-310.pyc b/__pycache__/dashboard.cpython-310.pyc index 66600d3ba265eaae9c231c26081dc0874f78cd80..f8955d36cc164c42beb21753d7aef479c79912d3 100644 GIT binary patch delta 19 ZcmbQqGn0oapO=@50SNeRZ{*@<0{|y01EBx_ delta 19 ZcmbQqGn0oapO=@50SGP}*~rDu1^_EW1WW(` diff --git a/dashboard_static/js/code.js b/dashboard_static/js/code.js index 64747fb..8f97723 100644 --- a/dashboard_static/js/code.js +++ b/dashboard_static/js/code.js @@ -10,7 +10,7 @@ let filters = { function showFeeds() { if ($(window).width() < 1280) { - if (selectedSports.length === 0) { + if(filters.sports.length === 0 && filters.blockedWords.length === 0 && filters.searchedWords.length === 0 && (filters.sorted == "time" && filters.order == "desc")) { $(".leftcol").show() $(".centercol").hide() } else { diff --git a/dashboard_static/js/events.js b/dashboard_static/js/events.js index 8ada20f..5fe6f95 100644 --- a/dashboard_static/js/events.js +++ b/dashboard_static/js/events.js @@ -3,6 +3,7 @@ $(".sport").on("selected", function(e, selected, sports) { filters.sports = sports; $(window).trigger("filter"); + showFeeds() }) window.addEventListener('DOMContentLoaded', (event) => { @@ -101,22 +102,26 @@ $(".order-btn").on("click", function() { filters.order = 'desc' } $(window).trigger("filter") + showFeeds() }) function updateSearched(searched){ searched = searched.split(","); filters.searchedWords = searched; $(window).trigger("filter"); + showFeeds() } function updateBlocked(blocked){ blocked = blocked.split(","); filters.blockedWords = blocked; $(window).trigger("filter"); + showFeeds() } function updateSort(sort){ sortarray = [] filters.sorted = sort; $(window).trigger("filter"); + showFeeds() } \ No newline at end of file