Merge pull request andrewevans0102#3 from andrewevans02/file-cleanup

moving files to be more closely coupled with usage

Author: andrewevans0102

src/app/app.module.ts

@@ -19,7 +19,7 @@ import { reducers, metaReducers } from './reducers';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { environment } from '../environments/environment';
 import { EffectsModule } from '@ngrx/effects';
-import { WeatherEffects } from './effects/weather.effects';
+import { WeatherEffects } from './weather/weather.effects';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 
 @NgModule({

src/app/reducers/index.ts

@@ -1,8 +1,8 @@
-import { ActionReducerMap, MetaReducer, Action} from '@ngrx/store';
+import { ActionReducerMap, MetaReducer } from '@ngrx/store';
 import { environment } from '../../environments/environment';
 import { WeatherData } from '../models/weather-data/weather-data';
-import { WeatherActionTypes, WeatherAction } from '../actions/weather.actions';
-import { LocationActionTypes, LocationAction } from '../actions/location.actions';
+import { WeatherActionTypes, WeatherAction } from '../weather/weather.actions';
+import { LocationActionTypes, LocationAction } from '../weather/location.actions';
 import { LocationData } from '../models/location-data/location-data';
 
 export interface WeatherState {

src/app/actions/location.actions.ts renamed to src/app/weather/location.actions.ts

@@ -1,7 +1,7 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
-import { map, startWith, takeUntil } from 'rxjs/operators';
+import { Component, OnInit } from '@angular/core';
+import { map, startWith } from 'rxjs/operators';
 import { Breakpoints, BreakpointObserver } from '@angular/cdk/layout';
-import { WeatherService } from '../services/weather.service';
+import { WeatherService } from './weather.service';
 import { CurrentConditionsComponent } from '../cards/current-conditions/current-conditions.component';
 import { WeatherDiscussionComponent } from '../cards/weather-discussion/weather-discussion.component';
 import { WeeklyForecastComponent } from '../cards/weekly-forecast/weekly-forecast.component';
@@ -10,14 +10,14 @@ import { AboutDesktopComponent } from '../cards/about-desktop/about-desktop.comp
 import { AboutMobileComponent } from '../cards/about-mobile/about-mobile.component';
 import { Store, select } from '@ngrx/store';
 import { AppState, selectError } from '../reducers';
-import { LoadLocations } from '../actions/location.actions';
+import { LoadLocations } from './location.actions';
 import { LocationData } from '../models/location-data/location-data';
 import { FormControl } from '@angular/forms';
 import { Observable, Subject } from 'rxjs';
 import * as USCities from '../../assets/us_cities.json';
 import { City } from '../models/city/city';
 import { MatAutocompleteSelectedEvent } from '@angular/material';
-import { LoadWeather } from '../actions/weather.actions';
+import { LoadWeather } from './weather.actions';
 
 @Component({
   selector: 'app-weather',

src/app/actions/weather.actions.ts renamed to src/app/weather/weather.actions.ts

@@ -1,4 +1,4 @@
-import { TestBed, inject } from '@angular/core/testing';
+import { TestBed } from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { Observable } from 'rxjs';
 

src/app/weather/weather.component.ts

@@ -1,12 +1,12 @@
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects';
-import { LoadWeather } from '../actions/weather.actions';
+import { LoadWeather } from './weather.actions';
 import { map, mergeMap, catchError } from 'rxjs/operators';
 import { AppState } from '../reducers';
 import { Store } from '@ngrx/store';
-import { WeatherService } from '../services/weather.service';
-import { LocationActionTypes, LocationsError, LoadLocations } from '../actions/location.actions';
-import { of, throwError } from 'rxjs';
+import { WeatherService } from './weather.service';
+import { LocationActionTypes, LocationsError, LoadLocations } from './location.actions';
+import { of } from 'rxjs';
 
 @Injectable()
 export class WeatherEffects {

src/app/effects/weather.effects.spec.ts renamed to src/app/weather/weather.effects.spec.ts

@@ -1,10 +1,10 @@
-import { TestBed, async, inject } from '@angular/core/testing';
+import { TestBed, async } from '@angular/core/testing';
 import { WeatherService } from './weather.service';
 import { HttpClientModule } from '@angular/common/http';
 import { StoreModule } from '@ngrx/store';
 import { reducers, metaReducers } from '../reducers';
 import { LocationData } from '../models/location-data/location-data';
-import { of, throwError } from 'rxjs';
+import { of } from 'rxjs';
 import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { HttpClient } from '@angular/common/http';
 import { environment } from 'src/environments/environment';

src/app/effects/weather.effects.ts renamed to src/app/weather/weather.effects.ts

@@ -4,7 +4,7 @@ import { environment } from '../../environments/environment';
 import { WeatherData } from '../models/weather-data/weather-data';
 import { WeeklyForecast } from '../models/weekly-forecast/weekly-forecast';
 import { HourlyForecast } from '../models/hourly-forecast/hourly-forecast';
-import { Observable, throwError, of } from 'rxjs';
+import { Observable, throwError } from 'rxjs';
 import { catchError, mergeMap } from 'rxjs/operators';
 import { map } from 'rxjs/operators';
 import { LocationData } from '../models/location-data/location-data';