diff --git a/src/frontend/app/app.component.ts b/src/frontend/app/app.component.ts index 632ea2176488be0bc5141f95adbea8230373ffc2..d3bb4a2be367b2be456001fad9d82b42254b4ac2 100755 --- a/src/frontend/app/app.component.ts +++ b/src/frontend/app/app.component.ts @@ -1,4 +1,4 @@ -import { Component, ViewEncapsulation } from '@angular/core'; +import { Component, HostListener, OnInit, ViewEncapsulation } from '@angular/core'; import { CookieService } from 'ngx-cookie-service'; import { SignaturesContentService } from './service/signatures.service'; import { HttpClient } from '@angular/common/http'; @@ -19,11 +19,12 @@ import { Platform } from '@ionic/angular'; styleUrls: ['app.component.scss'] }) -export class AppComponent { +export class AppComponent implements OnInit { isPortrait: boolean; debugMode: boolean; showLeftContent: boolean = false; showRightContent: boolean = false; + constructor(private translate: TranslateService, public http: HttpClient, public signaturesService: SignaturesContentService, @@ -53,8 +54,32 @@ export class AppComponent { } - test() { - return true; + // The event listens for window resize and checks if the device resolution has changed + @HostListener('window:resize', ['$event']) + onResize() { + if (window.matchMedia('(resolution: ' + window.devicePixelRatio + 'dppx)').matches) { + if (window.devicePixelRatio >= 1.25) { + this.signaturesService.mobileMode = true; + setTimeout(() => { + $('.right-menu-responsive').css('--max-width', 'none'); + }, 0); + } else { + this.signaturesService.mobileMode = false; + } + } + } + + ngOnInit(): void { + if (window.matchMedia('(resolution: ' + window.devicePixelRatio + 'dppx)').matches) { + if (window.devicePixelRatio >= 1.25) { + this.signaturesService.mobileMode = true; + setTimeout(() => { + $('.right-menu-responsive').css('--max-width', 'none'); + }, 0); + } else { + this.signaturesService.mobileMode = false; + } + } } allowedRoute() { diff --git a/src/frontend/app/sidebar/sidebar.component.ts b/src/frontend/app/sidebar/sidebar.component.ts index 65df2131da35d26f04c1cf6bd7cfdce4d7db9044..d3e74e04611fdafebb6a0bca9a8c3d68b8126fec 100755 --- a/src/frontend/app/sidebar/sidebar.component.ts +++ b/src/frontend/app/sidebar/sidebar.component.ts @@ -78,7 +78,8 @@ export class SidebarComponent implements OnInit, AfterViewInit { async openProfile() { const modal = await this.modalController.create({ component: ProfileComponent, - cssClass: 'profileCss' + cssClass: 'profileCss', + backdropDismiss: false }); await modal.present(); } diff --git a/src/frontend/core/global.scss b/src/frontend/core/global.scss index 677133306eb77c355893dc27098657c69d8559eb..72561592efa13dcdcbb78e04156db9051a74a54d 100644 --- a/src/frontend/core/global.scss +++ b/src/frontend/core/global.scss @@ -92,8 +92,14 @@ input:read-only { } .profileCss { - --width: 40%; - --height: 65%; + @media screen and (min-width: 768px) and (min-height: 768px) { + --width: 56%; + --height: 600px + } + @media screen and (min-width: 768px) and (min-height: 600px) { + --width: 56%; + --height: 600px + } } .aboutUsCss {