pull/3338/head
Jamie Rees 5 years ago
parent 585bd0aab1
commit d633049b7d

File diff suppressed because it is too large Load Diff

@ -35,7 +35,6 @@
"angular-bootstrap-md": "^7.5.4",
"angular-router-loader": "^0.8.5",
"angular2-template-loader": "^0.6.2",
"angularx-qrcode": "^1.7.0-beta.5",
"aspnet-prerendering": "^3.0.1",
"awesome-typescript-loader": "^5.2.0",
"bootstrap": "^4.2.1",

@ -14,8 +14,8 @@ export class UserPreferenceComponent implements OnInit {
public username: string;
public selectedLang: string;
public availableLanguages = AvailableLanguages;
public qrCode: string;
public qrCodeEnabled: boolean;
//public qrCode: string;
//public qrCodeEnabled: boolean;
constructor(private authService: AuthService,
private readonly translate: TranslateService,
@ -31,13 +31,13 @@ export class UserPreferenceComponent implements OnInit {
const customization = await this.settingsService.getCustomization().toPromise();
const accessToken = await this.identityService.getAccessToken().toPromise();
this.qrCode = `${customization.applicationUrl}|${accessToken}`;
//this.qrCode = `${customization.applicationUrl}|${accessToken}`;
if(!customization.applicationUrl) {
this.qrCodeEnabled = false;
} else {
this.qrCodeEnabled = true;
}
//if(!customization.applicationUrl) {
// this.qrCodeEnabled = false;
//} else {
// this.qrCodeEnabled = true;
//}
const selectedLang = this.storage.get("Language");
if (selectedLang) {
@ -50,4 +50,4 @@ export class UserPreferenceComponent implements OnInit {
this.translate.use(this.selectedLang);
}
}
}

@ -1,6 +1,5 @@
import { NgModule } from "@angular/core";
import { NgModule } from "@angular/core";
import { RouterModule } from "@angular/router"
import { QRCodeModule } from 'angularx-qrcode';
import { MatCheckboxModule } from '@angular/material';
@ -13,7 +12,6 @@ import * as fromComponents from './components';
imports: [
RouterModule.forChild(fromComponents.routes),
SharedModule,
QRCodeModule,
MatCheckboxModule,
],
declarations: [

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save