diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 881b6c43..8b47336a 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -19,9 +19,7 @@ import { Component, ViewChild, OnInit } from '@angular/core'; import { LandingPageComponent } from '@components/landing-page/landing-page.component'; import { INGXLoggerMetadata, NGXLogger, NgxLoggerLevel } from 'ngx-logger'; -import { MatSnackBar } from '@angular/material/snack-bar'; import { IconService } from '@services/icon-service/icon.service'; -import { MainFormService } from './services/main-form/main-form.service'; import { Title } from '@angular/platform-browser'; import { ArlasSettingsService } from 'arlas-wui-toolkit'; import { NavigationEnd, Router } from '@angular/router'; @@ -39,17 +37,15 @@ export class AppComponent implements OnInit { public title = 'ARLAS-wui-builder'; public version: string; public displayTopMenu = true; - public displayLeftMenu = true; + public displayLeftMenu = false; @ViewChild('landing', { static: false }) public landing: LandingPageComponent; public constructor( - private mainFormService: MainFormService, - private logger: NGXLogger, - private snackbar: MatSnackBar, - private iconService: IconService, - private titleService: Title, - private arlasSettingsService: ArlasSettingsService, - private router: Router + private readonly logger: NGXLogger, + private readonly iconService: IconService, + private readonly titleService: Title, + private readonly arlasSettingsService: ArlasSettingsService, + private readonly router: Router ) { this.logger.registerMonitor({ onLog(logObject: INGXLoggerMetadata): void { @@ -68,21 +64,21 @@ export class AppComponent implements OnInit { this.iconService.registerIcons(); // remove arlas gif after const gifElement = document.querySelector('.gif'); - if (!!gifElement) { + if (gifElement) { document.querySelector('.gif').remove(); } this.router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe( (data) => { - this.displayTopMenu = (data as NavigationEnd).url !== '/login' - && !(data as NavigationEnd).url.startsWith('/register') - && (data as NavigationEnd).url !== '/password_forgot' - && !(data as NavigationEnd).url.startsWith('/verify/') - && (data as NavigationEnd).url !== '/reset/'; + this.displayTopMenu = data.url !== '/login' + && !data.url.startsWith('/register') + && data.url !== '/password_forgot' + && !data.url.startsWith('/verify/') + && data.url !== '/reset/'; - this.displayLeftMenu = this.displayTopMenu && (data as NavigationEnd).url !== '/' - && !(data as NavigationEnd).url.startsWith('/?') - && !(data as NavigationEnd).url.startsWith('/load'); + this.displayLeftMenu = this.displayTopMenu && data.url !== '/' + && !data.url.startsWith('/?') + && !data.url.startsWith('/load'); } ); } diff --git a/src/styles.scss b/src/styles.scss index 9d468cb0..29ad5580 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -86,9 +86,9 @@ body { } #mapgl { - width: 100% !important; + width: 100%; top: 49px !important; - height: calc(100% - 59px) !important; + height: calc(100% - 49px); position: absolute !important; bottom: 0px !important; right: 0px !important; @@ -96,8 +96,7 @@ body { .map-preview { #mapgl { - width: 80% !important; - height: 80% !important; + height: 100%; margin: -24px !important; position: absolute !important; bottom: unset !important; @@ -107,8 +106,7 @@ body { // Properly position basemap when in window preview mode .basemaps { - right: calc(10% + 9px) !important; - top: 298px !important; + top: 195px !important; } .basemap-container { right: calc(10% + 9px + 30px + 5px) !important;