gofnnp/h-usersite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #14717 Добавить меню в андрод WPAL: remove back arrow from guest card

Browse Source
This commit is contained in:
nikolay 2023-07-11 15:48:02 +04:00
parent 19577e272f
commit 9d00a32d4f
4 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html
View File

@ -1,11 +1,9 @@
<div class="container"> <div class="container">
<div class="block">
<h1 class="title">{{title}}</h1>
</div>
<div class="block"> <div class="block">
<div class="back"> <div class="back">
<mat-icon *ngIf="backEvent" style="cursor: pointer;" aria-hidden="false" aria-label="Назад" fontIcon="arrow_back_ios" class="back-arrow" (click)="back()"></mat-icon> <mat-icon *ngIf="backEvent" style="cursor: pointer;" aria-hidden="false" aria-label="Назад" fontIcon="arrow_back_ios" class="back-arrow" (click)="back()"></mat-icon>
</div> </div>
<h1 class="title">{{title}}</h1>
<!-- <div class="plug"></div> --> <!-- <div class="plug"></div> -->
<div *ngIf="showDropdown" class="backdrop" (click)="closeMenu()"></div> <div *ngIf="showDropdown" class="backdrop" (click)="closeMenu()"></div>
<div class="menu"> <div class="menu">
@ -18,11 +16,11 @@
<div class="menu__dropdown" *ngIf="showDropdown"> <div class="menu__dropdown" *ngIf="showDropdown">
<ul> <ul>
<menu-item [handler]="handler(aboutApp)"> <menu-item [handler]="handler(aboutApp)">
<span class="material-icons icon" style="color: var(--main-color)"> <span class="material-icons icon" style="color: var(--main-color)">
info info
</span> </span>
<span class="item_title">О приложении</span> <span class="item_title">О приложении</span>
</menu-item> </menu-item>
<ng-container *ngIf="isios"> <ng-container *ngIf="isios">
<menu-item [handler]="handler(addToWallet)"> <menu-item [handler]="handler(addToWallet)">
<img src="./assets/apple_wallet.svg" class="icon" width="24" height="24" alt="" /> <img src="./assets/apple_wallet.svg" class="icon" width="24" height="24" alt="" />
@ -53,6 +51,6 @@
</menu-item> </menu-item>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

18
angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss
View File

@ -21,12 +21,12 @@
flex-direction: column; flex-direction: column;
gap: 10px; gap: 10px;
.block { .block {
display: flex; display: flex;
justify-content: space-between;
align-items: center; align-items: center;
justify-content: space-between;
} }
.back { .back {
width: 40px; width: 64px;
} }
.back-arrow { .back-arrow {
font-size: 16px; font-size: 16px;
@ -43,17 +43,11 @@
font-weight: 700; font-weight: 700;
font-size: 17px; font-size: 17px;
line-height: 22px; line-height: 22px;
margin: 0 auto; margin: 0 auto;
}
}
.wrapper {
display: flex;
align-items: center;
gap: 10px;
min-width: 40px;
}
.menu { .menu {
position: relative; position: relative;
width: 64px;
.menu__dropdown { .menu__dropdown {
z-index: 110; z-index: 110;

2
angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html
View File

@ -1,4 +1,4 @@
<app-navbar title="Карта гостя" [backEvent]="showBack ? logout : undefined"></app-navbar> <app-navbar title="Карта гостя"></app-navbar>
<ng-container *ngIf="!authService.loading && authService.userInfo"> <ng-container *ngIf="!authService.loading && authService.userInfo">
<div class="guest-card"> <div class="guest-card">
<div class="top-info"> <div class="top-info">

4
angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts
View File

@ -4,7 +4,6 @@ import { ExitComponent } from 'src/app/components/exit/exit.component';
import { CookiesService } from 'src/app/services/cookies.service'; import { CookiesService } from 'src/app/services/cookies.service';
import { MessageService } from 'primeng/api'; import { MessageService } from 'primeng/api';
import { MessagingService } from 'src/app/services/messaging.service'; import { MessagingService } from 'src/app/services/messaging.service';
import { DeviceType, getTypeDevice } from 'src/app/utils';
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
@Component({ @Component({
@ -16,7 +15,6 @@ export class GuestCardComponent implements OnInit {
public qrCodeSize: number = 85; public qrCodeSize: number = 85;
private isQrCodeClicked: boolean = false; private isQrCodeClicked: boolean = false;
public Math: Math = Math; public Math: Math = Math;
public showBack: boolean = false;
public phone?: string; public phone?: string;
constructor( constructor(
@ -28,8 +26,6 @@ export class GuestCardComponent implements OnInit {
) { } ) { }
ngOnInit(): void { ngOnInit(): void {
this.showBack = getTypeDevice() === DeviceType.android;
this.phone = this.cookiesService.getItem('phone-number') || this.authService.userInfo?.phone; this.phone = this.cookiesService.getItem('phone-number') || this.authService.userInfo?.phone;
this.requestPermission(); this.requestPermission();