Add login redirection

4 files changed, 33 insertions, 9 deletions

diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.html b/ufund-ui/src/app/components/dashboard/dashboard.component.html
index f41ccef..c73849f 100644
--- a/ufund-ui/src/app/components/dashboard/dashboard.component.html
+++ b/ufund-ui/src/app/components/dashboard/dashboard.component.html
@@ -1,3 +1,5 @@
 <p>dashboard works!</p>
-<a routerLink="/cupboard">Go to the Cupboard</a>
-<a routerLink="/basket">Go to my basket</a>
+<ul>
+    <li><a routerLink="/cupboard">Go to the Cupboard</a></li>
+    <li><a routerLink="/basket">Go to my basket</a></li>
+</ul>
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 8b12306..c44aa27 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
@@ -1,4 +1,6 @@
-import { Component } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
+import {Router} from '@angular/router';
+import {UsersService} from '../../services/users.service';
 
 @Component({
   selector: 'app-funding-basket',
@@ -6,6 +8,16 @@ import { Component } from '@angular/core';
   templateUrl: './funding-basket.component.html',
   styleUrl: './funding-basket.component.css'
 })
-export class FundingBasketComponent {
+export class FundingBasketComponent implements OnInit{
+    constructor(
+       private router: Router,
+       private userService: UsersService
+    ) {}
+
+    ngOnInit() {
+        if (!this.userService.getCurrentUser()) {
+            this.router.navigate(['/login'], {queryParams: {redir: this.router.url}})
+        }
+    }
 
 }
diff --git a/ufund-ui/src/app/components/login/login.component.html b/ufund-ui/src/app/components/login/login.component.html
index 178ddbf..bfd7f5e 100644
--- a/ufund-ui/src/app/components/login/login.component.html
+++ b/ufund-ui/src/app/components/login/login.component.html
@@ -1,3 +1,4 @@
+<div *ngIf="next" style="color: red">You must be logged in to view this page</div>
 <p>Login:</p>
 <input placeholder="Username" type="text" #username>
 <input placeholder="Password" type="password" #password>
diff --git a/ufund-ui/src/app/components/login/login.component.ts b/ufund-ui/src/app/components/login/login.component.ts
index 50dd018..7d90624 100644
--- a/ufund-ui/src/app/components/login/login.component.ts
+++ b/ufund-ui/src/app/components/login/login.component.ts
@@ -1,6 +1,6 @@
-import { Component } from '@angular/core'
+import {Component, OnInit} from '@angular/core'
 import {UsersService} from '../../services/users.service';
-import {Router} from '@angular/router';
+import {ActivatedRoute, Router} from '@angular/router';
 
 @Component({
   selector: 'app-login',
@@ -8,20 +8,29 @@ import {Router} from '@angular/router';
   templateUrl: './login.component.html',
   styleUrl: './login.component.css'
 })
-export class LoginComponent {
+export class LoginComponent implements OnInit {
+
+    protected next?: string | null;
+
     constructor(
         protected usersService: UsersService,
-        private router: Router
+        private router: Router,
+        private route: ActivatedRoute
     ) {}
 
+    ngOnInit() {
+        this.next = this.route.snapshot.queryParamMap.get('redir')
+    }
+
     login(username: string | null, password: string | null) {
+        let next = this.next || '/dashboard'
         console.log(`attempting to log in with ${username} ${password}`)
         if (!username || !password) {
             return;
         }
 
         this.usersService.login(username, password).then(() => {
-            this.router.navigate(['/dashboard']);
+            this.router.navigate([next]);
         })
     }
 }