lint cleanup

Author: nerdfiles

src/app/app-state.service.ts

@@ -1,14 +1,14 @@
 import { Injectable } from '@angular/core';
-import { Subject }    from 'rxjs';
+import { Subject } from 'rxjs';
 
 @Injectable({
   providedIn: 'root'
 })
 export class AppStateService {
-  public _subject = new Subject<any>();
-  public event = this._subject.asObservable();
+  public subject = new Subject<any>();
+  public event = this.subject.asObservable();
 
-  public publish(data: any){
-    this._subject.next(data);
+  public publish(data: any) {
+    this.subject.next(data);
   }
 }

src/app/cities-reference.service.ts

@@ -8,18 +8,18 @@ const querySting = require('query-string');
 })
 export class CitiesReferenceService {
 
-  url = 'http://localhost:3000/cities'
+  url = 'http://localhost:3000/cities';
 
-  constructor (private http: HttpClient) { }
+  constructor(private http: HttpClient) { }
 
-  getCities ({ state, country }) : Observable<any> {
+  getCities({ state, country }): Observable<any> {
     return this.http.get([
       this.url,
       '?',
       querySting.stringify({
-        state: state,
-        country: country
+        state,
+        country
       })
-    ].join(''))
+    ].join(''));
   }
 }

src/app/city.service.ts

@@ -1,28 +1,28 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-const queryString = require('query-string')
+const queryString = require('query-string');
 
 @Injectable({
   providedIn: 'root'
 })
 export class CityService {
 
-  url = 'http://localhost:3000/cities'
+  url = 'http://localhost:3000/cities';
 
-  constructor(private http:HttpClient) { }
+  constructor(private http: HttpClient) { }
 
-  getData ({ city, state, country }) : Observable<any> {
-    const cityName = city
+  getData({ city, state, country }): Observable<any> {
+    const cityName = city;
     return this.http.get([
       this.url,
       '/',
       cityName,
       '?',
       queryString.stringify({
-        state: state,
-        country: country
+        state,
+        country
       })
-    ].join(''))
+    ].join(''));
   }
 }

src/app/configure/configure.page.ts

@@ -19,97 +19,99 @@ export class ConfigurePage {
   selectedState: any;
   selectedCity: any;
 
-  constructor (
+  constructor(
     private browserStorageService: BrowserStorageService,
     private countriesReferenceService: CountriesReferenceService,
     private statesReferenceService: StatesReferenceService,
     private citiesReferenceService: CitiesReferenceService,
     private appStateService: AppStateService
   ) {
     this.loadCountries().then(() => {
-      this.selectedCountry = browserStorageService.getLocal('selectedCountry') || ''
-      if (this.selectedCountry)
+      this.selectedCountry = browserStorageService.getLocal('selectedCountry') || '';
+      if (this.selectedCountry) {
         this._loadStates(this.selectedCountry).then(res => {
-          if (this.selectedState)
-            this._loadCities(this.selectedState)
-        })
-    })
+          if (this.selectedState) {
+            this._loadCities(this.selectedState);
+          }
+        });
+      }
+    });
   }
 
   /**
    * selectedCityHandler
    */
-  selectedCityHandler (selectedCity) {
-    this.selectedCity = selectedCity;
+  selectedCityHandler(city) {
+    this.selectedCity = city;
     this.browserStorageService.setLocal('selectedCity', this.selectedCity);
     this.appStateService.publish({
-      selectedCity: selectedCity,
+      selectedCity: city,
       selectedState: this.selectedState,
       selectedCountry: this.selectedCountry
     });
   }
 
-  _loadCities (selectedState) {
+  _loadCities(selectedState) {
     this.citiesReferenceService.getCities({
       state: selectedState,
       country: this.selectedCountry
     })
       .subscribe((citiesRef) => {
         this.cities = citiesRef._embedded;
-        this.selectedCity = this.browserStorageService.getLocal('selectedCity') || ''
+        this.selectedCity = this.browserStorageService.getLocal('selectedCity') || '';
       }, (e) => {
-        console.log({ error: e })
-      })
+        console.log({ error: e });
+      });
   }
 
   /**
    * selectedStateHandler
    */
-  selectedStateHandler (selectedState) {
+  selectedStateHandler(selectedState) {
     this.selectedState = selectedState;
     this.browserStorageService.setLocal('selectedState', this.selectedState);
 
-    this._loadCities(selectedState)
+    this._loadCities(selectedState);
   }
 
-  _loadStates (selectedCountry) {
+  _loadStates(selectedCountry) {
     return new Promise((res, rej) => {
       this.statesReferenceService.getStates({ country: selectedCountry })
         .subscribe((statesRef) => {
           this.states = statesRef._embedded;
-          this.selectedState = this.browserStorageService.getLocal('selectedState') || ''
-          res(statesRef)
+          this.selectedState = this.browserStorageService.getLocal('selectedState') || '';
+          res(statesRef);
         }, (e) => {
           console.log({ error: e });
-          rej({ error: e })
+          rej({ error: e });
         });
-    })
+    });
   }
 
   /**
    * selectedCountryHandler
    */
