From 9b2bc20c6965d8807228ecdd5ca1fa35858024b9 Mon Sep 17 00:00:00 2001 From: Kataev Denis Date: Wed, 7 Sep 2022 17:49:59 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#12401=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8=20=D0=BF=D0=BE=20=D0=B2=D0=B5=D1=80=D1=81=D1=82=D0=BA?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- angular.json | 4 +- src/app/app.constants.ts | 6 +-- src/app/components/exit/exit.component.scss | 2 +- src/app/pages/account/account.component.scss | 1 + .../pages/account/auth/auth.component.html | 1 - .../pages/account/auth/auth.component.scss | 9 ++-- .../bonus-program.component.html | 50 ++++++++++--------- .../bonus-program.component.scss | 4 +- src/assets/firebase-messaging-sw.js | 13 +++++ 9 files changed, 55 insertions(+), 35 deletions(-) create mode 100644 src/assets/firebase-messaging-sw.js diff --git a/angular.json b/angular.json index 23989d4..7906cf7 100644 --- a/angular.json +++ b/angular.json @@ -34,7 +34,9 @@ "node_modules/primeng/resources/primeng.min.css", "src/styles.scss" ], - "scripts": [], + "scripts": [ + "src/assets/firebase-messaging-sw.js" + ], "serviceWorker": true, "ngswConfigPath": "ngsw-config.json" }, diff --git a/src/app/app.constants.ts b/src/app/app.constants.ts index e247b5b..36bcd44 100644 --- a/src/app/app.constants.ts +++ b/src/app/app.constants.ts @@ -25,21 +25,21 @@ export const PageListWithBonus: Page[] = [ { code: PageCode.BonusProgram, name: 'Ваша карта лояльности', - description: 'Lorem Ipsum - это текст-"рыба", часто используемый в печати и вэб-дизайне.', + description: '', resName: 'bonus-program', onSideBar: true, }, { code: PageCode.Orders, name: 'Ваши чеки', - description: 'Lorem Ipsum - это текст-"рыба", часто используемый в печати и вэб-дизайне.', + description: '', resName: 'orders', onSideBar: true, }, { code: PageCode.RefSystem, name: 'Пригласить друга', - description: 'Lorem Ipsum - это текст-"рыба", часто используемый в печати и вэб-дизайне.', + description: '', resName: 'ref-system', onSideBar: true, }, diff --git a/src/app/components/exit/exit.component.scss b/src/app/components/exit/exit.component.scss index 0d10b09..a8d444c 100644 --- a/src/app/components/exit/exit.component.scss +++ b/src/app/components/exit/exit.component.scss @@ -2,7 +2,7 @@ button { margin-right: 1rem; padding: 4px 21px; margin-top: 8px; - background-color: #009688; + background-color: #09467f; color: #fff; border-radius: 3px; border: none; diff --git a/src/app/pages/account/account.component.scss b/src/app/pages/account/account.component.scss index 2b086af..51e740a 100644 --- a/src/app/pages/account/account.component.scss +++ b/src/app/pages/account/account.component.scss @@ -4,6 +4,7 @@ padding: 20px 18px; nav { margin-bottom: 24px; + margin-top: 26px; display: flex; justify-content: center; ul { diff --git a/src/app/pages/account/auth/auth.component.html b/src/app/pages/account/auth/auth.component.html index dfd977b..502d5d1 100644 --- a/src/app/pages/account/auth/auth.component.html +++ b/src/app/pages/account/auth/auth.component.html @@ -45,7 +45,6 @@

Вход

diff --git a/src/app/pages/account/auth/auth.component.scss b/src/app/pages/account/auth/auth.component.scss index 9101834..b8c43e6 100644 --- a/src/app/pages/account/auth/auth.component.scss +++ b/src/app/pages/account/auth/auth.component.scss @@ -1,4 +1,6 @@ :host { + display: flex; + justify-content: center; .woocommerce-form-login__submit { width: 150px; } @@ -35,9 +37,11 @@ background: #ffffff; box-shadow: 0px 0px 10px rgb(0 0 0 / 15%); border-radius: 15px; - height: 262px; + min-height: 262px; + max-width: 400px; overflow: auto; position: relative; + padding-bottom: 10px; } .form-row { @@ -85,9 +89,6 @@ } } .decoration-pattern { - position: absolute; - bottom: 10px; - left: 0; width: 100%; height: 34px; background: url("../../../../assets/card-decorative-pattern.png") repeat-x; 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 b2c6efa..59d137f 100644 --- a/src/app/pages/account/bonus-program/bonus-program.component.html +++ b/src/app/pages/account/bonus-program/bonus-program.component.html @@ -1,30 +1,32 @@

{{currentPage.name}}

-

{{currentPage.description}}

-
-
- Логотип карта - #{{accountData.CardNumber}} -
-
-
-
-
-
-
-
-
- Имя - {{accountData.BonusProgramName}} - Не задано -
-
- Баланс карты - {{accountData.Bonuses}} -
+ +
+
+
+ Логотип карта + #{{accountData.CardNumber}}
-
- +
+
+
+
+
+
+
+
+ Имя + {{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 1bccf1b..ff660dc 100644 --- a/src/app/pages/account/bonus-program/bonus-program.component.scss +++ b/src/app/pages/account/bonus-program/bonus-program.component.scss @@ -22,6 +22,8 @@ height: 466px; margin-top: 11px; overflow: hidden; + max-width: 400px; + width: 100%; &__header { height: 62px; color: #fff; @@ -79,7 +81,7 @@ align-items: center; padding: 33px 0; #barcode { - border-radius: 16px; + border-radius: 16px; } } } diff --git a/src/assets/firebase-messaging-sw.js b/src/assets/firebase-messaging-sw.js new file mode 100644 index 0000000..9fecb49 --- /dev/null +++ b/src/assets/firebase-messaging-sw.js @@ -0,0 +1,13 @@ +importScripts('https://www.gstatic.com/firebasejs/3.6.8/firebase-app.js'); +importScripts('https://www.gstatic.com/firebasejs/3.6.8/firebase-messaging.js'); + +firebase.initializeApp({ + apiKey: "AIzaSyCujHg9GtN8Uxi-JcCN8zggvXlfNQRKc04", + authDomain: "push-notification-test2-56dac.firebaseapp.com", + projectId: "push-notification-test2-56dac", + storageBucket: "push-notification-test2-56dac.appspot.com", + messagingSenderId: "1004369687552", + appId: "1:1004369687552:web:a6cc20625e05520a37d4e5" +}); + +const messaging = firebase.messaging(); \ No newline at end of file