From 6a93ead4f262bf7571192417cc2f6029e9a9e3a8 Mon Sep 17 00:00:00 2001
From: benal01 <bja4245@rit.edu>
Date: Thu, 3 Apr 2025 11:55:04 -0400
Subject: need-page's transparent image in background

---
 .../components/need-page/need-page.component.css   | 27 ++++-----------
 .../components/need-page/need-page.component.html  | 39 ++++++++++------------
 2 files changed, 23 insertions(+), 43 deletions(-)

(limited to 'ufund-ui')

diff --git a/ufund-ui/src/app/components/need-page/need-page.component.css b/ufund-ui/src/app/components/need-page/need-page.component.css
index 44db4b4..0bbc2aa 100644
--- a/ufund-ui/src/app/components/need-page/need-page.component.css
+++ b/ufund-ui/src/app/components/need-page/need-page.component.css
@@ -4,6 +4,7 @@
 }
 
 #box {
+    padding-top: 5%;
     display: flex;
     flex-direction: column;
     width: 800px;
@@ -22,32 +23,16 @@
     /*margin-bottom: 20px;*/
 }
 
-.split {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-
-
-    .left {
-        display: flex;
-        flex-direction: column;
-        width : 50%;
-    }
-
-    .right {
-        display: flex;
-        flex-direction: column;
-        align-items: end;
-    }
-}
 
 .need-image {
-    width: 400px;
-    height: auto;
+    width: 55%;
+    height: 40%;
+    position: absolute;
+    left: 22.5%;
     aspect-ratio: 16/9;
     object-fit: cover;
+    mask-image: linear-gradient(to bottom, rgba(255,255,255,1) 0%, rgba(255,255,255,.15) 35%, transparent 100%);
     border-radius: 10px;
-    box-shadow: rgb(0, 40, 70) 0 0 50px;
 }
 
 .urgent {
diff --git a/ufund-ui/src/app/components/need-page/need-page.component.html b/ufund-ui/src/app/components/need-page/need-page.component.html
index f8c2007..cd98c3b 100644
--- a/ufund-ui/src/app/components/need-page/need-page.component.html
+++ b/ufund-ui/src/app/components/need-page/need-page.component.html
@@ -1,4 +1,6 @@
-<div id="box">
+<img *ngIf="need.image" alt="Need image" class="need-image" [src]="need.image"/>
+
+<div id="box">    
     <h1>{{need.name}}</h1>
     <span class="needType">{{need.type}} GOAL</span>
     <p>{{need.description}}</p>
@@ -8,34 +10,27 @@
         <span>This goal is <strong>{{(((need.current)*100) / (need.maxGoal)).toFixed(0)}}%</strong> complete!</span>
     </div>
 
-    <div class="split">
-        <div class="left">
+ 
     <span><strong>Target Goal:</strong> {{(need.type === GoalType.MONETARY) ? "$" : ""}}{{need.maxGoal}}</span>
 
     <span><strong>Amount Currently Collected:</strong> {{need.current}}</span>
 
     <span><strong>Location:</strong> {{need.location}}</span>
 
-            <span><strong>Urgency: </strong>
-                <span *ngIf="!need.urgent">Not urgent</span>
-                <span *ngIf="need.urgent" class="urgent">URGENT</span>
-            </span>
-        
-            <div *ngIf="need.filterAttributes.length > 0">
-                <strong>Tags:</strong>
-                <ul style="display: flex; column-gap: 24px;">
-                    <li *ngFor="let tag of need?.filterAttributes">
-                        <p>{{tag}}</p>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <div class="right">
-          <img *ngIf="need.image" alt="Need image" class="need-image" [src]="need.image"/>
-        </div>
-    </div>
+    <span><strong>Urgency: </strong>
+        <span *ngIf="!need.urgent">Not urgent</span>
+        <span *ngIf="need.urgent" class="urgent">URGENT</span>
+    </span>
     
-
+    <div *ngIf="need.filterAttributes.length > 0">
+        <strong>Tags:</strong>
+        <ul style="display: flex; column-gap: 24px;">
+            <li *ngFor="let tag of need?.filterAttributes">
+                <p>{{tag}}</p>
+            </li>
+        </ul>
+    </div>
+      
     <div class="actionArea">
         <button *ngIf="isHelper()" (click)="add(need!)">
             <span class="icon">add</span>Add To Basket
-- 
cgit v1.2.3


From 5186df87c75d83eb24a2cb5d868d8d0bb6aa5b88 Mon Sep 17 00:00:00 2001
From: benal01 <bja4245@rit.edu>
Date: Fri, 4 Apr 2025 10:37:45 -0400
Subject: localstorage for page (keeps current page on refresh/back arrow)

---
 ufund-ui/src/app/components/need-list/need-list.component.ts | 12 +++++++++++-
 .../src/app/components/need-page/need-page.component.html    |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'ufund-ui')