-  selectedCountryHandler (selectedCountry) {
+  selectedCountryHandler(selectedCountry) {
     this.selectedCountry = selectedCountry;
     this.browserStorageService.setLocal('selectedCountry', this.selectedCountry);
     this._loadStates(selectedCountry).then(res => {
-      console.log(res)
-    })
+      console.log(res);
+    });
   }
 
   /**
    * loadCountries
    */
-  loadCountries () {
+  loadCountries() {
     return new Promise((res, rej) => {
       this.countriesReferenceService.getCountries()
-      .subscribe((countriesRef) => {
-        this.countries = countriesRef._embedded;
-        res(countriesRef)
-      }, (e) => {
-        console.log({ error: e });
-        rej({ error: e });
-      });
+        .subscribe((countriesRef) => {
+          this.countries = countriesRef._embedded;
+          res(countriesRef);
+        }, (e) => {
+          console.log({ error: e });
+          rej({ error: e });
+        });
     });
   }
 

src/app/countries-reference.service.ts

@@ -10,9 +10,9 @@ export class CountriesReferenceService {
 
   url = 'http://localhost:3000/countries';
 
-  constructor (private http: HttpClient) { }
+  constructor(private http: HttpClient) { }
 
-  getCountries () : Observable<any> {
-    return this.http.get(this.url)
+  getCountries(): Observable<any> {
+    return this.http.get(this.url);
   }
 }

src/app/profile/profile.module.ts

@@ -5,7 +5,7 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { ProfilePage } from './profile.page';
 
-import { ProfilePageRoutingModule } from './profile-routing.module'
+import { ProfilePageRoutingModule } from './profile-routing.module';
 
 @NgModule({
   imports: [

src/app/states-reference.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable } from 'rxjs';
-const queryString = require('query-string')
+const queryString = require('query-string');
 
 
 @Injectable({
@@ -12,13 +12,13 @@ export class StatesReferenceService {
   url = 'http://localhost:3000/states';
   qs = '?';
 
-  constructor (private http: HttpClient) { }
+  constructor(private http: HttpClient) { }
 
-  getStates ({ country }) : Observable<any> {
+  getStates({ country }): Observable<any> {
     return this.http.get([
       this.url,
       this.qs,
-      queryString.stringify({ country: country })
+      queryString.stringify({ country })
     ].join(''));
   }
 

src/app/weather/weather.page.ts

@@ -9,7 +9,8 @@ import { AppStateService } from '../app-state.service';
   styleUrls: ['weather.page.scss']
 })
 export class WeatherPage implements OnInit {
-  weatherIconIndex:object = {
+
+  weatherIconIndex: object = {
     '01d': {
       description: 'clear sky (day)'
     },
@@ -49,7 +50,7 @@ export class WeatherPage implements OnInit {
     '50n': {
       description: 'mist (night)'
     }
-  }
+  };
 
   sub: any;
 
@@ -81,9 +82,10 @@ export class WeatherPage implements OnInit {
       }
     },
   };
+
   altIcon = {
     description: null
-  }
+  };
 
   constructor(
     private browserStorageService: BrowserStorageService,
@@ -105,7 +107,6 @@ export class WeatherPage implements OnInit {
 
   ngOnInit() {
 
-    console.log(this.selectedCity)
     if (this.selectedCountry && this.selectedState && this.selectedCity) {
       this.loadCityData({
         city: this.selectedCity,
@@ -115,14 +116,15 @@ export class WeatherPage implements OnInit {
     }
   }
 
-  loadCityData ({ city, state, country }) {
-    this.sub = this.cityService.getData({ city, state, country }).subscribe(cityRef => {
-      this.selectedCityData = cityRef && cityRef.data ? cityRef.data : {}
+  loadCityData({ city, state, country }) {
+    this.sub = this.cityService.getData({ city, state, country })
+      .subscribe(cityRef => {
+        this.selectedCityData = cityRef && cityRef.data ? cityRef.data : {};
 
-      this.altIcon = this.weatherIconIndex[this.selectedCityData.current.weather.ic] || this.altIcon
-    }, e => {
-      console.log({ error: e })
-    })
+        this.altIcon = this.weatherIconIndex[this.selectedCityData.current.weather.ic] || this.altIcon;
+      }, e => {
+        console.log({ error: e });
+      });
   }
 
 }