From 0e5e7e1d84340ade4f85fb6b92beb035afcfe518 Mon Sep 17 00:00:00 2001 From: nikolay Date: Fri, 30 Jun 2023 13:38:43 +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:=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guest-card/guest-card.component.html | 2 +- .../guest-card/guest-card.component.scss | 208 +----------------- angular/src/app/services/auth.service.ts | 5 +- angular/src/assets/logo.svg | 199 ++++++++++++++++- wallet_meta/config.json | 18 +- 5 files changed, 204 insertions(+), 228 deletions(-) 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 8e85e22..24362a8 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 @@ -21,7 +21,7 @@
Бонусы - {{authService.getBalanceAmount($any(authService.userInfo?.walletBalances))}} + {{authService.getBalanceAmount($any(authService.userInfo?.walletBalances)).toLocaleString()}}
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 338b472..b9d6ba7 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 @@ -1,210 +1,4 @@ :host { - // .guest-card { - // display: flex; - // flex-direction: column; - // align-items: center; - // max-width: 600px; - // margin: 0 auto; - - // .top-info { - // padding: 8px 0 0; - // width: 100%; - // display: flex; - // flex-direction: column; - // align-items: center; - - // &__level { - // width: 100%; - - // display: flex; - // align-items: center; - // justify-content: space-around; - - // font-size: 16px; - // } - - // & p { - // color: var(--button-color); - // } - - // p.top-info__bonus { - // font-size: 20px; - // } - // } - - // &__qr { - // margin: 10px; - // padding: 5px; - // width: fit-content; - // // background-image: linear-gradient( - // // #008251 33%, - // // transparent 0px, - // // transparent 67%, - // // #008251 0px - // // ), - // // linear-gradient( - // // 90deg, - // // #008251 33%, - // // transparent 0px, - // // transparent 66%, - // // #008251 0px - // // ), - // // linear-gradient(#008251 33%, transparent 0px, transparent 67%, #008251 0), - // // linear-gradient(90deg, #008251 33%, transparent 0, transparent 66%, #008251 0); - // // background-size: 3px 100%, 100% 3px, 3px 100%, 100% 3px; - // // background-position: 0 0, 0 0, 100% 100%, 100% 100%; - // // background-repeat: no-repeat, no-repeat, no-repeat, no-repeat; - // cursor: pointer; - // } - - // &__user-description { - // padding: 14px 24px; - - // p { - // width: 60%; - // text-align: center; - // margin: 0 auto; - // font-style: normal; - // font-weight: 400; - // font-size: 16px; - // line-height: 19px; - // letter-spacing: -0.5px; - // } - - // .price, - // .percent { - // font-weight: bold; - // } - // } - - // &__purchases-description { - // margin: 0; - // padding: 14px 24px; - // width: 100%; - // text-align: center; - // font-style: normal; - // font-weight: 400; - // font-size: 16px; - // line-height: 19px; - // letter-spacing: -0.5px; - // grid-template-columns: calc(100% - 24px) 24px; - - // span { - // color: #219653; - // } - // } - - // &__level-info { - // padding-top: 36px; - // padding-left: 36px; - // padding-right: 36px; - // display: flex; - // flex-direction: column; - // align-items: center; - - // h2 { - // font-style: normal; - // font-weight: 700; - // font-size: 17px; - // line-height: 22px; - // text-align: center; - // letter-spacing: -0.408px; - // } - - // input[type="range"] { - // -webkit-appearance: none; - // width: 100%; - // height: 6px; - // border-radius: 5px; - // display: block; - // position: relative; - // background: #231f20; - // box-shadow: 0px 0px 3px #f2c94c59; - // background-image: linear-gradient(#f2c94c, #f2c94c); - // background-size: 70% 100%; - // background-repeat: no-repeat; - - // &::before, - // &::after { - // content: " "; - // display: block; - // width: 16px; - // height: 16px; - // border-radius: 100%; - // position: absolute; - // top: -5px; - // } - - // &::before { - // background-color: #f2c94c; - // left: 0px; - // } - - // &::after { - // background-color: #f2c94c; - // right: 0px; - // } - - // &::-webkit-slider-thumb { - // -webkit-appearance: none; - // background: #f2c94c; - // width: 16px; - // height: 16px; - // border-radius: 100%; - // } - - // &::-ms-thumb { - // -webkit-appearance: none; - // height: 20px; - // width: 20px; - // border-radius: 50%; - // background: #f2c94c; - // cursor: ew-resize; - // box-shadow: 0 0 2px 0 #555; - // transition: background 0.3s ease-in-out; - // } - - // &::-moz-range-thumb { - // -webkit-appearance: none; - // height: 20px; - // width: 20px; - // border-radius: 50%; - // background: #f2c94c; - // cursor: ew-resize; - // box-shadow: 0 0 2px 0 #555; - // transition: background 0.3s ease-in-out; - // } - // } - // } - - // &__download-app { - // width: 100%; - // position: relative; - // margin-top: 32px; - // display: flex; - // justify-content: flex-end; - // img { - // width: 100%; - // max-width: calc(100% - 16px); - // } - // } - - // &__loyalty-program { - // text-align: center; - // color: var(--button-color); - // font-style: normal; - // font-weight: bold; - // font-size: 12px; - // line-height: 16px; - // text-decoration: none; - // margin: 17px 0 0; - // } - // } - - // .wrapper { - // padding-top: 20px; - // } - .not-found { display: flex; width: 100%; @@ -255,7 +49,7 @@ } .guest-card__qr { margin: 0 auto; - margin-top: 80px; + margin-top: 20px; width: fit-content; padding: 8px; border-radius: 6px; diff --git a/angular/src/app/services/auth.service.ts b/angular/src/app/services/auth.service.ts index 41c8280..359f596 100644 --- a/angular/src/app/services/auth.service.ts +++ b/angular/src/app/services/auth.service.ts @@ -189,6 +189,7 @@ export class AuthService { }, error: (err) => { console.error(err); + this.loading = false; }, }) } else if (result.code === 230) { @@ -201,10 +202,8 @@ export class AuthService { }, error: (error) => { console.error(error); + this.loading = false; }, - complete: () => { - this.loading = false; - } }); } diff --git a/angular/src/assets/logo.svg b/angular/src/assets/logo.svg index 335e233..d17f259 100644 --- a/angular/src/assets/logo.svg +++ b/angular/src/assets/logo.svg @@ -1,9 +1,192 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wallet_meta/config.json b/wallet_meta/config.json index dbe2302..8e424b7 100644 --- a/wallet_meta/config.json +++ b/wallet_meta/config.json @@ -1,11 +1,11 @@ { - "style": { - "organizationName": "More", - "logoText": "More", - "description": "More", - "notificationPlaceholder": "Здесь будут уведомления", - "foregroundColor": "rgb(127,32,97)", - "labelColor": "rgb(127,32,97)", - "backgroundColor": "rgb(255,255,255)" - } + "style": { + "organizationName": "More", + "logoText": "More", + "description": "More", + "notificationPlaceholder": "Здесь будут уведомления", + "foregroundColor": "rgb(255, 255, 255)", + "labelColor": "rgb(255, 255, 255)", + "backgroundColor": "rgb(0, 0, 0)" + } }