UI: mobile qrcode improvements
This commit is contained in:
parent
0d7d9b481b
commit
d163b5679c
@ -20,9 +20,10 @@
|
|||||||
<div class="tb-flex row align-center shrink"
|
<div class="tb-flex row align-center shrink"
|
||||||
[class.row]="mobileAppSettings?.qrCodeConfig.badgePosition === badgePosition.RIGHT"
|
[class.row]="mobileAppSettings?.qrCodeConfig.badgePosition === badgePosition.RIGHT"
|
||||||
[class.row-reverse]="mobileAppSettings?.qrCodeConfig.badgePosition === badgePosition.LEFT">
|
[class.row-reverse]="mobileAppSettings?.qrCodeConfig.badgePosition === badgePosition.LEFT">
|
||||||
|
<!-- <canvas #canvas class="tb-qrcode"></canvas>-->
|
||||||
<canvas #canvas class="tb-qrcode"></canvas>
|
<canvas #canvas class="tb-qrcode"></canvas>
|
||||||
<div *ngIf="mobileAppSettings?.qrCodeConfig.badgeEnabled"
|
<div *ngIf="mobileAppSettings?.qrCodeConfig.badgeEnabled"
|
||||||
class="tb-flex column no-gap tb-badge-container"
|
class="tb-flex column tb-badge-container"
|
||||||
[class.tb-badge-container]="!previewMode && !ctx">
|
[class.tb-badge-container]="!previewMode && !ctx">
|
||||||
<ng-container *ngIf="mobileAppSettings.qrCodeConfig.badgeStyle === badgeStyle.ORIGINAL;else white">
|
<ng-container *ngIf="mobileAppSettings.qrCodeConfig.badgeStyle === badgeStyle.ORIGINAL;else white">
|
||||||
<img *ngIf="mobileAppSettings.iosConfig.enabled" [src]="badgeStyleURLMap.get(badgeStyle.ORIGINAL).iOS">
|
<img *ngIf="mobileAppSettings.iosConfig.enabled" [src]="badgeStyleURLMap.get(badgeStyle.ORIGINAL).iOS">
|
||||||
|
|||||||
@ -51,7 +51,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.tb-badge-container {
|
.tb-badge-container {
|
||||||
@media #{$mat-lt-lg} {
|
@media #{$mat-md} {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,7 +25,7 @@ import { UtilsService } from '@core/services/utils.service';
|
|||||||
import { interval, mergeMap, Observable, Subject, takeUntil } from 'rxjs';
|
import { interval, mergeMap, Observable, Subject, takeUntil } from 'rxjs';
|
||||||
import { MINUTE } from '@shared/models/time/time.models';
|
import { MINUTE } from '@shared/models/time/time.models';
|
||||||
import { coerceBoolean } from '@shared/decorators/coercion';
|
import { coerceBoolean } from '@shared/decorators/coercion';
|
||||||
import { MobileAppQrCodeWidgetSettings } from '@home/components/widget/lib/cards/mobile-app-qr-code-widge.models';
|
import { MobileAppQrCodeWidgetSettings } from '@home/components/widget/lib/cards/mobile-app-qr-code-widget.models';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'tb-mobile-app-qrcode-widget',
|
selector: 'tb-mobile-app-qrcode-widget',
|
||||||
@ -104,7 +104,10 @@ export class MobileAppQrcodeWidgetComponent extends PageComponent implements OnI
|
|||||||
|
|
||||||
updateQRCode(link: string) {
|
updateQRCode(link: string) {
|
||||||
import('qrcode').then((QRCode) => {
|
import('qrcode').then((QRCode) => {
|
||||||
QRCode.toCanvas(this.canvasRef.nativeElement, link, { width: 90 });
|
QRCode.toCanvas(this.canvasRef.nativeElement, link, { width: 100 });
|
||||||
|
// QRCode.toCanvas(this.canvasRef.nativeElement, link);
|
||||||
|
// this.canvasRef.nativeElement.style.width = '4.6vw';
|
||||||
|
// this.canvasRef.nativeElement.style.height = '4.6vw';
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -20,7 +20,7 @@ import { WidgetSettings, WidgetSettingsComponent } from "@shared/models/widget.m
|
|||||||
import { AppState } from '@core/core.state';
|
import { AppState } from '@core/core.state';
|
||||||
import { Store } from "@ngrx/store";
|
import { Store } from "@ngrx/store";
|
||||||
import { badgePositionTranslationsMap, badgeStyleTranslationsMap } from '@shared/models/mobile-app.models';
|
import { badgePositionTranslationsMap, badgeStyleTranslationsMap } from '@shared/models/mobile-app.models';
|
||||||
import { mobileAppQrCodeWidgetDefaultSettings } from '@home/components/widget/lib/cards/mobile-app-qr-code-widge.models';
|
import { mobileAppQrCodeWidgetDefaultSettings } from '@home/components/widget/lib/cards/mobile-app-qr-code-widget.models';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'tb-mobile-app-qr-code-widget-settings',
|
selector: 'tb-mobile-app-qr-code-widget-settings',
|
||||||
|
|||||||
@ -29,6 +29,7 @@ import {
|
|||||||
badgeStyleTranslationsMap,
|
badgeStyleTranslationsMap,
|
||||||
MobileAppQRCodeSettings
|
MobileAppQRCodeSettings
|
||||||
} from '@shared/models/mobile-app.models';
|
} from '@shared/models/mobile-app.models';
|
||||||
|
import { AuthService } from '@core/auth/auth.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'tb-mobile-app-settings',
|
selector: 'tb-mobile-app-settings',
|
||||||
@ -48,7 +49,7 @@ export class MobileAppSettingsComponent extends PageComponent implements HasConf
|
|||||||
|
|
||||||
constructor(protected store: Store<AppState>,
|
constructor(protected store: Store<AppState>,
|
||||||
private mobileAppService: MobileAppService,
|
private mobileAppService: MobileAppService,
|
||||||
public fb: FormBuilder) {
|
private fb: FormBuilder) {
|
||||||
super(store);
|
super(store);
|
||||||
this.buildMobileAppSettingsForm();
|
this.buildMobileAppSettingsForm();
|
||||||
this.mobileAppService.getMobileAppSettings()
|
this.mobileAppService.getMobileAppSettings()
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 7.5 KiB After Width: | Height: | Size: 12 KiB |
@ -1258,7 +1258,9 @@
|
|||||||
"sizeX": 35,
|
"sizeX": 35,
|
||||||
"sizeY": 16,
|
"sizeY": 16,
|
||||||
"row": 42,
|
"row": 42,
|
||||||
"col": 85
|
"col": 85,
|
||||||
|
"mobileOrder": 5,
|
||||||
|
"mobileHeight": 7
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"gridSettings": {
|
"gridSettings": {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user