diff --git a/angular/proxy.confi.json b/angular/proxy.confi.json index 27f7f12..d5a8fdc 100644 --- a/angular/proxy.confi.json +++ b/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": "" diff --git a/angular/src/app/components/navbar/navbar.component.html b/angular/src/app/components/navbar/navbar.component.html index 825db6c..41c32c1 100644 --- a/angular/src/app/components/navbar/navbar.component.html +++ b/angular/src/app/components/navbar/navbar.component.html @@ -1,5 +1,5 @@
- Логотип + Логотип diff --git a/angular/src/app/components/navbar/navbar.component.scss b/angular/src/app/components/navbar/navbar.component.scss index 9e1a7d4..4149779 100644 --- a/angular/src/app/components/navbar/navbar.component.scss +++ b/angular/src/app/components/navbar/navbar.component.scss @@ -1,44 +1,44 @@ .container-navbar { - box-sizing: border-box; - padding: 0 54px; - width: 100%; - height: 54px; - // background: var(--orange-main); - color: #fff; - display: flex; - align-items: center; - justify-content: space-between; + box-sizing: border-box; + padding: 16px 54px; + width: 100%; + height: fit-content; + color: #fff; + display: flex; + align-items: center; + justify-content: space-between; - img { - height: 26px; - } + img { + height: 68px; + border-radius: 12px; + } - .menu { - color: #252525; - font-weight: 600; - font-size: 14px; - letter-spacing: 2px; - border-bottom: 2px solid #E16F38; - cursor: pointer; - } + .menu { + color: #252525; + font-weight: 600; + font-size: 14px; + letter-spacing: 2px; + border-bottom: 2px solid #e16f38; + cursor: pointer; + } } .title { - font-weight: 400; - font-size: 18px; - margin-left: 12px; + font-weight: 400; + font-size: 18px; + margin-left: 12px; } @media screen and (max-width: 600px) { - .container-navbar { - justify-content: center; - } + .container-navbar { + justify-content: center; + } } @media screen and (max-width: 549px) { - .container-navbar { - .menu { - display: none; - } + .container-navbar { + .menu { + display: none; } -} \ No newline at end of file + } +} diff --git a/angular/src/app/pages/account/bonus-program/bonus-program.component.ts b/angular/src/app/pages/account/bonus-program/bonus-program.component.ts index 822fa87..95f5517 100644 --- a/angular/src/app/pages/account/bonus-program/bonus-program.component.ts +++ b/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") diff --git a/angular/src/assets/sakura-logo.png b/angular/src/assets/sakura-logo.png new file mode 100644 index 0000000..3d76a73 Binary files /dev/null and b/angular/src/assets/sakura-logo.png differ