Compare commits

..

No commits in common. "46d0f8c060fbe679527bd05888ae62582ad9112e" and "2c3c8fbff2ae878676b3ba6b6f58524546899e29" have entirely different histories.

10 changed files with 88 additions and 138 deletions

View File

@ -198,9 +198,9 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
} }
this.stateSetCount += 1; this.stateSetCount += 1;
}); });
setTimeout(() => { // setTimeout(() => {
this.map.instance.updateSize(); // this.map.instance.updateSize();
}, 500); // }, 500);
} }
handleSearchCollapse(event) { handleSearchCollapse(event) {

View File

@ -3,7 +3,6 @@ import {RouterModule} from '@angular/router';
import {AuthCallbackComponent} from './components/auth-callback/auth-callback.component'; import {AuthCallbackComponent} from './components/auth-callback/auth-callback.component';
import {AuthCallbackGuard} from './components/auth-callback/auth-callback.guard'; 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 {FullScreenGuard} from './services/full-screen-guard.service';
import {SessionClearedComponent} from './components/session-cleared/session-cleared.component'; import {SessionClearedComponent} from './components/session-cleared/session-cleared.component';
import {NotFoundComponent} from './components/not-found/not-found.component'; import {NotFoundComponent} from './components/not-found/not-found.component';
@ -22,8 +21,16 @@ const routes = [
}, },
{ {
path: '**', component: NotFoundComponent, path: '**', component: NotFoundComponent,
canActivate: [NavBarGuard] 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({ @NgModule({

View File

@ -29,7 +29,6 @@ import { NotImplementedComponent } from './components/not-implemented/not-implem
import { SidePanelComponent } from './components/side-panel/side-panel.component'; import { SidePanelComponent } from './components/side-panel/side-panel.component';
import { TimespanComponent } from './components/timespan/timespan.component'; import { TimespanComponent } from './components/timespan/timespan.component';
import { TagInputComponent } from './components/tag-input/tag-input.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 {IEventMessage } from './models/event.message';
import { IItem, Item } from './models/item'; import { IItem, Item } from './models/item';
import {IItemType} from './models/item.type'; import {IItemType} from './models/item.type';
@ -66,8 +65,7 @@ export {
commonActions, commonActions,
commonReducers, commonReducers,
IAuthconfigFactory, IAuthconfigFactory,
AuthConfigFactory, AuthConfigFactory
MenuBackgroundComponent
}; };
@NgModule({ @NgModule({
@ -92,8 +90,7 @@ export {
ResumableFileUploadComponent, ResumableFileUploadComponent,
TimespanComponent, TimespanComponent,
TagInputComponent, TagInputComponent,
SessionClearedComponent, SessionClearedComponent
MenuBackgroundComponent
], ],
exports: [ exports: [
NgbModule, NgbModule,
@ -109,8 +106,7 @@ export {
ResumableFileUploadComponent, ResumableFileUploadComponent,
TimespanComponent, TimespanComponent,
TagInputComponent, TagInputComponent,
SessionClearedComponent, SessionClearedComponent
MenuBackgroundComponent
] ]
}) })
export class AppCommonModule { export class AppCommonModule {

View File

@ -10,7 +10,6 @@
<div class="body"> <div class="body">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
<fm-menu-background [visible]="menuVisible|async"></fm-menu-background>
<fm-side-panel [visible]="menuVisible|async" [left]="true" class="menu" (click)="handleStopBubble($event)"> <fm-side-panel [visible]="menuVisible|async" [left]="true" class="menu" (click)="handleStopBubble($event)">
<div class="container-fluid"> <div class="container-fluid">
<div class="body"> <div class="body">

View File

@ -1,3 +0,0 @@
<div class="menu-background" [ngClass]="{'show':visible}">
</div>

View File

@ -1,17 +0,0 @@
.menu-background {
display: block;
position: absolute;
top:0;
left:0;
right:0;
bottom:0;
opacity: 0;
background-color: #000000;
transition: opacity 0s ease-out 1s;
pointer-events: none;
}
.menu-background.show {
pointer-events: all;
opacity: 0.3;
}

View File

@ -1,23 +0,0 @@
import { Component, OnInit,Input } from '@angular/core';
import { Store, Action } from '@ngrx/store';
import * as appReducers from '../../reducers/app-common.reducer';
import * as commonActions from '../../actions/app-common.actions';
@Component({
selector: 'fm-menu-background',
templateUrl: './menu-background.component.html',
styleUrls: ['./menu-background.component.scss'],
})
export class MenuBackgroundComponent implements OnInit {
@Input() visible:boolean = false;
constructor(private store: Store<appReducers.State>) { }
ngOnInit() { }
handleOnClick(event:MouseEvent) {
if(this.visible) {
this.store.dispatch(new commonActions.SetMenuVisible(false));
event.stopPropagation();
}
}
}

View File

@ -26,7 +26,7 @@ export const initialState: State = {
user:null, user:null,
fullScreen: true, fullScreen: true,
routeLoading: false, routeLoading: false,
menuVisible: false menuVisible: true
} }
export function reducer(state = initialState, action: appCommonActions.Actions ): State { export function reducer(state = initialState, action: appCommonActions.Actions ): State {

View File

@ -33,12 +33,6 @@ export class ItemTypeService {
return false; return false;
} }
hasEditor(item: IItem) {
let itemType: string = item.itemType;
if (this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined;
return false;
}
isLayer(item: IItem) { isLayer(item: IItem) {
let itemType: string = item.itemType; let itemType: string = item.itemType;
return itemType == "vnd.farmmaps.itemtype.geotiff.processed" || itemType == "vnd.farmmaps.itemtype.layer" || itemType == "vnd.farmmaps.itemtype.shape.processed"; return itemType == "vnd.farmmaps.itemtype.geotiff.processed" || itemType == "vnd.farmmaps.itemtype.layer" || itemType == "vnd.farmmaps.itemtype.shape.processed";

View File

@ -6,7 +6,6 @@ import { MapComponent } from '@farmmaps/common-map';
import { LogoComponent } from './logo/logo.component'; import { LogoComponent } from './logo/logo.component';
import { MenuComponent } from './menu/menu.component'; import { MenuComponent } from './menu/menu.component';
import {NotImplementedComponent} from '@farmmaps/common'; import {NotImplementedComponent} from '@farmmaps/common';
import { NavBarGuard } from 'projects/common/src/public-api';
export function urlMatcher(url: UrlSegment[]) { export function urlMatcher(url: UrlSegment[]) {
return {consumed:url}; return {consumed:url};
@ -30,12 +29,10 @@ const routes = [
}, },
{ {
path:'editor/:type/item/:itemcode', path:'editor/:type/item/:itemcode',
canActivate:[NavBarGuard],
component: NotImplementedComponent component: NotImplementedComponent
}, },
{ {
path:'viewer/:type/item/:itemcode', path:'viewer/:type/item/:itemcode',
canActivate:[NavBarGuard],
component: NotImplementedComponent component: NotImplementedComponent
}, },
{ path: 'map', canActivateChild: [AuthGuard],canActivate:[FullScreenGuard], children: [ { path: 'map', canActivateChild: [AuthGuard],canActivate:[FullScreenGuard], children: [