updates

Author: Gid733

eform-client/package.json

@@ -14,6 +14,7 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "^6.0.3",
+    "@angular/cdk": "^6.4.6",
     "@angular/common": "^6.0.3",
     "@angular/compiler": "^6.0.3",
     "@angular/core": "^6.0.3",
@@ -23,7 +24,9 @@
     "@angular/platform-browser-dynamic": "^6.0.3",
     "@angular/router": "^6.0.3",
     "@ng-select/ng-select": "^2.3.3",
-    "@ngx-gallery/core": "^3.1.0-beta.0",
+    "@ngx-gallery/core": "^3.1.0",
+    "@ngx-gallery/gallerize": "^3.1.0",
+    "@ngx-gallery/lightbox": "^3.1.0",
     "@ngx-translate/core": "^10.0.2",
     "@ngx-translate/http-loader": "^3.0.1",
     "angular2-uuid": "^1.1.1",

eform-client/src/app/app.declarations.ts

@@ -11,7 +11,7 @@ import {
 } from 'src/app/common/services/advanced';
 import {AppSettingsService} from 'src/app/common/services/app-settings';
 import {AuthService, LocaleService, UserSettingsService} from 'src/app/common/services/auth';
-import {CasesService} from 'src/app/common/services/cases';
+import {CasesService, ImageService} from 'src/app/common/services/cases';
 import {DeviceUserService} from 'src/app/common/services/device-users';
 import {EFormService, EFormTagService} from 'src/app/common/services/eform';
 import {AdminService} from 'src/app/common/services/users';
@@ -37,6 +37,7 @@ export let providers = [
   EFormService,
   EFormTagService,
   CasesService,
+  ImageService,
   // Helpers
   EventBrokerService,
   DatePipe,

eform-client/src/app/app.module.ts

@@ -2,7 +2,10 @@ import {HttpClientModule} from '@angular/common/http';
 import {BrowserModule} from '@angular/platform-browser';
 import {NgModule, NO_ERRORS_SCHEMA} from '@angular/core';
 import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
+import {GalleryModule} from '@ngx-gallery/core';
+import {GallerizeModule} from '@ngx-gallery/gallerize';
 import {TranslateModule} from '@ngx-translate/core';
+import { LightboxModule } from  '@ngx-gallery/lightbox';
 import {DragulaModule} from 'ng2-dragula';
 import {ToastrModule} from 'ngx-toastr';
 
@@ -63,6 +66,9 @@ import {
     BrowserAnimationsModule,
     ToastrModule.forRoot(),
     DragulaModule.forRoot(),
+    GalleryModule.forRoot(),
+    LightboxModule.forRoot(),
+    GallerizeModule,
     // Modules
     PluginsModule
   ],

eform-client/src/app/app.routing.ts

@@ -45,12 +45,11 @@ export const routes: Routes = [
         canActivate: [AuthGuard],
         loadChildren: './modules/account-management/account-management.module#AccountManagementModule'
       },
-      // {
-      //   path: 'plugins',
-      //   canActivate: [AuthGuard],
-      //   loadChildren: './plugins/plugins.module#PluginsModule',
-      //   data: { preload: true }
-      // },
+      {
+        path: 'plugins',
+        canActivate: [AuthGuard],
+        loadChildren: './plugins/plugins.module#PluginsModule'
+      },
     ]
   },
   {

eform-client/src/app/common/modules/eform-imported/ng-datepicker/component/ng-datepicker.component.html

@@ -1,11 +1,14 @@
 <div class="ngx-datepicker-container">
   <div class="md-form">
-    <i class="material-icons prefix" (click)="toggle()">
+    <i class="material-icons prefix text-black-50" (click)="toggle()">
       date_range
     </i>
     <input mdbInputDirective type="text" *ngIf="!headless" class="form-control"
            [(ngModel)]="displayValue" readonly [placeholder]="placeholder"
            [ngClass]="addClass" [ngStyle]="addStyle" [id]="fieldId" [disabled]="disabled" (click)="toggle()"/>
+    <label style="
+    font-size: 13px;
+    margin-top: -23px;" for="{{fieldId}}" *ngIf="placeholder && innerValue">{{placeholder}}</label>
   </div>
 
   <ng-content></ng-content>

eform-client/src/app/common/modules/eform-imported/ng-datepicker/component/ng-datepicker.component.ts

@@ -130,7 +130,8 @@ export class NgDatepickerComponent implements ControlValueAccessor, OnInit, OnCh
   }
 
   set value(val: Date) {
-    this.innerValue = val;
+    val = new Date(val.setHours(val.getHours() + 4));
+    this.innerValue =  val;
     this.onChangeCallback(this.innerValue);
   }
 
