merge conflict resolve

code/moya-angular/src/app/app.component.html

 <div id="top-container">
-<<<<<<< HEAD
-    <div id="left-menu">
-      <router-outlet name="left-menu"></router-outlet>
-    </div>
-  
-    <div id="contentarea">
-      <div id="topbar">
-        <top-menu></top-menu>
-      </div>
-      <div id="content">
-        <router-outlet></router-outlet>
-      </div>
-=======
   <div id="left-menu">
     <router-outlet name="left-menu"></router-outlet>
   </div>
@@ -24,7 +11,6 @@
     <div id="content">
 
       <router-outlet></router-outlet>
->>>>>>> 1cbc86e7a97395b4e066423d4e947bd68e293b1d
     </div>
   </div>
   
\ No newline at end of file

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

-import {BrowserModule} from '@angular/platform-browser';
-import {NgModule} from '@angular/core';
-import {FormsModule} from '@angular/forms';
-import {AppComponent} from './app.component';
-import {ViplistComponent} from './pages/info/viplist/viplist.component';
-import {AlertModule} from 'ngx-bootstrap';
-import { Router, RouterModule, PreloadAllModules} from '@angular/router';
-import {TestComponent} from './test/test.component';
-import {AdminMenuComponent} from './menu/admin-menu/admin-menu.component';
-import {TopMenuComponent} from './menu/top-menu/top-menu.component';
-import {UserMenuComponent} from './menu/user-menu/user-menu.component';
-<<<<<<< HEAD
-import {HttpClientModule, HttpHandler } from '@angular/common/http';
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { AppComponent } from './app.component';
+import { ViplistComponent } from './pages/info/viplist/viplist.component';
+import { AlertModule } from 'ngx-bootstrap';
+import { Router, RouterModule, PreloadAllModules } from '@angular/router';
+import { TestComponent } from './test/test.component';
+import { AdminMenuComponent } from './menu/admin-menu/admin-menu.component';
+import { TopMenuComponent } from './menu/top-menu/top-menu.component';
+import { UserMenuComponent } from './menu/user-menu/user-menu.component';
 import { HttpModule } from '@angular/http';
-import {StaticInjector} from "@angular/core/src/di/injector";
-import {CommonModule} from "@angular/common";
-import {CacheService} from "./shared/services/cache.service";
-import {MoyaRestModule} from "./moya-rest";
+import { StaticInjector } from "@angular/core/src/di/injector";
 import { AppRoutingModule } from './app-routing.module';
 import { LoginComponent } from './pages/login/login.component';
-=======
-import {UserComponent} from './pages/user/user.component';
-import {InfoComponent} from './pages/info/info.component';
-import {AdminComponent} from './pages/admin/admin.component';
-import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule} from '@angular/common/http';
-import {CommonModule} from '@angular/common';
-import {CacheService} from './shared/services/cache.service';
-import {SafePipe} from './shared/pipes/safe.pipe';
-import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
-import {TranslateHttpLoader} from '@ngx-translate/http-loader';
-import {MoyaLocaleService} from './components/moya-locale/moya-locale.service';
+import { UserComponent } from './pages/user/user.component';
+import { InfoComponent } from './pages/info/info.component';
+import { AdminComponent } from './pages/admin/admin.component';
+import { HTTP_INTERCEPTORS, HttpClient, HttpClientModule, HttpHandler } from '@angular/common/http';
+import { CommonModule } from '@angular/common';
+import { CacheService } from './shared/services/cache.service';
+import { SafePipe } from './shared/pipes/safe.pipe';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+import { MoyaLocaleService } from './components/moya-locale/moya-locale.service';
 import { MoyaLocaleComponent } from './components/moya-locale/moya-locale.component';
-import {ErrorInterceptor} from './shared/interceptors/error.interceptor';
-import {ViplistService} from './pages/info/viplist/viplist.service';
-import {UserService} from './shared/services/user.service';
+import { ErrorInterceptor } from './shared/interceptors/error.interceptor';
+import { ViplistService } from './pages/info/viplist/viplist.service';
+import { UserService } from './shared/services/user.service';
 
-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},
-];
-
->>>>>>> 1cbc86e7a97395b4e066423d4e947bd68e293b1d
 
 @NgModule({
   declarations: [
     LoginComponent,
     AppComponent,
-<<<<<<< HEAD
-    TopMenuComponent
-=======
-    ViplistComponent,
-    OldMoyaComponent,
-    TestComponent,
     TopMenuComponent,
-    LeftMenuComponent,
-    AdminMenuComponent,
-    InfoMenuComponent,
-    UserMenuComponent,
-    UserComponent,
-    InfoComponent,
-    AdminComponent,
-    SafePipe,
     MoyaLocaleComponent
-
->>>>>>> 1cbc86e7a97395b4e066423d4e947bd68e293b1d
   ],
   imports: [
     BrowserModule,
@@ -96,10 +43,6 @@ const appRoutes: Routes = [
     FormsModule,
     HttpClientModule,
     AlertModule.forRoot(),
-<<<<<<< HEAD
-    MoyaRestModule
-=======
-    RouterModule.forRoot(appRoutes),
     TranslateModule.forRoot({
       loader: {
         provide: TranslateLoader,
@@ -109,7 +52,6 @@ const appRoutes: Routes = [
         deps: [HttpClient]
       }
     })
->>>>>>> 1cbc86e7a97395b4e066423d4e947bd68e293b1d
   ],
   providers: [
     CacheService,
@@ -118,4 +60,4 @@ const appRoutes: Routes = [
     UserService],
   bootstrap: [AppComponent]
 })
-export class AppModule {}
+export class AppModule { }

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

-import { ViplistComponent } from './../../viplist/viplist.component';
+import { ViplistComponent } from './viplist/viplist.component';
 import { OldMoyaComponent } from './../old-moya/old-moya.component';
 import { InfoMenuComponent } from './../../menu/info-menu/info-menu.component';
 import { NgModule } from '@angular/core';

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

+import { ViplistComponent } from './viplist/viplist.component';
 import { OldMoyaModule } from './../old-moya/old-moya.module';
-import { ViplistComponent } from './../../viplist/viplist.component';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { InfoRoutingModule } from './info-routing.module';

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

+import { PipesModule } from './../../shared/pipes/pipes.module';
 import { OldMoyaModule } from './../old-moya/old-moya.module';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
@@ -6,13 +7,15 @@ import { UserRoutingModule } from './user-routing.module';
 import { UserComponent } from './user.component';
 import { UserMenuComponent } from '../../menu/user-menu/user-menu.component';
 import { LeftMenuModule } from '../../menu/left-menu/left-menu.module';
+import { TranslateModule } from '@ngx-translate/core';
 
 @NgModule({
   imports: [
     CommonModule,
     UserRoutingModule,
     LeftMenuModule,
-    OldMoyaModule
+    OldMoyaModule,
+    TranslateModule.forRoot()
   ],
   declarations: [UserComponent, UserMenuComponent]
 })