gofnnp/h-usersite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #12401

Browse Source 
правки по верстке
This commit is contained in:
Kataev Denis 2022-09-07 17:49:59 +04:00
parent 67a8e1b1c0
commit 9b2bc20c69
9 changed files with 55 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
angular.json
View File

@ -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"
},

6
src/app/app.constants.ts
View File

@ -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,
},

2
src/app/components/exit/exit.component.scss
View File

@ -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;

1
src/app/pages/account/account.component.scss
View File

@ -4,6 +4,7 @@
padding: 20px 18px;
nav {
margin-bottom: 24px;
margin-top: 26px;
display: flex;
justify-content: center;
ul {

1
src/app/pages/account/auth/auth.component.html
View File

@ -45,7 +45,6 @@
<form
class="woocommerce-form woocommerce-form-login login"
action="false"
style="height: 334px;"
(submit)="confirmCode($event)"
>
<h2>Вход</h2>

9
src/app/pages/account/auth/auth.component.scss
View File

@ -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;

50
src/app/pages/account/bonus-program/bonus-program.component.html
View File

@ -1,30 +1,32 @@
<div class="woocommerce-MyAccount-content">
<h2>{{currentPage.name}}</h2>
<p>{{currentPage.description}}</p>
<div class="card-container">
<div class="card-container__header">
<img src="../../../../assets/logo.svg" alt="Логотип карта">
<span *ngIf="accountData">#{{accountData.CardNumber}}</span>
</div>
<div class="card-container__decorative-pattern">
<div class="imgs-row"></div>
<div class="imgs-row" style="background-position-x: -22px;"></div>
<div class="imgs-row"></div>
</div>
<div class="card-container__content">
<div class="info" *ngIf="accountData">
<div class="row">
<span class="key">Имя</span>
<span class="value" *ngIf="accountData.BonusProgramName">{{accountData.BonusProgramName}}</span>
<span class="value" *ngIf="!accountData.BonusProgramName">Не задано</span>
</div>
<div class="row">
<span class="key">Баланс карты</span>
<span class="value">{{accountData.Bonuses}}</span>
</div>
<!-- <p>{{currentPage.description}}</p> -->
<div style="display: flex;justify-content: center;">
<div class="card-container">
<div class="card-container__header">
<img src="../../../../assets/logo.svg" alt="Логотип карта">
<span *ngIf="accountData">#{{accountData.CardNumber}}</span>
</div>
<div class="card-container__barcode-container">
<svg id="barcode"></svg>
<div class="card-container__decorative-pattern">
<div class="imgs-row"></div>
<div class="imgs-row" style="background-position-x: -22px;"></div>
<div class="imgs-row"></div>
</div>
<div class="card-container__content">
<div class="info" *ngIf="accountData">
<div class="row">
<span class="key">Имя</span>
<span class="value" *ngIf="accountData.BonusProgramName">{{accountData.BonusProgramName}}</span>
<span class="value" *ngIf="!accountData.BonusProgramName">Не задано</span>
</div>
<div class="row">
<span class="key">Баланс карты</span>
<span class="value">{{accountData.Bonuses}}</span>
</div>
</div>
<div class="card-container__barcode-container">
<svg id="barcode"></svg>
</div>
</div>
</div>
</div>

4
src/app/pages/account/bonus-program/bonus-program.component.scss
View File

@ -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;
}
}
}

13
src/assets/firebase-messaging-sw.js Normal file
View File

@ -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();