Merge pull request #12 from RIT-SWEN-261-02/need-page-rework-rework

Need page rework rework -> main pull request

2 files changed, 26 insertions, 10 deletions

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 4bb001e..8234ac7 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,8 +1,21 @@
-<input type="button" value="Back" (click)="back()">
-<h1>Need page</h1>
-<p>id: {{need?.id}}</p>
-<p>name: {{need?.name}}</p>
-<p>filterAttributes: {{need?.filterAttributes}}</p>
-<p>type: {{need?.type}}</p>
-<p>max goal: {{need?.maxGoal}}</p>
-<p>current: {{need?.maxGoal}}</p>
\ No newline at end of file
+<h1>Viewing Need: {{need?.name}}</h1>
+<a>internal id: {{need?.id}}</a>
+<div style="display: flex; column-gap: 6px;">
+    <h3>Looking for</h3>
+    <h3><u>{{need?.type}}</u></h3>
+    <h3>Donations.</h3>
+</div>
+<div *ngIf="need?.filterAttributes != null">
+    <p>Tags:</p>
+    <ul style="display: flex; column-gap: 24px;">
+        <li *ngFor="let tag of need?.filterAttributes">
+            <p>{{tag}}</p>
+        </li>
+    </ul>
+</div>
+
+<hr>
+
+<p>Goal: {{need?.maxGoal}}</p>
+<p>Current: {{need?.current}}</p>
+<p>This goal is <strong>{{((need?.current ?? 0)*100) / (need?.maxGoal ?? 0)}}%</strong> complete!</p>
\ No newline at end of file
diff --git a/ufund-ui/src/app/components/need-page/need-page.component.ts b/ufund-ui/src/app/components/need-page/need-page.component.ts
index 0673f86..597d0e0 100644
--- a/ufund-ui/src/app/components/need-page/need-page.component.ts
+++ b/ufund-ui/src/app/components/need-page/need-page.component.ts
@@ -1,7 +1,8 @@
 import {Component, Input} from '@angular/core';
-import {Need} from '../../models/Need';
+import {GoalType, Need} from '../../models/Need';
 import {ActivatedRoute} from "@angular/router";
 import {CupboardService} from "../../services/cupboard.service";
+import { NgFor } from '@angular/common';
 
 @Component({
   selector: 'app-need-page',
@@ -15,6 +16,8 @@ export class NeedPageComponent {
      private cupboardService: CupboardService,
   ) {}
 
+  public GoalType = GoalType;
+
   @Input() need?: Need;
 
   ngOnInit(): void {
@@ -25,4 +28,4 @@ export class NeedPageComponent {
   back() {
     window.history.back();
   }
-}
+}
\ No newline at end of file