From ca4443d0d0c5e2a3ee31ffe4a957bcfc3cac8114 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Sun, 6 Apr 2025 15:27:38 -0400
Subject: Complete back-merge

---
 ufund-ui/src/app/components/cupboard/cupboard.component.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ufund-ui/src/app/components/cupboard/cupboard.component.html')

diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.html b/ufund-ui/src/app/components/cupboard/cupboard.component.html
index 4eebc2d..8f6901a 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -10,13 +10,13 @@
     <div id="header2">
         <div id="searchArea">
             <form id="search-form" #searchForm="ngForm">
-                <input type="text" name="search" class="wide-input" placeholder="Search in {{needs.length}} needs..." (input)="search(searchForm.value)" ngModel>
+                <input type="text" name="search" class="wide-input sort-scheme" placeholder="Search in {{needs.length}} needs..." (input)="search(searchForm.value)" ngModel>
                 <input type="reset" value="Clear" (click)="search(null)"> <br>
             </form>
         </div>
         <div id="sortArea">
             <label for="sort">Sort by: </label>
-            <select id='sort' [(ngModel)] = "currentSortAlgo" class="wide-input" (change)="search(searchForm.value)" [value]="currentSortAlgo">
+            <select id='sort' [(ngModel)] = "currentSortAlgo" class="wide-input sort-scheme" (change)="search(searchForm.value)" [value]="currentSortAlgo">
                 <option *ngFor="let algorithm of Object.keys(SortingAlgorithms)" [value]="algorithm">
                     {{SortingAlgorithms[algorithm].display[sortMode === 'Ascending' ? 0 : 1]}}
                 </option>
@@ -25,7 +25,7 @@
                 <span class="icon">{{sortMode === 'Ascending' ? 'arrow_upward': 'arrow_downward'}}</span>
             </button>
             <label>Needs per page: </label>
-            <input type ="number" [(ngModel)]="itemsPerPage" (change)="editItemsPerPage()" min="1" max="{{searchResults.length}}">
+            <input type ="number" class="sort-scheme" [(ngModel)]="itemsPerPage" (change)="editItemsPerPage()" min="1" max="{{searchResults.length}}">
         </div>
     </div>
     <h2 *ngIf="searchResults.length < needs.length && searchResults.length != 0"> Search Results({{needs.length - searchResults.length}} needs filtered): </h2>
-- 
cgit v1.2.3


From eeec3e68327ed5b989680a74893e2dcee3ff3e22 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Mon, 7 Apr 2025 20:39:10 -0400
Subject: Fix sorting and searching bugs, save sort mode and algo to
 localStorage

---
 ufund-ui/src/app/components/cupboard/cupboard.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'ufund-ui/src/app/components/cupboard/cupboard.component.html')

diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.html b/ufund-ui/src/app/components/cupboard/cupboard.component.html
index 8f6901a..2d3fa7c 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -9,8 +9,8 @@
 
     <div id="header2">
         <div id="searchArea">
-            <form id="search-form" #searchForm="ngForm">
-                <input type="text" name="search" class="wide-input sort-scheme" placeholder="Search in {{needs.length}} needs..." (input)="search(searchForm.value)" ngModel>
+            <form id="search-form">
+                <input type="text" name="search" class="wide-input sort-scheme" placeholder="Search in {{needs.length}} needs..." (input)="search(searchForm.value)" #searchForm>
                 <input type="reset" value="Clear" (click)="search(null)"> <br>
             </form>
         </div>
-- 
cgit v1.2.3