now menu works

code/moya-angular/src/app/app-routing.module.ts

@@ -10,10 +10,8 @@ const APP_ROUTES: Routes = [
   /*{ path: 'viplist', loadChildren: 'app/modules/viplist/viplist.module#ViplistModule'  },*/
   { path: 'viplist', component: InfoViplistPageComponent  },
   { path: 'old', loadChildren: 'app/modules/old-moya/old-moya.module#OldMoyaModule'  },
-  { path: 'user',   pathMatch: 'full', component: FrontpageComponent },
-  { path: 'info',   pathMatch: 'full', component: FrontpageComponent },
-  { path: 'admin',   pathMatch: 'full', component: FrontpageComponent },
-  { path: '',   pathMatch: 'full', component: FrontpageComponent }
+  { path: 'index',   component: FrontpageComponent },
+  { path: '',   pathMatch: 'full' , redirectTo: '/index', }
 ];
 
 @NgModule({

code/moya-angular/src/app/menu/defines/menu.ts

@@ -27,6 +27,11 @@ export class MENU {
 
   static USER: MenuGroup[] = [
     {
+      'name': '',
+      'items': [
+        { 'path': '/index', 'name': 'Frontpage' },
+      ]},
+    {
       'name': 'Event',
       'items': [
         { 'path': '/old/user', 'name': 'Poll', 'params': {p: 'poll/index.jsf'} },

code/moya-angular/src/app/menu/left-menu/left-menu.component.ts

 import {Component, OnInit} from '@angular/core';
 import {MenuGroup} from '../models/menu-group.model';
 import {MENU} from "../defines/menu";
-import {ActivatedRoute, UrlSegment} from "@angular/router";
+import {ActivatedRoute, Router, RouterEvent, UrlSegment} from "@angular/router";
 
 @Component({
   selector: 'left-menu',
@@ -16,13 +16,14 @@ export class LeftMenuComponent implements OnInit {
 
   searchPath(path : string, menu : MenuGroup[]): boolean {
 
-    menu.forEach(group => {
-      group.items.forEach(item => {
+    for(let i in menu) {
+      for(let n in menu[i].items) {
+        let item = menu[i].items[n];
         if(path.startsWith(item.path)) {
           return true;
         }
-      });
-    });
+      }
+    }
 
     return false;
   }
@@ -30,29 +31,29 @@ export class LeftMenuComponent implements OnInit {
 
 
 
-  constructor(private route: ActivatedRoute) {
+  constructor(private route: Router) {
 
-    this.route.url.subscribe(segments  => {
-      let path : string = segments.map(segment => segment.path).join("/");
+    route.events.filter(e => e instanceof RouterEvent).subscribe(event => {
 
-      console.log(path);
+      const revent = event as RouterEvent;
 
-      if(this.searchPath(path, MENU.USER)) {
+      if(this.searchPath(revent.url, MENU.USER)) {
         this.activateUser();
         return;
       }
 
-      if(this.searchPath(path, MENU.INFO)) {
+      if(this.searchPath(revent.url, MENU.INFO)) {
         this.activateInfo();
         return;
       }
 
-      if(this.searchPath(path, MENU.ADMIN)) {
+      if(this.searchPath(revent.url, MENU.ADMIN)) {
         this.activateAdmin();
         return;
       }
 
     });
+
   }
 
 
@@ -63,22 +64,17 @@ export class LeftMenuComponent implements OnInit {
 
 
   activateInfo() {
-    console.log("activating info");
     this.menu =  MENU.INFO;
     this.styleClass = "infoMenu";
   }
 
   activateUser() {
-
-    console.log("activating user");
     this.menu =  MENU.USER;
     this.styleClass = "userMenu";
   }
 
 
   activateAdmin() {
-
-    console.log("activating admin");
     this.menu =  MENU.ADMIN;
     this.styleClass = "adminMenu";
   }

code/moya-angular/src/app/menu/top-menu/top-menu.component.html

 
 <nav id="topNav">
-  <a  class="topNavItem" id="userTopNav" routerLink="/user" routerLinkActive="active"  i18n>Kävijänäkymä</a>
-  <a  class="topNavItem" id="infoTopNav" routerLink="/info" routerLinkActive="active" [queryParams]="{p: 'useradmin/list.jsf'}"  i18n>Infonäkymä</a>
-  <a  class="topNavItem" id="adminTopNav" routerLink="/admin" routerLinkActive="active"  i18n>Ylläpitonäkymä</a>
+  <a  class="topNavItem" id="userTopNav" routerLink="/index" routerLinkActive="active"  i18n>Kävijänäkymä</a>
+  <a  class="topNavItem" id="infoTopNav" routerLink="/old/info" routerLinkActive="active" [queryParams]="{p: 'useradmin/list.jsf'}"  i18n>Infonäkymä</a>
+  <a  class="topNavItem" id="adminTopNav" routerLink="/old/admin" routerLinkActive="active" [queryParams]="{p: 'product/list.jsf'}"  i18n>Ylläpitonäkymä</a>
 </nav>