Ng cli conflict fix

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

 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { Routes } from '@angular/router';
+import { InfoComponent } from './pages/info/info.component';
+
+/* const appRoutes: Routes = [
+  {
+    path: 'user',
+    children: [
+      {path: '', component: UserMenuComponent, outlet: 'left-menu'},
+      {path: '', pathMatch: 'full', component: UserComponent},
+      {path: 'old', component: OldMoyaComponent},
+    ]
+  },
+  {
+    path: 'info',
+    children: [
+      {path: '', component: InfoMenuComponent, outlet: 'left-menu'},
+      {path: '', pathMatch: 'full', component: OldMoyaComponent},
+      {path: 'old', component: OldMoyaComponent},
+      {path: 'viplist', component: ViplistComponent},
+    ]
+  },
+  {
+    path: 'admin',
+    children: [
+      {path: '', component: AdminMenuComponent, outlet: 'left-menu'},
+      {path: '', pathMatch: 'full', component: AdminComponent},
+      {path: 'old', component: OldMoyaComponent},
+    ]
+  },
+
+  {path: 'old', pathMatch: 'prefix', component: OldMoyaComponent},
+]; */
+const appRoutes: Routes = [
+  { path: '', pathMatch: 'full', redirectTo: 'login' },
+  { path: 'info', loadChildren: 'app/pages/info/info.module#InfoModule' },
+  { path: 'admin', loadChildren: 'app/pages/info/info.module#InfoModule' },
+  { path: 'user', loadChildren: 'app/pages/info/info.module#InfoModule' },
+  { path: 'login', loadChildren: 'app/pages/info/info.module#InfoModule' },
+]; 
 
 @NgModule({
   imports: [

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

@@ -25,41 +25,12 @@ import {CommonModule} from "@angular/common";
 import {CacheService} from "./shared/services/cache.service";
 import {MoyaRestModule} from "./moya-rest";
 import {SafePipe} from "./shared/pipes/safe.pipe";
-
-const appRoutes: Routes = [
-  {
-    path: 'user',
-    children: [
-      {path: '', component: UserMenuComponent, outlet: 'left-menu'},
-      {path: '', pathMatch: 'full', component: UserComponent},
-      {path: 'old', component: OldMoyaComponent},
-    ]
-  },
-  {
-    path: 'info',
-    children: [
-      {path: '', component: InfoMenuComponent, outlet: 'left-menu'},
-      {path: '', pathMatch: 'full', component: OldMoyaComponent},
-      {path: 'old', component: OldMoyaComponent},
-      {path: 'viplist', component: ViplistComponent},
-    ]
-  },
-  {
-    path: 'admin',
-    children: [
-      {path: '', component: AdminMenuComponent, outlet: 'left-menu'},
-      {path: '', pathMatch: 'full', component: AdminComponent},
-      {path: 'old', component: OldMoyaComponent},
-    ]
-  },
-
-  {path: 'old', pathMatch: 'prefix', component: OldMoyaComponent},
-];
-
+import { AppRoutingModule } from './app-routing.module';
 
 @NgModule({
   declarations: [
     AppComponent,
+    RouterModule,
     ViplistComponent,
     OldMoyaComponent,
     TestComponent,
@@ -75,14 +46,13 @@ const appRoutes: Routes = [
 
   ],
   imports: [
+    AppRoutingModule,
     CommonModule,
     BrowserModule,
     FormsModule,
     HttpClientModule,
     AlertModule.forRoot(),
-    MoyaRestModule,
-    //MoyaRestModule.forRoot(),
-    RouterModule.forRoot(appRoutes)
+    MoyaRestModule
   ],
   providers: [CacheService],
   bootstrap: [AppComponent]