From 5f6175d79c9a5780608a5805ad563669e96a8943 Mon Sep 17 00:00:00 2001 From: Arundathi Patil Date: Mon, 7 Jan 2019 22:24:41 +0530 Subject: App routing added application routes Issue-ID: CCSDK-816 Change-Id: Iba52d17aeabdb767c52cf6f8d56bf0bca1ae031c Signed-off-by: Arundathi Patil --- cds-ui/client/src/app/app-routing.module.ts | 30 ++++++++-------------- cds-ui/client/src/app/app.module.ts | 6 ++++- .../client/src/app/common/shared/shared.module.ts | 6 ++--- 3 files changed, 19 insertions(+), 23 deletions(-) (limited to 'cds-ui/client') diff --git a/cds-ui/client/src/app/app-routing.module.ts b/cds-ui/client/src/app/app-routing.module.ts index 8a33f224a..22e488749 100644 --- a/cds-ui/client/src/app/app-routing.module.ts +++ b/cds-ui/client/src/app/app-routing.module.ts @@ -21,28 +21,20 @@ limitations under the License. import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -// import { AboutComponent } from './common/shared/components/about/about.component'; -// import { PageNotFoundComponent } from './common/shared/components/page-not-found/page-not-found.component'; -// import { SelectTemplateComponent } from './feature-module/select-template/select-template.component'; -// import { HomeComponent } from './common/shared/components/home/home.component'; +import { HomeComponent } from './common/shared/components/home/home.component'; const routes: Routes = [ -// { -// path: '', -// component: HomeComponent, -// children: [ -// { -// path: '', -// component: AboutComponent - -// }, -// { -// path: 'controllerBlueprint', -// loadChildren: './feature-module/controller-blueprint/controller-blueprint.module#ControllerBlueprintModule' -// } -// ] -// } +{ + path: '', + component: HomeComponent, + children: [ + { + path: 'blueprint', + loadChildren: './feature-modules/blueprint/blueprint.module#BlueprintModule' + } + ] +} ]; @NgModule({ diff --git a/cds-ui/client/src/app/app.module.ts b/cds-ui/client/src/app/app.module.ts index 25ea016fa..d61731dde 100644 --- a/cds-ui/client/src/app/app.module.ts +++ b/cds-ui/client/src/app/app.module.ts @@ -30,6 +30,9 @@ import { HttpClientModule } from '@angular/common/http'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; +import { SharedModule } from './common/shared/shared.module'; + + // import { blueprintReducer } from './common/store/reducers/blueprint.reducer'; // import { HeaderComponent, AboutComponent, PageNotFoundComponent, HomeComponent } from './common/shared/components/index'; // import { SharedModule } from './common/shared/shared.module'; @@ -65,7 +68,8 @@ import { AppComponent } from './app.component'; MatRadioModule, MatFormFieldModule, MatStepperModule, - HttpClientModule + HttpClientModule, + SharedModule ], providers: [], bootstrap: [AppComponent] diff --git a/cds-ui/client/src/app/common/shared/shared.module.ts b/cds-ui/client/src/app/common/shared/shared.module.ts index 202a41870..e3760b01c 100644 --- a/cds-ui/client/src/app/common/shared/shared.module.ts +++ b/cds-ui/client/src/app/common/shared/shared.module.ts @@ -21,18 +21,18 @@ limitations under the License. import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -// import { HomeComponent } from './components/home/home.component'; +import { HomeComponent } from './components/home/home.component'; import { CBAWizardComponent } from './components/cbawizard/cbawizard.component'; import { MatToolbarModule,MatIconModule, MatButtonModule, MatSidenavModule, MatListModule, MatGridListModule, MatCardModule, MatMenuModule, MatTableModule, MatPaginatorModule, MatSortModule, MatInputModule, MatSelectModule, MatRadioModule, MatFormFieldModule, MatStepperModule} from '@angular/material'; import { RouterModule } from "@angular/router"; @NgModule({ declarations: [ - // HomeComponent, + HomeComponent, CBAWizardComponent ], exports: [ - // HomeComponent, + HomeComponent, CBAWizardComponent ], imports: [ -- cgit 1.2.3-korg