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

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

View File

@ -34,16 +34,6 @@
</div>
</div>
<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>
</div>
</div>

View File

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

View File

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

View File

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

View File

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

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 21 KiB

View File

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

View File

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

View File

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

View File

@ -124,7 +124,7 @@ body {
--button-text-color: #000000;
--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 {

View File

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