From 3e5422b90a09d1ed2cfffae56abf8dbe361f6c27 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Wed, 2 Apr 2025 23:27:27 -0400
Subject: [incomplete] rearrange code to begin need-list abstraction

---
 .../components/cupboard/cupboard.component.html    | 88 ++++++++++++++--------
 1 file changed, 58 insertions(+), 30 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 37954bb..bdc8a0e 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -3,36 +3,64 @@
         <h1> Cupboard </h1>
         <button *ngIf="isManager()" class="button2" (click)="this.selectForm('create')"><span class="icon">add</span>Create Need</button>
     </div>
-    <app-need-list (currentNeed) = populateForm($event) #needList></app-need-list>
-</div>
-<ng-template [ngIf]="isManager()" >
-<div>
-    <app-need-edit *ngIf="selectedForm === 'update'" [selectedNeed]="selectedNeed" (refreshNeedList)="needList.refresh()"></app-need-edit>
-    <div>
-    <div id="create-form" *ngIf="selectedForm === 'create'">
-        <h1> Create Need </h1>
-        <form #cupboardForm="ngForm" (ngSubmit)="submit(cupboardForm.value)">
-            <label>Name:</label><br>
-            <input type="text" name="name" ngModel><br>
-            <label>Image:</label><br>
-            <input type="text" name="image" ngModel><br>
-            <label>Location:</label><br>
-            <input type="text" name="location" ngModel><br>
-            <label>Max Goal:</label><br>
-            <input type="number" name="maxGoal" ngModel><br>
-            <label>Type</label><br>
-            <input type="radio" name="type" value="MONETARY" ngModel>
-            <label>Monetary</label><br>
-            <input type="radio" name="type" value="PHYSICAL" ngModel>
-            <label>Physical</label><br>
-            <input type="checkbox" name="urgent" value="false" ngModel>
-            <label>Urgent</label><br>
-            <label>Description</label><br>
-            <textarea name="description"></textarea><br>
-            <input type="submit" value="Submit">
 
-        </form>
-    </div>
+    <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="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">
+                <option *ngFor="let algorithm of Object.values(SortingAlgoArrays)" value="{{algorithm}}">
+                    {{algorithm.display[sortMode === 'Ascending' ? 0 : 1]}}
+                </option>
+            </select>
+            <button (click)="changeSortMode(searchForm.value)">
+                <span class="icon">{{sortMode === 'Ascending' ? 'arrow_upward': 'arrow_downward'}}</span>
+            </button>
+            <label>Needs per page: </label>
+<!--            <input type ="number" [(ngModel)]="itemsPerPage" min="1" max="{{searchResults.length}}">-->
+        </div>
+        <!--<button (click)="close()">Close</button>-->
     </div>
+    <h2 *ngIf="(searchResults | async)?.length < needs.length && (searchResults | async)?.length != 0"> Search Results({{needs.length - (searchResults | async)?.length}} needs filtered): </h2>
+    <h2 *ngIf="(searchResults | async)?.length == needs.length"> All Needs </h2>
+    <h2 *ngIf="(searchResults | async)?.length == 0"> No Results Found </h2>
+
+    <app-need-list [needs]="searchResults" #needList></app-need-list>
 </div>
-</ng-template>
+
+<!--<ng-template [ngIf]="isManager()" >-->
+<!--<div>-->
+<!--    <app-need-edit *ngIf="selectedForm === 'update'" [selectedNeed]="selectedNeed" (refreshNeedList)="needList.refresh()"></app-need-edit>-->
+<!--    <div>-->
+<!--        <div id="create-form" *ngIf="selectedForm === 'create'">-->
+<!--            <h1> Create Need </h1>-->
+<!--            <form #cupboardForm="ngForm" (ngSubmit)="submit(cupboardForm.value)">-->
+<!--                <label>Name:</label><br>-->
+<!--                <input type="text" name="name" ngModel><br>-->
+<!--                <label>Image:</label><br>-->
+<!--                <input type="text" name="image" ngModel><br>-->
+<!--                <label>Location:</label><br>-->
+<!--                <input type="text" name="location" ngModel><br>-->
+<!--                <label>Max Goal:</label><br>-->
+<!--                <input type="number" name="maxGoal" ngModel><br>-->
+<!--                <label>Type</label><br>-->
+<!--                <input type="radio" name="type" value="MONETARY" ngModel>-->
+<!--                <label>Monetary</label><br>-->
+<!--                <input type="radio" name="type" value="PHYSICAL" ngModel>-->
+<!--                <label>Physical</label><br>-->
+<!--                <input type="checkbox" name="urgent" value="false" ngModel>-->
+<!--                <label>Urgent</label><br>-->
+<!--                <label>Description</label><br>-->
+<!--                <textarea name="description"></textarea><br>-->
+<!--                <input type="submit" value="Submit">-->
+
+<!--            </form>-->
+<!--        </div>-->
+<!--    </div>-->
+<!--</div>-->
+<!--</ng-template>-->
-- 
cgit v1.2.3


