Misc stuff

code/moya-angular/package.json

@@ -34,7 +34,7 @@
   },
   "devDependencies": {
     "@angular/cdk": "^5.2.4",
-    "@angular/cli": "^1.7.3",
+    "@angular/cli": "^1.6.5",
     "@angular/compiler-cli": "^5.2.9",
     "@angular/language-service": "^5.2.9",
     "@types/jasmine": "~2.8.3",

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';
+import { Routes, RouterModule } from '@angular/router';
+import { LoginComponent } from './pages/login/login.component';
 
 /* const appRoutes: Routes = [
   {
@@ -32,18 +32,30 @@ import { InfoComponent } from './pages/info/info.component';
 
   {path: 'old', pathMatch: 'prefix', component: OldMoyaComponent},
 ]; */
-const appRoutes: Routes = [
-  { path: '', pathMatch: 'full', redirectTo: 'login' },
+
+const APP_ROUTES: Routes = [
   { 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' },
+  { path: 'admin', loadChildren: 'app/pages/admin/admin.module#AdminModule' },
+  { path: 'user', loadChildren: 'app/pages/user/user.module#UserModule' },
+  { path: 'login', component: LoginComponent },
+  { path: '', pathMatch: 'full', redirectTo: 'login' },
+  { path: '**', component: LoginComponent }
 ]; 
 
 @NgModule({
   imports: [
-    CommonModule
+    RouterModule.forRoot(
+      APP_ROUTES,
+/*       {
+        enableTracing: true, // <-- debugging purposes only
+
+      } */
+    )
+  ],
+  exports: [
+    RouterModule
   ],
-  declarations: []
+  providers: [
+  ]
 })
 export class AppRoutingModule { }

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

-
-
-<div id="top-container">
-  <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>
-</div>
+<router-outlet></router-outlet>

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

@@ -3,10 +3,8 @@ import {Router} from '@angular/router';
 
 declare var window: any;
 
-
-
 @Component({
-  selector: 'app-root',
+  selector: 'moya-root',
   templateUrl: './app.component.html',
   styleUrls: ['./app.component.scss']
 })
@@ -14,11 +12,11 @@ export class AppComponent {
 
   constructor(private router: Router, private zone: NgZone) {
 
-    window.angularRoute = (url => {
+/*     window.angularRoute = (url => {
       zone.run(() => {
         router.navigateByUrl(url);
       });
-    });
+    }); */
   }
 
 }

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

@@ -7,7 +7,7 @@ import {ViplistComponent} from './viplist/viplist.component';
 import {AlertModule} from 'ngx-bootstrap';
 
 
-import {RouterModule, Routes} from '@angular/router';
+import { Router, RouterModule, PreloadAllModules} 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';
@@ -15,9 +15,6 @@ import {TopMenuComponent} from './menu/top-menu/top-menu.component';
 import {LeftMenuComponent} from './menu/left-menu/left-menu.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 {HttpClientModule, HttpHandler } from '@angular/common/http';
 import { HttpModule } from '@angular/http';
 import {StaticInjector} from "@angular/core/src/di/injector";
@@ -26,29 +23,18 @@ import {CacheService} from "./shared/services/cache.service";
 import {MoyaRestModule} from "./moya-rest";
 import {SafePipe} from "./shared/pipes/safe.pipe";
 import { AppRoutingModule } from './app-routing.module';
+import { LoginComponent } from './pages/login/login.component';
 
 @NgModule({
   declarations: [
-    AppComponent,
-    RouterModule,
-    ViplistComponent,
-    OldMoyaComponent,
-    TestComponent,
-    TopMenuComponent,
-    LeftMenuComponent,
-    AdminMenuComponent,
-    InfoMenuComponent,
-    UserMenuComponent,
-    UserComponent,
-    InfoComponent,
-    AdminComponent,
-    SafePipe
-
+    SafePipe,
+    LoginComponent,
+    AppComponent
   ],
   imports: [
+    BrowserModule,
     AppRoutingModule,
     CommonModule,
-    BrowserModule,
     FormsModule,
     HttpClientModule,
     AlertModule.forRoot(),
@@ -58,4 +44,7 @@ import { AppRoutingModule } from './app-routing.module';
   bootstrap: [AppComponent]
 })
 export class AppModule {
+  constructor(router: Router) {
+    console.log('Routes: ', JSON.stringify(router.config, undefined, 2));
+  }
 }

code/moya-angular/src/index.html

@@ -8,7 +8,8 @@
 
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
+<head>Hello you are at moya!</head>
 <body>
-  <app-root>Welcome to new MOYA</app-root>
+  <moya-root>Welcome to new MOYA</moya-root>
 </body>
 </html>