@@ -277,7 +278,6 @@ export class NgDatepickerComponent implements ControlValueAccessor, OnInit, OnCh
         isSelectable: this.isDateSelectable(date)
       });
     }
-
     if (this.innerValue) {
       this.displayValue = format(this.innerValue, this.displayFormat, this.locale);
       this.barTitle = format(start, this.barTitleFormat, this.locale);
@@ -339,6 +339,9 @@ export class NgDatepickerComponent implements ControlValueAccessor, OnInit, OnCh
       this.init();
       this.displayValue = format(this.innerValue, this.displayFormat, this.locale);
       this.barTitle = format(startOfMonth(val), this.barTitleFormat, this.locale);
+    } else {
+      this.innerValue = null;
+      this.displayValue = null;
     }
   }
 

eform-client/src/app/common/modules/eform-imported/pell/pell.component.html

@@ -1,8 +1 @@
-<div #pell>
-  <div [class]="actionBarClass">
-    <button *ngFor="let action of actions" [class]="actionButtonClass" [title]="action.title" 
-    (click)="action.result()" [innerHTML]="action.icon">
-    </button>
-  </div>
-  <div contenteditable="true" [class]="contentClass" (input)="onInput($event)"></div>
-</div>
+<div #wysiwyg></div>

eform-client/src/app/common/modules/eform-imported/pell/pell.component.ts

@@ -1,25 +1,61 @@
-import { Component, OnInit, Output, EventEmitter } from '@angular/core';
+import { Component, OnInit, OnChanges, AfterViewInit, Input, Output, EventEmitter } from '@angular/core';
+import { ElementRef, Renderer2, ViewChild, ViewEncapsulation } from '@angular/core';
 import * as pell from './pell';
 
 
 @Component({
   selector: 'pell-editor',
-  templateUrl: './pell.component.html'
+  templateUrl: './pell.component.html',
+  encapsulation: ViewEncapsulation.None
 })