From ad651c44ce2515d497c8e5214147c69126e25903 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Thu, 3 Apr 2025 19:48:54 -0400
Subject: abstraction working with search and sort

---
 .../src/app/components/cupboard/cupboard.component.html  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 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 bdc8a0e..969b232 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -14,23 +14,23 @@
         <div id="sortArea">
             <label for="sort">Sort by: </label>
             <select id='sort' [(ngModel)] = "currentSortAlgo" class="wide-input" (change)="search(searchForm.value)" [value]="currentSortAlgo">
-                <option *ngFor="let algorithm of Object.values(SortingAlgoArrays)" value="{{algorithm}}">
-                    {{algorithm.display[sortMode === 'Ascending' ? 0 : 1]}}
+                <option *ngFor="let algorithm of Object.keys(SortingAlgorithms)" [value]="algorithm">
+                    {{SortingAlgorithms[algorithm].display[sortMode === 'Ascending' ? 0 : 1]}}
                 </option>
             </select>
-            <button (click)="changeSortMode(searchForm.value)">
+            <button (click)="toggleSortMode(searchForm.value)">
                 <span class="icon">{{sortMode === 'Ascending' ? 'arrow_upward': 'arrow_downward'}}</span>
             </button>
             <label>Needs per page: </label>
-<!--            <input type ="number" [(ngModel)]="itemsPerPage" min="1" max="{{searchResults.length}}">-->
+            <input type ="number" [(ngModel)]="itemsPerPage" min="1" max="{{searchResults.length}}">
         </div>
         <!--<button (click)="close()">Close</button>-->
     </div>
-    <h2 *ngIf="(searchResults | async)?.length < needs.length && (searchResults | async)?.length != 0"> Search Results({{needs.length - (searchResults | async)?.length}} needs filtered): </h2>
-    <h2 *ngIf="(searchResults | async)?.length == needs.length"> All Needs </h2>
-    <h2 *ngIf="(searchResults | async)?.length == 0"> No Results Found </h2>
+    <h2 *ngIf="searchResults.length < needs.length && searchResults.length != 0"> Search Results({{needs.length - searchResults.length}} needs filtered): </h2>
+    <h2 *ngIf="searchResults.length == needs.length"> All Needs </h2>
+    <h2 *ngIf="searchResults.length == 0"> No Results Found </h2>
 
-    <app-need-list [needs]="searchResults" #needList></app-need-list>
+    <app-need-list *ngIf="searchResults.length > 0" [needs]="searchResults" [itemsPerPage]="itemsPerPage" #needList></app-need-list>
 </div>
 
 <!--<ng-template [ngIf]="isManager()" >-->
-- 
cgit v1.2.3


From 6a5033afc3c8e0d5d12d709b35b306b6ea1f70e8 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Thu, 3 Apr 2025 23:11:05 -0400
Subject: Implemented action buttons with ng-template!!!

---
 .../src/app/components/cupboard/cupboard.component.html    | 14 ++++++++++++--
 1 file changed, 12 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 969b232..cd387a3 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -24,13 +24,23 @@
             <label>Needs per page: </label>
             <input type ="number" [(ngModel)]="itemsPerPage" min="1" max="{{searchResults.length}}">
         </div>
-        <!--<button (click)="close()">Close</button>-->
     </div>
     <h2 *ngIf="searchResults.length < needs.length && searchResults.length != 0"> Search Results({{needs.length - searchResults.length}} needs filtered): </h2>
     <h2 *ngIf="searchResults.length == needs.length"> All Needs </h2>
     <h2 *ngIf="searchResults.length == 0"> No Results Found </h2>
 
-    <app-need-list *ngIf="searchResults.length > 0" [needs]="searchResults" [itemsPerPage]="itemsPerPage" #needList></app-need-list>
+    <ng-template let-need #NLActions>
+        <button *ngIf="isHelper()" (click)="addToBasket(need)">
+            <span class="icon">add</span>Add To Basket
+        </button>
+        <button *ngIf="isManager()" (click)="select(need)">
+            <span class="icon">edit</span>Edit Need
+        </button>
+        <button *ngIf="isManager()" (click)="deleteNeed(need.id)" >
+            <span class="icon">delete</span>Delete Need
+        </button>
+    </ng-template>
+    <app-need-list [actionArea]="NLActions" *ngIf="searchResults.length > 0" [needs]="searchResults" [itemsPerPage]="itemsPerPage" #needList></app-need-list>
 </div>
 
 <!--<ng-template [ngIf]="isManager()" >-->
-- 
cgit v1.2.3


