diff options
Diffstat (limited to 'ufund-ui')
5 files changed, 16 insertions, 8 deletions
diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.html b/ufund-ui/src/app/components/dashboard/dashboard.component.html index c73849f..fc8baf0 100644 --- a/ufund-ui/src/app/components/dashboard/dashboard.component.html +++ b/ufund-ui/src/app/components/dashboard/dashboard.component.html @@ -1,5 +1,5 @@ -<p>dashboard works!</p> -<ul> - <li><a routerLink="/cupboard">Go to the Cupboard</a></li> - <li><a routerLink="/basket">Go to my basket</a></li> -</ul> + +<h1>Dashboard</h1> +<input type="button" value="Back to Login" (click)="back()"> +<app-cupboard></app-cupboard> +<app-funding-basket></app-funding-basket>
\ No newline at end of file diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.ts b/ufund-ui/src/app/components/dashboard/dashboard.component.ts index dd323c4..48c5894 100644 --- a/ufund-ui/src/app/components/dashboard/dashboard.component.ts +++ b/ufund-ui/src/app/components/dashboard/dashboard.component.ts @@ -8,4 +8,8 @@ import { Component } from '@angular/core'; }) export class DashboardComponent { constructor() {} + + back() { + window.history.back(); + } } diff --git a/ufund-ui/src/app/components/home-page/home-page.component.html b/ufund-ui/src/app/components/home-page/home-page.component.html index e13c539..d41e670 100644 --- a/ufund-ui/src/app/components/home-page/home-page.component.html +++ b/ufund-ui/src/app/components/home-page/home-page.component.html @@ -1,4 +1,3 @@ <a routerLink="/login"> Login/Sign Up -</a> -<p>home-page works!</p> +</a>
\ No newline at end of file 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 0bc4746..4bb001e 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,7 +1,8 @@ +<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> +<p>current: {{need?.maxGoal}}</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 15c1e87..0673f86 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 @@ -21,4 +21,8 @@ export class NeedPageComponent { const id = Number(this.route.snapshot.paramMap.get('id')); this.cupboardService.getNeed(id).subscribe(n => this.need = n); } + + back() { + window.history.back(); + } } |