diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b8476c6..837022e 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,27 +1,27 @@ -import { BrowserModule } from '@angular/platform-browser'; -import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; -import { HttpClientModule, HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http'; -import { TranslateHttpLoader } from '@ngx-translate/http-loader'; -import { environment } from '../environments/environment'; -import { LayoutsModule } from './layouts/layouts.module'; -import { NgxResgridLibModule } from '@resgrid/ngx-resgridlib'; -import { AppRoutingModule } from './app-routing.module'; -import { AppComponent } from './app.component'; -import { NgxSpinnerModule } from 'ngx-spinner'; -import { StoreModule } from '@ngrx/store'; -import { metaReducers, reducers } from './store/reducers'; -import { EffectsModule } from '@ngrx/effects'; -import { StoreRouterConnectingModule } from '@ngrx/router-store'; -import { StoreDevtoolsModule } from '@ngrx/store-devtools'; -import { AuthModule } from './features/auth/auth.module'; -import { LeafletModule } from '@asymmetrik/ngx-leaflet'; -import { VoiceModule } from './features/voice/voice.module'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { MappingModule } from './features/mapping/mapping.module'; -import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; +import { BrowserModule } from "@angular/platform-browser"; +import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from "@angular/core"; +import { HttpClientModule, HTTP_INTERCEPTORS, HttpClient } from "@angular/common/http"; +import { TranslateHttpLoader } from "@ngx-translate/http-loader"; +import { environment } from "../environments/environment"; +import { LayoutsModule } from "./layouts/layouts.module"; +import { NgxResgridLibModule } from "@resgrid/ngx-resgridlib"; +import { AppRoutingModule } from "./app-routing.module"; +import { AppComponent } from "./app.component"; +import { NgxSpinnerModule } from "ngx-spinner"; +import { StoreModule } from "@ngrx/store"; +import { metaReducers, reducers } from "./store/reducers"; +import { EffectsModule } from "@ngrx/effects"; +import { StoreRouterConnectingModule } from "@ngrx/router-store"; +import { StoreDevtoolsModule } from "@ngrx/store-devtools"; +import { AuthModule } from "./features/auth/auth.module"; +import { LeafletModule } from "@asymmetrik/ngx-leaflet"; +import { VoiceModule } from "./features/voice/voice.module"; +import { BrowserAnimationsModule } from "@angular/platform-browser/animations"; +import { MappingModule } from "./features/mapping/mapping.module"; +import { TranslateModule, TranslateLoader } from "@ngx-translate/core"; export function createTranslateLoader(http: HttpClient): any { - return new TranslateHttpLoader(http, 'assets/i18n/', '.json'); + return new TranslateHttpLoader(http, "assets/i18n/", ".json"); } let getBaseUrl = (): string => { @@ -34,17 +34,15 @@ let getBaseUrl = (): string => { }; @NgModule({ - declarations: [ - AppComponent - ], + declarations: [AppComponent], imports: [ BrowserModule, HttpClientModule, AppRoutingModule, NgxResgridLibModule.forRoot({ baseApiUrl: getBaseUrl, - apiVersion: 'v4', - clientId: 'RgDispatchApp', + apiVersion: "v4", + clientId: "RgDispatchApp", googleApiKey: environment.googleMapsKey, channelUrl: environment.channelUrl, channelHubName: environment.channelHubName, @@ -52,8 +50,8 @@ let getBaseUrl = (): string => { logLevel: environment.logLevel, isMobileApp: true, cacheProvider: null, - storageProvider: null - }), + storageProvider: null, + }), BrowserAnimationsModule, LeafletModule, NgxSpinnerModule, @@ -62,20 +60,20 @@ let getBaseUrl = (): string => { StoreRouterConnectingModule.forRoot(), StoreDevtoolsModule.instrument({ maxAge: 10, // number of states to retain - name: 'Resgrid Dispatch', - logOnly: environment.production + name: "Resgrid Dispatch", + logOnly: environment.production, }), TranslateModule.forRoot({ loader: { provide: TranslateLoader, useFactory: createTranslateLoader, - deps: [HttpClient] - } + deps: [HttpClient], + }, }), AuthModule, VoiceModule, LayoutsModule, - MappingModule + MappingModule, ], providers: [ //{ provide: HTTP_INTERCEPTORS, useClass: JwtInterceptor, multi: true }, @@ -83,6 +81,6 @@ let getBaseUrl = (): string => { //{ provide: HTTP_INTERCEPTORS, useClass: FakeBackendInterceptor, multi: true }, ], schemas: [CUSTOM_ELEMENTS_SCHEMA], - bootstrap: [AppComponent] + bootstrap: [AppComponent], }) -export class AppModule { } +export class AppModule {} diff --git a/src/app/features/profile/pages/edit-profile/edit-profile.page.ts b/src/app/features/profile/pages/edit-profile/edit-profile.page.ts index 125d46c..ee6f51b 100644 --- a/src/app/features/profile/pages/edit-profile/edit-profile.page.ts +++ b/src/app/features/profile/pages/edit-profile/edit-profile.page.ts @@ -12,15 +12,10 @@ export class EditProfilePage implements OnInit, AfterViewInit { public microphones: IDevice[] = []; public selectedMicrophone: IDevice; - constructor(private router: Router) { - - } + constructor(private router: Router) {} ngOnInit(): void { - this.breadCrumbItems = [ - { label: "Resgrid Dispatch" }, - { label: "Edit Profile", active: true }, - ]; + this.breadCrumbItems = [{ label: "Resgrid Dispatch" }, { label: "Edit Profile", active: true }]; } ngAfterViewInit(): void { @@ -32,6 +27,6 @@ export class EditProfilePage implements OnInit, AfterViewInit { public save() { //this.deviceService.setMicSelected(this.selectedMicrophone?.device); - this.router.navigate(['/home']); + this.router.navigate(["/home"]); } } diff --git a/src/app/features/voice/effects/voice.effect.ts b/src/app/features/voice/effects/voice.effect.ts index 8d110db..133e457 100644 --- a/src/app/features/voice/effects/voice.effect.ts +++ b/src/app/features/voice/effects/voice.effect.ts @@ -26,10 +26,10 @@ export class VoiceEffects { })), tap((data) => {}), // If request fails, dispatch failed action - catchError(() => of({ type: voiceAction.VoiceActionTypes.GET_VOIPINFO_FAIL })) - ) - ) - ) + catchError(() => of({ type: voiceAction.VoiceActionTypes.GET_VOIPINFO_FAIL })), + ), + ), + ), ); getVoipInfoSuccess$ = createEffect(() => @@ -38,8 +38,8 @@ export class VoiceEffects { map((data) => ({ type: voiceAction.VoiceActionTypes.START_VOIP_SERVICES, payload: data.payload, - })) - ) + })), + ), ); startVoipServices$ = createEffect( @@ -48,9 +48,9 @@ export class VoiceEffects { ofType(voiceAction.VoiceActionTypes.START_VOIP_SERVICES), tap((action) => { //this.voiceProvider.startVoipServices(action.payload); - }) + }), ), - { dispatch: false } + { dispatch: false }, ); setNoChannel$ = createEffect( @@ -60,9 +60,9 @@ export class VoiceEffects { tap((data) => { //this.voiceProvider.disconnect(); //this.openViduService.leaveSession(); - }) + }), ), - { dispatch: false } + { dispatch: false }, ); setActiveChannel$ = createEffect(() => @@ -83,10 +83,10 @@ export class VoiceEffects { }), map((data) => ({ type: voiceAction.VoiceActionTypes.DONE, - })) - ) - ) - ) + })), + ), + ), + ), ); voipCallStartTransmitting$ = createEffect( @@ -96,9 +96,9 @@ export class VoiceEffects { tap((data) => { //this.voiceProvider.unmute(); //this.openViduService.unmute(); - }) + }), ), - { dispatch: false } + { dispatch: false }, ); voipCallStopTransmitting$ = createEffect( @@ -108,9 +108,9 @@ export class VoiceEffects { tap((data) => { //this.voiceProvider.mute(); //this.openViduService.mute(); - }) + }), ), - { dispatch: false } + { dispatch: false }, ); addOpenViduStream$ = createEffect(() => @@ -118,8 +118,8 @@ export class VoiceEffects { ofType(voiceAction.VoiceActionTypes.ADD_OPENVIDU_STREAM), map((data) => ({ type: voiceAction.VoiceActionTypes.DONE, - })) - ) + })), + ), ); removeOpenViduStream$ = createEffect(() => @@ -127,8 +127,8 @@ export class VoiceEffects { ofType(voiceAction.VoiceActionTypes.REMOVE_OPENVIDU_STREAM), map((data) => ({ type: voiceAction.VoiceActionTypes.DONE, - })) - ) + })), + ), ); done$ = createEffect(() => this.actions$.pipe(ofType(voiceAction.VoiceActionTypes.DONE)), { dispatch: false }); @@ -139,6 +139,6 @@ export class VoiceEffects { //private voiceProvider: KazooVoiceService, private voiceService: VoiceService, private homeStore: Store, - private authStore: Store + private authStore: Store, ) {} } diff --git a/src/app/layouts/layout/layout.component.html b/src/app/layouts/layout/layout.component.html index 95436d2..5f94f28 100644 --- a/src/app/layouts/layout/layout.component.html +++ b/src/app/layouts/layout/layout.component.html @@ -1,2 +1,2 @@ - \ No newline at end of file + diff --git a/src/assets/scss/app-dark.scss b/src/assets/scss/app-dark.scss index 9aaa7c4..d7c967a 100644 --- a/src/assets/scss/app-dark.scss +++ b/src/assets/scss/app-dark.scss @@ -28,7 +28,6 @@ @import "custom/components/demos"; @import "custom/components/print"; - // Plugins @import "custom/plugins/custom-scrollbar"; @import "custom/plugins/calendar"; @@ -54,7 +53,6 @@ @import "custom/plugins/google-map"; @import "custom/plugins/vector-maps"; - // Pages @import "custom/pages/authentication"; @import "custom/pages/ecommerce"; @@ -66,5 +64,5 @@ @import "custom/pages/extras-pages"; ngb-modal-backdrop { - z-index: 1040 !important; -} \ No newline at end of file + z-index: 1040 !important; +} diff --git a/src/assets/scss/app.scss b/src/assets/scss/app.scss index 2025759..d839e6e 100644 --- a/src/assets/scss/app.scss +++ b/src/assets/scss/app.scss @@ -71,10 +71,10 @@ // @import "custom/rtl/pages-rtl"; .required { - font-style: italic; - color: cornflowerblue; + font-style: italic; + color: cornflowerblue; } ngb-modal-backdrop { - z-index: 1040 !important; -} \ No newline at end of file + z-index: 1040 !important; +}