diff --git a/ng6-seed/src/app/AwsService/cognito.service.ts b/ng6-seed/src/app/AwsService/cognito.service.ts index 2290dbc52..a568b7c1f 100644 --- a/ng6-seed/src/app/AwsService/cognito.service.ts +++ b/ng6-seed/src/app/AwsService/cognito.service.ts @@ -11,7 +11,8 @@ import { CognitoUserSession } from "amazon-cognito-identity-js"; import { environment } from '../../environments/environment'; -import { BehaviorSubject } from 'rxjs'; + +import { BehaviorSubject,Observable,of } from 'rxjs'; const sineedge_poolData = { UserPoolId: "ap-south-1_y7dt3iEaX", //ap-south-1_qQ85yQZJO UserName :SPARQ_SINEEDGE_DEV ClientId: "291qt4smn5pql6o8cc2hi201lj" // ClientName: SINEEDGE_DEV_WEB @@ -122,7 +123,32 @@ isloggin:boolean = false; // callback.callbackWithParam(null); // } // } +refresh() { + let tokenexp:boolean; + this.getCurrentUser().getSession(function (err, session) { + if (err) { + console.log("CognitoUtil: Can't set the credentials:" + err); + } + + else { + if (session.isValid()) { + tokenexp = session.isValid(); + of(tokenexp) + console.log("CognitoUtil: refreshed successfully"); + + } else { + tokenexp = session.isValid(); + console.log("CognitoUtil: refreshed but session is still not valid"); + + } + } + + return tokenexp; + + }); +} getAccessToken(){ + this.refresh(); let jwttoken = ''; if (this.getCurrentUser() != null) { //console.log(JSON.stringify(this.getCurrentUser())); diff --git a/ng6-seed/src/app/_guard/auth.guard.ts b/ng6-seed/src/app/_guard/auth.guard.ts index 8d8db8cac..8b7e970b3 100644 --- a/ng6-seed/src/app/_guard/auth.guard.ts +++ b/ng6-seed/src/app/_guard/auth.guard.ts @@ -27,8 +27,10 @@ export class AuthGuard implements CanActivate, CanActivateChild { return true; } else { // alert("else"); - this.router.navigate(['/login']); + setTimeout(() => { + this.router.navigate(['authentication/login']); return false; + },1000); } } diff --git a/ng6-seed/src/app/layouts/admin/admin-layout.component.html b/ng6-seed/src/app/layouts/admin/admin-layout.component.html index b52f6dd0f..d604ccc09 100644 --- a/ng6-seed/src/app/layouts/admin/admin-layout.component.html +++ b/ng6-seed/src/app/layouts/admin/admin-layout.component.html @@ -6,25 +6,25 @@
-

{{userDep}} +

{{userDep}}

- + home - + person - + settings
@@ -61,6 +61,23 @@ {{ childitem.name | translate }} + + + {{ menuitem.icon }} + {{ menuitem.name | translate }} + + {{ badge.value }} + arrow_drop_down + +
+ + + {{ childitem.name | translate }} + + +
+ + + - -
-
+
- -
- - - -
- -
- +
+
Users
+
+ + + + +
+
@@ -101,6 +61,6 @@ - +
diff --git a/ng6-seed/src/app/settings/users/user-list/user-list.component.scss b/ng6-seed/src/app/settings/users/user-list/user-list.component.scss index 034c06190..04873a47d 100644 --- a/ng6-seed/src/app/settings/users/user-list/user-list.component.scss +++ b/ng6-seed/src/app/settings/users/user-list/user-list.component.scss @@ -33,6 +33,7 @@ table { .example-header { min-height: 64px; padding: 8px 24px 0; + background: #fff; } .mat-form-field { @@ -43,4 +44,48 @@ table { .mat-table { overflow: auto; max-height: 500px; +} +.mat-table { + display: table; + width: 100%; + overflow: auto; + max-height: 500px; + + > .mat-header-row, > .mat-row { + display: table-row; + padding: 0; + border: none; + + > .mat-header-cell, > .mat-cell { + display: table-cell; + height: 48px; + vertical-align: middle; + + border-bottom: 1px solid rgba(0, 0, 0, 0.12); + } + } +} + +/** Table CSS -nocontent */ +.nocontent { + color: red; + font-size: 16px; + text-align: center; +} + +/** Table CSS - Search(or)Filter Field */ +.mat-form-field { + font-size: 14px; + width: 100%; +} + +.filter-container { + display: flex; + flex-direction: column; + min-width: 300px; +} + +.filter-header { + min-height: 64px; + padding: 8px 24px 0; } \ No newline at end of file diff --git a/ng6-seed/src/app/shared/menu-items/menu-items.ts b/ng6-seed/src/app/shared/menu-items/menu-items.ts index ac9a52283..8ab9b85f3 100644 --- a/ng6-seed/src/app/shared/menu-items/menu-items.ts +++ b/ng6-seed/src/app/shared/menu-items/menu-items.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { state } from '@angular/animations'; export interface BadgeItem { type: string; @@ -11,8 +12,8 @@ export interface ChildrenItems { type?: string; } -export interface Menu { - state: string; +export interface Multichild { + state: any; name: string; type: string; icon: string; @@ -20,62 +21,65 @@ export interface Menu { children?: ChildrenItems[]; } +export interface Menu { + state: any; + name: string; + type: string; + icon: string; + badge?: BadgeItem[]; + children?: ChildrenItems[]; + multichild?:Multichild[]; +} + const MENUITEMS : Menu[] = [ + // { + // state: 'home', + // name: 'HOME', + // type: 'link', + // icon: 'explore' + // }, { - state: 'home', - name: 'HOME', - type: 'link', - icon: 'explore' - },{ - state:'setting', + state: '', + name: 'Manage', + type: 'multi', + icon: 'settings', + multichild: [ + { + state:'setting', name:'Settings', type:'sub', icon:'settings', children:[ - {state:'users',name:'User List'}, + {state:'users',name:'Users'}, {state:'mastermodule',name:'Master Details'}, - {state:'entity',name:'Entity Details'} - ] - }, - { - state:'pdtrigger', - name:'PD Trigger', - type:'link', - icon:'bubble_chart', - // children:[ - // {state:'pdtriggerlist',name:'Pd Trigger Listing'} - // ] - },{ - state: 'template', + {state:'entity',name:'Entities'}, + + + ], + }, + { + state: 'template', name: 'Template', type: 'sub', icon: 'art_track', children: [ {state: 'questions', name: 'Questions'} ] - }, - { - state: 'authentication', - name: 'AUTHENTICATION', - type: 'sub', - icon: 'security', - children: [ - {state: 'login', name: 'LOGIN'}, - {state: 'register', name: 'REGISTER'}, - {state: 'forgot-password', name: 'FORGOT'}, - {state: 'lockscreen', name: 'LOCKSCREEN'} + } ] + }, + { - state: 'error', - name: 'ERROR', - type: 'sub', - icon: 'error_outline', - children: [ - {state: '404', name: '404'}, - {state: '503', name: '503'} - ] + state:'pdtrigger', + name:'Personal Discussion', + type:'link', + icon:'forum', + // children:[ + // {state:'pdtriggerlist',name:'Pd Trigger Listing'} + // ] } + ]; @Injectable()