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 0000000..c7ba76c Binary files /dev/null and b/angular/src/assets/logo.png differ diff --git a/angular/src/assets/logo.svg b/angular/src/assets/logo.svg deleted file mode 100644 index 8ac9adb..0000000 --- a/angular/src/assets/logo.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - 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