-export class PellComponent implements OnInit {
-  actions = Object.keys(pell.actions).map(action => pell.actions[action]);
-  actionBarClass = 'pell-actionbar';
-  actionButtonClass = 'pell-button';
-  contentClass = 'pell-content';
+export class PellComponent implements OnInit, AfterViewInit, OnChanges {
+  @Input() actions: Array<Object> = [];
+  @Input() value: String = '';
+  @Output() valueChange = new EventEmitter();
+  pell = pell;
+  html;
+  editor;
 
-  @Output()
-  onChange = new EventEmitter<string>()
-  constructor() { }
+  constructor(
+    private rd: Renderer2
+
+  ) { }
 
   ngOnInit() {
   }
 
-  onInput(event: any) {
-    this.onChange.emit(event.target.innerHTML);
+  @ViewChild('wysiwyg') wysiwyg: ElementRef;
+
+  ngAfterViewInit() {
+    this.wysiwygInit(this.wysiwyg.nativeElement, this.actions);
+    this.editor.content.innerHTML = this.value;
+  }
+
+  ngOnChanges(changes: any) {
+    try {
+      if (this.editor.content.innerHTML != this.value) {
+        this.editor.content.innerHTML = this.value;
+      }
+    } catch (err) {
+
+    }
+  }
+
+  wysiwygInit(elm, actions) {
+    this.editor = pell.init({
+      element: elm,
+      onChange: html => {
+        this.html = html;
+        this.valueChange.emit(this.html);
+      },
+      styleWithCSS: true,
+      actions: [
+        'bold',
+        'underline',
+        'italic',
+        'strikethrough',
+      ].concat(actions),
+      classes: {}
+    });
   }
 }

eform-client/src/app/common/modules/eform-imported/pell/pell.ts

@@ -1,4 +1,4 @@
-export const actions = {
+const actions = {
   bold: {
     icon: '<b>B</b>',
     title: 'Bold',
@@ -14,56 +14,61 @@ export const actions = {
     title: 'Underline',
     result: () => exec('underline')
   },
+  strikethrough: {
+    icon: '<strike>S</strike>',
+    title: 'Strike-through',
+    result: () => exec('strikeThrough')
+  }
 };
 
 const classes = {
   actionbar: 'pell-actionbar',
   button: 'pell-button',
   content: 'pell-content'
-}
+};
 
 export const exec = (command, value = null) => {
-  document.execCommand(command, false, value)
-}
+  document.execCommand(command, false, value);
+};
 
 const preventTab = event => {
-  if (event.which === 9) event.preventDefault()
-}
+  if (event.which === 9) { event.preventDefault(); }
+};
 
 export const init = settings => {
   settings.actions = settings.actions
     ? settings.actions.map(action => {
-      if (typeof action === 'string') return actions[action]
-      else if (actions[action.name]) return { ...actions[action.name], ...action }
-      return action
+      if (typeof action === 'string') { return actions[action]; }
+      else if (actions[action.name]) { return { ...actions[action.name], ...action }; }
+      return action;
     })
-    : Object.keys(actions).map(action => actions[action])
+    : Object.keys(actions).map(action => actions[action]);
 
-  settings.classes = { ...classes, ...settings.classes }
+  settings.classes = { ...classes, ...settings.classes };
 
-  const actionbar = document.createElement('div')
-  actionbar.className = settings.classes.actionbar
-  settings.element.appendChild(actionbar)
+  const actionbar = document.createElement('div');
+  actionbar.className = settings.classes.actionbar;
+  settings.element.appendChild(actionbar);
 
-  settings.element.content = document.createElement('div')
-  settings.element.content.contentEditable = true
-  settings.element.content.className = settings.classes.content
-  settings.element.content.oninput = event => settings.onChange(event.target.innerHTML)
-  settings.element.content.onkeydown = preventTab
-  settings.element.appendChild(settings.element.content)
+  settings.element.content = document.createElement('div');
+  settings.element.content.contentEditable = true;
+  settings.element.content.className = settings.classes.content;
+  settings.element.content.oninput = event => settings.onChange(event.target.innerHTML);
+  settings.element.content.onkeydown = preventTab;
+  settings.element.appendChild(settings.element.content);
 
   settings.actions.forEach(action => {
-    const button = document.createElement('button')
-    button.className = settings.classes.button
-    button.innerHTML = action.icon
-    button.title = action.title
-    button.onclick = action.result
-    actionbar.appendChild(button)
-  })
+    const button = document.createElement('button');
+    button.className = settings.classes.button;
+    button.innerHTML = action.icon;
+    button.title = action.title;
+    button.onclick = action.result;
+    actionbar.appendChild(button);
+  });
 
-  if (settings.styleWithCSS) exec('styleWithCSS')
+  if (settings.styleWithCSS) { exec('styleWithCSS'); }
 
-  return settings.element
-}
+  return settings.element;
+};
 
-export default { exec, init }
+export default { exec, init };

eform-client/src/app/common/services/auth/auth.service.ts

@@ -46,7 +46,6 @@ export class AuthService extends BaseService {
     if (loginInfo.code) {
       body = body.append('code', loginInfo.code);
     }
-    debugger;
     return this.postUrlEncoded(AuthMethods.Login, body).pipe(map((result) => {
       return result;
     }));
@@ -96,10 +95,6 @@ export class AuthService extends BaseService {
     }));
   }
 
-  logout(): Observable<any> {
-    return this.get(AuthMethods.Logout);
-  }
-
   twoFactorAuthInfo(): Observable<OperationDataResult<boolean>> {
     return this.get(AuthMethods.TwoFactorAuthInfo);
   }