From b7cc0ed72d2037206aeee8bf6501a9a8334da7e1 Mon Sep 17 00:00:00 2001 From: nikolay Date: Thu, 29 Jun 2023 09:11:08 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#14384=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=BE=D1=82?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20WPA=20?= =?UTF-8?q?=D0=9A=D0=BE=D1=84=D0=B5=D0=9B=D0=B0=D0=B9=D0=BA:=20fix=20heade?= =?UTF-8?q?r;=20add=20link=20to=20banner;=20fix=20last=20purchase=20loadin?= =?UTF-8?q?g;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../last-order/last-order.component.html | 4 +- .../components/navbar/navbar.component.html | 10 +- .../components/navbar/navbar.component.scss | 134 +++++++++--------- angular/src/app/services/auth.service.ts | 7 +- 4 files changed, 84 insertions(+), 71 deletions(-) diff --git a/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html b/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html index 7410862..a8c7c71 100644 --- a/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html +++ b/angular/src/app/presentation-options/default-option/components/last-order/last-order.component.html @@ -17,7 +17,9 @@

- + + + diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html index 3068813..5bb96fd 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html @@ -1,8 +1,11 @@
-
- -
+

{{title}}

+
+
+
+ +
@@ -44,4 +47,5 @@
+
diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss index 51150dc..a7e7239 100644 --- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss +++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss @@ -9,69 +9,75 @@ } } -.container { - box-sizing: border-box; - padding: 12px 16px; - width: 100%; - background: var(--button-color); - color: var(--button-text-color); - display: grid; - justify-content: space-between; - grid-template-columns: auto auto auto; - justify-items: center; - align-items: center; - .back { - width: 40px; - } - .back-arrow { - font-size: 16px; +.container { + max-width: 600px; + margin: 0 auto; + box-sizing: border-box; + padding: 12px 16px; + width: 100%; + background: var(--button-color); + color: var(--button-text-color); display: flex; - align-items: center; - justify-content: center; - } - .plug { - height: 24px; - width: 24px; - visibility: hidden; - } - .title { - font-weight: 700; - font-size: 17px; - line-height: 22px; - margin: 0; - } - .wrapper { - display: flex; - align-items: center; - gap: 10px; - min-width: 40px; - } - .menu { - position: relative; - - .menu__dropdown { - z-index: 110; - position: fixed; - background-color: white; - width: fit-content; - height: fit-content; - right: 20px; - border-radius: 6px; - box-shadow: 0px 2px 5px -3px black; - - .item_title { - color: var(--text-color); - font-size: 14px; - font-style: normal; - } - } - } - .backdrop { - z-index: 100; - position: absolute; - width: 100vw; - left: 0; - top: 0; - height: 100vh; - } + flex-direction: column; + gap: 10px; + .block { + display: flex; + justify-content: space-between; + align-items: center; + } + .back { + width: 40px; + } + .back-arrow { + font-size: 16px; + display: flex; + align-items: center; + justify-content: center; + } + .plug { + height: 24px; + width: 24px; + visibility: hidden; + } + .title { + font-weight: 700; + font-size: 17px; + line-height: 22px; + margin: 0 auto; + + } + .wrapper { + display: flex; + align-items: center; + gap: 10px; + min-width: 40px; + } + .menu { + position: relative; + + .menu__dropdown { + z-index: 110; + position: fixed; + background-color: white; + width: fit-content; + height: fit-content; + right: 20px; + border-radius: 6px; + box-shadow: 0px 2px 5px -3px black; + + .item_title { + color: var(--text-color); + font-size: 14px; + font-style: normal; + } + } + } + .backdrop { + z-index: 100; + position: absolute; + width: 100vw; + left: 0; + top: 0; + height: 100vh; + } } diff --git a/angular/src/app/services/auth.service.ts b/angular/src/app/services/auth.service.ts index e5db85b..e30bd62 100644 --- a/angular/src/app/services/auth.service.ts +++ b/angular/src/app/services/auth.service.ts @@ -97,9 +97,6 @@ export class AuthService { error: (e) => { this.error = e; }, - complete: () => { - this.loading = false; - }, }); } @@ -251,11 +248,15 @@ export class AuthService { } getLastPurchase() { + this.loading = true; if (this.userInfo) { this.wpJsonService.getLastPurchase(environment.systemId, this.token!).subscribe({ next: (res) => { this.purchaseData.lastPurchase = res[this.userInfo!.id][0]; }, + complete: () => { + this.loading = false; + }, }); } }