module revamp

Author: krawaller

main.ts

@@ -1,28 +1,7 @@
 import 'zone.js';
 import 'reflect-metadata';
 
-import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { HttpClientModule } from '@angular/common/http';
-import { FormsModule } from '@angular/forms';
+import { AppModule } from './src/app.module';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
-import { AppComponent } from './src/components/app';
-import { BattleComponent } from './src/components/battle';
-import { CombatantComponent } from './src/components/combatant';
-import { CombatantDetailComponent } from './src/components/combatantdetail';
-
-import { UrlService } from './src/services/urlservice';
-import { GithubService } from './src/services/githubservice';
-import { BattleService } from './src/services/battleservice';
-import { AuthService } from './src/services/authservice';
-
-@NgModule({
-    imports: [ BrowserModule, HttpClientModule, FormsModule ],
-    declarations: [ AppComponent, CombatantComponent, CombatantDetailComponent, BattleComponent ],
-    bootstrap: [ AppComponent ],
-    providers: [ UrlService, GithubService, BattleService, AuthService ]
-})
-class AppModule {}
-
 platformBrowserDynamic().bootstrapModule(AppModule);

package-lock.json

@@ -15,6 +15,7 @@
   },
   "devDependencies": {
     "@angular/cli": "^6.2.4",
+    "@types/node": "^10.11.4",
     "angular2-template-loader": "^0.6.2",
     "raw-loader": "^0.5.1",
     "ts-loader": "5.2.1",

package.json

@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+
+import { ComponentModule } from './components/components.module';
+import { ServiceModule } from './services/services.module';
+
+import { AppComponent } from './components/app';
+
+@NgModule({
+    imports: [ ComponentModule, ServiceModule ],
+    bootstrap: [ AppComponent ],
+})
+export class AppModule {}

src/app.module.ts

@@ -43,10 +43,10 @@ export class AppComponent {
   error = null;
   loginName: string
   constructor(private authService: AuthService, private zone: NgZone){
-    authService.listenToAuthChanges((auth)=>{
+    authService.listenToAuthChanges(auth => {
       zone.run(() => { // hack to fix Zones not registering Websocket stuff reliably
         this.error = auth.error;
-        if (auth.token){
+        if (auth.token) {
           this.loginName = auth.user.displayName || auth.user.uid;
         }
       })

src/components/app.ts

@@ -12,7 +12,6 @@ import { CombatantDetailComponent } from './combatantdetail';
 
 @NgModule({
     imports: [BrowserModule, HttpClientModule, FormsModule, CommonModule],
-    declarations: [ AppComponent, CombatantComponent, CombatantDetailComponent, BattleComponent ],
-    bootstrap: [ AppComponent ],
+    declarations: [ AppComponent, CombatantComponent, CombatantDetailComponent, BattleComponent ]
 })
-export class ComponentModule {}
+export class ComponentModule {}

src/components/components.module.ts

@@ -1,5 +1,5 @@
 {
-  "compileOnSave": false,
+  "compileOnSave": true,
   "compilerOptions": {
     "outDir": "./dist",
     "sourceMap": true,
@@ -15,7 +15,8 @@
       "es5",
       "es2017",
       "dom"
-    ]
+    ],
+    "types": ["node"]
   },
   "exclude": [
     "node_modules"