Skip to content

Commit 0ad5c76

Browse files
IsmaestroIsmael Ramos
authored andcommitted
feat(services): add new pipe and catchError functions
1 parent 9099cc1 commit 0ad5c76

22 files changed

+143
-137
lines changed

package-lock.json

Lines changed: 49 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
},
4747
"devDependencies": {
4848
"@angular/cdk": "5.2.4",
49-
"@angular/cli": "1.7.4",
49+
"@angular/cli": "1.7.3",
5050
"@angular/compiler-cli": "5.2.10",
5151
"@angular/language-service": "5.2.10",
5252
"@angular/material": "5.2.4",

src/app/app.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule} from '@angular/common/h
1414
import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
1515
import {HttpLoaderFactory} from './app.translate.factory';
1616
import {HeroTopComponent} from './heroes/hero-top/hero-top.component';
17-
import {ProgressBarService} from './core/progress-bar.service';
17+
import {ProgressBarService} from './core/shared/progress-bar.service';
1818
import {ProgressInterceptor} from './shared/interceptors/progress.interceptor';
1919
import {TimingInterceptor} from './shared/interceptors/timing.interceptor';
2020
import {SampleModule} from 'angular-example-library';

src/app/core/core.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import {CommonModule} from '@angular/common';
33
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
44

55
import {throwIfAlreadyLoaded} from './module-import-guard';
6-
import {LoggerService} from './logger.service';
6+
import {LoggerService} from './shared/logger.service';
77

88
import {NavComponent} from './nav/nav.component';
99
import {FooterComponent} from './footer/footer.component';
1010
import {SharedModule} from '../shared/modules/shared.module';
1111
import {RouterModule} from '@angular/router';
1212
import {SearchBarComponent} from './search-bar/search-bar.component';
1313
import {Error404Component} from './error404/error-404.component';
14-
import {ProgressBarService} from './progress-bar.service';
14+
import {ProgressBarService} from './shared/progress-bar.service';
1515
import {SampleModule} from 'angular-example-library';
1616

1717
@NgModule({

src/app/core/error404/error-404.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {TranslateModule} from '@ngx-translate/core';
44
import {APP_CONFIG, AppConfig} from '../../config/app.config';
55
import {HeroService} from '../../heroes/shared/hero.service';
66
import {MaterialModule} from '../../shared/modules/material.module';
7-
import {ProgressBarService} from '../progress-bar.service';
7+
import {ProgressBarService} from '../shared/progress-bar.service';
88
import {TestsModule} from '../../shared/modules/tests.module';
99
import {Error404Component} from './error-404.component';
1010

src/app/core/nav/nav.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {TranslateModule, TranslateService} from '@ngx-translate/core';
55
import {APP_CONFIG, AppConfig} from '../../config/app.config';
66
import {HeroService} from '../../heroes/shared/hero.service';
77
import {MaterialModule} from '../../shared/modules/material.module';
8-
import {ProgressBarService} from '../progress-bar.service';
8+
import {ProgressBarService} from '../shared/progress-bar.service';
99
import {TestsModule} from '../../shared/modules/tests.module';
1010

1111
describe('NavComponent', () => {

src/app/core/nav/nav.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {TranslateService} from '@ngx-translate/core';
33

44
import {APP_CONFIG, AppConfig} from '../../config/app.config';
55
import {IAppConfig} from '../../config/iapp.config';
6-
import {ProgressBarService} from '../progress-bar.service';
6+
import {ProgressBarService} from '../shared/progress-bar.service';
77

88
@Component({
99
selector: 'app-nav',

src/app/core/search-bar/search-bar.component.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ describe('SearchBarComponent', () => {
4646
}));
4747

4848
it('should get all heroes', fakeAsync(() => {
49-
spyOn(heroService, 'getAllHeroes').and.returnValue(Promise.resolve(true));
49+
spyOn(heroService, 'getHeroes').and.returnValue(Promise.resolve(true));
5050
tick();
5151
fixture.detectChanges();
5252
expect(component.defaultHeroes.length).toBeGreaterThan(0);

src/app/core/search-bar/search-bar.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Component, OnInit} from '@angular/core';
2-
import {LoggerService} from '../logger.service';
2+
import {LoggerService} from '../shared/logger.service';
33
import {Hero} from '../../heroes/shared/hero.model';
44
import {FormControl} from '@angular/forms';
55
import {HeroService} from '../../heroes/shared/hero.service';
@@ -28,7 +28,7 @@ export class SearchBarComponent implements OnInit {
2828
}
2929

3030
ngOnInit() {
31-
this.heroService.getAllHeroes().subscribe((heroes: Array<Hero>) => {
31+
this.heroService.getHeroes().subscribe((heroes: Array<Hero>) => {
3232
this.defaultHeroes = heroes.filter(hero => hero['default']);
3333

3434
this.heroFormControl.valueChanges
File renamed without changes.

0 commit comments

Comments
 (0)