\ No newline at end of file
diff --git a/angular/src/app/pages/account/account.component.scss b/angular/src/app/pages/account/account.component.scss
index bd3e401..a7a505c 100644
--- a/angular/src/app/pages/account/account.component.scss
+++ b/angular/src/app/pages/account/account.component.scss
@@ -1,35 +1,51 @@
:host {
.woocommerce {
min-height: calc(100vh - 39px);
- padding: 20px 18px;
+ padding: 20px 18px 65px;
position: relative;
- &.auth-page {
- }
+ &.auth-page {}
.main-menu-container {
- max-width: 600px;
- height: 50px;
- margin: -20px auto 0 auto;
+ position: fixed;
+ width: 100%;
+ bottom: 0;
+ left: 0;
+ margin: 0;
+ z-index: 777;
+ height: 57px;
+ border-top: solid 1px #dfdfdf;
+ background-color: #fff;
ul {
display: flex;
- justify-content: space-between;
height: 100%;
- align-items: center;
font-size: 14px;
- padding: 0 16px;
+ flex-wrap: nowrap;
+ flex-direction: row;
li {
width: 100%;
- text-align: center;
- border-right: solid #e1e1e1 1px;
- padding: 8px 0;
+ height: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ gap: 4px;
+ font-size: 12px;
+ color: #b5b5b9;
cursor: pointer;
+ &.mat-icon {
+ color: #b5b5b9;
+
+ &.is-active {
+ color: #000;
+ }
+ }
+
&.is-active {
- background: #0d457e;
- color: #fff;
+ color: #000;
}
&.cart {
@@ -39,8 +55,8 @@
content: attr(data-counter);
color: #fff;
position: absolute;
- right: 3px;
- top: 1px;
+ right: calc(50% - 24px);
+ top: 3px;
background: #D7120B;
border-radius: 50px;
min-width: 1.2rem;
@@ -138,7 +154,28 @@
.version {
opacity: 0.5;
position: absolute;
- bottom: 12px;
+ bottom: 60px;
+ }
+
+ }
+
+ @media screen and (min-width: 550px) {
+ .woocommerce {
+ padding-bottom: 78px;
+
+ .main-menu-container {
+ width: 500px;
+ left: 50%;
+ transform: translate(-50%, 0);
+ bottom: 20px;
+ border: solid 1px #dfdfdf;
+ border-radius: 12px;
+ }
+
+ .version {
+ bottom: 20px;
+ }
}
}
+
}
\ No newline at end of file
diff --git a/angular/src/app/pages/account/account.component.ts b/angular/src/app/pages/account/account.component.ts
index 446e360..93254b5 100644
--- a/angular/src/app/pages/account/account.component.ts
+++ b/angular/src/app/pages/account/account.component.ts
@@ -203,35 +203,16 @@ export class AccountComponent implements OnInit {
// });
}
- logout(event?: MouseEvent) {
- if (event) {
- event.preventDefault();
- }
- this.ref = this.dialogService.open(ExitComponent, {
- width: 'auto',
- style: {
- 'max-width': '90vw',
- 'max-height': '90vh',
- },
- contentStyle: {
- 'max-height': '90vh',
- height: 'auto',
- 'max-width': '90vw',
- overflow: 'auto',
- 'border-radius': '4px',
- padding: '16px'
- },
- baseZIndex: 10000,
- autoZIndex: true,
- dismissableMask: true,
- closeOnEscape: true,
- showHeader: false,
- });
- this.ref.onClose.subscribe((result) => {
- if (result) {
- this.deleteToken();
- this.showAuthoriztion = true;
- }
- });
+ onReject() {
+ this.messageService.clear('c');
+ }
+
+ onConfirm() {
+ this.deleteToken();
+ this.showAuthoriztion = true;
+ }
+
+ logout() {
+ this.messageService.add({ key: 'c', sticky: true, severity: 'warn', summary: 'Вы уверены, что хотите выйти?' });
}
}
diff --git a/angular/src/app/pages/products/products.component.html b/angular/src/app/pages/products/products.component.html
index 96081c5..3cb700e 100644
--- a/angular/src/app/pages/products/products.component.html
+++ b/angular/src/app/pages/products/products.component.html
@@ -3,23 +3,29 @@
+ (onNodeSelect)="changeGroup()" (onNodeUnselect)="onGroupUnselect($event)" placeholder="Группа">
+
-
+
{{product.name}}
{{product.price}}₽
-
+
+
@@ -31,11 +37,11 @@
+ class="p-button-success">
+ class="p-button-secondary">
