merge conflicts

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

@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { Routes, RouterModule } from '@angular/router';
 import { Routes, RouterModule } from '@angular/router';
 import { LoginComponent } from './pages/login/login.component';
 import { LoginComponent } from './pages/login/login.component';
+import { InfoComponent } from './pages/info/info.component';
 
 
 /* const appRoutes: Routes = [
 /* const appRoutes: Routes = [
   {
   {

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

@@ -23,6 +23,7 @@ import {CacheService} from "./shared/services/cache.service";
 import {MoyaRestModule} from "./moya-rest";
 import {MoyaRestModule} from "./moya-rest";
 import {SafePipe} from "./shared/pipes/safe.pipe";
 import {SafePipe} from "./shared/pipes/safe.pipe";
 import { AppRoutingModule } from './app-routing.module';
 import { AppRoutingModule } from './app-routing.module';
+<<<<<<< HEAD
 import { LoginComponent } from './pages/login/login.component';
 import { LoginComponent } from './pages/login/login.component';
 
 
 @NgModule({
 @NgModule({
@@ -32,6 +33,30 @@ import { LoginComponent } from './pages/login/login.component';
     AppComponent
     AppComponent
   ],
   ],
   imports: [
   imports: [
+=======
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    RouterModule,
+    ViplistComponent,
+    OldMoyaComponent,
+    TestComponent,
+    TopMenuComponent,
+    LeftMenuComponent,
+    AdminMenuComponent,
+    InfoMenuComponent,
+    UserMenuComponent,
+    UserComponent,
+    InfoComponent,
+    AdminComponent,
+    SafePipe
+
+  ],
+  imports: [
+    AppRoutingModule,
+    CommonModule,
+>>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
     BrowserModule,
     BrowserModule,
     AppRoutingModule,
     AppRoutingModule,
     CommonModule,
     CommonModule,

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

 import { NgModule } from '@angular/core';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommonModule } from '@angular/common';
+<<<<<<< HEAD
 import { AdminRoutingModule } from './admin-routing.module';
 import { AdminRoutingModule } from './admin-routing.module';
 import { AdminComponent } from './admin.component';
 import { AdminComponent } from './admin.component';
+=======
+
+import { AdminRoutingModule } from './admin-routing.module';
+>>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [
     CommonModule,
     CommonModule,
     AdminRoutingModule
     AdminRoutingModule
   ],
   ],
+<<<<<<< HEAD
   declarations: [AdminComponent]
   declarations: [AdminComponent]
+=======
+  declarations: []
+>>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
 })
 })
 export class AdminModule { }
 export class AdminModule { }

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

 import { NgModule } from '@angular/core';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommonModule } from '@angular/common';
+<<<<<<< HEAD
 import { InfoRoutingModule } from './info-routing.module';
 import { InfoRoutingModule } from './info-routing.module';
 import { InfoComponent } from './info.component';
 import { InfoComponent } from './info.component';
+=======
+
+import { InfoRoutingModule } from './info-routing.module';
+>>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [
     CommonModule,
     CommonModule,
     InfoRoutingModule
     InfoRoutingModule
   ],
   ],
+<<<<<<< HEAD
   declarations: [InfoComponent]
   declarations: [InfoComponent]
+=======
+  declarations: []
+>>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885
 })
 })
 export class InfoModule { }
 export class InfoModule { }

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

+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { LoginComponent } from './login.component';
+
+const routes: Routes = [ 
+  { path: 'info', component: LoginComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class LoginRoutingModule { }

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

+<<<<<<< HEAD
 <div id="top-container">
 <div id="top-container">
   <div id="left-menu">
   <div id="left-menu">
  <!--    <router-outlet name="left-menu"></router-outlet> -->
  <!--    <router-outlet name="left-menu"></router-outlet> -->
@@ -13,3 +14,8 @@
     </div>
     </div>
   </div>
   </div>
 </div>
 </div>
+=======
+<p>
+  login works!
+</p>
+>>>>>>> 8fb70c94667661bbfde5bc55313041c12be2b885

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

+import { LoginRoutingModule } from './login-routing.module';
 import { NgModule } from '@angular/core';
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { CommonModule } from '@angular/common';
 import { LoginComponent } from './login.component';
 import { LoginComponent } from './login.component';
@@ -5,7 +6,8 @@ import { TopMenuComponent } from '../../menu/top-menu/top-menu.component';
 
 
 @NgModule({
 @NgModule({
   imports: [
   imports: [
-    CommonModule
+    CommonModule,
+    LoginRoutingModule
   ],
   ],
   declarations: [ LoginComponent, TopMenuComponent ]
   declarations: [ LoginComponent, TopMenuComponent ]
 })
 })