Refactoring

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

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

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.ts

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

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.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.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'

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.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'