diff --git a/ufund-ui/src/app/components/need-list/need-list.component.ts b/ufund-ui/src/app/components/need-list/need-list.component.ts
index ae6bc99..39ff538 100644
--- a/ufund-ui/src/app/components/need-list/need-list.component.ts
+++ b/ufund-ui/src/app/components/need-list/need-list.component.ts
@@ -68,7 +68,7 @@ export class NeedListComponent {
   searchResults: Need[] = [];
   visibleNeeds: Need[] = [];
   sortMode: 'Ascending' | 'Descending' = 'Ascending'
-  currentPage: number = 0;
+  currentPage: number = localStorage.getItem('currentPage') ? parseInt(localStorage.getItem('currentPage')!) : 0;
   itemsPerPage: number = 5;
   totalPages: number = Math.ceil(this.needs.length / this.itemsPerPage);
 
@@ -76,26 +76,33 @@ export class NeedListComponent {
       return (need.type === GoalType.MONETARY) ? "$" : "";
   }
 
+  //increment/decrement
   decrementPage() {
     this.currentPage--;
+    localStorage.setItem('currentPage', this.currentPage.toString());
     this.updateVisibleNeeds();
   }
 
   incrementPage() {
     this.currentPage++;
+    localStorage.setItem('currentPage', this.currentPage.toString());
     this.updateVisibleNeeds();
   }
 
+  //skipping pages
   lastPage() {
       this.currentPage = this.totalPages - 1
+      localStorage.setItem('currentPage', this.currentPage.toString());
       this.updateVisibleNeeds()
   }
 
   firstPage() {
       this.currentPage = 0
+      localStorage.setItem('currentPage', this.currentPage.toString());
       this.updateVisibleNeeds()
   }
 
+  //user editing needs per page
   editNeedsPerPage() {
     if (this.itemsPerPage > this.searchResults.length) {
       this.itemsPerPage = this.searchResults.length;
@@ -106,13 +113,16 @@ export class NeedListComponent {
     this.resetVisibleNeeds();
   }
 
+  //refresing visible needs
   updateVisibleNeeds() {
     this.totalPages = Math.ceil(this.searchResults.length / this.itemsPerPage);
     this.visibleNeeds = this.searchResults.slice(this.currentPage * this.itemsPerPage, (this.currentPage + 1) * this.itemsPerPage);
   }
 
+  //reset back to first page and refresh needs
   resetVisibleNeeds() {
     this.currentPage = 0;
+    localStorage.setItem('currentPage', this.currentPage.toString());
     this.updateVisibleNeeds();
   }
 
diff --git a/ufund-ui/src/app/components/need-page/need-page.component.html b/ufund-ui/src/app/components/need-page/need-page.component.html
index f5f78f6..a4937ed 100644
--- a/ufund-ui/src/app/components/need-page/need-page.component.html
+++ b/ufund-ui/src/app/components/need-page/need-page.component.html
@@ -13,9 +13,9 @@
  
     <span><strong>Target Goal:</strong> {{(need.type === GoalType.MONETARY) ? "$" : ""}}{{need.maxGoal}}</span>
 
-        <span><strong>Amount Currently Collected:</strong> {{need.type.toString() == 'MONETARY' ? '$' : ''}}{{need.current}}</span>
+    <span><strong>Amount Currently Collected:</strong> {{need.type.toString() == 'MONETARY' ? '$' : ''}}{{need.current}}</span>
 
-        <span><strong>Location:</strong> {{need.location}}</span>
+    <span><strong>Location:</strong> {{need.location}}</span>
 
     <span><strong>Urgency: </strong>
         <span *ngIf="!need.urgent">Not urgent</span>
-- 
cgit v1.2.3


From 4e59fe19150614b8a9b8033d50cb8a3e0ea1d13b Mon Sep 17 00:00:00 2001
From: benal01 <bja4245@rit.edu>
Date: Sat, 5 Apr 2025 13:18:30 -0400
Subject: need items per page persistence

---
 ufund-ui/src/app/components/need-list/need-list.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ufund-ui')

diff --git a/ufund-ui/src/app/components/need-list/need-list.component.ts b/ufund-ui/src/app/components/need-list/need-list.component.ts
index 39ff538..ca92eeb 100644
--- a/ufund-ui/src/app/components/need-list/need-list.component.ts
+++ b/ufund-ui/src/app/components/need-list/need-list.component.ts
@@ -69,7 +69,7 @@ export class NeedListComponent {
   visibleNeeds: Need[] = [];
   sortMode: 'Ascending' | 'Descending' = 'Ascending'
   currentPage: number = localStorage.getItem('currentPage') ? parseInt(localStorage.getItem('currentPage')!) : 0;
-  itemsPerPage: number = 5;
+  itemsPerPage: number = localStorage.getItem('itemsPerPage') ? parseInt(localStorage.getItem('itemsPerPage')!) : 5;
   totalPages: number = Math.ceil(this.needs.length / this.itemsPerPage);
 
   getPrefix(need: Need) {
@@ -110,6 +110,7 @@ export class NeedListComponent {
     if (this.itemsPerPage < 1) {
       this.itemsPerPage = 1;
     }
+    localStorage.setItem('itemsPerPage', this.itemsPerPage.toString());
     this.resetVisibleNeeds();
   }
 
-- 
cgit v1.2.3


From 09dabe1971f3891f472e24b5c038e4df481ee967 Mon Sep 17 00:00:00 2001
From: benal01 <bja4245@rit.edu>
Date: Sat, 5 Apr 2025 13:33:47 -0400
Subject: need image gradient fix

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

(limited to 'ufund-ui')

diff --git a/ufund-ui/src/app/components/need-page/need-page.component.css b/ufund-ui/src/app/components/need-page/need-page.component.css
index 0bbc2aa..8263737 100644
--- a/ufund-ui/src/app/components/need-page/need-page.component.css
+++ b/ufund-ui/src/app/components/need-page/need-page.component.css
@@ -4,7 +4,7 @@
 }
 
 #box {
-    padding-top: 5%;
+    padding-top: 7.5%;
     display: flex;
     flex-direction: column;
     width: 800px;
@@ -31,7 +31,7 @@
     left: 22.5%;
     aspect-ratio: 16/9;
     object-fit: cover;
-    mask-image: linear-gradient(to bottom, rgba(255,255,255,1) 0%, rgba(255,255,255,.15) 35%, transparent 100%);
+    mask-image: linear-gradient(to bottom, rgba(255,255,255,1) 0%, rgba(255,255,255,.2) 50%, rgba(255,255,255,.1) 90%, transparent 100%);
     border-radius: 10px;
 }
 
-- 
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

---
 .../components/cupboard/cupboard.component.html    |  4 +-
 .../app/components/cupboard/cupboard.component.ts  | 13 +++++-
 .../funding-basket/funding-basket.component.html   |  2 +-
 .../components/need-list/need-list.component.ts    | 54 +++++++++++-----------
 ufund-ui/src/app/services/users.service.ts         |  4 +-
 5 files changed, 46 insertions(+), 31 deletions(-)

(limited to 'ufund-ui')

diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.html b/ufund-ui/src/app/components/cupboard/cupboard.component.html
index cd8fec2..4eebc2d 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.html
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.html
@@ -25,7 +25,7 @@
                 <span class="icon">{{sortMode === 'Ascending' ? 'arrow_upward': 'arrow_downward'}}</span>
             </button>
             <label>Needs per page: </label>
-            <input type ="number" [(ngModel)]="itemsPerPage" min="1" max="{{searchResults.length}}">
+            <input type ="number" [(ngModel)]="itemsPerPage" (change)="editItemsPerPage()" min="1" max="{{searchResults.length}}">
         </div>
     </div>
     <h2 *ngIf="searchResults.length < needs.length && searchResults.length != 0"> Search Results({{needs.length - searchResults.length}} needs filtered): </h2>
@@ -46,5 +46,5 @@
             <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 [uid]="0" [actionArea]="NLActions" *ngIf="searchResults.length > 0" [needs]="searchResults" [itemsPerPage]="itemsPerPage" #needList/>
 </div>
diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.ts b/ufund-ui/src/app/components/cupboard/cupboard.component.ts
index b03b77e..aca1397 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.ts
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.ts
@@ -26,7 +26,7 @@ export class CupboardComponent implements OnInit {
     needs: Need[] = [];
     searchResults: Need[] = [];
     sortMode: 'Ascending' | 'Descending' = 'Ascending'
-    itemsPerPage = 5;
+    itemsPerPage = parseInt(localStorage.getItem('itemsPerPage') ?? '5') ?? 5;
     currentSortAlgo = 'sortByPriority';
 
     constructor(
@@ -135,6 +135,17 @@ export class CupboardComponent implements OnInit {
         }
     }
 
+    editItemsPerPage() {
+        if (this.itemsPerPage > this.searchResults.length) {
+            this.itemsPerPage = this.searchResults.length
+        }
+        if (this.itemsPerPage < 1) {
+            this.itemsPerPage = 1
+        }
+        localStorage.setItem('itemsPerPage', this.itemsPerPage.toString())
+        this.refresh();
+    }
+
     protected readonly SortingAlgorithms = SortingAlgoArrays;
     protected readonly Object = Object;
 }
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>
diff --git a/ufund-ui/src/app/components/need-list/need-list.component.ts b/ufund-ui/src/app/components/need-list/need-list.component.ts
index 564f1f0..7ca0ae7 100644
--- a/ufund-ui/src/app/components/need-list/need-list.component.ts
+++ b/ufund-ui/src/app/components/need-list/need-list.component.ts
@@ -10,46 +10,48 @@ import {GoalType, Need} from '../../models/Need';
 export class NeedListComponent implements OnChanges {
 
     @Input({required: true}) needs!: Need[]
+    @Input({required: true}) uid!: number
     @Input() itemsPerPage: number = 5;
     @Input() actionArea: TemplateRef<any> | null = null
 
     visibleNeeds: Need[] = [];
-    currentPage: number = localStorage.getItem('currentPage') ? parseInt(localStorage.getItem('currentPage')!) : 0;
+    currentPage: number = parseInt(localStorage.getItem('currentPage'+this.uid) ?? '0') ?? 0;
     totalPages: number = 0;
 
     ngOnChanges() {
         this.updateVisibleNeeds()
+        this.currentPage = parseInt(localStorage.getItem('currentPage'+this.uid) ?? '0') ?? 0;
     }
 
     getPrefix(need: Need) {
         return (need.type === GoalType.MONETARY) ? "$" : "";
     }
 
-  //increment/decrement
-  decrementPage() {
-    this.currentPage--;
-    localStorage.setItem('currentPage', this.currentPage.toString());
-    this.updateVisibleNeeds();
-  }
-
-  incrementPage() {
-    this.currentPage++;
-    localStorage.setItem('currentPage', this.currentPage.toString());
-    this.updateVisibleNeeds();
-  }
-
-  //skipping pages
-  lastPage() {
-      this.currentPage = this.totalPages - 1
-      localStorage.setItem('currentPage', this.currentPage.toString());
-      this.updateVisibleNeeds()
-  }
-
-  firstPage() {
-      this.currentPage = 0
-      localStorage.setItem('currentPage', this.currentPage.toString());
-      this.updateVisibleNeeds()
-  }
+    //increment/decrement
+    decrementPage() {
+        this.currentPage--;
+        localStorage.setItem('currentPage'+this.uid, this.currentPage.toString());
+        this.updateVisibleNeeds();
+    }
+
+    incrementPage() {
+        this.currentPage++;
+        localStorage.setItem('currentPage'+this.uid, this.currentPage.toString());
+        this.updateVisibleNeeds();
+    }
+
+    //skipping pages
+    lastPage() {
+        this.currentPage = this.totalPages - 1
+        localStorage.setItem('currentPage'+this.uid, this.currentPage.toString());
+        this.updateVisibleNeeds()
+    }
+
+    firstPage() {
+        this.currentPage = 0
+        localStorage.setItem('currentPage'+this.uid, this.currentPage.toString());
+        this.updateVisibleNeeds()
+    }
 
     updateVisibleNeeds() {
         this.totalPages = Math.ceil(this.needs.length / this.itemsPerPage);
diff --git a/ufund-ui/src/app/services/users.service.ts b/ufund-ui/src/app/services/users.service.ts
index 35d080d..688d6e4 100644
--- a/ufund-ui/src/app/services/users.service.ts
+++ b/ufund-ui/src/app/services/users.service.ts
@@ -60,7 +60,9 @@ export class UsersService {
     }
 
     refreshBasket() {
-        let promiseArr = this.authService.getCurrentUser()!.basket.map(async needID => {
+        let usr = this.authService.getCurrentUser();
+        if (!usr) return;
+        let promiseArr = usr.basket.map(async needID => {
             return await firstValueFrom(this.cupboardService.getNeed(needID));
         })
         Promise.all(promiseArr).then(r => this.basket.next(r));
-- 
cgit v1.2.3


From 2f37b1de28399a361dc272b51ad624ac8902a562 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Sat, 5 Apr 2025 16:51:58 -0400
Subject: Make need-page image work on all screen sizes

---
 .../components/need-page/need-page.component.css   | 12 ++++---
 .../components/need-page/need-page.component.html  | 38 +++++++++-------------
 2 files changed, 23 insertions(+), 27 deletions(-)

(limited to 'ufund-ui')

diff --git a/ufund-ui/src/app/components/need-page/need-page.component.css b/ufund-ui/src/app/components/need-page/need-page.component.css
index 79d3fb3..6ca1350 100644
--- a/ufund-ui/src/app/components/need-page/need-page.component.css
+++ b/ufund-ui/src/app/components/need-page/need-page.component.css
@@ -4,12 +4,13 @@
 }
 
 #box {
-    padding-top: 7.5%;
+    /*padding-top: 7.5%;*/
     display: flex;
     flex-direction: column;
     width: 800px;
     justify-content: start;
     gap: 10px;
+    padding: 0 10px;
 }
 
 .needName {
@@ -25,14 +26,17 @@
 
 
 .need-image {
-    width: 55%;
+    width: calc(100% + 40px);
     height: 40%;
-    position: absolute;
+    /*position: absolute;*/
     left: 22.5%;
     aspect-ratio: 16/9;
     object-fit: cover;
-    mask-image: linear-gradient(to bottom, rgba(255,255,255,1) 0%, rgba(255,255,255,.2) 50%, rgba(255,255,255,.1) 90%, transparent 100%);
+    mask-image: linear-gradient(to bottom, rgba(255,255,255,1) 0%, rgba(255,255,255,.2) 80%, rgba(255,255,255,.1) 90%, transparent 100%);
     border-radius: 10px;
+    margin-left: -20px;
+    margin-right: -20px;
+    margin-bottom: -80px;
 }
 
 .urgent {
diff --git a/ufund-ui/src/app/components/need-page/need-page.component.html b/ufund-ui/src/app/components/need-page/need-page.component.html
index ff5990f..2629346 100644
--- a/ufund-ui/src/app/components/need-page/need-page.component.html
+++ b/ufund-ui/src/app/components/need-page/need-page.component.html
@@ -1,5 +1,6 @@
 <div id="box">
     @if (need) {
+        <img *ngIf="need.image" alt="Need image" class="need-image" [src]="need.image"/>
         <h1>{{need.name}}</h1>
         <span class="needType">{{need.type}} GOAL</span>
         <p>{{need.description}}</p>
@@ -8,35 +9,26 @@
             <span>This goal is <strong>{{(((need.current)*100) / (need.maxGoal)).toFixed(0)}}%</strong> complete!</span>
         </div>
 
+        <span><strong>Target Goal:</strong> {{(need.type === GoalType.MONETARY) ? "$" : ""}}{{need.maxGoal}}</span>
 
-        <div class="split">
-          <div class="left">
-            <span><strong>Target Goal:</strong> {{(need.type === GoalType.MONETARY) ? "$" : ""}}{{need.maxGoal}}</span>
+        <span><strong>Amount Currently Collected:</strong> {{need.type.toString() == 'MONETARY' ? '$' : ''}}{{need.current}}</span>
 
-            <span><strong>Amount Currently Collected:</strong> {{need.type.toString() == 'MONETARY' ? '$' : ''}}{{need.current}}</span>
+        <span><strong>Location:</strong> {{need.location}}</span>
 
-            <span><strong>Location:</strong> {{need.location}}</span>
+        <span><strong>Urgency: </strong>
+            <span *ngIf="!need.urgent">Not urgent</span>
+            <span *ngIf="need.urgent" class="urgent">URGENT</span>
+        </span>
 
-                <span><strong>Urgency: </strong>
-                    <span *ngIf="!need.urgent">Not urgent</span>
-                    <span *ngIf="need.urgent" class="urgent">URGENT</span>
-                </span>
-
-            <div *ngIf="need.filterAttributes?.length">
-                    <strong>Tags:</strong>
-                    <ul style="display: flex; column-gap: 24px;">
-                        <li *ngFor="let tag of need?.filterAttributes">
-                            <p>{{tag}}</p>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-            <div class="right">
-              <img *ngIf="need.image" alt="Need image" class="need-image" [src]="need.image"/>
-            </div>
+        <div *ngIf="need.filterAttributes?.length">
+            <strong>Tags:</strong>
+            <ul style="display: flex; column-gap: 24px;">
+                <li *ngFor="let tag of need?.filterAttributes">
+                    <p>{{tag}}</p>
+                </li>
+            </ul>
         </div>
 
-
         <div class="actionArea">
             <button *ngIf="usersService.isHelper()" (click)="add(need)" [disabled]="usersService.inBasket(usersService.getBasket() | async, need)">
                 <span class="icon">{{usersService.inBasket(usersService.getBasket() | async, need)? "check": "add" }}</span>Add To Basket
-- 
cgit v1.2.3