Skip to content

Commit 70defd5

Browse files
committed
CU-8669gwcn1 Fixing modal backdrop
1 parent 93a9078 commit 70defd5

File tree

10 files changed

+18906
-2627
lines changed

10 files changed

+18906
-2627
lines changed

package-lock.json

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

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,22 @@
3636
"@fullcalendar/timegrid": "6.1.10",
3737
"@maptiler/geocoder": "^1.1.0",
3838
"@microsoft/signalr": "^5.0.9",
39-
"@ng-bootstrap/ng-bootstrap": "14.0.0",
39+
"@ng-bootstrap/ng-bootstrap": "14.2.0",
4040
"@ng-select/ng-select": "10.0.4",
4141
"@ngrx/effects": "15.4.0",
4242
"@ngrx/router-store": "15.4.0",
4343
"@ngrx/store": "15.4.0",
4444
"@ngrx/store-devtools": "15.4.0",
4545
"@ngx-translate/core": "13.0.0",
4646
"@ngx-translate/http-loader": "6.0.0",
47+
"@popperjs/core": "2.11.6",
4748
"@resgrid/ngx-resgridlib": "^1.3.31",
4849
"@sentry/angular": "7.86.0",
4950
"@sentry/tracing": "7.86.0",
5051
"@types/jquery": "3.5.6",
5152
"angular-archwizard": "6.1.0",
5253
"base64-arraybuffer": "0.2.0",
53-
"bootstrap": "4.5.0",
54+
"bootstrap": "4.6.2",
5455
"bs-custom-file-input": "1.3.4",
5556
"chart.js": "2.9.4",
5657
"firebase": "7.16.0",

src/app/app.module.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ let getBaseUrl = (): string => {
5151
realtimeGeolocationHubName: environment.realtimeGeolocationHubName,
5252
logLevel: environment.logLevel,
5353
isMobileApp: true,
54-
cacheProvider: null
54+
cacheProvider: null,
55+
storageProvider: null
5556
}),
5657
BrowserAnimationsModule,
5758
LeafletModule,

src/app/features/profile/pages/edit-profile/edit-profile.page.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { AfterViewInit, Component, OnInit } from "@angular/core";
22
import { Router } from "@angular/router";
33
import { IDevice } from "src/app/core/models/deviceType";
4-
import { OpenViduDevicesService } from "src/app/providers/openviduDevices";
54

65
@Component({
76
selector: "app-profile-edit-profile",
@@ -13,7 +12,7 @@ export class EditProfilePage implements OnInit, AfterViewInit {
1312
public microphones: IDevice[] = [];
1413
public selectedMicrophone: IDevice;
1514

16-
constructor(private deviceService: OpenViduDevicesService, private router: Router) {
15+
constructor(private router: Router) {
1716

1817
}
1918

@@ -25,14 +24,14 @@ export class EditProfilePage implements OnInit, AfterViewInit {
2524
}
2625

2726
ngAfterViewInit(): void {
28-
this.deviceService.initDevices().then(() => {
29-
this.microphones = this.deviceService.getMicrophones();
30-
this.selectedMicrophone = this.deviceService.getMicSelected();
31-
});
27+
//this.deviceService.initDevices().then(() => {
28+
// this.microphones = this.deviceService.getMicrophones();
29+
// this.selectedMicrophone = this.deviceService.getMicSelected();
30+
//});
3231
}
3332

3433
public save() {
35-
this.deviceService.setMicSelected(this.selectedMicrophone?.device);
34+
//this.deviceService.setMicSelected(this.selectedMicrophone?.device);
3635
this.router.navigate(['/home']);
3736
}
3837
}

src/app/features/voice/effects/voice.effect.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { from, Observable, of } from "rxjs";
77
import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap";
88
import { VoiceState } from "../store/voice.store";
99
import { VoiceService } from "@resgrid/ngx-resgridlib";
10-
import { OpenViduService } from "src/app/providers/openvidu";
1110
import { HomeState } from "../../home/store/home.store";
1211
import { selectAuthState } from "src/app/store";
1312
import { AuthState } from "../../auth/store/auth.store";
@@ -60,7 +59,7 @@ export class VoiceEffects {
6059
ofType<voiceAction.SetNoChannel>(voiceAction.VoiceActionTypes.SET_NOCHANNEL),
6160
tap((data) => {
6261
//this.voiceProvider.disconnect();
63-
this.openViduService.leaveSession();
62+
//this.openViduService.leaveSession();
6463
})
6564
),
6665
{ dispatch: false }
@@ -75,10 +74,10 @@ export class VoiceEffects {
7574
concatMap((data) => {
7675
if (data && data.channel) {
7776
if (data.channel.Id === "") {
78-
this.openViduService.leaveSession();
77+
//this.openViduService.leaveSession();
7978
return of(data);
8079
} else {
81-
return this.openViduService.joinChannel(data.channel, authState.user.fullName + "(Dispatch)");
80+
//return this.openViduService.joinChannel(data.channel, authState.user.fullName + "(Dispatch)");
8281
}
8382
}
8483
}),
@@ -96,7 +95,7 @@ export class VoiceEffects {
9695
ofType<voiceAction.StartTransmitting>(voiceAction.VoiceActionTypes.START_TRANSMITTING),
9796
tap((data) => {
9897
//this.voiceProvider.unmute();
99-
this.openViduService.unmute();
98+
//this.openViduService.unmute();
10099
})
101100
),
102101
{ dispatch: false }
@@ -108,7 +107,7 @@ export class VoiceEffects {
108107
ofType<voiceAction.StopTransmitting>(voiceAction.VoiceActionTypes.STOP_TRANSMITTING),
109108
tap((data) => {
110109
//this.voiceProvider.mute();
111-
this.openViduService.mute();
110+
//this.openViduService.mute();
112111
})
113112
),
114113
{ dispatch: false }
@@ -139,7 +138,6 @@ export class VoiceEffects {
139138
private store: Store<VoiceState>,
140139
//private voiceProvider: KazooVoiceService,
141140
private voiceService: VoiceService,
142-
private openViduService: OpenViduService,
143141
private homeStore: Store<HomeState>,
144142
private authStore: Store<AuthState>
145143
) {}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<app-vertical></app-vertical>
2-
<app-voice-footer></app-voice-footer>
2+
<!--<app-voice-footer></app-voice-footer>-->

src/app/providers/openvidu.ts

Lines changed: 0 additions & 251 deletions
This file was deleted.

0 commit comments

Comments
 (0)