Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21,051 changes: 18,880 additions & 2,171 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,22 @@
"@fullcalendar/timegrid": "6.1.10",
"@maptiler/geocoder": "^1.1.0",
"@microsoft/signalr": "^5.0.9",
"@ng-bootstrap/ng-bootstrap": "14.0.0",
"@ng-bootstrap/ng-bootstrap": "14.2.0",
"@ng-select/ng-select": "10.0.4",
"@ngrx/effects": "15.4.0",
"@ngrx/router-store": "15.4.0",
"@ngrx/store": "15.4.0",
"@ngrx/store-devtools": "15.4.0",
"@ngx-translate/core": "13.0.0",
"@ngx-translate/http-loader": "6.0.0",
"@popperjs/core": "2.11.6",
"@resgrid/ngx-resgridlib": "^1.3.31",
"@sentry/angular": "7.86.0",
"@sentry/tracing": "7.86.0",
"@types/jquery": "3.5.6",
"angular-archwizard": "6.1.0",
"base64-arraybuffer": "0.2.0",
"bootstrap": "4.5.0",
"bootstrap": "4.6.2",
"bs-custom-file-input": "1.3.4",
"chart.js": "2.9.4",
"firebase": "7.16.0",
Expand Down
3 changes: 2 additions & 1 deletion src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ let getBaseUrl = (): string => {
realtimeGeolocationHubName: environment.realtimeGeolocationHubName,
logLevel: environment.logLevel,
isMobileApp: true,
cacheProvider: null
cacheProvider: null,
storageProvider: null
}),
BrowserAnimationsModule,
LeafletModule,
Expand Down
13 changes: 6 additions & 7 deletions src/app/features/profile/pages/edit-profile/edit-profile.page.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { AfterViewInit, Component, OnInit } from "@angular/core";
import { Router } from "@angular/router";
import { IDevice } from "src/app/core/models/deviceType";
import { OpenViduDevicesService } from "src/app/providers/openviduDevices";

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

constructor(private deviceService: OpenViduDevicesService, private router: Router) {
constructor(private router: Router) {

}

Expand All @@ -25,14 +24,14 @@ export class EditProfilePage implements OnInit, AfterViewInit {
}

ngAfterViewInit(): void {
this.deviceService.initDevices().then(() => {
this.microphones = this.deviceService.getMicrophones();
this.selectedMicrophone = this.deviceService.getMicSelected();
});
//this.deviceService.initDevices().then(() => {
// this.microphones = this.deviceService.getMicrophones();
// this.selectedMicrophone = this.deviceService.getMicSelected();
//});
}

public save() {
this.deviceService.setMicSelected(this.selectedMicrophone?.device);
//this.deviceService.setMicSelected(this.selectedMicrophone?.device);
this.router.navigate(['/home']);
}
}
12 changes: 5 additions & 7 deletions src/app/features/voice/effects/voice.effect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import { from, Observable, of } from "rxjs";
import { NgbModal, NgbModalRef } from "@ng-bootstrap/ng-bootstrap";
import { VoiceState } from "../store/voice.store";
import { VoiceService } from "@resgrid/ngx-resgridlib";
import { OpenViduService } from "src/app/providers/openvidu";
import { HomeState } from "../../home/store/home.store";
import { selectAuthState } from "src/app/store";
import { AuthState } from "../../auth/store/auth.store";
Expand Down Expand Up @@ -60,7 +59,7 @@ export class VoiceEffects {
ofType<voiceAction.SetNoChannel>(voiceAction.VoiceActionTypes.SET_NOCHANNEL),
tap((data) => {
//this.voiceProvider.disconnect();
this.openViduService.leaveSession();
//this.openViduService.leaveSession();
})
),
{ dispatch: false }
Expand All @@ -75,10 +74,10 @@ export class VoiceEffects {
concatMap((data) => {
if (data && data.channel) {
if (data.channel.Id === "") {
this.openViduService.leaveSession();
//this.openViduService.leaveSession();
return of(data);
} else {
return this.openViduService.joinChannel(data.channel, authState.user.fullName + "(Dispatch)");
//return this.openViduService.joinChannel(data.channel, authState.user.fullName + "(Dispatch)");
}
}
}),
Expand All @@ -96,7 +95,7 @@ export class VoiceEffects {
ofType<voiceAction.StartTransmitting>(voiceAction.VoiceActionTypes.START_TRANSMITTING),
tap((data) => {
//this.voiceProvider.unmute();
this.openViduService.unmute();
//this.openViduService.unmute();
})
),
{ dispatch: false }
Expand All @@ -108,7 +107,7 @@ export class VoiceEffects {
ofType<voiceAction.StopTransmitting>(voiceAction.VoiceActionTypes.STOP_TRANSMITTING),
tap((data) => {
//this.voiceProvider.mute();
this.openViduService.mute();
//this.openViduService.mute();
})
),
{ dispatch: false }
Expand Down Expand Up @@ -139,7 +138,6 @@ export class VoiceEffects {
private store: Store<VoiceState>,
//private voiceProvider: KazooVoiceService,
private voiceService: VoiceService,
private openViduService: OpenViduService,
private homeStore: Store<HomeState>,
private authStore: Store<AuthState>
) {}
Expand Down
2 changes: 1 addition & 1 deletion src/app/layouts/layout/layout.component.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<app-vertical></app-vertical>
<app-voice-footer></app-voice-footer>
<!--<app-voice-footer></app-voice-footer>-->
251 changes: 0 additions & 251 deletions src/app/providers/openvidu.ts

This file was deleted.

Loading
Loading