#3527 - Main menu

César Calvo

2017-03-14 5621e8341def5afd7b72e134c054f74e6e6ee895

#3527 - Main menu

 securis/src/main/webapp/src/app/home.component.html
..
..
@@ -1,32 +1,32 @@
1
-<td-layout>
1
+<td-layout *ngIf="isLoggedIn">
2
2
   <td-navigation-drawer #mainMenu sidenavTitle="SeCuris">
3
3
   </td-navigation-drawer>
4
4
 
5
5
   <md-nav-list td-sidenav-content>
6
6
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
7
7
       <md-icon md-list-avatar>view_compact</md-icon>
8
-      <h3 md-line> Packs </h3>
9
-      <p md-line> Packs to manage licenses </p>
8
+      <h3 md-line i18n="menu.packs">  </h3>
9
+      <p md-line i18n="menu.packs.description"> </p>
10
10
     </a>
11
11
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
12
12
       <md-icon md-list-avatar>view_compact</md-icon>
13
-      <h3 md-line>Applications </h3>
14
-      <p md-line>Applications </p>
13
+      <h3 md-line i18n="menu.applications">  </h3>
14
+      <p md-line i18n="menu.applications.description"> </p>
15
15
     </a>
16
16
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
17
17
       <md-icon md-list-avatar>view_compact</md-icon>
18
-      <h3 md-line>License types</h3>
19
-      <p md-line>License types</p>
18
+      <h3 md-line i18n="menu.license_types">  </h3>
19
+      <p md-line i18n="menu.license_types.description"> </p>
20
20
     </a>
21
21
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
22
22
       <md-icon md-list-avatar>view_compact</md-icon>
23
-      <h3 md-line> Organizations </h3>
24
-      <p md-line> Organizations </p>
23
+      <h3 md-line i18n="menu.organizations">  </h3>
24
+      <p md-line i18n="menu.organizations.description"> </p>
25
25
     </a>
26
26
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
27
27
       <md-icon md-list-avatar>view_compact</md-icon>
28
-      <h3 md-line> Users </h3>
29
-      <p md-line> Users </p>
28
+      <h3 md-line i18n="menu.users">  </h3>
29
+      <p md-line i18n="menu.users.description"> </p>
30
30
     </a>                
31
31
   </md-nav-list>
32
32
 
..
..
@@ -41,3 +41,14 @@
41
41
   </td-layout-footer>
42
42
 </td-layout-nav>
43
43
 </td-layout>
44
+
45
+<td-layout-nav *ngIf="!isLoggedIn" toolbarTitle="SeCuris" logo="assets:logo-white">
46
+	<router-outlet></router-outlet>
47
+  <td-layout-footer>
48
+	<div layout="row" layout-align="start center" flex>
49
+		<div flex layout="row" layout-align="start center">v. {{securisVersion}}</div>
50
+		<div flex layout="row" layout-align="center center"><a href="http://www.curistec.com/" target="_blank">CurisTec</a>&nbsp;©2017</div>
51
+		<div flex></div>
52
+	</div>
53
+  </td-layout-footer>
54
+</td-layout-nav>
 securis/src/main/webapp/src/app/home.component.ts
..
..
@@ -22,7 +22,7 @@
22
22
   @ViewChild('mainMenu') mainMenu: TdNavigationDrawerComponent;
23
23
 
24
24
   securisVersion : string;
25
-  showMenu : boolean = false;
25
+  isLoggedIn : boolean = false;
26
26
 
27
27
   constructor(private userService: UserService,
28
28
               toaster: ToastsManager,
..
..
@@ -60,13 +60,15 @@
60
60
     this.mainMenu.close();
61
61
   }
62
62
 
63
-  ngAfterViewInit(): void {
64
-     // this.showMenu = true;    
65
-      this.media.broadcast();
63
+  ngOnInit(): void {
66
64
       this.userService.isLoggedIn().subscribe(authOk => {
67
-        //this.showMenu = authOk.valueOf();
68
-        this.router.navigateByUrl(authOk ? 'packs' : 'login');
69
-      }, 
70
-      err => /* Show message */ this.router.navigateByUrl('login'));
65
+        this.isLoggedIn = true//authOk.valueOf();
66
+        this.router.navigateByUrl(this.isLoggedIn ? 'packs' : 'login');
67
+      }  , 
68
+      err => /* Show message */ this.router.navigateByUrl('login'));  
69
+  }
70
+
71
+  ngAfterViewInit(): void {
72
+      this.media.broadcast();
71
73
   }
72
74
 }
 securis/src/main/webapp/src/lang/messages_en.json
..
..
@@ -30,6 +30,16 @@
30
30
 	"license.status.EX": "Expired",
31
31
 	"license.status.BL": "Blocked",
32
32
 	"license.status.CA": "Cancelled",
33
+	"menu.packs": "Packs",
34
+	"menu.packs.description": "Packs to manage licenses",
35
+	"menu.applications": "Applications",
36
+	"menu.applications.description": "Applications",
37
+	"menu.license_types": "License types",
38
+	"menu.license_types.description": "License types",
39
+	"menu.organizations": "Organizations",
40
+	"menu.organizations.description": "Organizations",
41
+	"menu.users": "Users",
42
+	"menu.users.description": "Users",
33
43
 	"": ""
34
44
 }
35
45