From 0adafa4d1ca9c766d2f3e7aeafcf638652e6191f Mon Sep 17 00:00:00 2001 From: gofnnp Date: Mon, 24 Oct 2022 22:54:26 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#12925=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB?= =?UTF-8?q?=20=D0=B1=D0=B0=D0=B1=D0=BE=D1=87=D0=B5=D0=BA,=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8F=D0=BB=20=D0=BB=D0=BE=D0=B3=D0=BE,=20?= =?UTF-8?q?=D0=B4=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=BB=20=D0=BF?= =?UTF-8?q?=D1=83=D1=82=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=BB?= =?UTF-8?q?=D1=83=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/components/navbar/navbar.component.html | 2 +- .../app/components/navbar/navbar.component.scss | 4 ++++ .../src/app/pages/account/account.component.ts | 2 +- .../app/pages/account/auth/auth.component.html | 4 ++-- .../app/pages/account/auth/auth.component.scss | 2 +- .../bonus-program/bonus-program.component.html | 6 +++--- .../bonus-program/bonus-program.component.scss | 15 +++++++++------ .../account/user-data/user-data.component.html | 4 ++-- angular/src/app/pages/main/main.component.html | 4 ++-- angular/src/app/services/wp-json.service.ts | 2 +- angular/src/assets/logo.png | Bin 0 -> 5052 bytes angular/src/assets/logo.svg | 9 --------- ...men_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json | 0 13 files changed, 26 insertions(+), 28 deletions(-) create mode 100644 angular/src/assets/logo.png delete mode 100644 angular/src/assets/logo.svg rename angular/src/{assets => static}/nomen_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json (100%) diff --git a/angular/src/app/components/navbar/navbar.component.html b/angular/src/app/components/navbar/navbar.component.html index 398caac..52a5db0 100644 --- a/angular/src/app/components/navbar/navbar.component.html +++ b/angular/src/app/components/navbar/navbar.component.html @@ -1,3 +1,3 @@
- Логотип + Логотип
diff --git a/angular/src/app/components/navbar/navbar.component.scss b/angular/src/app/components/navbar/navbar.component.scss index d7f8be2..01d0de6 100644 --- a/angular/src/app/components/navbar/navbar.component.scss +++ b/angular/src/app/components/navbar/navbar.component.scss @@ -5,6 +5,10 @@ height: 39px; background: #09467F; color: #fff; + img { + height: 26px; + margin-left: 4px; + } } .title { diff --git a/angular/src/app/pages/account/account.component.ts b/angular/src/app/pages/account/account.component.ts index 624c9f4..87de779 100644 --- a/angular/src/app/pages/account/account.component.ts +++ b/angular/src/app/pages/account/account.component.ts @@ -42,7 +42,7 @@ export class AccountComponent implements OnInit { readonly MainPageCode = MainPageCode; readonly mainPageList = PageListMain; - public currentPageMain: Page = this.mainPageList[1]; + public currentPageMain: Page = this.mainPageList[0]; ngOnInit(): void { if (!this.getToken()) { diff --git a/angular/src/app/pages/account/auth/auth.component.html b/angular/src/app/pages/account/auth/auth.component.html index b7a22fc..57d87ae 100644 --- a/angular/src/app/pages/account/auth/auth.component.html +++ b/angular/src/app/pages/account/auth/auth.component.html @@ -40,7 +40,7 @@ >

-
+ @@ -94,6 +94,6 @@

Пароль введен неверно

-
+ diff --git a/angular/src/app/pages/account/auth/auth.component.scss b/angular/src/app/pages/account/auth/auth.component.scss index 97beb28..9451bfa 100644 --- a/angular/src/app/pages/account/auth/auth.component.scss +++ b/angular/src/app/pages/account/auth/auth.component.scss @@ -39,7 +39,7 @@ background: #ffffff; box-shadow: 0px 0px 10px rgb(0 0 0 / 15%); border-radius: 15px; - min-height: 262px; + // min-height: 262px; max-width: 400px; overflow: auto; position: relative; diff --git a/angular/src/app/pages/account/bonus-program/bonus-program.component.html b/angular/src/app/pages/account/bonus-program/bonus-program.component.html index e67f48f..9247730 100644 --- a/angular/src/app/pages/account/bonus-program/bonus-program.component.html +++ b/angular/src/app/pages/account/bonus-program/bonus-program.component.html @@ -4,14 +4,14 @@
- Логотип карта + Логотип карта #{{ accountData.CardNumber }}
- +
@@ -47,5 +47,5 @@
- +
diff --git a/angular/src/app/pages/account/bonus-program/bonus-program.component.scss b/angular/src/app/pages/account/bonus-program/bonus-program.component.scss index 623bb5d..4cdd421 100644 --- a/angular/src/app/pages/account/bonus-program/bonus-program.component.scss +++ b/angular/src/app/pages/account/bonus-program/bonus-program.component.scss @@ -3,14 +3,14 @@ display: flex; flex-direction: column; - & > h2 { + &>h2 { font-style: normal; font-weight: 700; font-size: 20px; line-height: 24px; } - & > p { + &>p { font-style: normal; font-weight: 400; font-size: 15px; @@ -35,8 +35,9 @@ justify-content: space-between; img { - height: 38px; + height: 32px; margin-top: 15px; + margin-left: 8px; } span { @@ -56,6 +57,7 @@ display: flex; justify-content: center; align-items: center; + img { height: 90px; } @@ -103,6 +105,7 @@ #barcode { border-radius: 16px; + &.hidden { display: none; width: 0; @@ -154,12 +157,12 @@ } &.active_back { - > .card-content__front { + >.card-content__front { transform: rotateY(180deg); opacity: 0; } - > .card-content__back { + >.card-content__back { opacity: 1; transform: rotateY(0deg); } @@ -206,4 +209,4 @@ color: #fff; } } -} +} \ No newline at end of file diff --git a/angular/src/app/pages/account/user-data/user-data.component.html b/angular/src/app/pages/account/user-data/user-data.component.html index 2e74ecb..0856906 100644 --- a/angular/src/app/pages/account/user-data/user-data.component.html +++ b/angular/src/app/pages/account/user-data/user-data.component.html @@ -72,7 +72,7 @@ >Нажимая кнопку, Вы соглашаетесь с Политикой обработки персональных данных. -
+ diff --git a/angular/src/app/pages/main/main.component.html b/angular/src/app/pages/main/main.component.html index 457c663..7188213 100644 --- a/angular/src/app/pages/main/main.component.html +++ b/angular/src/app/pages/main/main.component.html @@ -1,7 +1,7 @@
- + (requestingPermission)="requestPermission()"> -->
\ No newline at end of file diff --git a/angular/src/app/services/wp-json.service.ts b/angular/src/app/services/wp-json.service.ts index 04996e2..97dd18e 100644 --- a/angular/src/app/services/wp-json.service.ts +++ b/angular/src/app/services/wp-json.service.ts @@ -43,7 +43,7 @@ export class WpJsonService { } getAllData(): Observable { - return this._request('nomen_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json', 'GET') + return this._request('static/nomen_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json', 'GET') } _request(path: string, method: string, body?: any, auth = false): Observable { diff --git a/angular/src/assets/logo.png b/angular/src/assets/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..c7ba76c0f8b52a0830e3ae3ab7fcf68433308df9 GIT binary patch literal 5052 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 - - - - - - - - diff --git a/angular/src/assets/nomen_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json b/angular/src/static/nomen_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json similarity index 100% rename from angular/src/assets/nomen_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json rename to angular/src/static/nomen_1eb3fb56-3c4c-43b7-9a04-ce532ab7548f.json