Skip to content

Commit 352d447

Browse files
feat(APP): refactor utils helper service and some imports
1 parent e693968 commit 352d447

14 files changed

Lines changed: 55 additions & 62 deletions

File tree

angular.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"includePaths": ["src/app/shared/styles"]
5353
},
5454
"allowedCommonJsDependencies": [
55-
"~app/modules/core/services/utils-helper.service"
55+
"~modules/core/services/utils.service"
5656
],
5757
"scripts": [
5858
"src/assets/js/gtm.js",

src/app/app.component.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { NavigationEnd, Router } from '@angular/router';
44
import { MatSnackBar } from '@angular/material/snack-bar';
55
import { DOCUMENT } from '@angular/common';
66
import { RoutesConfig } from './configs/routes.config';
7-
import { UtilsHelperService } from '~app/modules/core/services/utils-helper.service';
7+
import { UtilsService } from '~modules/core/services/utils.service';
88

99
declare const Modernizr: any;
1010

@@ -58,7 +58,7 @@ export class AppComponent implements OnInit {
5858
}
5959

6060
checkBrowser() {
61-
if (UtilsHelperService.isBrowserValid()) {
61+
if (UtilsService.isBrowserValid()) {
6262
this.checkBrowserFeatures();
6363
} else {
6464
this.snackBar.open('Change your browser', 'OK');

src/app/modules/auth/auth.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import { Injectable } from '@angular/core';
33
import { MatSnackBar } from '@angular/material/snack-bar';
44
import { Apollo, gql } from 'apollo-angular';
55
import { map } from 'rxjs/operators';
6-
import { UtilsService } from '~shared/services/utils.service';
76
import jwt_decode from 'jwt-decode';
87
import { StorageKey, StorageService } from '~shared/services/storage.service';
8+
import { UtilsService } from '~modules/core/services/utils.service';
99

1010
@Injectable({
1111
providedIn: 'root',

src/app/modules/auth/pages/log-in-page/log-in-page.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'
55
import { AuthService } from '../../auth.service';
66
import { RoutesConfig } from '~app/configs/routes.config';
77
import { Router } from '@angular/router';
8-
import { UtilsService } from '~shared/services/utils.service';
8+
import { UtilsService } from '~modules/core/services/utils.service';
99

1010
export enum UserLoginError {
1111
BAD_CREDENTIALS = 11000,

src/app/modules/auth/pages/sign-up-page/sign-up-page.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { transition, trigger, useAnimation } from '@angular/animations';
33
import { fadeIn } from 'ng-animate';
44
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
55
import { AuthService } from '../../auth.service';
6-
import { UtilsService } from '~shared/services/utils.service';
6+
import { UtilsService } from '~modules/core/services/utils.service';
77
import { RoutesConfig } from '~app/configs/routes.config';
88
import { Router } from '@angular/router';
99

src/app/modules/core/core.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@ import { SentryErrorHandler } from './sentry.errorhandler';
1212
import { TokenInterceptor } from './interceptors/token.interceptor';
1313
import { StorageService } from '~shared/services/storage.service';
1414
import { Apollo } from 'apollo-angular';
15+
import { SharedModule } from '~shared/shared.module';
1516

1617
@NgModule({
1718
imports: [
1819
RouterModule,
1920
BrowserAnimationsModule,
21+
SharedModule,
2022
NgxExampleLibraryModule.forRoot({
2123
config: {
2224
say: 'hello',
File renamed without changes.

src/app/modules/core/services/utils-helper.service.spec.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { TestBed, waitForAsync } from '@angular/core/testing';
2+
import { UtilsService } from './utils.service';
3+
4+
describe('UtilsService', () => {
5+
let utilsHelperService: UtilsService;
6+
7+
beforeEach(waitForAsync(() => {
8+
TestBed.configureTestingModule({
9+
providers: [UtilsService],
10+
});
11+
12+
utilsHelperService = TestBed.inject(UtilsService);
13+
}));
14+
15+
it('should check if is palindrome', () => {
16+
expect(UtilsService.isPalindrome('')).toBe(true);
17+
expect(UtilsService.isPalindrome('asd')).toBe(false);
18+
expect(UtilsService.isPalindrome('aas')).toBe(false);
19+
expect(UtilsService.isPalindrome('ass')).toBe(false);
20+
expect(UtilsService.isPalindrome('aassaa')).toBe(true);
21+
expect(UtilsService.isPalindrome('asa')).toBe(true);
22+
expect(UtilsService.isPalindrome('asswssa')).toBe(true);
23+
});
24+
25+
it('should check if browser is valid', () => {
26+
expect(UtilsService.isBrowserValid()).toBe(true);
27+
});
28+
});

src/app/modules/core/services/utils-helper.service.ts renamed to src/app/modules/core/services/utils.service.ts

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
import { Injectable } from '@angular/core';
2+
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar';
3+
import { AppConfig } from '~app/configs/app.config';
24

35
declare const require: any;
46
const bowser = require('bowser');
57

68
@Injectable({
79
providedIn: 'root',
810
})
9-
export class UtilsHelperService {
11+
export class UtilsService {
12+
constructor(private snackBar: MatSnackBar) {}
13+
1014
static isPalindrome(str: string) {
1115
const len = Math.floor(str.length / 2);
1216
for (let i = 0; i < len; i++) {
@@ -31,4 +35,13 @@ export class UtilsHelperService {
3135
opera: '>22',
3236
});
3337
}
38+
39+
showSnackBar(name: string, panelClass: string): void {
40+
const config: any = new MatSnackBarConfig();
41+
config.duration = panelClass === 'warning-snack-bar' ? 50000 : AppConfig.snackBarDuration;
42+
config.horizontalPosition = 'right';
43+
config.verticalPosition = 'top';
44+
config.panelClass = panelClass;
45+
this.snackBar.open(name, 'OK', config);
46+
}
3447
}

0 commit comments

Comments
 (0)