Skip to content

Commit ae53c78

Browse files
IsmaestroIsmael Ramos
authored andcommitted
fix(shared): moved service to core module and removed utils service
1 parent cd0b1d4 commit ae53c78

13 files changed

+39
-80
lines changed

src/app/app.component.spec.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {HeroTopComponent} from './heroes/hero-top/hero-top.component';
88
import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
99
import {APP_CONFIG, AppConfig} from './config/app.config';
1010
import {HeroService} from './heroes/shared/hero.service';
11-
import {UtilsService} from './shared/services/utils.service';
1211
import {Error404Component} from './core/error404/error-404.component';
1312

1413
describe('AppComponent', () => {
@@ -30,8 +29,7 @@ describe('AppComponent', () => {
3029
providers: [
3130
{provide: APP_CONFIG, useValue: AppConfig},
3231
{provide: APP_BASE_HREF, useValue: '/'},
33-
HeroService,
34-
UtilsService
32+
HeroService
3533
],
3634
schemas: [CUSTOM_ELEMENTS_SCHEMA]
3735
}).compileComponents();
@@ -55,4 +53,8 @@ describe('AppComponent', () => {
5553
expect(component.title.getTitle()).toBe('Heroes list');
5654
});
5755
}));
56+
57+
it('should check browser features', (() => {
58+
expect(component.checkBrowserFeatures()).toBeTruthy();
59+
}));
5860
});

src/app/app.component.ts

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import {Meta, Title} from '@angular/platform-browser';
44

55
import {NavigationEnd, Router} from '@angular/router';
66
import {AppConfig} from './config/app.config';
7-
import {UtilsService} from './shared/services/utils.service';
7+
import {MatSnackBar} from '@angular/material';
88

9+
declare const Modernizr;
910

1011
@Component({
1112
selector: 'app-root',
@@ -17,7 +18,7 @@ export class AppComponent {
1718
constructor(private translateService: TranslateService,
1819
private title: Title,
1920
private meta: Meta,
20-
private utilsService: UtilsService,
21+
private snackBar: MatSnackBar,
2122
private router: Router) {
2223

2324
this.translateService = translateService;
@@ -45,8 +46,25 @@ export class AppComponent {
4546
}
4647
});
4748

48-
this.utilsService.checkBrowserFeatures();
49+
this.checkBrowserFeatures();
4950
}
5051

52+
checkBrowserFeatures() {
53+
let supported = true;
54+
for (let feature in Modernizr) {
55+
if (Modernizr.hasOwnProperty(feature) &&
56+
typeof Modernizr[feature] === 'boolean' && Modernizr[feature] === false) {
57+
supported = false;
58+
break;
59+
}
60+
}
61+
62+
if (!supported) {
63+
this.translateService.get(['updateBrowser']).subscribe((texts) => {
64+
this.snackBar.open(texts['updateBrowser'], 'OK');
65+
});
66+
}
5167

68+
return supported;
69+
}
5270
}

src/app/core/core.module.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ 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';
1415

1516

1617
@NgModule({
@@ -32,7 +33,8 @@ import {Error404Component} from './error404/error-404.component';
3233
Error404Component
3334
],
3435
providers: [
35-
LoggerService
36+
LoggerService,
37+
ProgressBarService
3638
]
3739
})
3840

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 '../../shared/services/progress-bar.service';
7+
import {ProgressBarService} from '../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 '../../shared/services/progress-bar.service';
8+
import {ProgressBarService} from '../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 '../../shared/services/progress-bar.service';
6+
import {ProgressBarService} from '../progress-bar.service';
77

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

src/app/shared/services/progress-bar.service.spec.ts renamed to src/app/core/progress-bar.service.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import {ProgressBarService} from './progress-bar.service';
33

44
import 'rxjs/add/operator/catch';
55
import 'rxjs/add/operator/startWith';
6-
import {HeroService} from '../../heroes/shared/hero.service';
7-
import {TestsModule} from '../modules/tests.module';
6+
import {HeroService} from '../heroes/shared/hero.service';
7+
import {TestsModule} from '../shared/modules/tests.module';
88
import {TranslateModule} from '@ngx-translate/core';
9-
import {APP_CONFIG, AppConfig} from '../../config/app.config';
9+
import {APP_CONFIG, AppConfig} from '../config/app.config';
1010

1111
describe('ProgressBarService', () => {
1212
let progressBarService;

src/app/shared/services/progress-bar.service.ts renamed to src/app/core/progress-bar.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {EventEmitter, Injectable} from '@angular/core';
2-
import {HeroService} from '../../heroes/shared/hero.service';
2+
import {HeroService} from '../heroes/shared/hero.service';
33

44
@Injectable()
55
export class ProgressBarService {

src/app/shared/modules/shared.module.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import {ModuleWithProviders, NgModule} from '@angular/core';
2-
import {ProgressBarService} from '../services/progress-bar.service';
32
import {MaterialModule} from './material.module';
43
import {TranslateModule} from '@ngx-translate/core';
54
import {HeroService} from '../../heroes/shared/hero.service';
6-
import {UtilsService} from '../services/utils.service';
75

86
@NgModule({
97
imports: [
@@ -21,7 +19,7 @@ export class SharedModule {
2119
return {
2220
ngModule: SharedModule,
2321
providers: [
24-
ProgressBarService, HeroService, UtilsService
22+
HeroService
2523
]
2624
};
2725
}

src/app/shared/modules/tests.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {NgModule} from '@angular/core';
2-
import {ProgressBarService} from '../services/progress-bar.service';
2+
import {ProgressBarService} from '../../core/progress-bar.service';
33
import {MaterialModule} from './material.module';
44
import {BrowserModule} from '@angular/platform-browser';
55
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';

0 commit comments

Comments
 (0)