Merge remote-tracking branch 'origin/css' into css

4 files changed, 17 insertions, 16 deletions

diff --git a/README.md b/README.md
index 2ab375e..42f5a07 100644
--- a/README.md
+++ b/README.md
@@ -25,8 +25,7 @@ An online U-Fund system built in Java **21** and __Angular 19__
 2. Execute `mvn compile exec:java`
 3. CD into the ufund-ui directory in a new terminal
 4. Execute `ng serve -o`
-3. Open in your browser `http://localhost:8080/`
-4.  _add any other steps required or examples of how to use/run_
+3. Open in your browser `http://localhost:4200/`
 
 ## Known bugs and disclaimers
 (It may be the case that your implementation is not perfect.)
@@ -41,8 +40,9 @@ reports in HTML.
 
 To run tests on all tiers together do this:
 
-1. Execute `mvn clean test jacoco:report`
-2. Open in your browser the file at `PROJECT_API_HOME/target/site/jacoco/index.html`
+1. CD into ufund/api
+2. Execute `mvn clean test jacoco:report`
+3. Open in your browser the file at `PROJECT_API_HOME/target/site/jacoco/index.html`
 
 To run tests on a single tier do this:
 
@@ -68,10 +68,7 @@ To run tests on all the tiers in isolation do this:
 
 ## How to setup/run/test program 
 1. Tester, first obtain the Acceptance Test plan
-2. IP address of target machine running the app
-3. Execute ________
-4. ...
-5. ...
+2. Run the batch file
 
 ## License
 
diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.ts b/ufund-ui/src/app/components/cupboard/cupboard.component.ts
index fff8760..662def4 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.ts
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.ts
@@ -100,11 +100,11 @@ export class CupboardComponent implements OnInit {
         this.cupboardService.updateNeed(need.id, need)
             .pipe(catchError((ex, _) => {
                 if (ex.status == 500) {
-                    this.toastService.sendToast(ToastType.INFO, 'Fields cannot be blank');
+                    this.toastService.sendToast(ToastType.ERROR, 'Fields cannot be blank');
                 } else if (ex.status == 400) {
-                    this.toastService.sendToast(ToastType.INFO, ex.error);
+                    this.toastService.sendToast(ToastType.ERROR, ex.error);
                 } else {
-                    this.toastService.sendToast(ToastType.INFO, "Error on creating need");
+                    this.toastService.sendToast(ToastType.ERROR, "Error on creating need");
                 }
                 return of()
             }))
@@ -139,11 +139,11 @@ export class CupboardComponent implements OnInit {
         this.cupboardService.createNeed(need)
             .pipe(catchError((ex, _) => {
                 if (ex.status == 500) {
-                    this.toastService.sendToast(ToastType.INFO, "Fields cannot be blank");
+                    this.toastService.sendToast(ToastType.ERROR, "Fields cannot be blank");
                 } else if (ex.status == 400) {
-                    this.toastService.sendToast(ToastType.INFO, ex.error);
+                    this.toastService.sendToast(ToastType.ERROR, ex.error);
                 } else {
-                    this.toastService.sendToast(ToastType.INFO, "Error on creating need");
+                    this.toastService.sendToast(ToastType.ERROR, "Error on creating need");
                 }
                 return of()
             }))
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 646ef35..b3826be 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
@@ -46,7 +46,11 @@ export class FundingBasketComponent implements OnInit {
                 this.isValid = false;
 
                 contribution.setAttribute("style", "color: #ff0000");
-                this.toastService.sendToast(ToastType.WARNING, "Invalid input in funding basket!")
+                this.toastService.sendToast(ToastType.ERROR, "Invalid input in funding basket!")
+
+                setTimeout(() => {
+                    contribution.setAttribute("style", "color: #ffffff");
+                }, 3000);
             }
         }
         // if (this.usersService.getBasket().value != await firstValueFrom(this.usersService.getUser(1))
diff --git a/ufund-ui/src/app/components/signup/signup.component.ts b/ufund-ui/src/app/components/signup/signup.component.ts
index 5ec84ae..a20d828 100644
--- a/ufund-ui/src/app/components/signup/signup.component.ts
+++ b/ufund-ui/src/app/components/signup/signup.component.ts
@@ -47,7 +47,7 @@ export class SignupComponent {
         this.usersService.createUser(username, password).then(() => {
             this.showSuccessMessage.next(true);
         }).catch(ex => {
-            this.toastService.sendToast(ToastType.INFO, "Unable to create account: " + friendlyHttpStatus[ex.status])
+            this.toastService.sendToast(ToastType.ERROR, "Unable to create account: " + friendlyHttpStatus[ex.status])
             console.log(ex)
         })
     }