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 +---------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

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

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>
-- 
cgit v1.2.3


From 0652eb445728806d7fd6a50021a763051503ab36 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Thu, 3 Apr 2025 14:55:55 -0400
Subject: get checkout abstraction kinda working

---
 .../funding-basket/funding-basket.component.html   | 72 +---------------------
 1 file changed, 2 insertions(+), 70 deletions(-)

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

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..2b05d01 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,75 +1,7 @@
-
-<!--<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">
-        <div id="needList">
-            <div *ngFor="let need of usersService.getBasket().getValue()" class="needEntry">
-                <div [routerLink]="'/need/' + need.id" class="clickable">
-                    <div class="split">
-                        <div class="left">
-                            <span class="needName">{{need.name}}</span>
-                            <span class="needType">{{need.type}}</span>
-                        </div>
-
-                        <div class="right">
-                            <span *ngIf="need.urgent" class="urgent">URGENT</span>
-                            <span *ngIf="need.location"><span class="icon">location_on</span>{{need.location}}</span>
-                        </div>
-                    </div>
-
-                    <br>
-
-                    <div class="prog">
-                        <span id="hover-status-label-{{need.id}}"> </span>
-                        <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">
-                    <button class="removeNeed" title="delete need" (click)="this.usersService.removeNeed(need.id)">
-                        <span class="icon">delete</span> Remove from Basket
-                    </button>
-                </div>
-            </div>
-        </div>
+    <ng-template [ngIf]="(usersService.getBasket() | async)?.length">
+        <app-need-list [needs]="(usersService.getBasket() | async)!"/>
         <br>
         <div id="footer">
             <button class="button2" title="checkout" (click)="checkout()">Checkout</button>
-- 
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!!!

---
 .../app/components/funding-basket/funding-basket.component.html   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

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 2b05d01..3e884cd 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,7 +1,13 @@
 <div id="box">
     <h1>Funding Basket</h1>
     <ng-template [ngIf]="(usersService.getBasket() | async)?.length">
-        <app-need-list [needs]="(usersService.getBasket() | async)!"/>
+        <ng-template let-need #NLActions>
+            <input type="number" placeholder="Quantity" min="1" [id]="need?.id" class="contribution">
+            <button class="removeNeed" title="delete need" (click)="this.usersService.removeNeed(need.id)">
+                <span class="icon">delete</span>Remove from Basket
+            </button>
+        </ng-template>
+        <app-need-list [actionArea]="NLActions" [needs]="(usersService.getBasket() | async)!"/>
         <br>
         <div id="footer">
             <button class="button2" title="checkout" (click)="checkout()">Checkout</button>
-- 
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

---
 .../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/funding-basket.component.html')

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 3e884cd..edc9609 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 @@
     <ng-template [ngIf]="(usersService.getBasket() | async)?.length">
         <ng-template let-need #NLActions>
             <input type="number" placeholder="Quantity" min="1" [id]="need?.id" class="contribution">
-            <button class="removeNeed" title="delete need" (click)="this.usersService.removeNeed(need.id)">
+            <button class="removeNeed" (click)="this.usersService.removeNeed(need.id)">
                 <span class="icon">delete</span>Remove from Basket
             </button>
         </ng-template>
-- 
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

---
 .../funding-basket/funding-basket.component.html   | 35 ++++++++++++----------
 1 file changed, 20 insertions(+), 15 deletions(-)

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

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 edc9609..fcd5437 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,19 +1,24 @@
 <div id="box">
-    <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">
-            <button class="removeNeed" (click)="this.usersService.removeNeed(need.id)">
-                <span class="icon">delete</span>Remove from Basket
-            </button>
+    @if ((authService.getCurrentUserSubject() | async)?.type === userType.HELPER) {
+        <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">
+                <button class="removeNeed" (click)="this.usersService.removeNeed(need.id)">
+                    <span class="icon">delete</span>Remove from Basket
+                </button>
+            </ng-template>
+            <app-need-list [actionArea]="NLActions" [needs]="(usersService.getBasket() | async)!"/>
+            <br>
+            <div id="footer">
+                <button class="button2" title="checkout" (click)="checkout()">Checkout</button>
+            </div>
         </ng-template>
-        <app-need-list [actionArea]="NLActions" [needs]="(usersService.getBasket() | async)!"/>
-        <br>
-        <div id="footer">
-            <button class="button2" title="checkout" (click)="checkout()">Checkout</button>
+        <div *ngIf="!usersService.getBasket().getValue().length">
+            <span>There are no needs in your basket! </span><a routerLink="/cupboard">Browse the cupboard</a>
         </div>
-    </ng-template>
-    <div *ngIf="!usersService.getBasket().getValue().length">
-        <span>There are no needs in your basket! </span><a routerLink="/cupboard">Browse the cupboard</a>
-    </div>
+    } @else {
+        <h1>Unauthorized</h1>
+        <span>This page requires you to be logged in as a user! <a routerLink="/login">Log In</a></span>
+    }
 </div>
-- 
cgit v1.2.3


From d7c974a98de42f41f3ca16f961d2dee96a3c4313 Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Sat, 5 Apr 2025 13:17:29 -0400
Subject: Added running total to checkout

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

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

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 bba66a3..67e1083 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
@@ -36,6 +36,7 @@
         <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>
     </ng-template>
     <div *ngIf="!usersService.getBasket().getValue().length">
-- 
cgit v1.2.3


From 80492e8f6f88bff8035e27b814cc9eacbee40c65 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Sat, 5 Apr 2025 16:29:05 -0400
Subject: Fix storage after 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/funding-basket.component.html')

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 3f840e1..c4b12c9 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 [actionArea]="NLActions" [needs]="(usersService.getBasket() | async)!"/>
+            <app-need-list [uid]="1" [actionArea]="NLActions" [needs]="(usersService.getBasket() | async)!"/>
             <br>
             <div id="footer">
                 <button class="button2" title="checkout" (click)="checkout()">Checkout</button>
-- 
cgit v1.2.3