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 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

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>
-- 
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

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

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

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


From 7c49fcd788692a898e985cb156dd9fd910c05790 Mon Sep 17 00:00:00 2001
From: sowgro <tpoke.ferrari@gmail.com>
Date: Fri, 4 Apr 2025 23:14:14 -0400
Subject: Add new authentication to dashboard, cleanup

---
 .../components/dashboard/dashboard.component.html  | 31 ++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

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

diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.html b/ufund-ui/src/app/components/dashboard/dashboard.component.html
index 2af467c..074ca76 100644
--- a/ufund-ui/src/app/components/dashboard/dashboard.component.html
+++ b/ufund-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,14 +1,17 @@
-
-<h1>Admin Dashboard</h1>
-<!--<app-mini-need-list [needList]="topNeeds" jtitle="Top needs" url="/cupboard"/>-->
-<!--<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>_ Fulfilled needs</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>
-<span *ngIf="totalDonations">${{totalDonations | async}} </span>
-<span>_ </span>
+<div id="box">
+    @if ((authService.getCurrentUserSubject() | async)?.type === userType.MANAGER) {
+        <h1>Admin Dashboard</h1>
+        <span>_ Registered users</span>
+        <span *ngIf="count"> {{count | async}} </span>
+        <span>_ Fulfilled needs</span>
+        <app-mini-need-list [needList]="fulfilledNeeds.getValue()" label="Fulfilled needs"> </app-mini-need-list>
+        <span>_ Most fulfilled needs</span>
+        <app-mini-need-list [needList]="mostFulfilledNeeds.getValue()" label="Most fulfilled"> </app-mini-need-list>
+        <span>_ Total monetary contributions</span>
+        <span *ngIf="totalDonations">${{totalDonations | async}} </span>
+        <span>_ </span>
+    } @else {
+        <h1>Unauthorized</h1>
+        <span>This page requires you to be logged in as an admin! <a routerLink="/login">Log In</a></span>
+    }
+</div>
-- 
cgit v1.2.3


From 1d4073c04aac11226fa3394ba84a745ed427d1cd Mon Sep 17 00:00:00 2001
From: Gunther6070 <haydenhartman10@yahoo.com>
Date: Sat, 5 Apr 2025 23:26:11 -0400
Subject: Updated dashboard styling

---
 .../components/dashboard/dashboard.component.html  | 30 +++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

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

diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.html b/ufund-ui/src/app/components/dashboard/dashboard.component.html
index 074ca76..233096a 100644
--- a/ufund-ui/src/app/components/dashboard/dashboard.component.html
+++ b/ufund-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,15 +1,27 @@
 <div id="box">
     @if ((authService.getCurrentUserSubject() | async)?.type === userType.MANAGER) {
         <h1>Admin Dashboard</h1>
-        <span>_ Registered users</span>
-        <span *ngIf="count"> {{count | async}} </span>
-        <span>_ Fulfilled needs</span>
-        <app-mini-need-list [needList]="fulfilledNeeds.getValue()" label="Fulfilled needs"> </app-mini-need-list>
-        <span>_ Most fulfilled needs</span>
-        <app-mini-need-list [needList]="mostFulfilledNeeds.getValue()" label="Most fulfilled"> </app-mini-need-list>
-        <span>_ Total monetary contributions</span>
-        <span *ngIf="totalDonations">${{totalDonations | async}} </span>
-        <span>_ </span>
+        <div id="stats">
+            <div class="card">
+                <span>Registered users</span>
+                <h1 class="content" *ngIf="count"> {{count | async}} </h1>
+            </div>
+
+            <div class="card">
+                <span>Total monetary contributions</span>
+                <h1 class="content" *ngIf="totalDonations"> ${{totalDonations | async}} </h1>
+            </div>
+        </div>
+
+        <div class="listCard">
+            <span>Fulfilled needs</span>
+            <app-mini-need-list [needList]="fulfilledNeeds.getValue()" label="Fulfilled needs"> </app-mini-need-list>
+        </div>
+        <div class="listCard">
+            <span>Most fulfilled needs</span>
+            <app-mini-need-list [needList]="mostFulfilledNeeds.getValue()" label="Most fulfilled"> </app-mini-need-list>
+        </div>
+
     } @else {
         <h1>Unauthorized</h1>
         <span>This page requires you to be logged in as an admin! <a routerLink="/login">Log In</a></span>
-- 
cgit v1.2.3