dev #13306

поменял лого и правки

angular/proxy.confi.json

@@ -9,7 +9,7 @@
       "logLevel": "debug"
     },
     "/icard-proxy": {
-      "target": "https://p1.icard-proxy.crm4retail.ru",
+      "target": "https://sakura.lk.crm4retail.ru/api/icard-proxy",
       "secure": false,
       "pathRewrite": {
         "^/icard-proxy": ""

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

@@ -1,5 +1,5 @@
 <div class="container-navbar">
-    <img src="./assets/logo-black.png" alt="Логотип">
+    <img src="./assets/sakura-logo.png" alt="Логотип">
     <!-- <span class="menu" (click)="showMenu()">Меню</span> -->
     <app-cart #cart></app-cart>
     <app-menu (toggleMenu)="cart.toggleSideBar()"></app-menu>

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

@@ -1,44 +1,44 @@
 .container-navbar {
-    box-sizing: border-box;
+  box-sizing: border-box;
-    padding: 0 54px;
+  padding: 16px 54px;
-    width: 100%;
+  width: 100%;
-    height: 54px;
+  height: fit-content;
-    // background: var(--orange-main);
+  color: #fff;
-    color: #fff;
+  display: flex;
-    display: flex;
+  align-items: center;
-    align-items: center;
+  justify-content: space-between;
-    justify-content: space-between;
 
-    img {
+  img {
-        height: 26px;
+    height: 68px;
-    }
+    border-radius: 12px;
+  }
 
-    .menu {
+  .menu {
-        color: #252525;
+    color: #252525;
-        font-weight: 600;
+    font-weight: 600;
-        font-size: 14px;
+    font-size: 14px;
-        letter-spacing: 2px;
+    letter-spacing: 2px;
-        border-bottom: 2px solid #E16F38;
+    border-bottom: 2px solid #e16f38;
-        cursor: pointer;
+    cursor: pointer;
-    }
+  }
 }
 
 .title {
-    font-weight: 400;
+  font-weight: 400;
-    font-size: 18px;
+  font-size: 18px;
-    margin-left: 12px;
+  margin-left: 12px;
 }
 
 @media screen and (max-width: 600px) {
-    .container-navbar {
+  .container-navbar {
-        justify-content: center;
+    justify-content: center;
-    }
+  }
 }
 
 @media screen and (max-width: 549px) {
-    .container-navbar {
+  .container-navbar {
-        .menu {
+    .menu {
-            display: none;
+      display: none;
-        }
     }
-}
+  }
+}

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

@@ -57,7 +57,7 @@ export class BonusProgramComponent implements OnInit {
       next: (res) => {
         this.userName = res.customer_info.name
         this.accountData = {
-          CardNumber: res.customer_info.cards[0].Number,
+          CardNumber: res.customer_info.cards[0]?.Number || '',
           Bonuses: res.customer_info.walletBalances[0].balance
         }
         barcode("#barcode")