From f88e5d727ae42d0e27ae7949d0f0d4189dda464d Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Wed, 2 Apr 2025 21:08:38 -0400
Subject: [incomplete] checkout flow improvement

---
 .../funding-basket/funding-basket.component.html   | 39 +-------------
 .../funding-basket/funding-basket.component.ts     | 60 ++++++----------------
 2 files changed, 18 insertions(+), 81 deletions(-)

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..bba66a3 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
@@ -1,36 +1,3 @@
-
-<!--<div id="needCount">-->
-<!--    <label for="needCount">Needs in Basket:</label>-->
-<!--    <span>{{ this.usersService.getBasket().getValue().length }}</span>-->
-<!--</div>-->
-
-<!--<div *ngIf="this.usersService.getBasket().getValue().length == 0">-->
-<!--    <h2>There are no needs in the basket</h2>-->
-<!--</div>-->
-
-<!--<table class="needs" id="funding-basket" *ngIf="this.usersService.getBasket().getValue().length != 0">-->
-<!--    <thead>-->
-<!--        <tr>-->
-<!--            <th class="need"></th>-->
-<!--        </tr>-->
-<!--    </thead>-->
-<!--    <tbody>-->
-<!--        <tr *ngFor="let need of usersService.getBasket().getValue()">-->
-<!--            <td>-->
-<!--                <a routerLink="/need/{{need.id}}">{{need.name}}</a>-->
-<!--                <p>Goal: {{need.maxGoal}}</p>-->
-<!--                <p>Current: {{(need.current).toFixed(2)}}</p>-->
-<!--                <p>How much to Contribute: <input type="number" placeholder="insert value" min="1" id={{need.id}} class="contribution"></p>-->
-<!--                <br>-->
-<!--                <div>-->
-<!--                    <button type="button" class="removeNeed" title="delete need"-->
-<!--                    (click)="this.usersService.removeNeed(need.id)">Remove Need</button>-->
-<!--                </div>-->
-<!--            </td>-->
-<!--        </tr>-->
-<!--    </tbody>-->
-<!--</table>-->
-<!--<br>-->
 <div id="box">
     <h1>Funding Basket</h1>
     <ng-template [ngIf]="usersService.getBasket().getValue().length">
@@ -56,14 +23,10 @@
                         <span>{{need.current}}/{{need.maxGoal}} ({{((need.current / need.maxGoal) * 100).toFixed(0)}}%)</span>
                         <progress [value]="need.current" [max]="need.maxGoal"></progress>
                     </div>
-
-                    <!--            <div class="description">-->
-                    <!--                {{need.description}}-->
-                    <!--            </div>-->
                 </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" (input)="resetColor($event)">
                     <button class="removeNeed" title="delete need" (click)="this.usersService.removeNeed(need.id)">
                         <span class="icon">delete</span> Remove from Basket
                     </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 847baee..18bb9b8 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
@@ -23,7 +23,6 @@ export class FundingBasketComponent implements OnInit {
     ) {}
 
     @ViewChild("contribution") contribution?: Input;
