From 9d00a32d4f00692584844920e4d657d3eea07b37 Mon Sep 17 00:00:00 2001
From: nikolay <gugalohikolaychur@gmail.com>
Date: Tue, 11 Jul 2023 15:48:02 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#14717=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B2=20=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B4=D1=80=D0=BE=D0=B4=20WPAL:=20remove=20back=20arrow?=
 =?UTF-8?q?=20from=20guest=20card?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/navbar/navbar.component.html   | 22 +++++++++----------
 .../components/navbar/navbar.component.scss   | 18 +++++----------
 .../guest-card/guest-card.component.html      |  2 +-
 .../pages/guest-card/guest-card.component.ts  |  4 ----
 4 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html
index 17f11df..7eae632 100644
--- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html
+++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html
@@ -1,11 +1,9 @@
 <div class="container">
-  <div class="block">
-    <h1 class="title">{{title}}</h1>
-  </div>
   <div class="block">
     <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>
-  </div>    
+      <mat-icon *ngIf="backEvent" style="cursor: pointer;" aria-hidden="false" aria-label="Назад" fontIcon="arrow_back_ios" class="back-arrow" (click)="back()"></mat-icon>
+    </div>
+    <h1 class="title">{{title}}</h1>      
     <!-- <div class="plug"></div> -->
     <div *ngIf="showDropdown" class="backdrop" (click)="closeMenu()"></div>
     <div class="menu">
@@ -18,11 +16,11 @@
       <div class="menu__dropdown" *ngIf="showDropdown">
 	<ul>
 	  <menu-item [handler]="handler(aboutApp)">
-	      <span class="material-icons icon" style="color: var(--main-color)">
-		info
-	      </span>
-	      <span class="item_title">О приложении</span>
-	    </menu-item>
+	    <span class="material-icons icon" style="color: var(--main-color)">
+	      info
+	    </span>
+	    <span class="item_title">О приложении</span>
+	  </menu-item>
 	  <ng-container *ngIf="isios">	    
 	    <menu-item [handler]="handler(addToWallet)">
 	      <img src="./assets/apple_wallet.svg" class="icon" width="24" height="24" alt="" />
@@ -53,6 +51,6 @@
 	  </menu-item>
 	</ul>
       </div>
-    </div>    
-  </div> 
+    </div>
+  </div>
 </div>
diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss
index 1de3918..a25fff6 100644
--- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss
+++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss
@@ -21,12 +21,12 @@
     flex-direction: column;
     gap: 10px;
     .block {
-	display: flex;
-	justify-content: space-between;
+	display: flex;	
 	align-items: center;
+	justify-content: space-between;
     }
     .back {
-	width: 40px;      
+	width: 64px;      
     }
     .back-arrow {
 	font-size: 16px;
@@ -43,17 +43,11 @@
 	font-weight: 700;
 	font-size: 17px;
 	line-height: 22px;
-	margin: 0 auto;
-	
-    }
-    .wrapper {
-	display: flex;
-	align-items: center;
-	gap: 10px;
-	min-width: 40px;
-    }
+	margin: 0 auto;	
+    }    
     .menu {
 	position: relative;
+	width: 64px;
 	
 	.menu__dropdown {
 	    z-index: 110;
diff --git a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html
index c893901..a6acbd1 100644
--- a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html
+++ b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html
@@ -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">
   <div class="guest-card">
     <div class="top-info">
diff --git a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts
index ee3ac2b..9229ca6 100644
--- a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts
+++ b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts
@@ -4,7 +4,6 @@ import { ExitComponent } from 'src/app/components/exit/exit.component';
 import { CookiesService } from 'src/app/services/cookies.service';
 import { MessageService } from 'primeng/api';
 import { MessagingService } from 'src/app/services/messaging.service';
-import { DeviceType, getTypeDevice } from 'src/app/utils';
 import { AuthService } from 'src/app/services/auth.service';
 
 @Component({
@@ -16,7 +15,6 @@ export class GuestCardComponent implements OnInit {
   public qrCodeSize: number = 85;
   private isQrCodeClicked: boolean = false;
   public Math: Math = Math;
-  public showBack: boolean = false;
   public phone?: string;
 
   constructor(
@@ -28,8 +26,6 @@ export class GuestCardComponent implements OnInit {
   ) { }
 
   ngOnInit(): void {
-    this.showBack = getTypeDevice() === DeviceType.android;
-
     this.phone = this.cookiesService.getItem('phone-number') || this.authService.userInfo?.phone;
 
     this.requestPermission();