summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-01-07 17:31:01 +0000
committerGerrit Code Review <gerrit@onap.org>2019-01-07 17:31:01 +0000
commitb114208b9dfba7a42dfb009106143c7b506884a4 (patch)
treecdae12dec9761c469137c4343ad328a08fc8d1d2
parent255abc6d88ec969e7fd6d03185c77e366edbf907 (diff)
parent5f6175d79c9a5780608a5805ad563669e96a8943 (diff)
Merge "App routing"
-rw-r--r--cds-ui/client/src/app/app-routing.module.ts30
-rw-r--r--cds-ui/client/src/app/app.module.ts6
-rw-r--r--cds-ui/client/src/app/common/shared/shared.module.ts6
3 files changed, 19 insertions, 23 deletions
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: [