-    @Input() isValid: boolean = true;
 
     // this is for login rerouting
     ngOnInit(): void {
@@ -37,58 +36,33 @@ export class FundingBasketComponent implements OnInit {
     }
 
     async checkout() {
-        this.isValid = true;
-        for (let c of document.querySelectorAll('.contribution')!) {
-            let contribution = c as HTMLInputElement;
-            contribution.setAttribute("style", "");
-            if (contribution.value == '' || contribution.valueAsNumber <= 0) {
-                this.isValid = false;
+        let order: { id: number, quantity: number }[] = []
 
+        for (let contribution of document.querySelectorAll<HTMLInputElement>('.contribution')!) {
+            if (contribution.value == '' || contribution.valueAsNumber <= 0) {
                 contribution.setAttribute("style", "border-color: #ff0000");
                 this.toastService.sendToast(ToastType.ERROR, "Invalid input in funding basket!")
-
-                setTimeout(() => {
-                    contribution.setAttribute("style", "border-color: #ffffff");
-                }, 3000);
+                return;
             }
+            order.push({id: +contribution.id, quantity: contribution.valueAsNumber});
         }
-        // if (this.usersService.getBasket().value != await firstValueFrom(this.usersService.getUser(1))
-        // for (let c of this.usersService.getBasket().value) {
-        //     if (c == null) {
-        //         this.isValid = false;
-        //         this.statusText.next("One or more needs have been deleted")
-        //     } else {
-        //         this.statusText.next("test")
-        //     }
-        // }
-        if (this.isValid) {
-            for (let c of document.querySelectorAll('.contribution')!) {
-                let contribution = c as HTMLInputElement;
+
+        for (let c of document.querySelectorAll('.contribution')!) {
+            let contribution = c as HTMLInputElement;
+            try {
                 let need = await firstValueFrom(this.cupboardService.getNeed(+contribution.id));
+                await firstValueFrom(this.cupboardService.checkoutNeed(need.id, +contribution.value));
                 need.current += +contribution.value;
                 this.usersService.removeNeed(+need.id);
-                this.cupboardService.checkoutNeed(need.id, +contribution.value)
-                    .pipe(catchError((ex, _) => {
-                        if (ex.status == 500) {
-                            this.toastService.sendToast(ToastType.ERROR, 'Fields cannot be blank');
-                        } else if (ex.status == 400) {
-                            this.toastService.sendToast(ToastType.ERROR, ex.error);
-                        } else {
-                            this.toastService.sendToast(ToastType.ERROR, 'Error on creating need');
-                        }
-                        return new Observable<string>();
-                    }))
-                    .subscribe((result) => {
-                        if (result) {
-                            //this.needList?.refresh()
-                        } else {
-                            console.log('need update failed');
-                        }
-                        this.toastService.sendToast(ToastType.INFO, "Checkout successful");
-                    });
+                this.toastService.sendToast(ToastType.INFO, "Checkout successful");
+            } catch (ex: any) {
+                this.toastService.sendToast(ToastType.ERROR, ex.error);
             }
         }
     }
 
-
+    resetColor(ev: any) {
+        console.log(ev);
+        (ev.target as HTMLInputElement).setAttribute("style", "border-color: unset")
+    }
 }
-- 
cgit v1.2.3


From cb6463630446503d441b37f3d62ec2d064b00269 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Thu, 3 Apr 2025 07:56:54 -0400
Subject: Added dashboard statistics

---
 .../api/ufundapi/controller/UserController.java    |  2 +-
 .../components/dashboard/dashboard.component.ts    | 37 +++++++++++++++-------
 ufund-ui/src/app/services/users.service.ts         | 13 ++++++++
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java
index c6e622c..6953276 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/UserController.java
@@ -108,7 +108,7 @@ public class UserController {
 
         try {
             authService.keyHasAccessToCupboard(key);
-            int count = userService.getUserCount();
+            String count = String.valueOf(userService.getUserCount());
             return new ResponseEntity<>(count, HttpStatus.OK);
         } catch (IllegalAccessException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.ts b/ufund-ui/src/app/components/dashboard/dashboard.component.ts
index c94b5c6..8c397ff 100644
--- a/ufund-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/ufund-ui/src/app/components/dashboard/dashboard.component.ts
@@ -1,10 +1,10 @@
 import {Component, OnInit} from '@angular/core';
 import {AuthService} from '../../services/auth.service';
 import {Router} from '@angular/router';
-import {Need} from '../../models/Need';
 import {CupboardService} from '../../services/cupboard.service';
-import {firstValueFrom} from 'rxjs';
 import {UsersService} from '../../services/users.service';
+import {BehaviorSubject} from 'rxjs';
+import {GoalType, Need} from '../../models/Need';
 
 @Component({
     selector: 'app-dashboard',
@@ -14,9 +14,10 @@ import {UsersService} from '../../services/users.service';
 })
 export class DashboardComponent implements OnInit{
 
-    topNeeds?: Need[]
-    almostThere?: Need[]
-    inBasket?: Need[]
+    protected count = new BehaviorSubject<number | undefined>(undefined)
+    protected totalDonations = new BehaviorSubject<number | undefined>(undefined)
+    protected fulfilledNeeds = new BehaviorSubject<number | undefined>(undefined)
+    protected mostFulfilledNeeds = new BehaviorSubject<Need[] | undefined>(undefined)
 
     constructor(
         protected authService: AuthService,
@@ -32,14 +33,28 @@ export class DashboardComponent implements OnInit{
             return
         }
 
-        firstValueFrom(this.cupboardService.getNeeds()).then(r => {
-            this.topNeeds = r.sort((a, b) => b.current - a.current)
-            this.almostThere = r.sort((a, b) => a.current/a.maxGoal - b.current/b.maxGoal)
-        })
+        this.userService.getCount().subscribe(count => this.count.next(count))
+        this.cupboardService.getNeeds().subscribe(needs => {
+            let fulfilledNeeds = 0
+            let totalValue = 0
+            for (let need of needs) {
+                let needPercent = need.current / need.maxGoal
+                if (needPercent >= 1) {
+                    fulfilledNeeds++
+                    this.fulfilledNeeds.next(fulfilledNeeds)
+                }
+                if (need.type === GoalType.MONETARY) {
+                    totalValue += need.current
+                    this.totalDonations.next(totalValue)
+                }
 
-        this.userService.getBasket().subscribe(r => {
-            this.inBasket = r;
+            }
+            needs.sort((a, b) => b.current/b.maxGoal - a.current/a.maxGoal)
+            needs = needs.filter(a => a.current != 0)
+            this.mostFulfilledNeeds.next(needs.slice(0, 5))
         })
+
+
     }
 
 }
diff --git a/ufund-ui/src/app/services/users.service.ts b/ufund-ui/src/app/services/users.service.ts
index 4080ebf..080c394 100644
--- a/ufund-ui/src/app/services/users.service.ts
+++ b/ufund-ui/src/app/services/users.service.ts
@@ -21,6 +21,15 @@ export class UsersService {
         })
     });
 
+    httpOptions2 = () => ({
+        headers: new HttpHeaders({
+            'Content-Type': 'application/json',
+            "jelly-api-key": this.authService.getApiKey()
+        }),
+        responseType: "text" as "json" // don't ask me how or why this works, bc i have no clue...
+        // see the relevant angular bug report https://github.com/angular/angular/issues/18586
+    });
+
     constructor(
         private http: HttpClient,
         private cupboardService: CupboardService,
@@ -35,6 +44,10 @@ export class UsersService {
         return this.http.get<User>(`${this.url}/${id}`, this.httpOptions())
     }
 
+    getCount(): Observable<number> {
+        return this.http.get<number>(`${this.url}/count`, this.httpOptions2())
+    }
+
     updateUser(user: User): Observable<User> {
         console.log(`${this.url}/${user.username}`, user, this.httpOptions)
         return this.http.put<User>(`${this.url}/${user.username}`, user, this.httpOptions())
-- 
cgit v1.2.3


From 27b70a790a6418aa6702f950a0f85f1d23f38ff6 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Thu, 3 Apr 2025 07:58:13 -0400
Subject: Added dollar signs and other small additions to needs

---
 ufund-ui/src/app/components/dashboard/dashboard.component.html     | 7 ++++++-
 .../src/app/components/mini-need-list/mini-need-list.component.css | 2 +-
 .../app/components/mini-need-list/mini-need-list.component.html    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.html b/ufund-ui/src/app/components/dashboard/dashboard.component.html
index 2d7b4c3..69ae66e 100644
--- a/ufund-ui/src/app/components/dashboard/dashboard.component.html
+++ b/ufund-ui/src/app/components/dashboard/dashboard.component.html
@@ -4,7 +4,12 @@
 <!--<app-mini-need-list [needList]="almostThere" jtitle="Almost there" url="/cupboard"/>-->
 <!--<app-mini-need-list [needList]="inBasket" jtitle="In your basket" url="/basket"/>-->
 <span>_ Registered users</span>
+<span *ngIf="count"> {{count | async}} </span>
 <span>_ Needs with overflow</span>
-<span>_ Needs in peoples baskets</span>
+<span>_ Fulfilled needs</span>
+<span *ngIf="fulfilledNeeds"> {{fulfilledNeeds | async}} </span>
+<span>_ Most fulfilled needs</span>
+<app-mini-need-list [needList]="mostFulfilledNeeds.getValue()" jtitle="Most fulfilled"> </app-mini-need-list>
 <span>_ Total monetary contributions</span>
+<span *ngIf="totalDonations">${{totalDonations | async}} </span>
 <span>_ </span>
diff --git a/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.css b/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.css
index ac456ab..090bea9 100644
--- a/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.css
+++ b/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.css
@@ -23,7 +23,7 @@
     padding: 10px;
     gap: 10px;
     justify-content: start;
-    overflow: clip;
+    overflow: auto;
 }
 
 .needEntry {
diff --git a/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.html b/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.html
index a2de9e5..9febfa5 100644
--- a/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.html
+++ b/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.html
@@ -1,6 +1,6 @@
 <div id="header">
     <span>{{jtitle}}</span>
-    <a [routerLink]="url">Show All<span class="icon">arrow_forward_ios</span></a>
+    <a *ngIf="url" [routerLink]="url">Show All<span class="icon">arrow_forward_ios</span></a>
 </div>
 
 <div id="needList">
-- 
cgit v1.2.3


From d7cbf88df5d8cb9e5b8feb563b787a3ac20816aa Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Thu, 3 Apr 2025 07:58:13 -0400
Subject: Updated statistics on dashboard

---
 ufund-ui/src/app/components/dashboard/dashboard.component.html     | 7 ++++++-
 .../src/app/components/mini-need-list/mini-need-list.component.css | 2 +-
 .../app/components/mini-need-list/mini-need-list.component.html    | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.html b/ufund-ui/src/app/components/dashboard/dashboard.component.html
index 2d7b4c3..69ae66e 100644
--- a/ufund-ui/src/app/components/dashboard/dashboard.component.html
+++ b/ufund-ui/src/app/components/dashboard/dashboard.component.html
@@ -4,7 +4,12 @@
 <!--<app-mini-need-list [needList]="almostThere" jtitle="Almost there" url="/cupboard"/>-->
 <!--<app-mini-need-list [needList]="inBasket" jtitle="In your basket" url="/basket"/>-->
 <span>_ Registered users</span>
+<span *ngIf="count"> {{count | async}} </span>
 <span>_ Needs with overflow</span>
-<span>_ Needs in peoples baskets</span>
+<span>_ Fulfilled needs</span>
+<span *ngIf="fulfilledNeeds"> {{fulfilledNeeds | async}} </span>
+<span>_ Most fulfilled needs</span>
+<app-mini-need-list [needList]="mostFulfilledNeeds.getValue()" jtitle="Most fulfilled"> </app-mini-need-list>
 <span>_ Total monetary contributions</span>
+<span *ngIf="totalDonations">${{totalDonations | async}} </span>
 <span>_ </span>
diff --git a/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.css b/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.css
index ac456ab..090bea9 100644
--- a/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.css
+++ b/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.css
@@ -23,7 +23,7 @@
     padding: 10px;
     gap: 10px;
     justify-content: start;
-    overflow: clip;
+    overflow: auto;
 }
 
 .needEntry {
diff --git a/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.html b/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.html
index a2de9e5..9febfa5 100644
--- a/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.html
+++ b/ufund-ui/src/app/components/mini-need-list/mini-need-list.component.html
@@ -1,6 +1,6 @@
 <div id="header">
     <span>{{jtitle}}</span>
-    <a [routerLink]="url">Show All<span class="icon">arrow_forward_ios</span></a>
+    <a *ngIf="url" [routerLink]="url">Show All<span class="icon">arrow_forward_ios</span></a>
 </div>
 
 <div id="needList">
-- 
cgit v1.2.3


From 8cdf84ae4a6765db8f462cc71e2685c1d3514f08 Mon Sep 17 00:00:00 2001
From: benal01 <bja4245@rit.edu>
Date: Thu, 3 Apr 2025 08:08:08 -0400
Subject: re-adding resources folder

---
 ufund-api/src/main/resources/application.properties | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 ufund-api/src/main/resources/application.properties

diff --git a/ufund-api/src/main/resources/application.properties b/ufund-api/src/main/resources/application.properties
new file mode 100644
index 0000000..c742063
--- /dev/null
+++ b/ufund-api/src/main/resources/application.properties
@@ -0,0 +1,11 @@
+server.error.include-message=always
+
+cupboard.file=data/cupboard.json
+users.file=data/users.json
+authKeys.file=data/userAuths.json
+
+spring.jackson.mapper.auto-detect-getters=false
+spring.jackson.mapper.auto-detect-setters=false
+spring.jackson.mapper.auto-detect-is-getters=false
+spring.jackson.mapper.auto-detect-creators=false
+spring.jackson.mapper.auto-detect-fields=false
\ No newline at end of file
-- 
cgit v1.2.3


From 84cb4b31da27c0db49b933a56a1de563121ceb60 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Thu, 3 Apr 2025 12:59:54 -0400
Subject: Updated styling on signup page

---
 .../src/app/components/signup/signup.component.css | 27 +++++++++++++++++-----
 .../app/components/signup/signup.component.html    |  9 ++++----
 .../src/app/components/signup/signup.component.ts  |  9 ++++----
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/ufund-ui/src/app/components/signup/signup.component.css b/ufund-ui/src/app/components/signup/signup.component.css
index 429bc42..aa90e04 100644
--- a/ufund-ui/src/app/components/signup/signup.component.css
+++ b/ufund-ui/src/app/components/signup/signup.component.css
@@ -3,15 +3,26 @@
     align-items: center;
     justify-content: center;
     height: 100%;
-    margin-top: -66px
+    margin-top: -66px;
+    background: rgba(0, 0, 0, .65) url("https://4kwallpapers.com/images/walls/thumbs_2t/13136.png");
+    background-blend-mode: darken;
+    background-size: cover;
 
 }
 
 #box {
     display: flex;
     flex-direction: column;
-    /*max-width: 300px;*/
+    max-width: 500px;
     gap: 10px;
+    backdrop-filter: blur(25px);
+    background-color: rgba(0, 0, 0, 0.1);
+    padding: 30px;
+    color: white;
+    border-radius: 5px;
+    border-style: solid;
+    border-width: 1px;
+    border-color: rgb(140, 140, 255);
 
     & > div {
         display: flex;
@@ -19,6 +30,11 @@
     }
 }
 
+#password {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
 .border {
     border-style: solid;
     border-width: 1px;
@@ -34,6 +50,8 @@
     width: 100%;
     appearance: none;
     overflow: hidden;
+    border-bottom-right-radius: 5px;
+    border-bottom-left-radius: 5px;
     /*margin-top: -5px;*/
 }
 
@@ -57,13 +75,10 @@
 #passReq {
     display: flex;
     flex-direction: column;
+    margin-top: 10px;
 }
 
 #box > div {
-    display: flex;
-    flex-direction: row;
-    align-items: start;
-    gap: 20px;
 
     div {
         display: flex;
diff --git a/ufund-ui/src/app/components/signup/signup.component.html b/ufund-ui/src/app/components/signup/signup.component.html
index 84f15e4..ef2fc27 100644
--- a/ufund-ui/src/app/components/signup/signup.component.html
+++ b/ufund-ui/src/app/components/signup/signup.component.html
@@ -7,13 +7,12 @@
 
     <div>
         <div>
-            <input placeholder="Password" type="password" (input)="validate(username.value, confirmPass.value, password.value)" #password>
+            <input id="password" placeholder="Password" type="password" (input)="validate(username.value, confirmPass.value, password.value)" #password>
             <progress [ngClass]="'color' + strength.getValue()" id="bar" [value]="strength | async" max="5">  </progress>
             <span *ngIf="passwordStatusText">{{passwordStatusText | async}}</span>
-        </div>
-
-        <div id="passReq">
-            <span *ngFor="let requirement of Object.values(passwordRequirements)" [style.color]="requirement.value ? 'green' : 'red'"><span class="icon">{{requirement.value?"check":"close"}}</span> {{requirement.title}}</span>
+            <div id="passReq">
+                <span *ngFor="let requirement of Object.values(passwordRequirements)" [style.color]="requirement.value ? 'green' : 'red'"><span class="icon">{{requirement.value?"check":"close"}}</span> {{requirement.title}}</span>
+            </div>
         </div>
     </div>
 
diff --git a/ufund-ui/src/app/components/signup/signup.component.ts b/ufund-ui/src/app/components/signup/signup.component.ts
index 9c37211..2762d03 100644
--- a/ufund-ui/src/app/components/signup/signup.component.ts
+++ b/ufund-ui/src/app/components/signup/signup.component.ts
@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import {Component, ElementRef, ViewChild} from '@angular/core';
 import {UsersService} from '../../services/users.service';
 import {Router} from '@angular/router';
 import {BehaviorSubject} from 'rxjs';
@@ -29,6 +29,7 @@ export class SignupComponent {
     protected ableToCreateAccount = new BehaviorSubject(false)
     protected passwordRequirements: PasswordRequirements = new PasswordRequirements()
     protected strength = new BehaviorSubject(0)
+    @ViewChild("username") usernameInput!: ElementRef<HTMLInputElement>
 
     constructor(
         protected usersService: UsersService,
@@ -56,11 +57,11 @@ export class SignupComponent {
 
     validate(username: string, passConfirm:string, password: string) {
         this.passwordsMatch.next(false)
-        this.usernameStatusText.next("")
+        this.usernameInput.nativeElement.setAttribute("style", "")
         this.checkPasswordStrength(password);
 
         if (username === "") {
-            this.usernameStatusText.next("Username field can't be blank")
+            this.usernameInput.nativeElement.setAttribute("style", "border-color: #ff0000")
         }
 
         if (passConfirm && password === passConfirm) {
@@ -105,8 +106,6 @@ export class SignupComponent {
             this.passwordStatusText.next("")
         } else if (strength == 0) {
             this.passwordStatusText.next("")
-        } else {
-            this.passwordStatusText.next("Password must meet requirements")
         }
 
         this.strength.next(strength)
-- 
cgit v1.2.3


From 2423f4ee67e7e9079e12ecde51326472308cf22f Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Thu, 3 Apr 2025 13:00:38 -0400
Subject: Added fulfilled needs list dashboard

---
 .../src/app/components/dashboard/dashboard.component.html    |  3 +--
 ufund-ui/src/app/components/dashboard/dashboard.component.ts | 12 +++++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.html b/ufund-ui/src/app/components/dashboard/dashboard.component.html
index 69ae66e..2af467c 100644
--- a/ufund-ui/src/app/components/dashboard/dashboard.component.html
+++ b/ufund-ui/src/app/components/dashboard/dashboard.component.html
@@ -5,9 +5,8 @@
 <!--<app-mini-need-list [needList]="inBasket" jtitle="In your basket" url="/basket"/>-->
 <span>_ Registered users</span>
 <span *ngIf="count"> {{count | async}} </span>
-<span>_ Needs with overflow</span>
 <span>_ Fulfilled needs</span>
-<span *ngIf="fulfilledNeeds"> {{fulfilledNeeds | async}} </span>
+<app-mini-need-list [needList]="fulfilledNeeds.getValue()" jtitle="Fulfilled needs"> </app-mini-need-list>
 <span>_ Most fulfilled needs</span>
 <app-mini-need-list [needList]="mostFulfilledNeeds.getValue()" jtitle="Most fulfilled"> </app-mini-need-list>
 <span>_ Total monetary contributions</span>
diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.ts b/ufund-ui/src/app/components/dashboard/dashboard.component.ts
index 8c397ff..9bf7627 100644
--- a/ufund-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/ufund-ui/src/app/components/dashboard/dashboard.component.ts
@@ -16,7 +16,8 @@ export class DashboardComponent implements OnInit{
 
     protected count = new BehaviorSubject<number | undefined>(undefined)
     protected totalDonations = new BehaviorSubject<number | undefined>(undefined)
-    protected fulfilledNeeds = new BehaviorSubject<number | undefined>(undefined)
+    protected totalNeeds = new BehaviorSubject<number | undefined>(undefined)
+    protected fulfilledNeeds = new BehaviorSubject<Need[] | undefined>(undefined)
     protected mostFulfilledNeeds = new BehaviorSubject<Need[] | undefined>(undefined)
 
     constructor(
@@ -35,22 +36,19 @@ export class DashboardComponent implements OnInit{
 
         this.userService.getCount().subscribe(count => this.count.next(count))
         this.cupboardService.getNeeds().subscribe(needs => {
-            let fulfilledNeeds = 0
             let totalValue = 0
             for (let need of needs) {
-                let needPercent = need.current / need.maxGoal
-                if (needPercent >= 1) {
-                    fulfilledNeeds++
-                    this.fulfilledNeeds.next(fulfilledNeeds)
-                }
                 if (need.type === GoalType.MONETARY) {
                     totalValue += need.current
                     this.totalDonations.next(totalValue)
                 }
 
             }
+            this.fulfilledNeeds.next(needs.filter(a => ((a.current / a.maxGoal)) >= 1))
             needs.sort((a, b) => b.current/b.maxGoal - a.current/a.maxGoal)
+
             needs = needs.filter(a => a.current != 0)
+            this.totalNeeds.next(needs.length)
             this.mostFulfilledNeeds.next(needs.slice(0, 5))
         })
 
-- 
cgit v1.2.3


From 26b4a37cb91dfe5551f3e227512cd5ceff897d54 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Thu, 3 Apr 2025 14:49:04 -0400
Subject: Changes to cupboard on front end and back end to try and fix bugs

---
 .../ufundapi/controller/CupboardController.java    | 21 +++++++++++----
 .../funding-basket/funding-basket.component.ts     | 30 +++++++++++++---------
 ufund-ui/src/app/services/cupboard.service.ts      |  5 ++--
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
index 12fb0a9..2cf8647 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
@@ -1,6 +1,7 @@
 package com.ufund.api.ufundapi.controller;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -189,12 +190,22 @@ public class CupboardController {
      * @return OK if successful, other statuses if failure
      */
     @PutMapping("/checkout")
-    public ResponseEntity<Object> checkoutNeeds(@RequestBody Map<String, Integer> data, @RequestHeader("jelly-api-key") String key) {
-        int needID = data.get("needID");
-        int checkoutAmount = data.get("amount");
-        LOG.log(Level.INFO, "PUT /need/checkout body={0}", data);
+    public ResponseEntity<Object> checkoutNeeds(@RequestBody List<Map<String, Integer>> data, @RequestHeader("jelly-api-key") String key) {
+        LOG.log(Level.INFO, "PUT /cupboard/checkout body={0}", data);
         try {
-            cupboardService.checkoutNeed(needID, checkoutAmount, key);
+            authService.keyIsValid(key);
+
+            for (Map<String, Integer> map : data) {
+                int needID = map.get("needID");
+                if (cupboardService.getNeed(needID) != null) {
+                    return new ResponseEntity<>("One or more need is invalid, please refresh.", HttpStatus.BAD_REQUEST);
+                }
+            }
+            for (Map<String, Integer> map : data) {
+                int needID = map.get("needID");
+                int checkoutAmount = map.get("amount");
+                cupboardService.checkoutNeed(needID, checkoutAmount, key);
+            }
             return new ResponseEntity<>(HttpStatus.OK);
         } catch (IllegalArgumentException ex) {
             LOG.log(Level.WARNING, ex.getLocalizedMessage());
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 18bb9b8..015d5b5 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
@@ -47,22 +47,28 @@ export class FundingBasketComponent implements OnInit {
             order.push({id: +contribution.id, quantity: contribution.valueAsNumber});
         }
 
-        for (let c of document.querySelectorAll('.contribution')!) {
-            let contribution = c as HTMLInputElement;
-            try {
-                let need = await firstValueFrom(this.cupboardService.getNeed(+contribution.id));
-                await firstValueFrom(this.cupboardService.checkoutNeed(need.id, +contribution.value));
-                need.current += +contribution.value;
-                this.usersService.removeNeed(+need.id);
-                this.toastService.sendToast(ToastType.INFO, "Checkout successful");
-            } catch (ex: any) {
-                this.toastService.sendToast(ToastType.ERROR, ex.error);
-            }
+        try {
+            this.cupboardService.checkoutNeed(order)
+        } catch (ex:any) {
+            this.toastService.sendToast(ToastType.ERROR, ex.error);
+            return
         }
+
+        console.log(order)
+
+        for (let contribution of order) {
+            let need = await firstValueFrom(this.cupboardService.getNeed(contribution.id))
+            need.current += contribution.quantity;
+            this.usersService.removeNeed(need.id);
+            this.toastService.sendToast(ToastType.INFO, "Checkout successful");
+        }
+
+        // this.usersService.getBasket().subscribe(console.log)
+        // this.usersService.refreshBasket()
     }
 
     resetColor(ev: any) {
-        console.log(ev);
+        // console.log(ev);
         (ev.target as HTMLInputElement).setAttribute("style", "border-color: unset")
     }
 }
diff --git a/ufund-ui/src/app/services/cupboard.service.ts b/ufund-ui/src/app/services/cupboard.service.ts
index 9232c0c..786973e 100644
--- a/ufund-ui/src/app/services/cupboard.service.ts
+++ b/ufund-ui/src/app/services/cupboard.service.ts
@@ -47,7 +47,8 @@ export class CupboardService {
         return this.http.delete<boolean>(`${this.url}/${id}`, this.httpOptions())
     }
 
-    checkoutNeed(id: number, quantity: number) {
-        return this.http.put(`${this.url}/checkout`, {needID: id, amount: quantity}, this.httpOptions())
+    checkoutNeed(data: {id: number, quantity: number}[]) {
+        console.log("GOT HERE")
+        return this.http.put(`${this.url}/checkout`, data, this.httpOptions())
     }
 }
-- 
cgit v1.2.3


From 75f5ad5fb154811d7acd236687bb7f30bb7c10aa Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Thu, 3 Apr 2025 15:35:12 -0400
Subject: Fixed incognito race condition and checkout bugs

---
 .../ufundapi/controller/CupboardController.java    |  4 ++--
 .../funding-basket/funding-basket.component.ts     | 23 ++++++----------------
 .../src/app/components/toast/toast.component.ts    |  1 -
 ufund-ui/src/app/services/cupboard.service.ts      |  3 +--
 4 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
index 2cf8647..075878a 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
@@ -197,13 +197,13 @@ public class CupboardController {
 
             for (Map<String, Integer> map : data) {
                 int needID = map.get("needID");
-                if (cupboardService.getNeed(needID) != null) {
+                if (cupboardService.getNeed(needID) == null) {
                     return new ResponseEntity<>("One or more need is invalid, please refresh.", HttpStatus.BAD_REQUEST);
                 }
             }
             for (Map<String, Integer> map : data) {
                 int needID = map.get("needID");
-                int checkoutAmount = map.get("amount");
+                int checkoutAmount = map.get("quantity");
                 cupboardService.checkoutNeed(needID, checkoutAmount, key);
             }
             return new ResponseEntity<>(HttpStatus.OK);
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 015d5b5..5d94124 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
@@ -2,7 +2,7 @@ import {Component, Input, OnInit, ViewChild} from '@angular/core';
 import {UsersService} from '../../services/users.service';
 import {Router} from '@angular/router';
 import {CupboardService} from '../../services/cupboard.service';
-import {catchError, firstValueFrom, Observable} from 'rxjs';
+import {firstValueFrom} from 'rxjs';
 import {AuthService} from '../../services/auth.service';
 import {ToastsService, ToastType} from '../../services/toasts.service';
 
@@ -32,11 +32,10 @@ export class FundingBasketComponent implements OnInit {
         }
 
         this.usersService.refreshBasket();
-        // this.usersService.removeNeed(); <- call this to remove
     }
 
     async checkout() {
-        let order: { id: number, quantity: number }[] = []
+        let order: { needID: number, quantity: number }[] = []
 
         for (let contribution of document.querySelectorAll<HTMLInputElement>('.contribution')!) {
             if (contribution.value == '' || contribution.valueAsNumber <= 0) {
@@ -44,31 +43,21 @@ export class FundingBasketComponent implements OnInit {
                 this.toastService.sendToast(ToastType.ERROR, "Invalid input in funding basket!")
                 return;
             }
-            order.push({id: +contribution.id, quantity: contribution.valueAsNumber});
+            order.push({needID: +contribution.id, quantity: contribution.valueAsNumber});
         }
 
         try {
-            this.cupboardService.checkoutNeed(order)
+            await firstValueFrom(this.cupboardService.checkoutNeed(order))
         } catch (ex:any) {
             this.toastService.sendToast(ToastType.ERROR, ex.error);
             return
         }
 
-        console.log(order)
-
-        for (let contribution of order) {
-            let need = await firstValueFrom(this.cupboardService.getNeed(contribution.id))
-            need.current += contribution.quantity;
-            this.usersService.removeNeed(need.id);
-            this.toastService.sendToast(ToastType.INFO, "Checkout successful");
-        }
-
-        // this.usersService.getBasket().subscribe(console.log)
-        // this.usersService.refreshBasket()
+        order.forEach(contribution => this.usersService.removeNeed(contribution.needID))
+        this.toastService.sendToast(ToastType.INFO, "Checkout successful");
     }
 
     resetColor(ev: any) {
-        // console.log(ev);
         (ev.target as HTMLInputElement).setAttribute("style", "border-color: unset")
     }
 }
diff --git a/ufund-ui/src/app/components/toast/toast.component.ts b/ufund-ui/src/app/components/toast/toast.component.ts
index 47fd7ff..6bbae34 100644
--- a/ufund-ui/src/app/components/toast/toast.component.ts
+++ b/ufund-ui/src/app/components/toast/toast.component.ts
@@ -21,7 +21,6 @@ export class ToastComponent implements OnInit{
     }
 
     hide() {
-        console.log(this.toastDiv, typeof this.toastDiv)
         this.toastDiv.nativeElement.classList.add('hide')
     }
 
diff --git a/ufund-ui/src/app/services/cupboard.service.ts b/ufund-ui/src/app/services/cupboard.service.ts
index 786973e..1060476 100644
--- a/ufund-ui/src/app/services/cupboard.service.ts
+++ b/ufund-ui/src/app/services/cupboard.service.ts
@@ -47,8 +47,7 @@ export class CupboardService {
         return this.http.delete<boolean>(`${this.url}/${id}`, this.httpOptions())
     }
 
-    checkoutNeed(data: {id: number, quantity: number}[]) {
-        console.log("GOT HERE")
+    checkoutNeed(data: {needID: number, quantity: number}[]) {
         return this.http.put(`${this.url}/checkout`, data, this.httpOptions())
     }
 }
-- 
cgit v1.2.3


From 8c38792e8e257cf264d5739e80e085c824ccecd8 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Thu, 3 Apr 2025 15:54:36 -0400
Subject: Fixed broken tests

---
 .../controller/CupboardControllerTest.java         | 48 +++++++++++++++-------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java
index 8572ec6..7ea4455 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/controller/CupboardControllerTest.java
@@ -1,6 +1,7 @@
 package com.ufund.api.ufundapi.controller;
 
 import java.io.IOException;
+import java.util.List;
 import java.util.Map;
 import static java.util.Map.entry;
 
@@ -418,12 +419,14 @@ public class CupboardControllerTest {
 
     @Test
     public void checkoutNeeds() throws IOException, IllegalAccessException {
+        when(mockCupboardService.getNeed(0)).thenReturn(new Need("name", "image", "location", 0, 10, GoalType.MONETARY, true, "a"));
         doNothing().when(mockCupboardService).checkoutNeed(0, 20, key);
 
-
-        Map<String, Integer> needMap = Map.ofEntries(
-                entry("needID", 0),
-                entry("amount", 20)
+        var needMap = List.of(
+                Map.ofEntries(
+                        entry("needID", 0),
+                        entry("quantity", 20)
+                )
         );
 
         var res = cupboardController.checkoutNeeds(needMap, key);
@@ -435,9 +438,15 @@ public class CupboardControllerTest {
     public void checkoutNeedsBadRequest() throws IOException, IllegalAccessException {
         doThrow(new IllegalArgumentException()).when(mockCupboardService).checkoutNeed(0, 20, key);
 
-        Map<String, Integer> needMap = Map.ofEntries(
-                entry("needID", 0),
-                entry("amount", 20)
+        var needMap = List.of(
+                Map.ofEntries(
+                        entry("needID", 0),
+                        entry("quantity", 20)
+                ),
+                Map.ofEntries(
+                        entry("needID", 2),
+                        entry("quantity", 30)
+                )
         );
 
         var res = cupboardController.checkoutNeeds(needMap, key);
@@ -447,11 +456,17 @@ public class CupboardControllerTest {
 
     @Test
     public void checkoutNeedsUnauthorized() throws IOException, IllegalAccessException {
-        doThrow(new IllegalAccessException()).when(mockCupboardService).checkoutNeed(0, 20, key);
-
-        Map<String, Integer> needMap = Map.ofEntries(
-                entry("needID", 0),
-                entry("amount", 20)
+        doThrow(new IllegalAccessException()).when(mockAuthService).keyIsValid(key);
+
+        var needMap = List.of(
+                Map.ofEntries(
+                        entry("needID", 0),
+                        entry("quantity", 20)
+                ),
+                Map.ofEntries(
+                        entry("needID", 2),
+                        entry("quantity", 30)
+                )
         );
 
         var res = cupboardController.checkoutNeeds(needMap, key);
@@ -461,11 +476,14 @@ public class CupboardControllerTest {
 
     @Test
     public void checkoutNeedsInternalError() throws IOException, IllegalAccessException {
+        when(mockCupboardService.getNeed(0)).thenReturn(new Need("name", "image", "location", 0, 10, GoalType.MONETARY, true, "a"));
         doThrow(new IOException()).when(mockCupboardService).checkoutNeed(0, 20, key);
 
-        Map<String, Integer> needMap = Map.ofEntries(
-                entry("needID", 0),
-                entry("amount", 20)
+        var needMap = List.of(
+                Map.ofEntries(
+                        entry("needID", 0),
+                        entry("quantity", 20)
+                )
         );
 
         var res = cupboardController.checkoutNeeds(needMap, key);
-- 
cgit v1.2.3


From 0a876b31609144c62f312ea59f074f5f79b67ae7 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Fri, 4 Apr 2025 16:13:25 -0400
Subject: Made every invalid need input in basket turn red when invalid

---
 .../components/funding-basket/funding-basket.component.ts    | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 5d94124..a39b4f3 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
@@ -36,16 +36,21 @@ export class FundingBasketComponent implements OnInit {
 
     async checkout() {
         let order: { needID: number, quantity: number }[] = []
+        let isNotValid = false
 
         for (let contribution of document.querySelectorAll<HTMLInputElement>('.contribution')!) {
             if (contribution.value == '' || contribution.valueAsNumber <= 0) {
+                isNotValid = true
                 contribution.setAttribute("style", "border-color: #ff0000");
-                this.toastService.sendToast(ToastType.ERROR, "Invalid input in funding basket!")
-                return;
             }
             order.push({needID: +contribution.id, quantity: contribution.valueAsNumber});
         }
 
+        if (isNotValid) {
+            this.toastService.sendToast(ToastType.ERROR, "Invalid input in funding basket!")
+            return;
+        }
+
         try {
             await firstValueFrom(this.cupboardService.checkoutNeed(order))
         } catch (ex:any) {
@@ -58,6 +63,9 @@ export class FundingBasketComponent implements OnInit {
     }
 
     resetColor(ev: any) {
+        for (let contribution of document.querySelectorAll<HTMLInputElement>('.contribution')!) {
+
+        }
         (ev.target as HTMLInputElement).setAttribute("style", "border-color: unset")
     }
 }
-- 
cgit v1.2.3