Indenting, casing and naming fix

Author: jeroenouw

src/app/app.module.ts

@@ -3,7 +3,7 @@ import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FormsModule } from '@angular/forms';
 import { HttpClientModule } from '@angular/common/http';
-import { MatButtonModule, MatInputModule, MatCardModule, MatIconModule } from '@angular/Material';
+import { MatButtonModule, MatInputModule, MatCardModule, MatIconModule } from '@angular/material';
 
 import { AppComponent } from './app.component';
 

src/app/components/ai/ai.component.html

@@ -1,11 +1,9 @@
 <mat-card>
-  <h1 class="mat-display-1">Angular 5 AI</h1>
+  <h1 class="mat-display-1">Angular 6 AI</h1>
 
   <mat-card-content *ngFor="let message of allMessages | async">
-    <div
-    class="message"
-    [ngClass]="{ 'from': message.sentBy === 'bot', 'to':   message.sentBy === 'user' }">
-    {{ message.content }}
+    <div class="message" [ngClass]="{ 'from': message.sentBy === 'bot', 'to':   message.sentBy === 'user' }">
+      {{ message.content }}
     </div>
   </mat-card-content>
 
@@ -15,9 +13,9 @@ <h1 class="mat-display-1">Angular 5 AI</h1>
         <mat-icon>keyboard_voice</mat-icon>
       </button>
     </mat-card-actions>
-    <mat-input-container>
+    <mat-form-field>
       <input matInput [(ngModel)]="formInput" min="2" placeholder="Your Message..." (keyup.enter)="sendMessageToBot()" type="text">
-    </mat-input-container>
+    </mat-form-field>
   </div>
 
   <mat-card-actions class="button center">

src/app/components/ai/ai.component.scss

@@ -34,7 +34,7 @@
   justify-content: center;
 }
 
-.mat-input-container {
+.mat-form-field {
   display: inline;
 }
 

src/app/components/ai/ai.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit, OnDestroy } from '@angular/core';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs/observable';
 import { scan } from 'rxjs/operators';
 
 import { AiService } from '../../service/ai.service';
@@ -21,9 +21,9 @@ export class AiComponent implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.allMessages = this.ai.conversation.asObservable()
-    .pipe(
-      scan((acc, val) => acc.concat(val))
-    )
+      .pipe(
+        scan((acc, val) => acc.concat(val))
+      )
   }
 
   ngOnDestroy() {
@@ -37,21 +37,21 @@ export class AiComponent implements OnInit, OnDestroy {
 
   startTalkingToBot() {
     this.ai.voiceConversation()
-    .subscribe(
-      (value) => {
-        this.formInput = value;
-        // console.log(value);
-      },
-      (err) => {
-        console.log(err);
-        if (err.error  === 'no-speech') {
-          // console.log("Talking error");
+      .subscribe(
+        (value) => {
+          this.formInput = value;
+          // console.log(value);
+        },
+        (err) => {
+          console.log(err);
+          if (err.error === 'no-speech') {
+            // console.log("Talking error");
+            this.startTalkingToBot();
+          }
+        },
+        () => {
+          // console.log("Talking complete");
           this.startTalkingToBot();
-        }
-      },
-      () => {
-        // console.log("Talking complete");
-        this.startTalkingToBot();
-      });
-    }
+        });
   }
+}

src/app/model/message.ts

@@ -1,6 +1,6 @@
 export class Message {
-    constructor(
-        public content: string, 
-        public sentBy: string
-    ) {}
-}
+  constructor(
+    public content: string,
+    public sentBy: string
+  ) { }
+}

src/app/service/ai.service.ts

@@ -2,12 +2,12 @@ import { Injectable, NgZone } from '@angular/core';
 import { environment } from '../../environments/environment';
 import * as lodash from 'lodash';
 
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs/observable';
 import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
 import { ApiAiClient } from 'api-ai-javascript';
 import { Message } from '../model/message'
-import { IWindow } from '../interface/iwindow'
+import { IWindow } from '../interface/Iwindow'
 
 @Injectable()
 export class AiService {
@@ -28,11 +28,11 @@ export class AiService {
     const userMessage = new Message(msg, 'user');
     this.update(userMessage);
     return this.client.textRequest(msg)
-    .then(res => {
-      const speech = res.result.fulfillment.speech;
-      const botMessage = new Message(speech, 'bot');
-      this.update(botMessage);
-    });
+      .then(res => {
+        const speech = res.result.fulfillment.speech;
+        const botMessage = new Message(speech, 'bot');
+        this.update(botMessage);
+      });
   }
 
   voiceConversation(): Observable<string> {
@@ -67,7 +67,7 @@ export class AiService {
       };
 
       this.speechRecognition.start();
-        // console.log('Listening...');
+      // console.log('Listening...');
     });
   }