diff options
Diffstat (limited to '')
| -rw-r--r-- | ufund-ui/public/placeholder.png | bin | 0 -> 605690 bytes | |||
| -rw-r--r-- | ufund-ui/src/app/components/need-list/need-list.component.html | 5 | ||||
| -rw-r--r-- | ufund-ui/src/app/components/need-list/need-list.component.ts | 11 | ||||
| -rw-r--r-- | ufund-ui/src/app/components/need-page/need-page.component.css | 10 | ||||
| -rw-r--r-- | ufund-ui/src/app/components/need-page/need-page.component.html | 46 | 
5 files changed, 47 insertions, 25 deletions
diff --git a/ufund-ui/public/placeholder.png b/ufund-ui/public/placeholder.png Binary files differnew file mode 100644 index 0000000..5b86fb7 --- /dev/null +++ b/ufund-ui/public/placeholder.png diff --git a/ufund-ui/src/app/components/need-list/need-list.component.html b/ufund-ui/src/app/components/need-list/need-list.component.html index 593aebf..84f80dc 100644 --- a/ufund-ui/src/app/components/need-list/need-list.component.html +++ b/ufund-ui/src/app/components/need-list/need-list.component.html @@ -16,7 +16,7 @@              <span class="icon">{{sortMode === 'Ascending' ? 'arrow_upward': 'arrow_downward'}}</span>          </button>          <label>Needs per page: </label> -        <input type ="number" [(ngModel)]="itemsPerPage" (change)="resetVisibleNeeds()" min="1" max="{{searchResults.length}}"> +        <input type ="number" [(ngModel)]="itemsPerPage" (change)="editNeedsPerPage()" min="1" max="{{searchResults.length}}">      </div>      <!--<button (click)="close()">Close</button>-->  </div> @@ -42,7 +42,8 @@              <div class="prog">                  <span id="hover-status-label-{{need.id}}"> </span> -                <span>{{getPrefix(need)}}{{need.current}}/{{need.maxGoal}} ({{((need.current / need.maxGoal) * 100).toFixed(0)}}%)</span> + +                <span>{{need.type.toString() == 'MONETARY' ? '$' : ''}}{{need.current}}/{{need.type.toString() == 'MONETARY' ? '$' : ''}}{{need.maxGoal}} ({{((need.current / need.maxGoal) * 100).toFixed(0)}}%)</span>                  <progress [value]="need.current" [max]="need.maxGoal"></progress>              </div> 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 2ec850e..ae6bc99 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 @@ -96,9 +96,14 @@ export class NeedListComponent {        this.updateVisibleNeeds()    } -  editNeedsPerPage(amount: number) { -    this.itemsPerPage = amount; -    this.updateVisibleNeeds(); +  editNeedsPerPage() { +    if (this.itemsPerPage > this.searchResults.length) { +      this.itemsPerPage = this.searchResults.length; +    } +    if (this.itemsPerPage < 1) { +      this.itemsPerPage = 1; +    } +    this.resetVisibleNeeds();    }    updateVisibleNeeds() { 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 844410f..44db4b4 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 @@ -31,6 +31,7 @@      .left {          display: flex;          flex-direction: column; +        width : 50%;      }      .right { @@ -40,6 +41,15 @@      }  } +.need-image { +    width: 400px; +    height: auto; +    aspect-ratio: 16/9; +    object-fit: cover; +    border-radius: 10px; +    box-shadow: rgb(0, 40, 70) 0 0 50px; +} +  .urgent {      font-size: 11pt;      background-color: rgba(255, 165, 0, 0.27); 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 3d362f5..6921eac 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,9 +1,6 @@  <div id="box">      <h1>{{need.name}}</h1>      <span class="needType">{{need.type}} GOAL</span> - -    <img *ngIf="need.image" alt="Need image" [src]="need.image"/> -      <p>{{need.description}}</p>      <div class="prog">  <!--        <span>{{need?.current}} / {{need?.maxGoal}}</span>--> @@ -11,25 +8,34 @@          <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> - -    <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 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>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> +          <div class="actionArea">          <button *ngIf="isHelper()" (click)="add(need!)">  | 
