Tweak styling and budget filter modal

BrunoBernardino · Jul 20, 2022 · 72bf1d1 · 72bf1d1
1 parent 56148b1
commit 72bf1d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/public/css/style.css b/public/css/style.css
@@ -374,7 +374,7 @@ a.button.secondary:focus {
   display: block;
   margin-bottom: 0.5rem;
   font-weight: bold;
-  color: var(--color-link-hover-dark);
+  color: var(--color-link);
   text-align: left;
 }
 
@@ -383,10 +383,6 @@ a.button.secondary:focus {
   display: inline-block;
 }
 
-#add-expense-form .input-wrapper>label {
-  color: var(--color-link);
-}
-
 .input-wrapper input[type="text"],
 .input-wrapper input[type="date"],
 .input-wrapper input[type="datetime"],
@@ -691,6 +687,8 @@ a.button.secondary:focus {
   justify-content: space-between;
   padding: 0.5rem;
   transition: all 60ms ease-in-out;
+  color: var(--color-link-hover-dark);
+  border-radius: 3px;
 }
 
 #budgets-filter-form .input-wrapper > label:hover {
@@ -771,7 +769,7 @@ a.button.secondary:focus {
 }
 
 .text {
-  color: #ccc;
+  color: var(--color-link);
   text-align: center;
   align-items: center;
   flex: 1;

diff --git a/public/js/index.js b/public/js/index.js
@@ -284,6 +284,7 @@
 
     async function navigateToMonth(month) {
       currentMonth = month;
+      budgetFilters.clear();
       await showData();
     }
 
@@ -610,22 +611,16 @@
         template: '#budgets-filter-modal',
         focusConfirm: false,
         allowEscapeKey: true,
+        showConfirmButton: false,
         didClose: () => {
           budgetsFilterButton.blur();
         },
         willOpen: async () => {
-          // Show all budgets in #budgets-filter-form
-          const allBudgets = await window.app.dataUtils.fetchBudgets();
-          const allUniquelyNamedBudgets = allBudgets.reduce((budgetsList, budget) => {
-            if (!budgetsList.some((_budget) => budget.name === _budget.name)) {
-              budgetsList.push(budget);
-            }
-
-            return budgetsList;
-          }, []);
+          // Show month's budgets in #budgets-filter-form
+          const monthBudgets = await window.app.dataUtils.fetchBudgets(currentMonth);
           const budgetsFilterForm = document.getElementById('budgets-filter-form');
           budgetsFilterForm.replaceChildren();
-          for (const budget of allUniquelyNamedBudgets) {
+          for (const budget of monthBudgets) {
             const element = getBudgetsFilterModalBudgetItemHtmlElement(budget);
 
             const inputElement = element.querySelector('input');