diff --git a/src/app/components/footer-buttons/footer-buttons.component.scss b/src/app/components/footer-buttons/footer-buttons.component.scss index 54569c2..40b3b19 100644 --- a/src/app/components/footer-buttons/footer-buttons.component.scss +++ b/src/app/components/footer-buttons/footer-buttons.component.scss @@ -4,6 +4,7 @@ width: 100%; display: flex; justify-content: center; + z-index: 9999; .footer-buttons-container { max-width: 400px; width: 90vw; @@ -11,6 +12,7 @@ width: 100%; height: 34px; background: #09467f; + border: solid #fff 1px !important; color: #fff; border-radius: 5px; font-weight: 600; diff --git a/src/app/pages/account/bonus-program/bonus-program.component.html b/src/app/pages/account/bonus-program/bonus-program.component.html index 9905b40..32e4cc7 100644 --- a/src/app/pages/account/bonus-program/bonus-program.component.html +++ b/src/app/pages/account/bonus-program/bonus-program.component.html @@ -1,88 +1,50 @@
-

{{currentPage.name}}

- -
-
-
- Логотип карта - #{{accountData.CardNumber}} -
-
- +
+
+
+ Логотип карта + #{{ accountData.CardNumber }} +
+
+ - -
-
-
-
- Имя - {{accountData.BonusProgramName}} - Не задано -
-
- Баланс карты - {{accountData.Bonuses}} -
-
-
- -
-
+ +
+
+
+
+ Имя + {{ + accountData.BonusProgramName + }} + Не задано +
+
+ Баланс карты + {{ accountData.Bonuses }} +
+
+ + +
+
- +
diff --git a/src/app/pages/account/bonus-program/bonus-program.component.scss b/src/app/pages/account/bonus-program/bonus-program.component.scss index 07af801..60f65d6 100644 --- a/src/app/pages/account/bonus-program/bonus-program.component.scss +++ b/src/app/pages/account/bonus-program/bonus-program.component.scss @@ -103,6 +103,10 @@ #barcode { border-radius: 16px; + &.hidden { + display: none; + width: 0; + } } } } @@ -186,13 +190,6 @@ font-size: 22px; } } - - &__barcode-container { - display: flex; - justify-content: center; - align-items: center; - height: 100%; - } } .explanation { diff --git a/src/app/pages/account/bonus-program/bonus-program.component.ts b/src/app/pages/account/bonus-program/bonus-program.component.ts index db33302..9ffc876 100644 --- a/src/app/pages/account/bonus-program/bonus-program.component.ts +++ b/src/app/pages/account/bonus-program/bonus-program.component.ts @@ -17,7 +17,6 @@ export class BonusProgramComponent implements OnInit { public accountData!: BonusProgramAccount; public purchases: Purchase[] = []; public loadingBonuses: boolean = false; - public isCardBack: boolean = false; readonly orderStatuses = orderStatuses; readonly moment = moment; readonly pageList = environment.hasBonusProgram ? PageListWithBonus : PageList; @@ -31,10 +30,6 @@ export class BonusProgramComponent implements OnInit { this.getAccountData(); } - rotateCard() { - this.isCardBack = !this.isCardBack - } - async getAccountData(): Promise{ this.loadingBonuses = true; this.accountData = (await lastValueFrom( @@ -44,12 +39,12 @@ export class BonusProgramComponent implements OnInit { }, RpcService.bonusService )))['Cards'][0]; + this.loadingBonuses = false; barcode("#barcode") .options({font: "OCR-B"}) // Will affect all barcodes .EAN13(`${this.accountData.CardNumber}`.padStart(12, "0"), {fontSize: 18, textMargin: 0}) .render(); - this.loadingBonuses = false; const transactions: Transaction[] = (await lastValueFrom( this.jsonrpc.rpc( { diff --git a/src/app/pages/account/user-data/user-data.component.scss b/src/app/pages/account/user-data/user-data.component.scss index 48534a4..e9f78bf 100644 --- a/src/app/pages/account/user-data/user-data.component.scss +++ b/src/app/pages/account/user-data/user-data.component.scss @@ -81,9 +81,9 @@ font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; - font-size: 1rem; color: #495057; padding: 0.5rem 0.75rem; + padding-left: 13px; transition: background-color 0.15s, border-color 0.15s, box-shadow 0.15s; -webkit-appearance: none; appearance: none; @@ -93,6 +93,8 @@ background: #FFFFFF; border: 1px solid #B8DEFF; border-radius: 15px; + font-size: 14px; + text-align: left; &.ng-dirty.ng-invalid { border-color: red; } @@ -102,13 +104,18 @@ } select { + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", + "Segoe UI Symbol"; background: #FFFFFF; border: 1px solid #B8DEFF; border-radius: 15px; width: 100%; height: 45px; padding: 0 10px; - + font-size: 14px; + text-align: left; + color: #495057; // option[value=""][disabled] { // display: none; // } @@ -158,12 +165,16 @@ position: relative; &::before { content: 'Выберите пол'; - top: 3px; position: absolute; + top: 3px; left: 13px; height: 100%; - font-weight: 500; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, + Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", + "Segoe UI Symbol" !important; + font-family: inherit; color: #6c757d; + font-size: 14px; } &.hidden::before { display: none; diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html index 2f5cefa..249274b 100644 --- a/src/app/pages/main/main.component.html +++ b/src/app/pages/main/main.component.html @@ -1,5 +1,5 @@
- +
\ No newline at end of file diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts index 5f3112f..44c00f0 100644 --- a/src/app/pages/main/main.component.ts +++ b/src/app/pages/main/main.component.ts @@ -27,17 +27,17 @@ export class MainComponent implements OnInit { public renderer: Renderer2, private messageService: MessageService ) { - // renderer.listen('window', 'appinstalled', (evt) => { - // console.log('INSTALLED!!!') - // }) - // renderer.listen('window', 'beforeinstallprompt', (e) => { - // e.preventDefault() - // this.deferredPrompt = e - // }) - // route.queryParams.subscribe( (params) => { - // console.log('####: ', params) - // if (params['token']) this.token = params['token'] - // }); + renderer.listen('window', 'appinstalled', (evt) => { + console.log('INSTALLED!!!') + }) + renderer.listen('window', 'beforeinstallprompt', (e) => { + e.preventDefault() + this.deferredPrompt = e + }) + route.queryParams.subscribe( (params) => { + console.log('####: ', params) + if (params['token']) this.token = params['token'] + }); } ngOnInit(): void {