From 1ac878b4aaa19ab889c7a98b7dab6acd57c778b3 Mon Sep 17 00:00:00 2001
From: Akash Keshav <112591754+domesticchores@users.noreply.github.com>
Date: Sat, 5 Apr 2025 22:00:00 -0400
Subject: finish styling basket and list; add persistent theme via
 localStorage. -ak

---
 .../src/app/components/funding-basket/funding-basket.component.css  | 6 +++---
 .../src/app/components/funding-basket/funding-basket.component.html | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'ufund-ui/src/app/components/funding-basket')

diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.css b/ufund-ui/src/app/components/funding-basket/funding-basket.component.css
index c46ef57..bd41fda 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.css
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.css
@@ -11,7 +11,7 @@
 }
 
 .needEntry {
-    background-color: #2e2e2e;
+    background-color: var(--tertiary-color);
     display: flex;
     flex-direction: column;
     border-radius: 5px;
@@ -66,13 +66,13 @@
 
 .clickable {
     padding: 10px;
-    background-color: #3a3a3a;
+    background-color: var(--secondary-color);
     border-radius: 5px;
     cursor: pointer;
 }
 
 .clickable:hover {
-    background-color: #444444;
+    background-color: var(--tertiary-color);
 }
 
 .actionArea {
diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
index 52b35c1..b88ef31 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
@@ -63,7 +63,7 @@
                 </div>
 
                 <div class="actionArea">
-                    <input type="number" placeholder="Quantity" min="1" id={{need.id}} class="contribution">
+                    <input type="number" placeholder="Quantity" min="1" id={{need.id}} class="contribution sort-scheme">
                     <button class="removeNeed" title="delete need" (click)="this.usersService.removeNeed(need.id)">
                         <span class="icon">delete</span> Remove from Basket
                     </button>
-- 
cgit v1.2.3


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

---
 .../src/app/components/funding-basket/funding-basket.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ufund-ui/src/app/components/funding-basket')

diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
index 7158194..6363c68 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
@@ -3,7 +3,7 @@
         <h1>Funding Basket</h1>
         <ng-template [ngIf]="(usersService.getBasket() | async)?.length">
             <ng-template let-need #NLActions>
-                <input type="number" placeholder="Quantity" min="1" [id]="need?.id" class="contribution" (input)="resetColor($event)">
+                <input type="number" placeholder="Quantity" min="1" [id]="need?.id" class="contribution sort-scheme" (input)="resetColor($event)">
                 <button class="removeNeed" (click)="this.usersService.removeNeed(need.id)">
                     <span class="icon">delete</span>Remove from Basket
                 </button>
-- 
cgit v1.2.3


From 88865595e2735784537e076a5b8d6edbf6fb6138 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Sun, 6 Apr 2025 19:52:12 -0400
Subject: Improve sort-scheme

---
 .../src/app/components/funding-basket/funding-basket.component.html     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ufund-ui/src/app/components/funding-basket')

diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
index 6363c68..7158194 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
@@ -3,7 +3,7 @@
         <h1>Funding Basket</h1>
         <ng-template [ngIf]="(usersService.getBasket() | async)?.length">
             <ng-template let-need #NLActions>
-                <input type="number" placeholder="Quantity" min="1" [id]="need?.id" class="contribution sort-scheme" (input)="resetColor($event)">
+                <input type="number" placeholder="Quantity" min="1" [id]="need?.id" class="contribution" (input)="resetColor($event)">
                 <button class="removeNeed" (click)="this.usersService.removeNeed(need.id)">
                     <span class="icon">delete</span>Remove from Basket
                 </button>
-- 
cgit v1.2.3


From d2858b59e495186d51eebd188f84534fe68fc420 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Mon, 7 Apr 2025 13:37:01 -0400
Subject: Disable pagination in checkout

---
 .../src/app/components/funding-basket/funding-basket.component.html     | 2 +-
 ufund-ui/src/app/components/funding-basket/funding-basket.component.ts  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'ufund-ui/src/app/components/funding-basket')

diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
index 7158194..a5fec6f 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
@@ -8,7 +8,7 @@
                     <span class="icon">delete</span>Remove from Basket
                 </button>
             </ng-template>
-            <app-need-list [uid]="1" [actionArea]="NLActions" [needs]="(usersService.getBasket() | async)!"/>
+            <app-need-list [itemsPerPage]="Infinity" [uid]="1" [actionArea]="NLActions" [needs]="(usersService.getBasket() | async)!"/>
             <br>
             <div id="footer">
                 <button class="button2" title="checkout" (click)="checkout()">Checkout</button>
diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
index 78ce958..3921ad2 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
@@ -77,4 +77,5 @@ export class FundingBasketComponent implements OnInit {
 
     protected readonly of = of;
     protected readonly userType = userType;
+    protected readonly Infinity = Infinity;
 }
-- 
cgit v1.2.3


From 81917b7cae6d3d22bc8e54f7b2bd416acd70475f Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Mon, 7 Apr 2025 14:03:59 -0400
Subject: Added total physical contributions to dashboard and funding basket

---
 .../components/funding-basket/funding-basket.component.css |  7 ++++++-
 .../funding-basket/funding-basket.component.html           |  9 +++++++--
 .../components/funding-basket/funding-basket.component.ts  | 14 ++++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'ufund-ui/src/app/components/funding-basket')

diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.css b/ufund-ui/src/app/components/funding-basket/funding-basket.component.css
index a1485a0..297a63a 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.css
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.css
@@ -84,7 +84,12 @@
 #footer {
     display: flex;
     flex-direction: row;
-    align-items: center;
+    align-items: start;
     gap: 20px;
     margin-bottom: 10px;
 }
+
+#totals {
+    display: flex;
+    flex-direction: column;
+}
diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
index 7158194..50d6abe 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
@@ -3,7 +3,7 @@
         <h1>Funding Basket</h1>
         <ng-template [ngIf]="(usersService.getBasket() | async)?.length">
             <ng-template let-need #NLActions>
-                <input type="number" placeholder="Quantity" min="1" [id]="need?.id" class="contribution" (input)="resetColor($event)">
+                <input type="number" placeholder="Quantity" min="1" [id]="need?.id" class="contribution" (input)="onInput($event)">
                 <button class="removeNeed" (click)="this.usersService.removeNeed(need.id)">
                     <span class="icon">delete</span>Remove from Basket
                 </button>
@@ -12,7 +12,12 @@
             <br>
             <div id="footer">
                 <button class="button2" title="checkout" (click)="checkout()">Checkout</button>
-                <span id="running-total">Your current running total is: ${{runningTotal | async}}</span>
+                <div id="totals">
+                    <ul>
+                        <li id="running-total">Your current running total is: ${{runningTotal | async}}</li>
+                        <li id="physicalNeeds" *ngFor="let need of physicalTotal">{{need}}</li>
+                    </ul>
+                </div>
             </div>
         </ng-template>
         <div *ngIf="!usersService.getBasket().getValue().length">
diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
index 78ce958..8d23d7b 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
@@ -24,7 +24,8 @@ export class FundingBasketComponent implements OnInit {
         private toastService: ToastsService
     ) {}
 
-    public runningTotal = new BehaviorSubject(0)
+    protected runningTotal = new BehaviorSubject(0)
+    protected physicalTotal: string[] = []
     @ViewChild("contribution") contribution?: Input;
 
     ngOnInit(): void {
@@ -36,6 +37,9 @@ export class FundingBasketComponent implements OnInit {
         let order: { needID: number, quantity: number }[] = []
         let isNotValid = false
 
+        this.runningTotal.next(0);
+        this.physicalTotal = []
+
         for (let contribution of document.querySelectorAll<HTMLInputElement>('.contribution')!) {
             if (contribution.value == '' || contribution.valueAsNumber <= 0) {
                 isNotValid = true
@@ -60,18 +64,24 @@ export class FundingBasketComponent implements OnInit {
         this.toastService.sendToast(ToastType.INFO, "Checkout successful");
     }
 
-    resetColor(ev: any) {
+    onInput(ev: any) {
         let total = 0
         this.runningTotal.next(total);
+        this.physicalTotal = []
         for (let contribution of document.querySelectorAll<HTMLInputElement>('.contribution')!) {
             this.cupboardService.getNeed(+contribution.id).subscribe(need => {
                 if (contribution.value != '' && need.type != GoalType.PHYSICAL) {
                     total += contribution.valueAsNumber
+                } else if (contribution.value != '' && need.type == GoalType.PHYSICAL) {
+                    this.physicalTotal.push(need.name + ": " + contribution.value)
                 }
                 this.runningTotal.next(total);
+
             })
         }
 
+        this.physicalTotal.sort((a, b) => a < b ? -1 : 1);
+
         (ev.target as HTMLInputElement).setAttribute("style", "border-color: unset")
     }
 
-- 
cgit v1.2.3