Skip to content

Commit

Permalink
fix(shared): moved service to core module and removed utils service
Browse files Browse the repository at this point in the history
  • Loading branch information
Ismaestro authored and Ismael Ramos committed Oct 18, 2017
1 parent cd0b1d4 commit ae53c78
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 80 deletions.
8 changes: 5 additions & 3 deletions src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {HeroTopComponent} from './heroes/hero-top/hero-top.component';
import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
import {APP_CONFIG, AppConfig} from './config/app.config';
import {HeroService} from './heroes/shared/hero.service';
import {UtilsService} from './shared/services/utils.service';
import {Error404Component} from './core/error404/error-404.component';

describe('AppComponent', () => {
Expand All @@ -30,8 +29,7 @@ describe('AppComponent', () => {
providers: [
{provide: APP_CONFIG, useValue: AppConfig},
{provide: APP_BASE_HREF, useValue: '/'},
HeroService,
UtilsService
HeroService
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
}).compileComponents();
Expand All @@ -55,4 +53,8 @@ describe('AppComponent', () => {
expect(component.title.getTitle()).toBe('Heroes list');
});
}));

it('should check browser features', (() => {
expect(component.checkBrowserFeatures()).toBeTruthy();
}));
});
24 changes: 21 additions & 3 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ import {Meta, Title} from '@angular/platform-browser';

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

declare const Modernizr;

@Component({
selector: 'app-root',
Expand All @@ -17,7 +18,7 @@ export class AppComponent {
constructor(private translateService: TranslateService,
private title: Title,
private meta: Meta,
private utilsService: UtilsService,
private snackBar: MatSnackBar,
private router: Router) {

this.translateService = translateService;
Expand Down Expand Up @@ -45,8 +46,25 @@ export class AppComponent {
}
});

this.utilsService.checkBrowserFeatures();
this.checkBrowserFeatures();
}

checkBrowserFeatures() {
let supported = true;
for (let feature in Modernizr) {
if (Modernizr.hasOwnProperty(feature) &&
typeof Modernizr[feature] === 'boolean' && Modernizr[feature] === false) {
supported = false;
break;
}
}

if (!supported) {
this.translateService.get(['updateBrowser']).subscribe((texts) => {
this.snackBar.open(texts['updateBrowser'], 'OK');
});
}

return supported;
}
}
4 changes: 3 additions & 1 deletion src/app/core/core.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {SharedModule} from '../shared/modules/shared.module';
import {RouterModule} from '@angular/router';
import {SearchBarComponent} from './search-bar/search-bar.component';
import {Error404Component} from './error404/error-404.component';
import {ProgressBarService} from './progress-bar.service';


@NgModule({
Expand All @@ -32,7 +33,8 @@ import {Error404Component} from './error404/error-404.component';
Error404Component
],
providers: [
LoggerService
LoggerService,
ProgressBarService
]
})

Expand Down
2 changes: 1 addition & 1 deletion src/app/core/error404/error-404.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {TranslateModule} from '@ngx-translate/core';
import {APP_CONFIG, AppConfig} from '../../config/app.config';
import {HeroService} from '../../heroes/shared/hero.service';
import {MaterialModule} from '../../shared/modules/material.module';
import {ProgressBarService} from '../../shared/services/progress-bar.service';
import {ProgressBarService} from '../progress-bar.service';
import {TestsModule} from '../../shared/modules/tests.module';
import {Error404Component} from './error-404.component';

Expand Down
2 changes: 1 addition & 1 deletion src/app/core/nav/nav.component.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {TranslateModule, TranslateService} from '@ngx-translate/core';
import {APP_CONFIG, AppConfig} from '../../config/app.config';
import {HeroService} from '../../heroes/shared/hero.service';
import {MaterialModule} from '../../shared/modules/material.module';
import {ProgressBarService} from '../../shared/services/progress-bar.service';
import {ProgressBarService} from '../progress-bar.service';
import {TestsModule} from '../../shared/modules/tests.module';

describe('NavComponent', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/nav/nav.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {TranslateService} from '@ngx-translate/core';

import {APP_CONFIG, AppConfig} from '../../config/app.config';
import {IAppConfig} from '../../config/iapp.config';
import {ProgressBarService} from '../../shared/services/progress-bar.service';
import {ProgressBarService} from '../progress-bar.service';

@Component({
selector: 'app-nav',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import {ProgressBarService} from './progress-bar.service';

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

describe('ProgressBarService', () => {
let progressBarService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {EventEmitter, Injectable} from '@angular/core';
import {HeroService} from '../../heroes/shared/hero.service';
import {HeroService} from '../heroes/shared/hero.service';

@Injectable()
export class ProgressBarService {
Expand Down
4 changes: 1 addition & 3 deletions src/app/shared/modules/shared.module.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import {ModuleWithProviders, NgModule} from '@angular/core';
import {ProgressBarService} from '../services/progress-bar.service';
import {MaterialModule} from './material.module';
import {TranslateModule} from '@ngx-translate/core';
import {HeroService} from '../../heroes/shared/hero.service';
import {UtilsService} from '../services/utils.service';

@NgModule({
imports: [
Expand All @@ -21,7 +19,7 @@ export class SharedModule {
return {
ngModule: SharedModule,
providers: [
ProgressBarService, HeroService, UtilsService
HeroService
]
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/modules/tests.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NgModule} from '@angular/core';
import {ProgressBarService} from '../services/progress-bar.service';
import {ProgressBarService} from '../../core/progress-bar.service';
import {MaterialModule} from './material.module';
import {BrowserModule} from '@angular/platform-browser';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
Expand Down
30 changes: 0 additions & 30 deletions src/app/shared/services/utils.service.spec.ts

This file was deleted.

32 changes: 0 additions & 32 deletions src/app/shared/services/utils.service.ts

This file was deleted.

1 change: 1 addition & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
import {enableProdMode} from '@angular/core';
import {environment} from './environments/environment';
import {AppModule} from './app/app.module';
import {ProgressBarService} from './app/core/progress-bar.service';

if (environment.production) {
enableProdMode();
Expand Down

0 comments on commit ae53c78

Please sign in to comment.