From d69d571393428fce4b6d4161124054fdaa47a932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Zieli=C5=84ski?= Date: Sun, 11 Dec 2022 21:30:54 +0100 Subject: [PATCH] View fix --- Frontend/package.json | 2 +- Frontend/src/app/auth/auth.service.ts | 9 +-------- .../src/app/main-view/main-view.component.scss | 2 +- .../src/app/main-view/main-view.component.ts | 7 +++++-- Frontend/src/index.html | 2 +- Frontend/src/manifest.webmanifest | 16 ++++++++-------- WebAPI/Controllers/AuthController.cs | 2 +- 7 files changed, 18 insertions(+), 22 deletions(-) diff --git a/Frontend/package.json b/Frontend/package.json index dfcbb78..cbd8109 100644 --- a/Frontend/package.json +++ b/Frontend/package.json @@ -1,6 +1,6 @@ { "name": "diuna", - "version": "0.0.3", + "version": "0.0.5", "scripts": { "ng": "ng", "start": "ng serve", diff --git a/Frontend/src/app/auth/auth.service.ts b/Frontend/src/app/auth/auth.service.ts index 19399d7..f712342 100644 --- a/Frontend/src/app/auth/auth.service.ts +++ b/Frontend/src/app/auth/auth.service.ts @@ -17,15 +17,8 @@ export class AuthService { ping() { return new Promise((resolve, reject) => { - const headers = new HttpHeaders({ - 'Authorization': `Bearer ${this.apiToken}` - }) - this.http$.get(`${environment.api.url}/ping/ping`, { - headers, - withCredentials: true - }).subscribe({ + this.http$.get(`${environment.api.url}/ping/ping`).subscribe({ next: (data) => { - console.log('Ping', data); resolve(data); }, error: (e) => { diff --git a/Frontend/src/app/main-view/main-view.component.scss b/Frontend/src/app/main-view/main-view.component.scss index 9c820d8..30d86e0 100644 --- a/Frontend/src/app/main-view/main-view.component.scss +++ b/Frontend/src/app/main-view/main-view.component.scss @@ -220,6 +220,6 @@ a:visited { color: #000; } -::ng-deep .mat-simple-snackbar-action { +::ng-deep .mat-mdc-snack-bar-action { color: #000; } \ No newline at end of file diff --git a/Frontend/src/app/main-view/main-view.component.ts b/Frontend/src/app/main-view/main-view.component.ts index 24c2caa..abf37fb 100644 --- a/Frontend/src/app/main-view/main-view.component.ts +++ b/Frontend/src/app/main-view/main-view.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild } from '@angular/core'; +import { Component, NgZone, ViewChild } from '@angular/core'; import { MatSidenav } from '@angular/material/sidenav'; import { NavigationStart, Router } from '@angular/router'; import { SwUpdate } from '@angular/service-worker'; @@ -26,6 +26,7 @@ export class MainViewComponent { public device$: DeviceService, private router$: Router, private swUpdate$: SwUpdate, + private ngZone$: NgZone ) { this.swUpdate$.versionUpdates.subscribe(() => { this.reloadApp(); @@ -38,7 +39,9 @@ export class MainViewComponent { //listen to loading subject data$.showLoader.subscribe(loading => { - this.loading = loading; + this.ngZone$.run(() => { + this.loading = loading; + }); }); } reloadApp() { diff --git a/Frontend/src/index.html b/Frontend/src/index.html index 5ad4fcc..54773ef 100644 --- a/Frontend/src/index.html +++ b/Frontend/src/index.html @@ -11,7 +11,7 @@ - + diff --git a/Frontend/src/manifest.webmanifest b/Frontend/src/manifest.webmanifest index bb1a087..a59024f 100644 --- a/Frontend/src/manifest.webmanifest +++ b/Frontend/src/manifest.webmanifest @@ -12,49 +12,49 @@ "src": "assets/icons/icon-72x72.png", "sizes": "72x72", "type": "image/png", - "purpose": "maskable any" + "purpose": "maskable" }, { "src": "assets/icons/icon-96x96.png", "sizes": "96x96", "type": "image/png", - "purpose": "maskable any" + "purpose": "maskable" }, { "src": "assets/icons/icon-128x128.png", "sizes": "128x128", "type": "image/png", - "purpose": "maskable any" + "purpose": "maskable" }, { "src": "assets/icons/icon-144x144.png", "sizes": "144x144", "type": "image/png", - "purpose": "maskable any" + "purpose": "maskable" }, { "src": "assets/icons/icon-152x152.png", "sizes": "152x152", "type": "image/png", - "purpose": "maskable any" + "purpose": "maskable" }, { "src": "assets/icons/icon-192x192.png", "sizes": "192x192", "type": "image/png", - "purpose": "maskable any" + "purpose": "maskable" }, { "src": "assets/icons/icon-384x384.png", "sizes": "384x384", "type": "image/png", - "purpose": "maskable any" + "purpose": "maskable" }, { "src": "assets/icons/icon-512x512.png", "sizes": "512x512", "type": "image/png", - "purpose": "maskable any" + "purpose": "maskable" } ] } diff --git a/WebAPI/Controllers/AuthController.cs b/WebAPI/Controllers/AuthController.cs index b5fefaa..2b13d28 100644 --- a/WebAPI/Controllers/AuthController.cs +++ b/WebAPI/Controllers/AuthController.cs @@ -57,7 +57,7 @@ namespace WebAPI.Controllers new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()) }), - Expires = DateTime.UtcNow.AddMinutes(5), + Expires = DateTime.UtcNow.AddMinutes(30), // TODO: to long - to fix in the future SigningCredentials = new SigningCredentials (new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha512Signature)