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

dev #14607 Море. Правки по сайту: add apple wallet and logo

Browse Source
This commit is contained in:
nikolay 2023-06-29 12:53:04 +04:00
parent 0abdb264f5
commit e12eb7a542
11 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html
View File

@ -34,16 +34,6 @@
</div> </div>
</div> </div>
<div class="wrapper" *ngIf="!showMenu"> <div class="wrapper" *ngIf="!showMenu">
<button
mat-button
*ngIf="!messagingService.checkRequestPermission()"
(click)="messagingService.requestPermission()"
class="notification"
>
<span class="material-icons">
notifications
</span>
</button>
<button mat-stroked-button appDownloadApp>Установить</button> <button mat-stroked-button appDownloadApp>Установить</button>
</div> </div>
</div> </div>

1
angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss
View File

@ -50,6 +50,7 @@
position: relative; position: relative;
.menu__dropdown { .menu__dropdown {
overflow: hidden;
z-index: 110; z-index: 110;
position: fixed; position: fixed;
background-color: white; background-color: white;

2
angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts
View File

@ -39,7 +39,7 @@ export class NavbarComponent implements OnInit {
ngOnInit(): void { ngOnInit(): void {
const deviceType = getTypeDevice(); const deviceType = getTypeDevice();
this.showMenu = deviceType !== DeviceType.ios; this.showMenu = deviceType === DeviceType.ios;
} }
toggleMenu() { toggleMenu() {

3
angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.html
View File

@ -1,6 +1,9 @@
<app-navbar title="Карта гостя" [backEvent]="showBack ? logout : undefined"></app-navbar> <app-navbar title="Карта гостя" [backEvent]="showBack ? logout : undefined"></app-navbar>
<ng-container *ngIf="!authService.loading && authService.userInfo"> <ng-container *ngIf="!authService.loading && authService.userInfo">
<div class="guest-card"> <div class="guest-card">
<div class="logo">
<img src="./assets/LOGO3.svg" alt=""/>
</div>
<div *ngIf="authService.userInfo?.name" class="owner"> <div *ngIf="authService.userInfo?.name" class="owner">
<span>Владелец карты</span> <span>Владелец карты</span>
<span class="name">{{authService.userInfo.name}}</span> <span class="name">{{authService.userInfo.name}}</span>

11
angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.scss
View File

@ -215,7 +215,7 @@
.guest-card { .guest-card {
max-width: 600px; max-width: 600px;
margin: 0 auto; margin: 0 auto;
margin-top: 20px; padding: 20px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 20px; gap: 20px;
@ -225,6 +225,13 @@
font-style: italic; font-style: italic;
} }
.logo {
margin-bottom: 200px;
img {
width: 40%;
}
}
.owner { .owner {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -246,7 +253,7 @@
} }
.guest-card__qr { .guest-card__qr {
margin: 0 auto; margin: 0 auto;
margin-top: 100px; margin-top: 80px;
width: fit-content; width: fit-content;
padding: 8px; padding: 8px;
border-radius: 6px; border-radius: 6px;

1
angular/src/assets/LOGO3.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

2
angular/src/environments/environment.prod.ts
View File

@ -21,5 +21,5 @@ export const environment = {
appleWalletEndpoint: 'https://apple-wallet-iiko.it-retail.tech/apns/api', appleWalletEndpoint: 'https://apple-wallet-iiko.it-retail.tech/apns/api',
icardProxy: 'https://more.lk.crm4retail.ru/api/icard-proxy/', icardProxy: 'https://more.lk.crm4retail.ru/api/icard-proxy/',
appleWalletSecret: 'Token F5mbzEERAznGKVbB6l', appleWalletSecret: 'Token F5mbzEERAznGKVbB6l',
clientName: 'coffeelike' clientName: 'more'
} }

2
angular/src/environments/environment.ts
View File

@ -21,5 +21,5 @@ export const environment = {
appleWalletEndpoint: 'https://apple-wallet-iiko.it-retail.tech/apns/api', appleWalletEndpoint: 'https://apple-wallet-iiko.it-retail.tech/apns/api',
icardProxy: 'https://more.lk.crm4retail.ru/api/icard-proxy/', icardProxy: 'https://more.lk.crm4retail.ru/api/icard-proxy/',
appleWalletSecret: 'Token F5mbzEERAznGKVbB6l', appleWalletSecret: 'Token F5mbzEERAznGKVbB6l',
clientName: 'coffeelike' clientName: 'more'
}; };

2
angular/src/index.html
View File

@ -2,7 +2,7 @@
<html lang="ru"> <html lang="ru">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>Coffee Like More</title> <title>More</title>
<base href="/"> <base href="/">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- <link rel="apple-touch-icon" href="./assets/icons/apple-icon-180x180.png"> --> <!-- <link rel="apple-touch-icon" href="./assets/icons/apple-icon-180x180.png"> -->

2
angular/src/styles.scss
View File

@ -124,7 +124,7 @@ body {
--button-text-color: #000000; --button-text-color: #000000;
--button-text-color_disabled: #cccccc; --button-text-color_disabled: #cccccc;
--main-color_hover: rgba(127, 32, 97, 0.3); --main-color_hover: rgba(0, 0, 0, 0.2);
} }
.mdc-button__label { .mdc-button__label {

12
wallet_meta/config.json
View File

@ -1,11 +1,11 @@
{ {
"style": { "style": {
"organizationName": "Fashionlogica", "organizationName": "More",
"logoText": "Fashionlogica", "logoText": "More",
"description": "Fashionlogica", "description": "More",
"notificationPlaceholder": "Здесь будут уведомления", "notificationPlaceholder": "Здесь будут уведомления",
"foregroundColor": "rgb(255,255,255)", "foregroundColor": "rgb(127,32,97)",
"labelColor": "rgb(255,255,255)", "labelColor": "rgb(127,32,97)",
"backgroundColor": "rgb(9,70,127)" "backgroundColor": "rgb(255,255,255)"
} }
} }