From e12eb7a542fe1583d4448d1cc9deb916b601b001 Mon Sep 17 00:00:00 2001 From: nikolay Date: Thu, 29 Jun 2023 12:53:04 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#14607=20=D0=9C=D0=BE=D1=80=D0=B5.=20?= =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=BE=20=D1=81?= =?UTF-8?q?=D0=B0=D0=B9=D1=82=D1=83:=20add=20apple=20wallet=20and=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/navbar/navbar.component.html | 10 ---------- .../components/navbar/navbar.component.scss | 1 + .../components/navbar/navbar.component.ts | 2 +- .../pages/guest-card/guest-card.component.html | 3 +++ .../pages/guest-card/guest-card.component.scss | 13 ++++++++++--- angular/src/assets/LOGO3.svg | 1 + angular/src/environments/environment.prod.ts | 2 +- angular/src/environments/environment.ts | 2 +- angular/src/index.html | 2 +- angular/src/styles.scss | 2 +- wallet_meta/config.json | 12 ++++++------ 11 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 angular/src/assets/LOGO3.svg 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 8f045da..d35e17f 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 @@ -34,16 +34,6 @@
-
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 83d8bf7..c270e25 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 @@ -50,6 +50,7 @@ position: relative; .menu__dropdown { + overflow: hidden; z-index: 110; position: fixed; background-color: white; diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts index 6879771..7e76690 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts @@ -39,7 +39,7 @@ export class NavbarComponent implements OnInit { ngOnInit(): void { const deviceType = getTypeDevice(); - this.showMenu = deviceType !== DeviceType.ios; + this.showMenu = deviceType === DeviceType.ios; } toggleMenu() { 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 9a2b9f7..b4bebfa 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,9 @@
+
Владелец карты {{authService.userInfo.name}} 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 cb89e17..458bace 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 @@ -215,7 +215,7 @@ .guest-card { max-width: 600px; margin: 0 auto; - margin-top: 20px; + padding: 20px; display: flex; flex-direction: column; gap: 20px; @@ -224,7 +224,14 @@ color: var(--text-color); font-style: italic; } - + + .logo { + margin-bottom: 200px; + + img { + width: 40%; + } + } .owner { display: flex; flex-direction: column; @@ -246,7 +253,7 @@ } .guest-card__qr { margin: 0 auto; - margin-top: 100px; + margin-top: 80px; width: fit-content; padding: 8px; border-radius: 6px; diff --git a/angular/src/assets/LOGO3.svg b/angular/src/assets/LOGO3.svg new file mode 100644 index 0000000..358fe7c --- /dev/null +++ b/angular/src/assets/LOGO3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/angular/src/environments/environment.prod.ts b/angular/src/environments/environment.prod.ts index 6769455..10922a3 100644 --- a/angular/src/environments/environment.prod.ts +++ b/angular/src/environments/environment.prod.ts @@ -21,5 +21,5 @@ export const environment = { appleWalletEndpoint: 'https://apple-wallet-iiko.it-retail.tech/apns/api', icardProxy: 'https://more.lk.crm4retail.ru/api/icard-proxy/', appleWalletSecret: 'Token F5mbzEERAznGKVbB6l', - clientName: 'coffeelike' + clientName: 'more' } diff --git a/angular/src/environments/environment.ts b/angular/src/environments/environment.ts index 230ba01..1d14e33 100644 --- a/angular/src/environments/environment.ts +++ b/angular/src/environments/environment.ts @@ -21,5 +21,5 @@ export const environment = { appleWalletEndpoint: 'https://apple-wallet-iiko.it-retail.tech/apns/api', icardProxy: 'https://more.lk.crm4retail.ru/api/icard-proxy/', appleWalletSecret: 'Token F5mbzEERAznGKVbB6l', - clientName: 'coffeelike' + clientName: 'more' }; diff --git a/angular/src/index.html b/angular/src/index.html index 8ae40a9..b16e8fb 100644 --- a/angular/src/index.html +++ b/angular/src/index.html @@ -2,7 +2,7 @@ - Coffee Like More + More diff --git a/angular/src/styles.scss b/angular/src/styles.scss index cc33085..1a14b62 100644 --- a/angular/src/styles.scss +++ b/angular/src/styles.scss @@ -124,7 +124,7 @@ body { --button-text-color: #000000; --button-text-color_disabled: #cccccc; - --main-color_hover: rgba(127, 32, 97, 0.3); + --main-color_hover: rgba(0, 0, 0, 0.2); } .mdc-button__label { diff --git a/wallet_meta/config.json b/wallet_meta/config.json index 6044ce5..dbe2302 100644 --- a/wallet_meta/config.json +++ b/wallet_meta/config.json @@ -1,11 +1,11 @@ { "style": { - "organizationName": "Fashionlogica", - "logoText": "Fashionlogica", - "description": "Fashionlogica", + "organizationName": "More", + "logoText": "More", + "description": "More", "notificationPlaceholder": "Здесь будут уведомления", - "foregroundColor": "rgb(255,255,255)", - "labelColor": "rgb(255,255,255)", - "backgroundColor": "rgb(9,70,127)" + "foregroundColor": "rgb(127,32,97)", + "labelColor": "rgb(127,32,97)", + "backgroundColor": "rgb(255,255,255)" } }