dev #12925

убрал бабочек, поменял лого, доработал пути для получения json

angular/src/app/components/navbar/navbar.component.html

@@ -1,3 +1,3 @@
 <div class="container">
-    <img src="./assets/logo.svg" alt="Логотип">
+    <img src="./assets/logo.png" alt="Логотип">
 </div>

angular/src/app/components/navbar/navbar.component.scss

@@ -5,6 +5,10 @@
     height: 39px;
     background: #09467F;
     color: #fff;
+    img {
+        height: 26px;
+        margin-left: 4px;
+    }
 }
 
 .title {

angular/src/app/pages/account/account.component.ts

@@ -42,7 +42,7 @@ export class AccountComponent implements OnInit {
 
   readonly MainPageCode = MainPageCode;
   readonly mainPageList = PageListMain;
-  public currentPageMain: Page = this.mainPageList[1];
+  public currentPageMain: Page = this.mainPageList[0];
 
   ngOnInit(): void {
     if (!this.getToken()) {

angular/src/app/pages/account/auth/auth.component.html

@@ -40,7 +40,7 @@
         ></p-progressSpinner>
       </button>
     </p>
-    <div class="decoration-pattern" style="background: url('./assets/card-decorative-pattern.png') no-repeat;"></div>
+    <!-- <div class="decoration-pattern" style="background: url('./assets/card-decorative-pattern.png') no-repeat;"></div> -->
   </form>
 </ng-container>
 <ng-template #confirmPhoneField>
@@ -94,6 +94,6 @@
     <p style="color: red; margin: 0" *ngIf="errorConfirmCode">
       Пароль введен неверно
     </p>
-    <div class="decoration-pattern" style="background: url('./assets/card-decorative-pattern.png') no-repeat;"></div>
+    <!-- <div class="decoration-pattern" style="background: url('./assets/card-decorative-pattern.png') no-repeat;"></div> -->
   </form>
 </ng-template>

angular/src/app/pages/account/auth/auth.component.scss

@@ -39,7 +39,7 @@
     background: #ffffff;
     box-shadow: 0px 0px 10px rgb(0 0 0 / 15%);
     border-radius: 15px;
-    min-height: 262px;
+    // min-height: 262px;
     max-width: 400px;
     overflow: auto;
     position: relative;

angular/src/app/pages/account/bonus-program/bonus-program.component.html

@@ -4,14 +4,14 @@
   <div style="display: flex; justify-content: center">
     <div class="card-container">
       <div class="card-container__header">
-        <img src="./assets/logo.svg" alt="Логотип карта" />
+        <img src="./assets/logo.png" alt="Логотип карта" />
         <span *ngIf="accountData">#{{ accountData.CardNumber }}</span>
       </div>
       <div class="card-container__decorative-pattern">
         <!-- <div class="imgs-row"></div>
                 <div class="imgs-row" style="background-position-x: -22px;"></div>
                 <div class="imgs-row"></div> -->
-        <img src="./assets/card-decorative-pattern.svg" alt="" />
+        <!-- <img src="./assets/card-decorative-pattern.svg" alt="" /> -->
       </div>
       <div class="card-container__content">
         <div class="info">
@@ -47,5 +47,5 @@
       </div>
     </div>
   </div>
-  <button *ngIf="deviceType == 'ios'" class="add-to-wallet" (click)="addCardToWallet($event)">Добавить в Apple Wallet</button>
+  <!-- <button *ngIf="deviceType == 'ios'" class="add-to-wallet" (click)="addCardToWallet($event)">Добавить в Apple Wallet</button> -->
 </div>

angular/src/app/pages/account/bonus-program/bonus-program.component.scss

@@ -3,14 +3,14 @@
     display: flex;
     flex-direction: column;
 
-    & > h2 {
+    &>h2 {
       font-style: normal;
       font-weight: 700;
       font-size: 20px;
       line-height: 24px;
     }
 
-    & > p {
+    &>p {
       font-style: normal;
       font-weight: 400;
       font-size: 15px;
@@ -35,8 +35,9 @@
         justify-content: space-between;
 
         img {
-          height: 38px;
+          height: 32px;
           margin-top: 15px;
+          margin-left: 8px;
         }
 
         span {
@@ -56,6 +57,7 @@
         display: flex;
         justify-content: center;
         align-items: center;
+
         img {
           height: 90px;
         }
@@ -103,6 +105,7 @@
 
         #barcode {
           border-radius: 16px;
+
           &.hidden {
             display: none;
             width: 0;
@@ -154,12 +157,12 @@
       }
 
       &.active_back {
-        > .card-content__front {
+        >.card-content__front {
           transform: rotateY(180deg);
           opacity: 0;
         }
 
-        > .card-content__back {
+        >.card-content__back {
           opacity: 1;
           transform: rotateY(0deg);
         }
@@ -206,4 +209,4 @@
       color: #fff;
     }
   }
-}
+}

angular/src/app/pages/account/user-data/user-data.component.html

@@ -72,7 +72,7 @@
     >Нажимая кнопку, Вы соглашаетесь с Политикой обработки персональных
     данных.</span
   >
-  <div class="decoration-pattern">
+  <!-- <div class="decoration-pattern">
     <img
       style="height: 34px"
       src="./assets/card-decorative-pattern.svg"
@@ -83,5 +83,5 @@
       src="./assets/card-decorative-pattern.svg"
       alt=""
     />
-  </div>
+  </div> -->
 </form>

angular/src/app/pages/main/main.component.html

@@ -1,7 +1,7 @@
 <div class="main-container">
     <app-navbar></app-navbar>
     <p-toast position="top-center"></p-toast>
-    <app-footer-buttons [token]="token" [deferredPrompt]="deferredPrompt"
+    <!-- <app-footer-buttons [token]="token" [deferredPrompt]="deferredPrompt"
         [isPermissionNotifications]="isPermissionNotifications" (downloadingPWA)="downloadPWA()"
-        (requestingPermission)="requestPermission()"></app-footer-buttons>
+        (requestingPermission)="requestPermission()"></app-footer-buttons> -->
 </div>

angular/src/app/services/wp-json.service.ts

@@ -43,7 +43,7 @@ export class WpJsonService {
   }
 
   getAllData(): Observable<any> {
-    return this._request('nomen_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json', 'GET')
+    return this._request('static/nomen_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json', 'GET')
   }
 
   _request(path: string, method: string, body?: any, auth = false): Observable<any> {