diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html index dfd7853..6b1f70b 100644 --- a/src/app/pages/family/family.page.html +++ b/src/app/pages/family/family.page.html @@ -13,40 +13,40 @@ -
-
+ + - 0 Task waiting to start - -
-
+ + + +
-
- - {{total_family}} Members -
-
- - {{family_active}} Tasks -
-
- - 0 Completed -
+ + + + + + + + + + + +
- Members + Members ({{total_family}}) - Tasks + Tasks ({{family_active}}) - Pending + Pending (0) diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index b846de9..3892736 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -3,6 +3,8 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; //import 'rxjs/add/operator/map'; import { environment } from 'src/environments/environment'; +import { SessionDataProviderService } from '../store/session-data-provider.service'; +import {Router} from "@angular/router"; @Injectable({ @@ -13,12 +15,20 @@ export class WrenchService { apiKey = '99dfe35fcb7de1ee'; url; - constructor(private http: HttpClient) { - + constructor(private http: HttpClient, + private router: Router, + public sessionDataProviderService :SessionDataProviderService) { + // this is test this.url = 'https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1'; } - getPostData(reqPath:string, reqData): Observable { + + if (reqPath != 'userlogin'){ + const sessionId = this.sessionDataProviderService.session; + if (sessionId.length==0){ + this.router.navigate(['login']); + } + } return this.http.post( `${environment.baseUrl}/${reqPath}`,reqData );