Refactor menu panel
All checks were successful
FarmMaps.Develop/FarmMapsLib/develop This commit looks good

This commit is contained in:
Willem Dantuma 2020-01-07 16:33:56 +01:00
parent 58f7c99ddc
commit e077aa34df
4 changed files with 145 additions and 110 deletions

View File

@ -46,6 +46,8 @@ export const FAIL = '[AppCommon] Fail';
export const UPLOADEDFILECLICK = '[AppCommon] UploadedFileClick'; export const UPLOADEDFILECLICK = '[AppCommon] UploadedFileClick';
export const TOGGLEMENU = '[AppCommon] ToggleMenu';
export class InitUser implements Action { export class InitUser implements Action {
readonly type = INITUSER; readonly type = INITUSER;
@ -213,6 +215,12 @@ export class UploadedFileClick implements Action {
constructor(public itemCode:string) { } constructor(public itemCode:string) { }
} }
export class ToggleMenu implements Action {
readonly type = TOGGLEMENU;
constructor() { }
}
export type Actions = OpenModal export type Actions = OpenModal
| InitRoot | InitRoot
@ -240,4 +248,5 @@ export type Actions = OpenModal
| TaskStartEvent | TaskStartEvent
| TaskEndEvent | TaskEndEvent
| TaskErrorEvent | TaskErrorEvent
| DeviceUpdateEvent; | DeviceUpdateEvent
| ToggleMenu;

View File

@ -10,5 +10,18 @@
<div class="body"> <div class="body">
<router-outlet></router-outlet> <router-outlet></router-outlet>
</div> </div>
<fm-side-panel [visible]="menuVisible|async" class="menu">
<div class="container-fluid">
<div class="body">
<div class="d-flex flex-row">
<div class="mt-2 mb-2 flex-grow-1 logo"><router-outlet name="side-panel-logo"></router-outlet></div>
<div class="mt-2 mb-2 ml-2"><button type="button" class="btn btn-outline-secondary" (click)="handleToggleMenu($event)"><i class="fa fa-times" aria-hidden="true"></i></button></div>
</div>
<div class="d-flex flex-column cards">
<router-outlet name="side-panel-menu"></router-outlet>
</div>
</div>
</div>
</fm-side-panel>
<fm-resumable-file-upload></fm-resumable-file-upload> <fm-resumable-file-upload></fm-resumable-file-upload>
</div> </div>

View File

@ -36,6 +36,7 @@ export class AppComponent implements OnInit, OnDestroy {
public fileDroptarget: any; public fileDroptarget: any;
public fullScreen: Observable<boolean>; public fullScreen: Observable<boolean>;
public routeLoading: Observable<boolean>; public routeLoading: Observable<boolean>;
public menuVisible:Observable<boolean>;
constructor( constructor(
private router: Router, private router: Router,
@ -88,6 +89,7 @@ export class AppComponent implements OnInit, OnDestroy {
ngOnInit() { ngOnInit() {
this.fullScreen = this.store.select(appReducers.selectGetFullScreen); this.fullScreen = this.store.select(appReducers.selectGetFullScreen);
this.routeLoading = this.store.select(appReducers.selectGetRouteLoading); this.routeLoading = this.store.select(appReducers.selectGetRouteLoading);
this.menuVisible = this.store.select(appReducers.SelectGetMenuVisible);
this.InstallRouteEventHandler(); this.InstallRouteEventHandler();
this.InstallEventServiceEventHandler(); this.InstallEventServiceEventHandler();
} }
@ -129,5 +131,9 @@ export class AppComponent implements OnInit, OnDestroy {
handleClick(event: MouseEvent) { handleClick(event: MouseEvent) {
this.store.dispatch(new commonActions.Escape(false,true)); this.store.dispatch(new commonActions.Escape(false,true));
} }
handleToggleMenu(event) {
this.store.dispatch(new commonActions.ToggleMenu());
}
} }

View File

@ -14,7 +14,8 @@ export interface State {
itemTypes: IItemTypes, itemTypes: IItemTypes,
user:IUser, user:IUser,
fullScreen: boolean, fullScreen: boolean,
routeLoading:boolean routeLoading:boolean,
menuVisible: boolean,
} }
export const initialState: State = { export const initialState: State = {
@ -24,7 +25,8 @@ export const initialState: State = {
itemTypes: {}, itemTypes: {},
user:null, user:null,
fullScreen: true, fullScreen: true,
routeLoading: false routeLoading: false,
menuVisible: true
} }
export function reducer(state = initialState, action: appCommonActions.Actions ): State { export function reducer(state = initialState, action: appCommonActions.Actions ): State {
@ -70,6 +72,9 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
routeLoading: false routeLoading: false
}); });
} }
case appCommonActions.TOGGLEMENU: {
return tassign(state, { menuVisible: !state.menuVisible });
}
default: { default: {
return state; return state;
} }
@ -82,6 +87,7 @@ export const getItemTypes = (state: State) => state.itemTypes;
export const getRootItems = (state: State) => state.rootItems; export const getRootItems = (state: State) => state.rootItems;
export const getFullScreen = (state: State) => state.fullScreen; export const getFullScreen = (state: State) => state.fullScreen;
export const getRouteLoading = (state: State) => state.routeLoading; export const getRouteLoading = (state: State) => state.routeLoading;
export const getMenuVisible = (state: State) => state.menuVisible;
export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME); export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);
@ -92,4 +98,5 @@ export const selectGetItemTypes = createSelector(selectAppCommonState, getItemTy
export const selectGetRootItems = createSelector(selectAppCommonState, getRootItems); export const selectGetRootItems = createSelector(selectAppCommonState, getRootItems);
export const selectGetFullScreen = createSelector(selectAppCommonState, getFullScreen); export const selectGetFullScreen = createSelector(selectAppCommonState, getFullScreen);
export const selectGetRouteLoading = createSelector(selectAppCommonState, getRouteLoading); export const selectGetRouteLoading = createSelector(selectAppCommonState, getRouteLoading);
export const SelectGetMenuVisible = createSelector(selectAppCommonState,getMenuVisible);