From ca0fa2bfa615b6cfced751a522771e84a0ec2797 Mon Sep 17 00:00:00 2001
From: nikolay <gugalohikolaychur@gmail.com>
Date: Tue, 16 May 2023 11:04:25 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#14305=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B8=D0=B7=D0=B0=D0=B9=D0=BD?=
 =?UTF-8?q?=D0=B0=20WPA=20=D0=9A=D0=BE=D1=84=D0=B5-=D0=BB=D0=B0=D0=B9?=
 =?UTF-8?q?=D0=BA=D0=B0:=20change=20loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 angular/src/app/app.component.html                  |  1 -
 .../components/footer/footer.component.scss         |  1 +
 .../pages/guest-card/guest-card.component.html      | 13 ++++++++-----
 .../pages/guest-card/guest-card.component.scss      |  8 ++++++--
 .../default-option/pages/login/login.component.html |  1 +
 .../loyality-program.component.html                 |  2 ++
 .../loyality-program.component.scss                 |  2 +-
 .../pages/guest-card/guest-card.component.html      | 12 +++++++++++-
 .../pages/guest-card/guest-card.component.scss      |  4 ++++
 .../first-option/pages/login/login.component.html   |  1 +
 angular/src/styles.scss                             |  5 +++++
 11 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/angular/src/app/app.component.html b/angular/src/app/app.component.html
index 4cca73f..0680b43 100644
--- a/angular/src/app/app.component.html
+++ b/angular/src/app/app.component.html
@@ -1,2 +1 @@
 <router-outlet></router-outlet>
-<app-footer></app-footer>
diff --git a/angular/src/app/presentation-options/default-option/components/footer/footer.component.scss b/angular/src/app/presentation-options/default-option/components/footer/footer.component.scss
index aeb84c5..e94eb82 100644
--- a/angular/src/app/presentation-options/default-option/components/footer/footer.component.scss
+++ b/angular/src/app/presentation-options/default-option/components/footer/footer.component.scss
@@ -4,6 +4,7 @@
   align-items: center;
   gap: 20px;
   padding-bottom: 100px;
