Added check to prevent redirect to login page

2 files changed, 3 insertions, 3 deletions

diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.ts b/ufund-ui/src/app/components/dashboard/dashboard.component.ts
index 165c7ba..49d93bf 100644
--- a/ufund-ui/src/app/components/dashboard/dashboard.component.ts
+++ b/ufund-ui/src/app/components/dashboard/dashboard.component.ts
@@ -27,7 +27,7 @@ export class DashboardComponent implements OnInit{
 
     ngOnInit() {
         let user = this.authService.getCurrentUser()
-        if(!user) {
+        if(!localStorage.getItem("credential") && !user) {
             this.router.navigate(['/login'])
             return
         }
@@ -35,7 +35,7 @@ export class DashboardComponent implements OnInit{
         firstValueFrom(this.cupboardService.getNeeds()).then(r => {
             this.topNeeds = r.sort((a, b) => b.current - a.current)
             this.almostThere = r.sort((a, b) => a.current/a.maxGoal - b.current/b.maxGoal)
-            this.inBasket = r.filter(n => n.id in user?.basket)
+            this.inBasket = r.filter(n => n.id in user!.basket)
         })
     }
 
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 faa7e0b..5c5776f 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
@@ -26,7 +26,7 @@ export class FundingBasketComponent implements OnInit {
 
     // this is for login rerouting
     ngOnInit(): void {
-        if (!this.authService.getCurrentUser()) {
+        if (!localStorage.getItem("credential") && !this.authService.getCurrentUser()) {
             this.router.navigate(['/login'], {queryParams: {redir: this.router.url}});
             return;
         }