diff --git a/src/frontend/app/app-service.module.ts b/src/frontend/app/app-service.module.ts index a1e34b52bd8092807686660aca16ee6a6d7b4c58..cf4ec1304c5457fbe4836928540106e365333ffe 100644 --- a/src/frontend/app/app-service.module.ts +++ b/src/frontend/app/app-service.module.ts @@ -16,23 +16,23 @@ import { SortPipe } from '../plugins/sorting.pipe'; NgStringPipesModule ], declarations: [ - TimeAgoPipe, - TimeLimitPipe, FilterListPipe, FullDatePipe, SafeHtmlPipe, SecureUrlPipe, - SortPipe + SortPipe, + TimeAgoPipe, + TimeLimitPipe, ], exports: [ NgStringPipesModule, - TimeAgoPipe, - TimeLimitPipe, FilterListPipe, FullDatePipe, SafeHtmlPipe, SecureUrlPipe, SortPipe, + TimeAgoPipe, + TimeLimitPipe, ], entryComponents: [ ], diff --git a/src/frontend/app/app.component.ts b/src/frontend/app/app.component.ts index 63239711bcd8afb28bfb3aeabde336b7bddcd9f5..282267f3ce7a919f882d02f7d5332f0954e6de3a 100755 --- a/src/frontend/app/app.component.ts +++ b/src/frontend/app/app.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewChild, OnInit } from '@angular/core'; +import { Component, ViewChild, OnInit, HostListener, AfterViewInit } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; import { MatIconRegistry } from '@angular/material/icon'; import { MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions } from '@angular/material/tooltip'; @@ -26,10 +26,14 @@ export const myCustomTooltipDefaults: MatTooltipDefaultOptions = { { provide: MAT_TOOLTIP_DEFAULT_OPTIONS, useValue: myCustomTooltipDefaults } ], }) -export class AppComponent implements OnInit { +export class AppComponent implements OnInit, AfterViewInit { debugMode: boolean = false; @ViewChild('snavLeft', { static: true }) snavLeft: MatSidenav; + @HostListener('window:resize', ['$event']) + onResize() { + this.appService.setScreenWidth(window.innerWidth); + } constructor( public http: HttpClient, public langService: LangService, @@ -54,4 +58,8 @@ export class AppComponent implements OnInit { this.headerService.hideSideBar = true; this.headerService.sideNavLeft = this.snavLeft; } + + ngAfterViewInit(): void { + this.appService.setScreenWidth(window.innerWidth); + } } diff --git a/src/frontend/app/installer/customization/customization.component.html b/src/frontend/app/installer/customization/customization.component.html index 8123b741f3074fda72c1c360bb4d73607b1f8473..b9e01ae429ad296522a3c8b47434be33a688b5cb 100644 --- a/src/frontend/app/installer/customization/customization.component.html +++ b/src/frontend/app/installer/customization/customization.component.html @@ -35,7 +35,7 @@ <div class="col-md-6"> <div>{{lang.chooseLogo}} : </div> <div> - <mat-card style="width: 350px;background-size: 100%;cursor: pointer;" [matRipple]="!stepFormGroup.controls['uploadedLogo'].disabled"> + <mat-card style="width: 350px;background-size: 100%;cursor: pointer;" matRipple> <img [src]="logoURL()" (click)="clickLogoButton(uploadLogo)" style="width: 100%;" /> <input type="file" name="files[]" #uploadLogo (change)="uploadTrigger($event, 'logo')" accept="image/svg+xml" style="display: none;"> diff --git a/src/frontend/app/printedFolder/printed-folder-modal.component.html b/src/frontend/app/printedFolder/printed-folder-modal.component.html index 3b4ee89a39b051d3d369f016d8e4b9d7cab4f17e..94d62c428305cb2a23a9e7968b6940e997ddfdd9 100644 --- a/src/frontend/app/printedFolder/printed-folder-modal.component.html +++ b/src/frontend/app/printedFolder/printed-folder-modal.component.html @@ -88,7 +88,7 @@ <div color="primary" [title]="element.creationDate | fullDate" style="flex:1;justify-content: flex-end;display: flex;font-size: 80%;"> - {{element.creationDate}} {{element.creationDate | timeAgo : 'full'}} + {{element.creationDate}} {{element.creationDate | date : "dd/MM/y HH:mm"}} </div> </div> </mat-list-option> diff --git a/src/frontend/service/app.guard.ts b/src/frontend/service/app.guard.ts index ae6bdfbab0e240a2c661faf2b88f9cde79bffb3f..21734bc88fbdf9fe69575441a8e586c58c388930 100644 --- a/src/frontend/service/app.guard.ts +++ b/src/frontend/service/app.guard.ts @@ -185,6 +185,7 @@ export class AppGuard implements CanActivate { if (err.error.errors === 'User must change his password') { return this.router.navigate(['/password-modification']); } else { + this.authService.logout(); return of(false); } }) diff --git a/src/frontend/service/app.service.ts b/src/frontend/service/app.service.ts index 869f3276c79be62d9ed8a43574206dd76a35c3f5..a23e08ef1d684f97798ee9826d56fdcec2e64e9d 100644 --- a/src/frontend/service/app.service.ts +++ b/src/frontend/service/app.service.ts @@ -5,27 +5,19 @@ import { Injectable } from '@angular/core'; }) export class AppService { - private _mobileQueryListener: () => void; - mobileQuery: MediaQueryList; + screenWidth: number = 0; - currentUser: any; - - constructor() { - /*this.mobileQuery = media.matchMedia('(max-width: 768px)'); - this._mobileQueryListener = () => changeDetectorRef.detectChanges(); - this.mobileQuery.addListener(this._mobileQueryListener);*/ - } + constructor() { } getViewMode() { - return false; if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) { return true; } else { - return this.mobileQuery.matches; + return this.screenWidth <= 768; } } - /*ngOnDestroy(): void { - this.mobileQuery.removeListener(this._mobileQueryListener); - }*/ + setScreenWidth(width: number) { + this.screenWidth = width; + } }