From 257db4a428d645a11b1984ffc6c0c1b52253133e Mon Sep 17 00:00:00 2001 From: statta Date: Fri, 23 Aug 2019 08:55:20 -0400 Subject: Update main page routing Issue-ID: PORTAL-706 Change-Id: I05ab9ca9b4a4bd420bca808f9be793c327c127ce Signed-off-by: statta --- ecomp-sdk/epsdk-app-os/ngapp/.gitignore | 4 +- .../ngapp/src/app/layout/layout-routing.module.ts | 57 ++++++++++++++++++++++ .../epsdk-app-os/ngapp/src/app/pages/.gitignore | 4 ++ .../ngapp/src/app/pages/pages-routing.module.ts | 21 ++++++++ .../ngapp/src/app/pages/admin/admin.module.ts | 7 +-- .../webapp/ngapp/src/app/pages/pages.module.ts | 12 +---- 6 files changed, 89 insertions(+), 16 deletions(-) create mode 100644 ecomp-sdk/epsdk-app-os/ngapp/src/app/layout/layout-routing.module.ts create mode 100644 ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/.gitignore create mode 100644 ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts diff --git a/ecomp-sdk/epsdk-app-os/ngapp/.gitignore b/ecomp-sdk/epsdk-app-os/ngapp/.gitignore index 02ded2d6..18128254 100644 --- a/ecomp-sdk/epsdk-app-os/ngapp/.gitignore +++ b/ecomp-sdk/epsdk-app-os/ngapp/.gitignore @@ -8,4 +8,6 @@ e2e src/styles src/app/* !src/app/pages -!src/app/*.* \ No newline at end of file +!src/app/pages/** +!src/app/*.* +!src/app/layout/layout-routing.module.js \ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-os/ngapp/src/app/layout/layout-routing.module.ts b/ecomp-sdk/epsdk-app-os/ngapp/src/app/layout/layout-routing.module.ts new file mode 100644 index 00000000..5d39bb94 --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/ngapp/src/app/layout/layout-routing.module.ts @@ -0,0 +1,57 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal SDK + * =================================================================== + * Copyright © 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { LayoutComponent } from './layout.component'; + +const routes: Routes = [ + { + path: '', + component: LayoutComponent, + children: [ + { path: '', loadChildren: () => import('../pages/pages.module').then(m => m.PagesModule) }, + + ] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class LayoutRoutingModule {} diff --git a/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/.gitignore b/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/.gitignore new file mode 100644 index 00000000..568f2f9c --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/.gitignore @@ -0,0 +1,4 @@ +* +!ext +!ext/** +!pages-routhing.module.ts \ No newline at end of file diff --git a/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts b/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts new file mode 100644 index 00000000..0186ddc0 --- /dev/null +++ b/ecomp-sdk/epsdk-app-os/ngapp/src/app/pages/pages-routing.module.ts @@ -0,0 +1,21 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { RoleFunctionsComponent } from './admin/role-functions/role-functions.component'; +import { UsageComponent } from './admin/usage/usage.component'; +import { CacheAdminComponent } from './admin/cache-admin/cache-admin.component'; +import { RolesComponent } from './admin/roles/roles.component'; +import { MenusComponent } from './admin/menus/menus.component'; + +const routes: Routes = [ + { path: 'admin/role_function_list', component: RoleFunctionsComponent }, + { path: 'admin/usage_list', component : UsageComponent}, + {path: 'admin/cache_admin', component :CacheAdminComponent}, + {path: 'admin/admin', component :RolesComponent}, + {path: 'admin/admin_menu_edit', component :MenusComponent} +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class PagesRoutingModule { } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/admin.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/admin.module.ts index 0daf59b9..e73e3c5a 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/admin.module.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/admin/admin.module.ts @@ -1,15 +1,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { AdminComponent } from './admin.component'; -import {AbsTablesModule} from 'abs-components-bc'; -import {AbsUtilitiesModule} from 'abs-components-bc'; + @NgModule({ declarations: [AdminComponent], imports: [ - CommonModule, - AbsTablesModule, - AbsUtilitiesModule + CommonModule ] }) export class AdminModule { } diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/pages.module.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/pages.module.ts index 94a06007..ade8a797 100644 --- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/pages.module.ts +++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/pages.module.ts @@ -3,8 +3,6 @@ import { CommonModule } from '@angular/common'; import { PagesComponent } from './pages.component'; import { PagesRoutingModule } from './pages-routing.module'; import { AdminComponent } from './admin/admin.component'; -import {AbsTablesModule} from 'abs-components-bc'; -import {AbsUtilitiesModule} from 'abs-components-bc' import { RoleFunctionsComponent } from './admin/role-functions/role-functions.component'; import { UsageComponent } from './admin/usage/usage.component'; import { CacheAdminComponent } from './admin/cache-admin/cache-admin.component'; @@ -20,19 +18,13 @@ import { MatExpansionModule } from '@angular/material/expansion'; import { SuccessModalComponent } from '../modals/success-modal/success-modal.component'; import { ErrorModalComponent } from '../modals/error-modal/error-modal.component'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { SearchComponent } from './ext/profile/search/search.component'; -import { SelfComponent } from './ext/profile/self/self.component'; -import { ImportusersComponent } from './ext/profile/importusers/importusers.component'; @NgModule({ - declarations: [PagesComponent, AdminComponent,RoleFunctionsComponent,UsageComponent,CacheAdminComponent,SearchComponent,RolesComponent,MenusComponent,InformationModalComponent,SelfComponent,ImportusersComponent,SuccessModalComponent,ErrorModalComponent], + declarations: [PagesComponent, AdminComponent,RoleFunctionsComponent,UsageComponent,CacheAdminComponent,RolesComponent,MenusComponent,InformationModalComponent,SuccessModalComponent,ErrorModalComponent], imports: [ CommonModule, PagesRoutingModule, - AbsTablesModule, - AbsTablesModule, - AbsUtilitiesModule, MaterialModule, ReactiveFormsModule, NgbModule, @@ -41,6 +33,6 @@ import { ImportusersComponent } from './ext/profile/importusers/importusers.comp FormsModule, MatFormFieldModule ], - entryComponents:[InformationModalComponent,RolesComponent,SuccessModalComponent,ErrorModalComponent, SelfComponent] + entryComponents:[InformationModalComponent,RolesComponent,SuccessModalComponent,ErrorModalComponent] }) export class PagesModule { } -- cgit 1.2.3-korg