+  padding-top: 52px;
   h3 {
     margin: 0;
     font-family: Montserrat;
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 70c5d0c..dce7733 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,6 +1,6 @@
 <app-navbar title="Карта гостя" (backEvent)="logout()"></app-navbar>
 
-<ng-container *ngIf="!this.loyaltyProgram.purchaseData.$loading">
+<ng-container *ngIf="!this.loyaltyProgram.purchaseData.$loading && customerInfo">
   <div class="guest-card">
     <div class="top-info">
       <div class="top-info__level">
@@ -93,13 +93,16 @@
       Программы лояльности</a
     >
   </div>
+  <app-footer></app-footer>
 </ng-container>
-<ng-container *ngIf="this.loyaltyProgram.purchaseData.$loading">
+<ng-container *ngIf="this.loyaltyProgram.purchaseData.$loading || !customerInfo">
   <ng-container
     *ngTemplateOutlet="spinner; context: { $implicit: 85 }"
-  ></ng-container>
+    ></ng-container>  
 </ng-container>
 
-<ng-template #spinner let-diameter>
-  <mat-spinner [strokeWidth]="3" [diameter]="diameter"></mat-spinner>
+<ng-template #spinner let-diameter>  
+  <div class="center wrapper">
+    <mat-spinner [strokeWidth]="3" [diameter]="diameter"></mat-spinner>
+  </div>
 </ng-template>
diff --git a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss
index f93f136..d8f5ee0 100644
--- a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss
+++ b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss
@@ -1,4 +1,4 @@
-:host {
+:host {    
   .guest-card {
     display: flex;
     flex-direction: column;
@@ -199,9 +199,13 @@
       font-size: 12px;
       line-height: 16px;
       text-decoration: none;
-      margin: 17px 0 22px;
+      margin: 17px 0 0;
     }
   }
+
+  .wrapper {
+      padding-top: 20px;
+  }
 }
 
 app-accordion {
diff --git a/angular/src/app/presentation-options/default-option/pages/login/login.component.html b/angular/src/app/presentation-options/default-option/pages/login/login.component.html
index 2069964..8fd478b 100644
--- a/angular/src/app/presentation-options/default-option/pages/login/login.component.html
+++ b/angular/src/app/presentation-options/default-option/pages/login/login.component.html
@@ -105,3 +105,4 @@
     </ng-container>
   </p>
 </ng-template>
+<app-footer></app-footer>
diff --git a/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.html b/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.html
index 23962b7..ece677d 100644
--- a/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.html
+++ b/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.html
@@ -97,3 +97,5 @@
   </ng-container>
 </app-accordion>
 </div>
+
+<app-footer></app-footer>
diff --git a/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.scss b/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.scss
index 7225d85..d5a5c6d 100644
--- a/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.scss
+++ b/angular/src/app/presentation-options/default-option/pages/loyality-program/loyality-program.component.scss
@@ -1,3 +1,3 @@
 .loyality-program {
-    margin-bottom: 20px;
+    
 }
diff --git a/angular/src/app/presentation-options/first-option/pages/guest-card/guest-card.component.html b/angular/src/app/presentation-options/first-option/pages/guest-card/guest-card.component.html
index 4681ca6..c3d9bbb 100644
--- a/angular/src/app/presentation-options/first-option/pages/guest-card/guest-card.component.html
+++ b/angular/src/app/presentation-options/first-option/pages/guest-card/guest-card.component.html
@@ -1,5 +1,6 @@
 <app-navbar title="Карта гостя" (backEvent)="logout()"></app-navbar>
 
+<ng-container *ngIf="!purchaseData.$loading">
 <div class="guest-card">
   <div class="guest-card__qr" (click)="qrCodeClick()">
     <ng-container *ngIf="customerInfo">
@@ -192,7 +193,16 @@
     Программы лояльности</a
   >
 </div>
+<app-footer></app-footer>
+</ng-container>
+<ng-container *ngIf="purchaseData.$loading">
+  <ng-container
+    *ngTemplateOutlet="spinner; context: { $implicit: 85 }"
+    ></ng-container>  
+</ng-container>
 
 <ng-template #spinner let-diameter>
-  <mat-spinner [strokeWidth]="3" [diameter]="diameter"></mat-spinner>
+  <div class="center wrapper">
+    <mat-spinner [strokeWidth]="3" [diameter]="diameter"></mat-spinner>
+  </div>
 </ng-template>
diff --git a/angular/src/app/presentation-options/first-option/pages/guest-card/guest-card.component.scss b/angular/src/app/presentation-options/first-option/pages/guest-card/guest-card.component.scss
index d94d12a..23cf252 100644
--- a/angular/src/app/presentation-options/first-option/pages/guest-card/guest-card.component.scss
+++ b/angular/src/app/presentation-options/first-option/pages/guest-card/guest-card.component.scss
@@ -188,6 +188,10 @@
       margin: 17px 0 22px;
     }
   }
+
+  .wrapper {
+      padding-top: 20px;
+  }
 }
 
 app-accordion {
diff --git a/angular/src/app/presentation-options/first-option/pages/login/login.component.html b/angular/src/app/presentation-options/first-option/pages/login/login.component.html
index 2069964..8fd478b 100644
--- a/angular/src/app/presentation-options/first-option/pages/login/login.component.html
+++ b/angular/src/app/presentation-options/first-option/pages/login/login.component.html
@@ -105,3 +105,4 @@
     </ng-container>
   </p>
 </ng-template>
+<app-footer></app-footer>
diff --git a/angular/src/styles.scss b/angular/src/styles.scss
index 7c4de9f..2a03824 100644
--- a/angular/src/styles.scss
+++ b/angular/src/styles.scss
@@ -17,6 +17,11 @@ table{border-collapse:collapse;border-spacing:0}
     font-family: 'Montserrat', sans-serif;
 }
 
+.center {
+    display: flex;
+    justify-content: center;
+}
+
 
 body {
     background-color: #231F20;