Refactoring

Display/src/app/components/app/app.component.spec.ts

@@ -3,33 +3,33 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        RouterTestingModule
-      ],
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            imports: [
+                RouterTestingModule
+            ],
+            declarations: [
+                AppComponent
+            ],
+        }).compileComponents();
+    }));
 
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  });
+    it('should create the app', () => {
+        const fixture = TestBed.createComponent(AppComponent);
+        const app = fixture.debugElement.componentInstance;
+        expect(app).toBeTruthy();
+    });
 
-  it(`should have as title 'Display'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('Display');
-  });
+    it(`should have as title 'Display'`, () => {
+        const fixture = TestBed.createComponent(AppComponent);
+        const app = fixture.debugElement.componentInstance;
+        expect(app.title).toEqual('Display');
+    });
 
-  it('should render title', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('.content span').textContent).toContain('Display app is running!');
-  });
+    it('should render title', () => {
+        const fixture = TestBed.createComponent(AppComponent);
+        fixture.detectChanges();
+        const compiled = fixture.debugElement.nativeElement;
+        expect(compiled.querySelector('.content span').textContent).toContain('Display app is running!');
+    });
 });

Display/src/app/components/app/app.component.ts

@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.scss']
+    selector: 'app-root',
+    templateUrl: './app.component.html',
+    styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
-  title = 'Display';
+    title = 'Display';
 }

Display/src/app/components/dashboard/dashboard.component.spec.ts

@@ -3,23 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { DashboardComponent } from './dashboard.component';
 
 describe('DashboardComponent', () => {
-  let component: DashboardComponent;
-  let fixture: ComponentFixture<DashboardComponent>;
+    let component: DashboardComponent;
+    let fixture: ComponentFixture<DashboardComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ DashboardComponent ]
-    })
-    .compileComponents();
-  }));
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [DashboardComponent]
+        })
+            .compileComponents();
+    }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DashboardComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    beforeEach(() => {
+        fixture = TestBed.createComponent(DashboardComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });

Display/src/app/components/dashboard/dashboard.component.ts

@@ -1,15 +1,15 @@
 import { Component, OnInit } from '@angular/core';
 
 @Component({
-  selector: 'app-dashboard',
-  templateUrl: './dashboard.component.html',
-  styleUrls: ['./dashboard.component.scss']
+    selector: 'app-dashboard',
+    templateUrl: './dashboard.component.html',
+    styleUrls: ['./dashboard.component.scss']
 })
 export class DashboardComponent implements OnInit {
 
-  constructor() { }
+    constructor() { }
 
-  ngOnInit() {
-  }
+    ngOnInit() {
+    }
 
 }

Display/src/app/components/laundry/laundry.component.html

@@ -22,3 +22,4 @@
             </tr>
         </table>
     </div>
+</div>

Display/src/app/components/laundry/laundry.component.scss

@@ -1,17 +1,17 @@
 .laundry-current {
-    font-size: 14px;
+  font-size: 14px;
 }
 
 .laundry-current-header {
-    font-weight: 500;
-    text-align: right;
-    padding-right: 10px;
+  font-weight: 500;
+  text-align: right;
+  padding-right: 10px;
 }
 
 .true {
-	color: darkgoldenrod;
+  color: darkgoldenrod;
 }
 
 .false {
-	color: darkgreen;
+  color: darkgreen;
 }

Display/src/app/components/laundry/laundry.component.spec.ts

@@ -3,23 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { LaundryComponent } from './laundry.component';
 
 describe('LaundryComponent', () => {
-  let component: LaundryComponent;
-  let fixture: ComponentFixture<LaundryComponent>;
+    let component: LaundryComponent;
+    let fixture: ComponentFixture<LaundryComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ LaundryComponent ]
-    })
-    .compileComponents();
-  }));
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [LaundryComponent]
+        })
+            .compileComponents();
+    }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(LaundryComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    beforeEach(() => {
+        fixture = TestBed.createComponent(LaundryComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });

Display/src/app/components/laundry/laundry.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { LaundryService } from '../../services/laundry/laundry.service';
-import { LaundryStatus } from '../../services/laundry/laundry-status';
+import { LaundryStatus } from '../../models/laundry/laundry-status';
 
 @Component({
     selector: 'app-laundry',

Display/src/app/components/nav/nav.component.scss

@@ -17,5 +17,5 @@
 }
 
 .mat-sidenav-content {
-    padding: 20px;
+  padding: 20px;
 }

Display/src/app/components/nav/nav.component.spec.ts

@@ -10,31 +10,31 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { NavComponent } from './nav.component';
 
 describe('NavComponent', () => {
-  let component: NavComponent;
-  let fixture: ComponentFixture<NavComponent>;
+    let component: NavComponent;
+    let fixture: ComponentFixture<NavComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [NavComponent],
-      imports: [
-        NoopAnimationsModule,
-        LayoutModule,
-        MatButtonModule,
-        MatIconModule,
-        MatListModule,
-        MatSidenavModule,
-        MatToolbarModule,
-      ]
-    }).compileComponents();
-  }));
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [NavComponent],
+            imports: [
+                NoopAnimationsModule,
+                LayoutModule,
+                MatButtonModule,
+                MatIconModule,
+                MatListModule,
+                MatSidenavModule,
+                MatToolbarModule,
+            ]
+        }).compileComponents();
+    }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(NavComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    beforeEach(() => {
+        fixture = TestBed.createComponent(NavComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
 
-  it('should compile', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should compile', () => {
+        expect(component).toBeTruthy();
+    });
 });

Display/src/app/components/nav/nav.component.ts

@@ -4,18 +4,16 @@ import { Observable } from 'rxjs';
 import { map, shareReplay } from 'rxjs/operators';
 
 @Component({
-  selector: 'app-nav',
-  templateUrl: './nav.component.html',
-  styleUrls: ['./nav.component.scss']
+    selector: 'app-nav',
+    templateUrl: './nav.component.html',
+    styleUrls: ['./nav.component.scss']
 })
 export class NavComponent {
+    isHandset$: Observable<boolean> = this.breakpointObserver.observe(Breakpoints.Handset)
+        .pipe(
+            map(result => result.matches),
+            shareReplay()
+        );
 
-  isHandset$: Observable<boolean> = this.breakpointObserver.observe(Breakpoints.Handset)
-    .pipe(
-      map(result => result.matches),
-      shareReplay()
-    );
-
-  constructor(private breakpointObserver: BreakpointObserver) {}
-
+    constructor(private breakpointObserver: BreakpointObserver) { }
 }

Display/src/app/components/weather/charts/weather-charts.component.scss

@@ -7,18 +7,18 @@
 }
 
 #chart {
-    position: absolute;
-    top: 50px;
-    bottom: 0;
-    left: 0;
-    right: 0;
-  }
+  position: absolute;
+  top: 50px;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
 
 .chart-header {
-    background-color: rgb(250, 250, 250);
-    height: 50px;
+  background-color: rgb(250, 250, 250);
+  height: 50px;
 }
 
 .chart-button-spacer {
-    margin-right: 20px;
+  margin-right: 20px;
 }

Display/src/app/components/weather/charts/weather-charts.component.spec.ts

@@ -3,23 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { WeatherChartsComponent } from './weather-charts.component';
 
 describe('WeatherChartsComponent', () => {
-  let component: WeatherChartsComponent;
-  let fixture: ComponentFixture<WeatherChartsComponent>;
+    let component: WeatherChartsComponent;
+    let fixture: ComponentFixture<WeatherChartsComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WeatherChartsComponent ]
-    })
-    .compileComponents();
-  }));
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [WeatherChartsComponent]
+        })
+            .compileComponents();
+    }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WeatherChartsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    beforeEach(() => {
+        fixture = TestBed.createComponent(WeatherChartsComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });

Display/src/app/components/weather/charts/weather-charts.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { Chart } from 'angular-highcharts';
 import { SeriesLineOptions } from 'highcharts';
 import { HttpClient } from '@angular/common/http';
-import { WeatherValue } from '../../../services/weather/weather-value';
+import { WeatherValue } from '../../../models/weather/weather-value';
 import { ActivatedRoute, ParamMap } from '@angular/router';
 import * as moment from 'moment';
 

Display/src/app/components/weather/current/weather-current.component.scss

@@ -1,9 +1,9 @@
 .weather-current {
-    font-size: 14px;
+  font-size: 14px;
 }
 
 .weather-current-header {
-    font-weight: 500;
-    text-align: right;
-    padding-right: 10px;
+  font-weight: 500;
+  text-align: right;
+  padding-right: 10px;
 }

Display/src/app/components/weather/current/weather-current.component.spec.ts

@@ -3,23 +3,23 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { WeatherCurrentComponent } from './weather-current.component';
 
 describe('WeatherCurrentComponent', () => {
-  let component: WeatherCurrentComponent;
-  let fixture: ComponentFixture<WeatherCurrentComponent>;
+    let component: WeatherCurrentComponent;
+    let fixture: ComponentFixture<WeatherCurrentComponent>;
 
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [ WeatherCurrentComponent ]
-    })
-    .compileComponents();
-  }));
+    beforeEach(async(() => {
+        TestBed.configureTestingModule({
+            declarations: [WeatherCurrentComponent]
+        })
+            .compileComponents();
+    }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(WeatherCurrentComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
+    beforeEach(() => {
+        fixture = TestBed.createComponent(WeatherCurrentComponent);
+        component = fixture.componentInstance;
+        fixture.detectChanges();
+    });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
+    it('should create', () => {
+        expect(component).toBeTruthy();
+    });
 });

Display/src/app/components/weather/current/weather-current.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { WeatherReading } from '../../../services/weather/weather-reading';
+import { WeatherReading } from '../../../models/weather/weather-reading';
 import { WeatherService } from '../../../services/weather/weather.service';
 
 @Component({

Display/src/app/models/laundry/laundry-status.spec.ts

@@ -0,0 +1,7 @@
+import { LaundryStatus } from './laundry-status';
+
+describe('LaundryStatus', () => {
+    it('should create an instance', () => {
+        expect(new LaundryStatus()).toBeTruthy();
+    });
+});

Display/src/app/models/weather/weather-reading.spec.ts

@@ -0,0 +1,7 @@
+import { WeatherReading } from './weather-reading';
+
+describe('WeatherReading', () => {
+    it('should create an instance', () => {
+        expect(new WeatherReading()).toBeTruthy();
+    });
+});

Display/src/app/services/laundry/laundry-status.spec.ts

@@ -1,7 +0,0 @@
-import { LaundryStatus } from './laundry-status';
-
-describe('LaundryStatus', () => {
-  it('should create an instance', () => {
-    expect(new LaundryStatus()).toBeTruthy();
-  });
-});

Display/src/app/services/laundry/laundry.service.spec.ts

@@ -3,10 +3,10 @@ import { TestBed } from '@angular/core/testing';
 import { LaundryService } from './laundry.service';
 
 describe('LaundryService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+    beforeEach(() => TestBed.configureTestingModule({}));
 
-  it('should be created', () => {
-    const service: LaundryService = TestBed.get(LaundryService);
-    expect(service).toBeTruthy();
-  });
+    it('should be created', () => {
+        const service: LaundryService = TestBed.get(LaundryService);
+        expect(service).toBeTruthy();
+    });
 });

Display/src/app/services/laundry/laundry.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable, BehaviorSubject } from 'rxjs';
 import { Socket } from 'ngx-socket-io';
-import { LaundryStatus } from './laundry-status';
+import { LaundryStatus } from '../../models/laundry/laundry-status';
 
 @Injectable({
     providedIn: 'root'
@@ -14,11 +14,11 @@ export class LaundryService {
             const newStatus: LaundryStatus = JSON.parse(statusString);
 
             if (newStatus.washer !== undefined) {
-               this.latestStatus.value.washer = newStatus.washer;
+                this.latestStatus.value.washer = newStatus.washer;
             }
 
             if (newStatus.dryer !== undefined) {
-               this.latestStatus.value.dryer = newStatus.dryer;
+                this.latestStatus.value.dryer = newStatus.dryer;
             }
         });
 

Display/src/app/services/weather/weather-reading.spec.ts

@@ -1,7 +0,0 @@
-import { WeatherReading } from './weather-reading';
-
-describe('WeatherReading', () => {
-  it('should create an instance', () => {
-    expect(new WeatherReading()).toBeTruthy();
-  });
-});

Display/src/app/services/weather/weather.service.spec.ts

@@ -3,10 +3,10 @@ import { TestBed } from '@angular/core/testing';
 import { WeatherService } from './weather.service';
 
 describe('WeatherService', () => {
-  beforeEach(() => TestBed.configureTestingModule({}));
+    beforeEach(() => TestBed.configureTestingModule({}));
 
-  it('should be created', () => {
-    const service: WeatherService = TestBed.get(WeatherService);
-    expect(service).toBeTruthy();
-  });
+    it('should be created', () => {
+        const service: WeatherService = TestBed.get(WeatherService);
+        expect(service).toBeTruthy();
+    });
 });

Display/src/app/services/weather/weather.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Observable, BehaviorSubject } from 'rxjs';
 import { HubConnectionBuilder, HubConnection } from '@aspnet/signalr';
-import { WeatherReading } from './weather-reading';
+import { WeatherReading } from '../../models/weather/weather-reading';
 
 @Injectable({
     providedIn: 'root'

Display/src/test.ts

@@ -3,16 +3,16 @@
 import 'zone.js/dist/zone-testing';
 import { getTestBed } from '@angular/core/testing';
 import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting
 } from '@angular/platform-browser-dynamic/testing';
 
 declare const require: any;
 
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+    BrowserDynamicTestingModule,
+    platformBrowserDynamicTesting()
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);