From 43b036dc8ac03100787ec691a4f4ebe3670f861f Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Thu, 3 Apr 2025 23:22:16 -0400
Subject: code cleanup

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

(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 cd387a3..c055c31 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -40,7 +40,7 @@
             <span class="icon">delete</span>Delete Need
         </button>
     </ng-template>
-    <app-need-list [actionArea]="NLActions" *ngIf="searchResults.length > 0" [needs]="searchResults" [itemsPerPage]="itemsPerPage" #needList></app-need-list>
+    <app-need-list [actionArea]="NLActions" *ngIf="searchResults.length > 0" [needs]="searchResults" [itemsPerPage]="itemsPerPage" #needList/>
 </div>
 
 <!--<ng-template [ngIf]="isManager()" >-->
-- 
cgit v1.2.3


From a5567b2ed092af3a50da75eef28d46c06760a266 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Fri, 4 Apr 2025 10:48:31 -0400
Subject: Improve add to basket feedback

---
 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 c055c31..71c258e 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -18,7 +18,7 @@
                     {{SortingAlgorithms[algorithm].display[sortMode === 'Ascending' ? 0 : 1]}}
                 </option>
             </select>
-            <button (click)="toggleSortMode(searchForm.value)">
+            <button (click)="toggleSortMode(searchForm.value)" [title]="sortMode">
                 <span class="icon">{{sortMode === 'Ascending' ? 'arrow_upward': 'arrow_downward'}}</span>
             </button>
             <label>Needs per page: </label>
@@ -30,8 +30,8 @@
     <h2 *ngIf="searchResults.length == 0"> No Results Found </h2>
 
     <ng-template let-need #NLActions>
-        <button *ngIf="isHelper()" (click)="addToBasket(need)">
-            <span class="icon">add</span>Add To Basket
+        <button *ngIf="isHelper()" (click)="addToBasket(need)" [disabled]="inBasket(usersService.getBasket() | async, need)">
+            <span class="icon">{{inBasket(usersService.getBasket() | async, need)? "check": "add" }}</span>Add To Basket
         </button>
         <button *ngIf="isManager()" (click)="select(need)">
             <span class="icon">edit</span>Edit Need
-- 
cgit v1.2.3


From d85eeb6918d521197c2e6ad1e3da2dec8ce95398 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Fri, 4 Apr 2025 17:22:10 -0400
Subject: Edit modal

---
 ufund-ui/src/app/components/cupboard/cupboard.component.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 71c258e..5e88582 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -33,7 +33,10 @@
         <button *ngIf="isHelper()" (click)="addToBasket(need)" [disabled]="inBasket(usersService.getBasket() | async, need)">
             <span class="icon">{{inBasket(usersService.getBasket() | async, need)? "check": "add" }}</span>Add To Basket
         </button>
-        <button *ngIf="isManager()" (click)="select(need)">
+        <ng-template #edit>
+            <app-need-edit *ngIf="need" [selectedNeed]="need" (refreshNeedList)="refresh()"></app-need-edit>
+        </ng-template>
+        <button *ngIf="isManager()" (click)="modalService.showModal(edit)">
             <span class="icon">edit</span>Edit Need
         </button>
         <button *ngIf="isManager()" (click)="deleteNeed(need.id)" >
@@ -43,9 +46,7 @@
     <app-need-list [actionArea]="NLActions" *ngIf="searchResults.length > 0" [needs]="searchResults" [itemsPerPage]="itemsPerPage" #needList/>
 </div>
 
-<!--<ng-template [ngIf]="isManager()" >-->
 <!--<div>-->
-<!--    <app-need-edit *ngIf="selectedForm === 'update'" [selectedNeed]="selectedNeed" (refreshNeedList)="needList.refresh()"></app-need-edit>-->
 <!--    <div>-->
 <!--        <div id="create-form" *ngIf="selectedForm === 'create'">-->
 <!--            <h1> Create Need </h1>-->
@@ -73,4 +74,3 @@
 <!--        </div>-->
 <!--    </div>-->
 <!--</div>-->
-<!--</ng-template>-->
-- 
cgit v1.2.3


From feba88fed855d1694d292e401a4cb336e0ff9d69 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Fri, 4 Apr 2025 20:56:02 -0400
Subject: Fix create-need dialog

---
 .../components/cupboard/cupboard.component.html    | 36 +++-------------------
 1 file changed, 5 insertions(+), 31 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 5e88582..3873719 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -1,7 +1,10 @@
 <div id="box">
     <div id="header">
         <h1> Cupboard </h1>
-        <button *ngIf="isManager()" class="button2" (click)="this.selectForm('create')"><span class="icon">add</span>Create Need</button>
+        <ng-template #create>
+            <app-need-edit [mode]="'Create'" (refreshNeedList)="refresh()"></app-need-edit>
+        </ng-template>
+        <button *ngIf="isManager()" class="button2" (click)="modalService.showModal(create)"><span class="icon">add</span>Create Need</button>
     </div>
 
     <div id="header2">
@@ -34,7 +37,7 @@
             <span class="icon">{{inBasket(usersService.getBasket() | async, need)? "check": "add" }}</span>Add To Basket
         </button>
         <ng-template #edit>
-            <app-need-edit *ngIf="need" [selectedNeed]="need" (refreshNeedList)="refresh()"></app-need-edit>
+            <app-need-edit *ngIf="need" [mode]="'Edit'" [need]="need" (refreshNeedList)="refresh()"></app-need-edit>
         </ng-template>
         <button *ngIf="isManager()" (click)="modalService.showModal(edit)">
             <span class="icon">edit</span>Edit Need
@@ -45,32 +48,3 @@
     </ng-template>
     <app-need-list [actionArea]="NLActions" *ngIf="searchResults.length > 0" [needs]="searchResults" [itemsPerPage]="itemsPerPage" #needList/>
 </div>
-
-<!--<div>-->
-<!--    <div>-->
-<!--        <div id="create-form" *ngIf="selectedForm === 'create'">-->
-<!--            <h1> Create Need </h1>-->
-<!--            <form #cupboardForm="ngForm" (ngSubmit)="submit(cupboardForm.value)">-->
-<!--                <label>Name:</label><br>-->
-<!--                <input type="text" name="name" ngModel><br>-->
-<!--                <label>Image:</label><br>-->
-<!--                <input type="text" name="image" ngModel><br>-->
-<!--                <label>Location:</label><br>-->
-<!--                <input type="text" name="location" ngModel><br>-->
-<!--                <label>Max Goal:</label><br>-->
-<!--                <input type="number" name="maxGoal" ngModel><br>-->
-<!--                <label>Type</label><br>-->
-<!--                <input type="radio" name="type" value="MONETARY" ngModel>-->
-<!--                <label>Monetary</label><br>-->
-<!--                <input type="radio" name="type" value="PHYSICAL" ngModel>-->
-<!--                <label>Physical</label><br>-->
-<!--                <input type="checkbox" name="urgent" value="false" ngModel>-->
-<!--                <label>Urgent</label><br>-->
-<!--                <label>Description</label><br>-->
-<!--                <textarea name="description"></textarea><br>-->
-<!--                <input type="submit" value="Submit">-->
-
-<!--            </form>-->
-<!--        </div>-->
-<!--    </div>-->
-<!--</div>-->
-- 
cgit v1.2.3


From b578584a1208178100bf90e8b06971772c7fc00f Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Fri, 4 Apr 2025 21:55:12 -0400
Subject: Fix many bugs and code clean up

---
 ufund-ui/src/app/components/cupboard/cupboard.component.html | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 3873719..cd8fec2 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -4,7 +4,7 @@
         <ng-template #create>
             <app-need-edit [mode]="'Create'" (refreshNeedList)="refresh()"></app-need-edit>
         </ng-template>
-        <button *ngIf="isManager()" class="button2" (click)="modalService.showModal(create)"><span class="icon">add</span>Create Need</button>
+        <button *ngIf="usersService.isManager()" class="button2" (click)="modalService.showModal(create)"><span class="icon">add</span>Create Need</button>
     </div>
 
     <div id="header2">
@@ -33,16 +33,16 @@
     <h2 *ngIf="searchResults.length == 0"> No Results Found </h2>
 
     <ng-template let-need #NLActions>
-        <button *ngIf="isHelper()" (click)="addToBasket(need)" [disabled]="inBasket(usersService.getBasket() | async, need)">
-            <span class="icon">{{inBasket(usersService.getBasket() | async, need)? "check": "add" }}</span>Add To Basket
+        <button *ngIf="usersService.isHelper()" (click)="addToBasket(need)" [disabled]="usersService.inBasket(usersService.getBasket() | async, need)">
+            <span class="icon">{{usersService.inBasket(usersService.getBasket() | async, need)? "check": "add" }}</span>Add To Basket
         </button>
         <ng-template #edit>
             <app-need-edit *ngIf="need" [mode]="'Edit'" [need]="need" (refreshNeedList)="refresh()"></app-need-edit>
         </ng-template>
-        <button *ngIf="isManager()" (click)="modalService.showModal(edit)">
+        <button *ngIf="usersService.isManager()" (click)="modalService.showModal(edit)">
             <span class="icon">edit</span>Edit Need
         </button>
-        <button *ngIf="isManager()" (click)="deleteNeed(need.id)" >
+        <button *ngIf="usersService.isManager()" (click)="deleteNeed(need.id)" >
             <span class="icon">delete</span>Delete Need
         </button>
     </ng-template>
-- 
cgit v1.2.3