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

Merge branch 'coffee-like-test' into coffee-like

Browse Source
This commit is contained in:
nikolay 2023-07-25 16:52:13 +04:00
commit 8c9a7ed1c2
28 changed files with 309 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
angular/README.md
View File

@ -1,4 +1,4 @@
# CoffeeLikeTest
# CoffeeLike
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 14.0.6.

4
angular/package-lock.json generated
View File

@ -1,11 +1,11 @@
{
"name": "coffee-like-test",
"name": "coffee-like",
"version": "0.0.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "coffee-like-test",
"name": "coffee-like",
"version": "0.0.2",
"dependencies": {
"@angular/animations": "^15.2.9",

37
angular/src/app/app.component.ts
View File

@ -1,8 +1,9 @@
import { Component, OnInit } from '@angular/core';
import { Component, HostListener, OnInit } from '@angular/core';
import { RouteConfigLoadStart, Router } from '@angular/router';
import { AuthService } from './services/auth.service';
import { CookiesService } from './services/cookies.service';
import { JsonrpcService, RpcService } from './services/jsonrpc.service';
import { pwaInstalled } from './utils';
@Component({
selector: 'app-root',
@ -11,12 +12,14 @@ import { JsonrpcService, RpcService } from './services/jsonrpc.service';
})
export class AppComponent implements OnInit {
title = 'Coffee Like';
public static pwaPrompt: any;
public static pwaInstalled: boolean = true;
constructor(
private router: Router,
private cookiesService: CookiesService,
private jsonRpcService: JsonrpcService,
private authService: AuthService,
private authService: AuthService
) {
this.router.events.subscribe((x) => {
if (x instanceof RouteConfigLoadStart && x.route.path === '') {
@ -37,6 +40,24 @@ export class AppComponent implements OnInit {
});
}
@HostListener('window:beforeinstallprompt', ['$event'])
onBeforeInstallPrompt(e: any) {
e.preventDefault();
AppComponent.pwaPrompt = e;
if (AppComponent.pwaPrompt) {
AppComponent.pwaInstalled = false;
}
}
@HostListener('window:appinstalled', ['$event'])
onAppInstalled(e: any) {
// Prevent Chrome 67 and earlier from automatically showing the prompt
e.preventDefault();
// Stash the event so it can be triggered later.
AppComponent.pwaPrompt = e;
AppComponent.pwaInstalled = true;
}
getAdditionalInfo() {
return this.jsonRpcService.rpc(
{
@ -49,16 +70,22 @@ export class AppComponent implements OnInit {
}
ngOnInit(): void {
pwaInstalled().then((res) => {
AppComponent.pwaInstalled = res;
});
if (this.authService.authorized) {
this.authService.getUserInfo();
}
this.getAdditionalInfo().subscribe({
next: (value) => {
this.cookiesService.setCookie('presentation-option', value?.data?.interface_id || 'default')
this.cookiesService.setCookie(
'presentation-option',
value?.data?.interface_id || 'default'
);
},
error: (err) => {
console.error(err);
}
})
},
});
}
}

4
angular/src/app/app.module.ts
View File

@ -107,7 +107,7 @@ import { DirectivesModule } from './directives/directives.module';
MatSnackBarModule,
MatBottomSheetModule,
MatProgressSpinnerModule,
DirectivesModule
DirectivesModule,
],
providers: [
DialogService,
@ -118,4 +118,4 @@ import { DirectivesModule } from './directives/directives.module';
],
bootstrap: [AppComponent],
})
export class AppModule { }
export class AppModule {}

47
angular/src/app/directives/download-app.directive.ts
View File

@ -7,57 +7,27 @@ import {
} from '@angular/core';
import { MessageService } from 'primeng/api';
import { getTypeDevice, pwaInstalled } from 'src/app/utils';
import { AppComponent } from '../app.component';
@Directive({
selector: '[appDownloadApp]',
})
export class DownloadAppDirective implements OnInit {
public deviceType: 'ios' | 'android' | null = null;
public deferredPrompt: any;
constructor(
private messageService: MessageService,
public renderer: Renderer2,
private el: ElementRef,
) { }
private el: ElementRef
) {}
ngOnInit(): void {
getTypeDevice();
if (this.deviceType === 'ios') {
this.el.nativeElement.style.display = 'block';
}
this.checkInstalled();
}
async checkInstalled(): Promise<void> {
if (window.matchMedia('(display-mode: standalone)').matches
|| await pwaInstalled()) {
if (AppComponent.pwaInstalled) {
this.el.nativeElement.style.display = 'none';
}
}
@HostListener('window:beforeinstallprompt', ['$event'])
onBeforeInstallPrompt(e: any) {
e.preventDefault();
this.deferredPrompt = e;
if (this.deferredPrompt) {
this.el.nativeElement.style.display = 'block';
}
}
@HostListener('window:appinstalled', ['$event'])
onAppInstalled(e: any) {
// Prevent Chrome 67 and earlier from automatically showing the prompt
e.preventDefault();
// Stash the event so it can be triggered later.
this.deferredPrompt = e;
this.el.nativeElement.style.display = 'none';
}
@HostListener('click', ['$event'])
async downloadApp(event: MouseEvent) {
if (!this.deferredPrompt) {
if (!AppComponent.pwaPrompt) {
this.messageService.clear();
this.messageService.add({
severity: 'error',
@ -65,8 +35,8 @@ export class DownloadAppDirective implements OnInit {
});
return;
}
this.deferredPrompt.prompt();
this.deferredPrompt.userChoice.then((res: any) => {
AppComponent.pwaPrompt.prompt();
AppComponent.pwaPrompt.userChoice.then((res: any) => {
if (res.outcome === 'accepted') {
this.messageService.clear();
this.messageService.add({
@ -74,8 +44,7 @@ export class DownloadAppDirective implements OnInit {
summary: 'Спасибо за установку!',
});
}
this.deferredPrompt = null;
AppComponent.pwaPrompt = null;
});
}
}

4
angular/src/app/interface/data.ts
View File

@ -6,7 +6,7 @@ export enum PageCode {
UserData,
}
export interface Moment extends moment.Moment { }
export interface Moment extends moment.Moment {}
export interface Page {
code: PageCode;
@ -216,7 +216,7 @@ export interface NextLevel {
}
export interface UserInfo {
current_level_and_cashback?: CurrentInfo;
current_level_and_cashback: CurrentInfo;
last_purchase?: LastPurchase;
id: string;
phone: string;

1
angular/src/app/pages/guest-card/guest-card.component.scss
View File

@ -75,6 +75,7 @@
font-size: 16px;
line-height: 19px;
letter-spacing: -0.5px;
color: var(--text-color);
}
.price,

13
angular/src/app/pipes/safe-html.pipe.ts Normal file
View File

@ -0,0 +1,13 @@
import { Pipe, PipeTransform } from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';
@Pipe({
name: 'safeHtml',
})
export class SafeHtmlPipe implements PipeTransform {
constructor(private sanitizer: DomSanitizer) {}
transform(html: string) {
return this.sanitizer.bypassSecurityTrustHtml(html);
}
}

4
angular/src/app/presentation-options/default-option/components/footer/footer.component.scss
View File

@ -14,7 +14,7 @@
line-height: 20px;
text-align: center;
letter-spacing: -0.24px;
color: #6a737c;
color: var(--text-color_1);
}
.phone-number {
font-style: normal;
@ -23,7 +23,7 @@
line-height: 22px;
text-align: center;
letter-spacing: -0.408px;
color: #d9d9d9;
color: var(--text-color);
text-decoration: none;
}
}

4
angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html
View File

@ -2,10 +2,10 @@
<ng-container *ngIf="lastOrder">
<h2>Ваш предыдущий заказ</h2>
<p class="flex"><span>Дата: </span>
<span *ngIf="!loading">{{lastOrder!.last_purchase_date}}</span>
<span class="info" *ngIf="!loading">{{lastOrder!.last_purchase_date}}</span>
</p>
<p class="flex"><span>На сумму: </span>
<span *ngIf="!loading">{{lastOrder?.last_purchase_sum}}₽</span>
<span class="info" *ngIf="!loading">{{lastOrder?.last_purchase_sum}}₽</span>
</p>
</ng-container>
<ng-container *ngIf="!lastOrder">

3
angular/src/app/presentation-options/default-option/components/last-order/last-order.component.scss
View File

@ -22,6 +22,9 @@
flex-direction: row;
gap: 8px;
}
.info {
font-size: 14px;
}
}
.evaluate-order {

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

@ -4,7 +4,7 @@
align-items: center;
padding: 10px;
cursor: pointer;
transition: background-color 0.1s;
transition: background-color 0.1s;
&:hover {
background-color: var(--main-color_hover);

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

@ -8,18 +8,26 @@
<div *ngIf="showDropdown" class="backdrop" (click)="closeMenu()"></div>
<div class="menu">
<button mat-button (click)="toggleMenu()">
<span class="material-icons" style="color: white !important">
<span class="material-icons" style="color: var(--button-text-color) !important">
more_horiz
</span>
</button>
<div class="menu__dropdown" *ngIf="showDropdown">
<ul>
<menu-item [handler]="handler(aboutApp)">
<span class="material-icons icon" style="color: var(--main-color)">
<!-- <menu-item [handler]="handler(aboutApp)">
<span class="material-icons icon" style="color: var(--main-color_2)">
info
</span>
<span class="item_title">О приложении</span>
</menu-item> -->
<menu-item [handler]="handler(navigateToLoyality)">
<span class="material-icons icon" style="color: var(--main-color_2)">
info
</span>
<span class="item_title">
О программе лояльности
</span>
</menu-item>
<ng-container *ngIf="isios">
<menu-item [handler]="handler(addToWallet)">
@ -34,8 +42,8 @@
Установить приложение
</span>
</menu-item>
<menu-item *ngIf="!messagingService.checkRequestPermission()" [handler]="handler(messagingService.requestPermission)">
<span class="material-icons" style="color: var(--main-color)">
<menu-item *ngIf="!notified()" [handler]="handler(notify)">
<span class="material-icons" style="color: var(--main-color_2)">
notifications
</span>
<span class="item_title">
@ -44,7 +52,7 @@
</menu-item>
</ng-container>
<menu-item [handler]="handler(logout)">
<span class="material-icons" style="color: var(--main-color)">
<span class="material-icons" style="color: var(--main-color_2)">
logout
</span>
<span class="item_title">Выйти</span>

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

@ -15,11 +15,10 @@
box-sizing: border-box;
padding: 12px 16px;
width: 100%;
background: var(--button-color);
color: var(--button-text-color);
background: var(--main-color_2);
display: flex;
flex-direction: column;
gap: 10px;
gap: 10px;
.block {
display: flex;
align-items: center;
@ -33,6 +32,7 @@
display: flex;
align-items: center;
justify-content: center;
color: var(--button-text-color);
}
.plug {
height: 24px;
@ -44,6 +44,7 @@
font-size: 17px;
line-height: 22px;
margin: 0 auto;
color: var(--button-text-color);
}
.menu {
position: relative;
@ -52,12 +53,13 @@
.menu__dropdown {
z-index: 110;
position: absolute;
background-color: white;
background-color: var(--background-color_1);
width: 250px;
height: fit-content;
right: 20px;
border-radius: 6px;
box-shadow: 0px 2px 5px -3px black;
overflow: hidden;
.item_title {
color: var(--text-color);

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

@ -6,14 +6,15 @@ import { CookiesService } from 'src/app/services/cookies.service';
import { MatBottomSheet } from '@angular/material/bottom-sheet';
import { ExitComponent } from 'src/app/components/exit/exit.component';
import { AuthService } from 'src/app/services/auth.service';
import { Router } from '@angular/router';
@Component({
selector: 'app-navbar[title]',
templateUrl: './navbar.component.html',
styleUrls: ['./navbar.component.scss']
styleUrls: ['./navbar.component.scss'],
})
export class NavbarComponent implements OnInit {
@Input() title: string = 'Название не задано'
@Input() title: string = 'Название не задано';
@Input() backEvent?: () => void;
showDropdown: boolean = false;
@ -25,16 +26,17 @@ export class NavbarComponent implements OnInit {
private cookiesService: CookiesService,
private _bottomSheet: MatBottomSheet,
private authService: AuthService,
) { }
private router: Router
) {}
handler(cb: () => void): (e: any) => void {
return (e: any) => {
cb();
this.closeMenu();
}
};
}
aboutApp() { }
aboutApp() {}
ngOnInit(): void {
this.isios = getTypeDevice() == DeviceType.ios;
@ -50,7 +52,7 @@ export class NavbarComponent implements OnInit {
closeMenu = () => {
this.showDropdown = false;
}
};
back() {
if (this.backEvent) {
@ -60,11 +62,11 @@ export class NavbarComponent implements OnInit {
addToWallet = () => {
this.appleWalletService.addCardToWallet();
}
};
deleteToken = (): void => {
this.cookiesService.logout();
}
};
logout = () => {
const bottomSheet = this._bottomSheet.open(ExitComponent);
@ -75,8 +77,19 @@ export class NavbarComponent implements OnInit {
}
},
});
}
};
installApp = () => { }
installApp = () => {};
notified = () => {
return this.messagingService.checkRequestPermission();
};
notify = () => {
this.messagingService.requestPermission();
};
navigateToLoyality = () => {
this.router.navigate(['loyality-program']);
};
}

2
angular/src/app/presentation-options/default-option/components/social-media-buttons/social-media-buttons.component.scss
View File

@ -7,7 +7,7 @@
width: 48px;
height: 48px;
border-radius: 100%;
background: var(--button-color);
background: var(--main-color_2);
display: flex;
align-items: center;
justify-content: center;

7
angular/src/app/presentation-options/default-option/default-option.module.ts
View File

@ -22,7 +22,7 @@ import { DirectivesModule } from 'src/app/directives/directives.module';
import { LoyalityProgramComponent } from './pages/loyality-program/loyality-program.component';
import { MatButtonModule } from '@angular/material/button';
import { ToastModule } from 'primeng/toast';
import { SafeHtmlPipe } from 'src/app/pipes/safe-html.pipe';
@NgModule({
declarations: [
@ -37,6 +37,7 @@ import { ToastModule } from 'primeng/toast';
LoginComponent,
LoyalityProgramComponent,
MenuItemComponent,
SafeHtmlPipe,
],
imports: [
ToastModule,
@ -51,8 +52,8 @@ import { ToastModule } from 'primeng/toast';
ReactiveFormsModule,
MatInputModule,
DirectivesModule,
MatButtonModule
MatButtonModule,
],
bootstrap: [IndexComponent],
})
export class DefaultOptionModule { }
export class DefaultOptionModule {}

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

@ -14,33 +14,26 @@
<ng-container *ngIf="authService.error || authService.userInfo.walletBalances >= 0">
<p class="top-info__bonus">
{{ authService.error ? '--' : Math.floor(authService.userInfo.walletBalances) }}
бонусов
бонусов
</p>
</ng-container>
</div>
<div class="guest-card__qr" (click)="qrCodeClick()">
<qr-code
<div class="qr-code-wrapper">
<qr-code
[value]="phone || 'Данные не найдены'"
[margin]="0"
[size]="qrCodeSize"
errorCorrectionLevel="H"
></qr-code>
></qr-code>
<span class="material-icons zoom">
zoom_in
</span>
</div>
<span>Покажи бариста</span>
</div>
<div class="guest-card__user-description">
<p>
Осталось купить на сумму
<span class="price">{{
authService.error ? '--' : authService.userInfo.next_level.sum_for_next_level
}}</span>
рублей, тогда кэшбек будет
<span class="percent">{{ authService.error ? '--' : authService.userInfo.next_level.cashback}}%</span>
с
{{
authService.currentPeriod[1]
.locale("ru")
.format("D MMMM")
}}
</p>
<p [innerHtml]="getLevelDescription() | safeHtml"></p>
</div>
<ng-container *ngIf="!authService.error">
<span id="bonuses-condition"></span>
@ -48,12 +41,7 @@
[lastOrder]="authService.userInfo?.last_purchase"
[loading]="authService.loading"
></app-last-order>
<a class="guest-card__loyalty-program" routerLink="loyality-program">
Подробнее о правилах
<br />
Программы лояльности
</a>
</ng-container>
<ng-container *ngIf="authService.error">
<img src="./assets/broken.jpg" alt="" />

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

@ -1,4 +1,4 @@
:host {
:host {
.guest-card {
display: flex;
flex-direction: column;
@ -12,6 +12,7 @@
display: flex;
flex-direction: column;
align-items: center;
font-size: 16px;
&__level {
width: 100%;
@ -20,61 +21,56 @@
align-items: center;
justify-content: space-around;
font-size: 16px;
}
& p {
color: var(--button-color);
}
p.top-info__bonus {
font-size: 20px;
}
}
&__qr {
margin: 10px;
padding: 5px;
width: fit-content;
// background-image: linear-gradient(
// #008251 33%,
// transparent 0px,
// transparent 67%,
// #008251 0px
// ),
// linear-gradient(
// 90deg,
// #008251 33%,
// transparent 0px,
// transparent 66%,
// #008251 0px
// ),
// linear-gradient(#008251 33%, transparent 0px, transparent 67%, #008251 0),
// linear-gradient(90deg, #008251 33%, transparent 0, transparent 66%, #008251 0);
// background-size: 3px 100%, 100% 3px, 3px 100%, 100% 3px;
// background-position: 0 0, 0 0, 100% 100%, 100% 100%;
// background-repeat: no-repeat, no-repeat, no-repeat, no-repeat;
width: fit-content;
border-radius: 6px;
align-items: center;
display: flex;
flex-direction: column;
cursor: pointer;
.qr-code-wrapper {
position: relative;
}
.zoom {
position: absolute;
bottom: 5px;
right: -35px;
color: var(--button-color);
}
}
&__user-description {
padding: 14px 24px;
p {
width: 60%;
width: 80%;
text-align: center;
margin: 0 auto;
font-style: normal;
font-weight: 400;
font-size: 16px;
line-height: 19px;
letter-spacing: -0.5px;
}
letter-spacing: -0.5px;
.price,
.percent {
font-weight: bold;
}
#price,
.percent {
font-weight: bold;
color: var(--button-color);
}
}
}
&__purchases-description {

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

@ -1,10 +1,38 @@
import { Component, OnInit } from '@angular/core';
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
import { MatBottomSheet } from '@angular/material/bottom-sheet';
import { ExitComponent } from 'src/app/components/exit/exit.component';
import { CookiesService } from 'src/app/services/cookies.service';
import { MessageService } from 'primeng/api';
import { MessagingService } from 'src/app/services/messaging.service';
import { AuthService } from 'src/app/services/auth.service';
import { format } from 'src/app/utils';
const levelDescriptionsTable = [
[
'Поднимай свой уровень!<br/>Купи еще на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и твой кешбек будет <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">6%</span> с {1}!',
'А ты хорош!<br/>Купи еще на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и получай кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">10%</span> с {1}',
'Ты крут!<br/>Купи еще на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и получай максимальный кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">15%</span> с {1}',
'Ты сделал это!<br/>Получай максимальный кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">15%</span> с {1}',
],
[
'Oops! Ты можешь оказаться на 1 уровне.<br/>Купи еще на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и твой кешбек будет <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">6%</span> с {1}!',
'Ты можешь стать круче!<br/>Купи еще на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и получай кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">10%</span> с {1}',
'Ого! Ты уже здесь! Хочешь еще больше кешбека?<br/>Купи на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и получай максимальный кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">15%</span> с {1}',
'Ты потрясающий!<br/>Получай максимальный кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">15%</span> с {1}',
],
[
'Oops! Ты можешь оказаться на 1 уровне.<br/>Купи еще на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и твой кешбек будет <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">6%</span> с {1}!',
'Для сохранения 3 уровня осталось немного.<br/>Купи еще на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span и получай кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">10%</span> с {1}',
'Ты почти на последнем уровне!<br/>Купи на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и получай максимальный кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">15%</span> с {1}',
'Ты лучший!<br/>Получай максимальный кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">15%</span> с {1}',
],
[
'Oops! Ты можешь оказаться на 1 уровне.<br/>Купи еще на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и твой кешбек будет <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">6%</span> с {1}!',
'Для сохранения 3 уровня осталось немного.<br/>Купи еще на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span и получай кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">10%</span> с {1}',
'Оу! Ты можешь остаться без максимального кешбека.<br/>Купи на <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">{0}₽</span> и возвращай себе кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">15%</span> с {1}',
'Ты наш герой!<br/>Получай максимальный кешбек <span style="color: var(--button-color); font-weight: bold; font-size: 17px;">15%</span> с {1}',
],
];
@Component({
selector: 'app-guest-card',
@ -22,11 +50,13 @@ export class GuestCardComponent implements OnInit {
public cookiesService: CookiesService,
private messagingService: MessagingService,
private messageService: MessageService,
public authService: AuthService,
) { }
public authService: AuthService
) {}
ngOnInit(): void {
this.phone = this.cookiesService.getItem('phone-number') || this.authService.userInfo?.phone;
this.phone =
this.cookiesService.getItem('phone-number') ||
this.authService.userInfo?.phone;
this.requestPermission();
}
@ -69,5 +99,24 @@ export class GuestCardComponent implements OnInit {
}
},
});
};
getLevelDescription() {
let curLevel = 0;
let nextLevel = 0;
if (this.authService.userInfo) {
curLevel =
this.authService.userInfo.current_level_and_cashback.current_level - 1;
nextLevel = this.authService.userInfo.next_level.next_level - 1;
}
const template = levelDescriptionsTable[curLevel][nextLevel];
return format(
template,
`${this.authService.userInfo?.next_level.sum_for_next_level}`,
`${this.authService.currentPeriod[1].locale('ru').format('D MMMM')}`
);
}
}

2
angular/src/app/presentation-options/default-option/pages/login/login.component.html
View File

@ -4,7 +4,7 @@
[backEvent]="backToPhoneForm"
></app-navbar>
<h1>Участвуй в программе лояльности COFFEE LIKE</h1>
<p class="description">Начни получать бонусы прямо сейчас</p>
<p class="description">Начни получать бонусы прямо сейчас!</p>
<form
*ngIf="isShowNumber; else smsCode"
(ngSubmit)="submitNumber()"

5
angular/src/app/presentation-options/default-option/pages/login/login.component.scss
View File

@ -57,6 +57,7 @@
a {
text-decoration: none;
color: var(--button-color);
text-decoration: underline;
}
}
@ -153,8 +154,8 @@
will-change: transform;
}
.box:focus-within {
box-shadow: 0 0 6px 1px rgba(rgb(127, 32, 97), 0.2),
0 0 0 2px rgba(rgb(127, 32, 97), 0.6);
box-shadow: 0 0 6px 1px rgba(rgb(0, 92, 80), 0.2),
0 0 0 2px rgba(rgb(0, 92, 80), 0.6);
}
.box::before,
.box::after {

12
angular/src/app/utils.ts
View File

@ -1,4 +1,4 @@
import { environment } from "src/environments/environment.prod";
import { environment } from 'src/environments/environment.prod';
export enum DeviceType {
ios,
@ -12,7 +12,9 @@ export function getTypeDevice(): DeviceType {
}
export async function pwaInstalled(): Promise<boolean> {
if ("getInstalledRelatedApps" in navigator) {
if (window.matchMedia('(display-mode: standalone)').matches) return true;
if ('getInstalledRelatedApps' in navigator) {
const apps = await (window.navigator as any).getInstalledRelatedApps();
for (const app of apps) {
if (app.url == environment.manifestUrl) {
@ -22,3 +24,9 @@ export async function pwaInstalled(): Promise<boolean> {
}
return false;
}
export function format(s: string, ...args: string[]) {
return s.replace(/{(\d+)}/g, function (match, number) {
return typeof args[number] != 'undefined' ? args[number] : match;
});
}

BIN
angular/src/assets/970х250_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 291 KiB

After

Width:  |  Height:  |  Size: 288 KiB

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

@ -7,19 +7,19 @@ export const environment = {
appWPEndpoint: 'http://213.239.210.240:4500/wp-json/woofood/v1/',
hasBonusProgram: true,
systemId: 'tsQ2cu59Xz9qgGTm3z',
defaultUrl: 'https://club.coffee-like.com',
manifestUrl: 'https://club.coffee-like.com/manifest.webmanifest',
defaultUrl: 'https://coffee-like.lk.crm4retail.ru',
manifestUrl: 'https://coffee-like.lk.crm4retail.ru/manifest.webmanifest',
firebase: {
apiKey: "AIzaSyDTb_xuMz2vDx8xGs34AJiltraKVlwmrtY",
authDomain: "coffee-like-77bfe.firebaseapp.com",
projectId: "coffee-like-77bfe",
storageBucket: "coffee-like-77bfe.appspot.com",
messagingSenderId: "1094726277369",
appId: "1:1094726277369:web:8af560662da7700e7a2a28"
apiKey: 'AIzaSyDTb_xuMz2vDx8xGs34AJiltraKVlwmrtY',
authDomain: 'coffee-like-77bfe.firebaseapp.com',
projectId: 'coffee-like-77bfe',
storageBucket: 'coffee-like-77bfe.appspot.com',
messagingSenderId: '1094726277369',
appId: '1:1094726277369:web:8af560662da7700e7a2a28',
},
version: packageJson.version,
appleWalletEndpoint: 'https://apple-wallet-iiko.it-retail.tech/apns/api',
icardProxy: 'https://club.coffee-like.com/api/icard-proxy/',
icardProxy: 'https://coffee-like.lk.crm4retail.ru/api/icard-proxy/',
appleWalletSecret: 'Token F5mbzEERAznGKVbB6l',
clientName: 'coffeelike'
}
clientName: 'coffeelike',
};

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

@ -8,18 +8,18 @@ export const environment = {
hasBonusProgram: true,
systemId: 'tsQ2cu59Xz9qgGTm3z',
defaultUrl: 'http://192.168.0.179:4200',
manifestUrl: 'https://club.coffee-like.com/manifest.webmanifest',
manifestUrl: 'https://coffee-like.lk.crm4retail.ru/manifest.webmanifest',
firebase: {
apiKey: "AIzaSyDTb_xuMz2vDx8xGs34AJiltraKVlwmrtY",
authDomain: "coffee-like-77bfe.firebaseapp.com",
projectId: "coffee-like-77bfe",
storageBucket: "coffee-like-77bfe.appspot.com",
messagingSenderId: "1094726277369",
appId: "1:1094726277369:web:8af560662da7700e7a2a28"
apiKey: 'AIzaSyDTb_xuMz2vDx8xGs34AJiltraKVlwmrtY',
authDomain: 'coffee-like-77bfe.firebaseapp.com',
projectId: 'coffee-like-77bfe',
storageBucket: 'coffee-like-77bfe.appspot.com',
messagingSenderId: '1094726277369',
appId: '1:1094726277369:web:8af560662da7700e7a2a28',
},
version: packageJson.version,
appleWalletEndpoint: 'https://apple-wallet-iiko.it-retail.tech/apns/api',
icardProxy: 'https://club.coffee-like.com/api/icard-proxy/',
icardProxy: 'https://coffee-like.lk.crm4retail.ru/api/icard-proxy/',
appleWalletSecret: 'Token F5mbzEERAznGKVbB6l',
clientName: 'coffeelike'
clientName: 'coffeelike',
};

2
angular/src/manifest.webmanifest
View File

@ -53,6 +53,6 @@
"gcm_sender_id": "99855572145",
"related_applications": [{
"platform": "webapp",
"url": "https://club.coffee-like.com/manifest.webmanifest"
"url": "https://coffee-like.lk.crm4retail.ru/manifest.webmanifest"
}]
}

90
angular/src/styles.scss
View File

@ -3,20 +3,20 @@
@include mat.core();
$primary: (
50 : #f0e4ec,
100 : #d9bcd0,
200 : #bf90b0,
300 : #a56390,
400 : #924179,
500 : #7f2061,
600 : #771c59,
700 : #6c184f,
800 : #621345,
900 : #4f0b33,
A100 : #ff85c7,
A200 : #ff52b0,
A400 : #ff1f99,
A700 : #ff068d,
50 : #e0ebea,
100 : #b3cecb,
200 : #80aea8,
300 : #4d8d85,
400 : #26746a,
500 : #005c50,
600 : #005449,
700 : #004a40,
800 : #004137,
900 : #003027,
A100 : #69ffdb,
A200 : #36ffce,
A400 : #03ffc2,
A700 : #00e8b0,
contrast: (
50 : #000000,
100 : #000000,
@ -30,8 +30,8 @@ $primary: (
900 : #ffffff,
A100 : #000000,
A200 : #000000,
A400 : #ffffff,
A700 : #ffffff,
A400 : #000000,
A700 : #000000,
)
);
@ -111,24 +111,52 @@ body {
}
:root {
--main-color: #7F2061;
--main-color: #28AF49;
--main-color_2: #005C50;
--main-border-radius: 35px;
--background-color: #ffffff;
--background-color: #ffffff;
--background-color_1: #ffffff;
--text-color: #222222;
--text-color_1: #666666;
--button-color: #7F2061;
--button-color_disabled: #4a0d37;
--text-color: #000000;
--text-color_1: #8d8d8d;
--button-color: #005C50;
--button-color_disabled: rgb(0, 92, 80, 0.9);
--button-text-color: #ffffff;
--button-text-color_disabled: #cccccc;
--main-color_hover: rgba(127, 32, 97, 0.3);
--main-color_hover: rgba(0, 92, 80, 0.3);
}
.mdc-button__label {
color: var(--button-text-color) !important;
.mdc-text-field--outlined:not(.mdc-text-field--disabled, .mdc-text-field--invalid, .mat-focused) .mdc-notched-outline__leading,
.mdc-text-field--outlined:not(.mdc-text-field--disabled, .mdc-text-field--invalid, .mat-focused) .mdc-notched-outline__notch,
.mdc-text-field--outlined:not(.mdc-text-field--disabled, .mdc-text-field--invalid, .mat-focused) .mdc-notched-outline__trailing {
border-color: var(--main-color_2) !important;
}
.mat-mdc-outlined-button:not(:disabled) {
border-color: var(--text-color) !important;
.mdc-button__label {
color: var(--text-color);
}
}
.mdc-text-field:not(.mdc-text-field--disabled, .mdc-text-field--invalid) .mdc-floating-label {
color: var(--main-color_2);
}
.mdc-text-field span {
color: inherit !important;
}
.mdc-text-field:not(.mdc-text-field--disabled) .mdc-text-field__input {
color: var(--text-color);
}
.mdc-button__label span {
color: var(--text-color) !important;
}
.mat-mdc-outlined-button:not(:disabled) {
@ -143,6 +171,10 @@ body {
font-family: Montserrat;
}
p, span, h1, h2, h3, h4, h5, h6 {
color: var(--text-color);
}
.mat-h2,
.mat-headline-6,
.mat-typography .mat-h2,
@ -151,6 +183,12 @@ body {
font-family: Montserrat, sans-serif;
}
.mat-bottom-sheet-container {
background: var(--background-color_1);
color: var(--text-color);
}
hr {
width: 100%;
border-top: 1px solid #BDBDBD;