Rebase changes

src/app/app.component.ts

@@ -4,7 +4,6 @@ import { SidenavService } from './core/service/sidenav.service';
 import { Component, ViewChild, OnInit } from '@angular/core';
 import { MatSidenav } from '@angular/material';
 import { ActivatedRoute } from '@angular/router';
-import { DegreePlannerDataService } from './core/service/degree-planner-data.service';
 import { Observable } from 'rxjs';
 import { debounceTime, switchMap, tap } from 'rxjs/operators';
 import { MatDialog } from '@angular/material';
@@ -31,11 +30,9 @@ export class AppComponent implements OnInit {
         private dataService: DataService,
         private route: ActivatedRoute,
         private sidenavService: SidenavService,
-        private degreePlannerDataSvc: DegreePlannerDataService,
         private fb: FormBuilder) {
             this.coursesInput = new FormControl('', [Validators.required]);
             this.selectedDegreePlan = 520224;
-            this.coursesData$ = this.degreePlannerDataSvc.getDegreePlanDataById(this.selectedDegreePlan);
     }
 
     ngOnInit() {
@@ -62,7 +59,6 @@ export class AppComponent implements OnInit {
 
 }
 
-}
 document.addEventListener('WebComponentsReady', function() {
     const customEvent = new CustomEvent('myuw-login', {
         detail: {

src/app/app.module.ts

@@ -6,15 +6,16 @@ import { StoreModule } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 import { EffectsModule } from '@ngrx/effects';
 
+import { DataService } from './core/data.service';
 import { AppRoutingModule } from './app.routing.module';
 import { AppComponent } from './app.component';
 import { CoreModule } from '@app/core/core.module';
 import { SharedModule } from '@app/shared/shared.module';
 import { HeaderComponent } from './core/header/header.component';
 import { SidenavService } from './core/service/sidenav.service';
-import { degreePlannerReducer } from '@app/degree-planner/reducer';
-import { DegreePlanEffects } from '@app/degree-planner/effects/plan.effects';
-import { NoteEffects } from '@app/degree-planner/effects/note.effects';
+import { degreePlannerReducer } from '@app/degree-planner/store/reducer';
+import { DegreePlanEffects } from '@app/degree-planner/store/effects/plan.effects';
+import { NoteEffects } from '@app/degree-planner/store/effects/note.effects';
 import { MatAutocompleteModule } from '@angular/material/autocomplete';
 import { CourseDetailsDialogComponent } from './degree-planner/dialogs/course-details-dialog/course-details-dialog.component';
 
@@ -40,7 +41,7 @@ import { CourseDetailsDialogComponent } from './degree-planner/dialogs/course-de
 		HeaderComponent
 	],
 	entryComponents: [CourseDetailsDialogComponent],
-	providers: [ SidenavService ],
+	providers: [ SidenavService, DataService ],
 	bootstrap: [ AppComponent ],
 	schemas: [ CUSTOM_ELEMENTS_SCHEMA ]
 })