diff --git a/projects/common-map/src/fm-map/components/map/map.component.ts b/projects/common-map/src/fm-map/components/map/map.component.ts index c90b02e..b584b7c 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.ts +++ b/projects/common-map/src/fm-map/components/map/map.component.ts @@ -198,9 +198,9 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } this.stateSetCount += 1; }); - // setTimeout(() => { - // this.map.instance.updateSize(); - // }, 500); + setTimeout(() => { + this.map.instance.updateSize(); + }, 500); } handleSearchCollapse(event) { diff --git a/projects/common/src/fm/common-routing.module.ts b/projects/common/src/fm/common-routing.module.ts index 733adac..3bc5ab8 100644 --- a/projects/common/src/fm/common-routing.module.ts +++ b/projects/common/src/fm/common-routing.module.ts @@ -1,41 +1,34 @@ -import {NgModule} from '@angular/core'; -import {RouterModule} from '@angular/router'; - -import {AuthCallbackComponent} from './components/auth-callback/auth-callback.component'; -import {AuthCallbackGuard} from './components/auth-callback/auth-callback.guard'; -import {FullScreenGuard} from './services/full-screen-guard.service'; -import {SessionClearedComponent} from './components/session-cleared/session-cleared.component'; -import {NotFoundComponent} from './components/not-found/not-found.component'; - - -const routes = [ - { - path: 'cb', - component: AuthCallbackComponent, - canActivate: [AuthCallbackGuard], - }, - { - path: 'loggedout', - component: SessionClearedComponent, - canActivate: [FullScreenGuard], - }, - { - path: '**', component: NotFoundComponent, - data: { - title: '404 - Not found', - meta: [{name: 'description', content: '404 - Error'}], - links: [], - // links: [ - // { rel: 'canonical', href: 'http://blogs.example.com/bootstrap/something' }, - // { rel: 'alternate', hreflang: 'es', href: 'http://es.example.com/bootstrap-demo' } - //] - }, - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class AppCommonRoutingModule { -} +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; + +import {AuthCallbackComponent} from './components/auth-callback/auth-callback.component'; +import {AuthCallbackGuard} from './components/auth-callback/auth-callback.guard'; +import {NavBarGuard} from './services/nav-bar-guard.service'; +import {FullScreenGuard} from './services/full-screen-guard.service'; +import {SessionClearedComponent} from './components/session-cleared/session-cleared.component'; +import {NotFoundComponent} from './components/not-found/not-found.component'; + + +const routes = [ + { + path: 'cb', + component: AuthCallbackComponent, + canActivate: [AuthCallbackGuard], + }, + { + path: 'loggedout', + component: SessionClearedComponent, + canActivate: [FullScreenGuard], + }, + { + path: '**', component: NotFoundComponent, + canActivate: [NavBarGuard] + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class AppCommonRoutingModule { +} diff --git a/projects/common/src/fm/common.module.ts b/projects/common/src/fm/common.module.ts index ae3edad..ab43fb2 100644 --- a/projects/common/src/fm/common.module.ts +++ b/projects/common/src/fm/common.module.ts @@ -29,6 +29,7 @@ import { NotImplementedComponent } from './components/not-implemented/not-implem import { SidePanelComponent } from './components/side-panel/side-panel.component'; import { TimespanComponent } from './components/timespan/timespan.component'; import { TagInputComponent } from './components/tag-input/tag-input.component'; +import {MenuBackgroundComponent} from './components/menu-background/menu-background.component'; import {IEventMessage } from './models/event.message'; import { IItem, Item } from './models/item'; import {IItemType} from './models/item.type'; @@ -65,7 +66,8 @@ export { commonActions, commonReducers, IAuthconfigFactory, - AuthConfigFactory + AuthConfigFactory, + MenuBackgroundComponent }; @NgModule({ @@ -90,7 +92,8 @@ export { ResumableFileUploadComponent, TimespanComponent, TagInputComponent, - SessionClearedComponent + SessionClearedComponent, + MenuBackgroundComponent ], exports: [ NgbModule, @@ -106,7 +109,8 @@ export { ResumableFileUploadComponent, TimespanComponent, TagInputComponent, - SessionClearedComponent + SessionClearedComponent, + MenuBackgroundComponent ] }) export class AppCommonModule { diff --git a/projects/common/src/fm/components/app/app.component.html b/projects/common/src/fm/components/app/app.component.html index 66318d2..29657b0 100644 --- a/projects/common/src/fm/components/app/app.component.html +++ b/projects/common/src/fm/components/app/app.component.html @@ -9,7 +9,8 @@