From 259d989404ffbb541b26d7fb687581e2b57111ae Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 15 Mar 2017 15:46:39 +0000
Subject: [PATCH] Merge branch 'angular2' of https://rsanchez@git.curisit.net/gitblit/git/common/securis.git into angular2
---
securis/src/main/webapp/src/app/app.routes.ts | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/securis/src/main/webapp/src/app/app.routes.ts b/securis/src/main/webapp/src/app/app.routes.ts
index e3f5054..060a1ff 100644
--- a/securis/src/main/webapp/src/app/app.routes.ts
+++ b/securis/src/main/webapp/src/app/app.routes.ts
@@ -1,17 +1,28 @@
import { Routes, RouterModule } from '@angular/router';
import { HomeComponent } from './home.component';
+import { MenuComponent } from './menu.component';
+import { NoMenuComponent } from './nomenu.component';
import { PackListComponent } from './pack.list.component';
import { LicenseListComponent } from './license.list.component';
import { LoginFormComponent } from './login.form.component';
const routes: Routes = [
// {path: '', redirectTo: '/packs', pathMatch: 'full'},
- {path: 'packs', children: [
- {path: '', component: PackListComponent },
- {path: ':id/licenses', component: LicenseListComponent },
- ]},
- {path: 'login', component: LoginFormComponent }
+ {path: 'menu', component: MenuComponent,
+ children: [
+ {path: 'packs', children: [
+ {path: '', component: PackListComponent },
+ {path: ':id/licenses', component: LicenseListComponent },
+ ]}
+ ]
+ },
+ {path: 'nomenu', component: NoMenuComponent,
+ children: [
+ {path: 'login', component: LoginFormComponent }
+ ]
+ }
+
];
/* {path: 'product', component: DashboardProductComponent, children: [
{path: '', component: ProductOverviewComponent},
--
Gitblit v1.3.2