merge conflicts

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 {RouterModule, Routes} from '@angular/router';
-import {OldMoyaComponent} from './pages/old-moya/old-moya.component';
-import {TestComponent} from './test/test.component';
-import {AdminMenuComponent} from './menu/admin-menu/admin-menu.component';
-import {GroupSelectorComponent} from './menu/group-selector-menu/group-selector-menu.component';
-import { SidebarComponent } from './menu/sidebar/sidebar.component';
-import {InfoMenuComponent} from './menu/info-menu/info-menu.component';
-import {UserMenuComponent} from './menu/user-menu/user-menu.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 { UserService } from './shared/services/user.service';
+import { ErrorInterceptor } from './shared/interceptors/error.interceptor';
+import { MoyaLocaleService } from './components/moya-locale/moya-locale.service';
+import { CacheService } from './shared/services/cache.service';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
+import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
+import { AlertModule } from 'ngx-bootstrap';
+import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { FormsModule } from '@angular/forms';
+import { AppRoutingModule } from './app-routing.module';
+import { BrowserModule } from '@angular/platform-browser';
 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';
-
-const appRoutes: Routes = [
-  {
-    path: 'user',
-    children: [
-      {path: '', component: UserMenuComponent, outlet: 'sidebar'},
-      {path: '', pathMatch: 'full', component: UserComponent},
-      {path: 'old', component: OldMoyaComponent},
-    ]
-  },
-  {
-    path: 'info',
-    children: [
-      {path: '', component: InfoMenuComponent, outlet: 'sidebar'},
-      {path: '', pathMatch: 'full', component: OldMoyaComponent},
-      {path: 'old', component: OldMoyaComponent},
-      {path: 'viplist', component: ViplistComponent},
-    ]
-  },
-  {
-    path: 'admin',
-    children: [
-      {path: '', component: AdminMenuComponent, outlet: 'sidebar'},
-      {path: '', pathMatch: 'full', component: AdminComponent},
-      {path: 'old', component: OldMoyaComponent},
-    ]
-  },
-
-  {path: 'old', pathMatch: 'prefix', component: OldMoyaComponent},
-];
-
+import { GroupSelectorComponent } from './menu/group-selector-menu/group-selector-menu.component';
+import { AppComponent } from './app.component';
+import { LoginComponent } from './pages/login/login.component';
+import { NgModule } from '@angular/core';
 
 @NgModule({
   declarations: [
+    LoginComponent,
     AppComponent,
-    ViplistComponent,
-    OldMoyaComponent,
-    TestComponent,
     GroupSelectorComponent,
-    SidebarComponent,
-    AdminMenuComponent,
-    InfoMenuComponent,
-    UserMenuComponent,
-    UserComponent,
-    InfoComponent,
-    AdminComponent,
-    SafePipe,
     MoyaLocaleComponent
-
   ],
   imports: [
-    CommonModule,
     BrowserModule,
+    AppRoutingModule,
     FormsModule,
     HttpClientModule,
     AlertModule.forRoot(),
-    RouterModule.forRoot(appRoutes),
     TranslateModule.forRoot({
       loader: {
         provide: TranslateLoader,
@@ -103,5 +45,4 @@ const appRoutes: Routes = [
     UserService],
   bootstrap: [AppComponent]
 })
-export class AppModule {
-}
+export class AppModule { }