Release 1.4 (#47)

* move to vuetify 1.1-rc fix #27

* remove ZIP from Build fix #40

* update Auskunftsrecht fix #42

* Hilfe is now in separated window 

* Refactor (#48)

* Lazy filter (#51)

electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ec-verwaltungs-app",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "EC-Verwaltungs Application",
   "keywords": [],
   "homepage": "https://ec-nordbund.de",
@@ -63,14 +63,6 @@
             "name": "EC-Verwaltungs-App"
           }
         },
-        {
-          "name": "@electron-forge/maker-zip",
-          "platforms": [
-            "darwin",
-            "linux",
-            "win32"
-          ]
-        },
         {
           "name": "@electron-forge/maker-dmg",
           "platforms": [
@@ -109,7 +101,6 @@
     "@electron-forge/maker-deb": "^6.0.0-beta.17",
     "@electron-forge/maker-dmg": "^6.0.0-beta.17",
     "@electron-forge/maker-squirrel": "^6.0.0-beta.17",
-    "@electron-forge/maker-zip": "^6.0.0-beta.17",
     "@electron-forge/publisher-github": "^6.0.0-beta.17",
     "electron": "2.0.2",
     "electron-debug": "^2.0.0",

electron/yarn.lock

@@ -159,16 +159,6 @@
   optionalDependencies:
     electron-winstaller "^2.5.0"
 
-"@electron-forge/maker-zip@^6.0.0-beta.17":
-  version "6.0.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.18.tgz#495772f5ee6bd888630934d79b52a07b3384816a"
-  dependencies:
-    "@electron-forge/maker-base" "6.0.0-beta.18"
-    "@electron-forge/shared-types" "6.0.0-beta.18"
-    cross-zip "^2.1.5"
-    fs-extra "^5.0.0"
-    pify "^3.0.0"
-
 "@electron-forge/[email protected]":
   version "6.0.0-beta.18"
   resolved "https://registry.yarnpkg.com/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.18.tgz#f8ed30f21669bf21a2775ac0ae35a80ca28ca424"
@@ -200,8 +190,8 @@
     ora "^2.0.0"
 
 "@octokit/rest@^15.2.6":
-  version "15.9.0"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.9.0.tgz#47863d114cd56a398b0774b4e6f9f942b3ffd2fd"
+  version "15.9.1"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.9.1.tgz#d1abd3e8b9c1b4cf647d94b59dd476cc34bb3d9e"
   dependencies:
     before-after-hook "^1.1.0"
     btoa-lite "^1.0.0"
@@ -629,12 +619,6 @@ [email protected]:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/cross-unzip/-/cross-unzip-0.0.2.tgz#5183bc47a09559befcf98cc4657964999359372f"
 
-cross-zip@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/cross-zip/-/cross-zip-2.1.5.tgz#c5d1a06a4b1a12a033064f946eb5ae6d4bdcf3e1"
-  dependencies:
-    rimraf "^2.5.2"
-
 [email protected]:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -1729,8 +1713,8 @@ nested-error-stacks@^1.0.1:
     inherits "~2.0.1"
 
 node-abi@^2.0.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.1.tgz#7628c4d4ec4e9cd3764ceb3652f36b2e7f8d4923"
+  version "2.4.3"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.3.tgz#43666b7b17e57863e572409edbb82115ac7af28b"
   dependencies:
     semver "^5.4.1"
 
@@ -2556,8 +2540,8 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
 universalify@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
 
 unorm@^1.4.1:
   version "1.4.1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ec-verwaltungs-app",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "EC-Verwaltungs Application",
   "keywords": [],
   "homepage": "https://ec-nordbund.de",
@@ -51,13 +51,14 @@
     "apollo-link-http": "^1.5.4",
     "apollo-utilities": "^1.0.15",
     "electron-settings": "^3.2.0",
+    "lazyfilter": "https://github.com/ecnordbund/lazyFilter.git",
     "node-fetch": "^2.1.2",
     "vue": "^2.5.16",
     "vue-apollo": "^3.0.0-beta.19",
     "vue-property-decorator": "^6.0.0",
     "vue-qriously": "^1.1.1",
     "vue-router": "^3.0.1",
-    "vuetify": "^1.0.16",
+    "vuetify": "^1.1.0-rc.2",
     "xlsx-template": "^0.3.1"
   },
   "devDependencies": {

src/App.vue

@@ -78,9 +78,10 @@
 <script lang="ts">
 import auth from '@/plugins/auth'
 import nav from '@/plugins/config/nav.config'
-import { isElectron } from '@/plugins/electron'
+import electron, { isElectron, isProduction } from '@/plugins/electron'
 import settings from '@/plugins/settings'
 import version from '@/plugins/version/version'
+import {BrowserWindow} from 'electron'
 
 import {
   Component,
@@ -101,6 +102,18 @@ export default class App extends Vue {
   auth = auth
   event = event
   click(route: string) {
+    if(route === '_hilfe') {
+      let win:BrowserWindow = new electron.remote.BrowserWindow({
+        show: false
+      })
+      const onlinePath = 'http://localhost:8081'
+      const url = isProduction?(isElectron?'../docs/index.html':onlinePath):'http://localhost:8081'
+      win.loadURL(url)
+      win.on('ready-to-show', () => {
+        win.show()
+      })
+      return
+    }
     this.$router.push(route)
     this.drawer = false
   }

src/baseComponents/reloader.ts

@@ -6,7 +6,7 @@ import { DocumentNode } from 'graphql'
 import event from '@/plugins/eventbus'
 
 /**
- * Klasse für Components (Views) with qraphqlconnection... (Including Watchquerry)
+ * Class of components (views) with GraphQL connection including a query watcher
  *
  * @export
  * @abstract
@@ -15,7 +15,7 @@ import event from '@/plugins/eventbus'
  */
 export default abstract class reloader extends Vue {
   /**
-   * Speichert die Variablen
+   * Stores variables as key-value-pairs
    *
    * @type {({[key: string]: string|number|boolean})}
    * @memberof reloader
@@ -25,7 +25,7 @@ export default abstract class reloader extends Vue {
   }
 
   /**
-   * Speichert die Query
+   * Current query
    *
    * @private
    * @type {ObservableQuery<any>}
@@ -34,30 +34,30 @@ export default abstract class reloader extends Vue {
   private _query!: ObservableQuery<any>
 
   /**
-   * Speichert die Daten
+   * Stores any type of data
    *
    * @type {*}
    * @memberof reloader
    */
   public data: any
 
   /**
-   * Speichert
+   * Saves
    *
    * @type {DocumentNode}
    * @memberof reloader
    */
   public query!: DocumentNode
 
   /**
-   * Authentication-Class-Instance
+   * Getter of authentication instance
    *
    * @memberof reloader
    */
   public auth = auth
 
   /**
-   * On Created
+   * Contains task to be done on creation
    *
    * @memberof reloader
    */
@@ -66,37 +66,50 @@ export default abstract class reloader extends Vue {
   }
 
   /**
-   * Lade Daten
+   * Loads data form server by creating a new `_query` and subscribe to it.
+   * If data is recieved, it will be saved in `data`.
+   * Provides a loading indicator for the user.
    *
    * @memberof reloader
    */
   public loadData() {
+    // start LoadingSpinner
     event.emit('showLoading')
+
     this._query = (this.$apollo as any).watchQuery({
       query: this.query,
       variables: this.variabels,
       fetchPolicy: 'cache-and-network',
       pollInterval: auth.pollInterval
     })
+
     if (this._query !== null) {
+      // subscribe to response
       this._query.subscribe((val: any) => {
         if (val.data) {
           this.data = val.data
+
+          // stop LoadingSpinner
           event.emit('hideLoading')
         }
       })
     }
   }
 
   /**
-   * Reload Daten
+   * Refetch data form last `_query` and save it in `data`.
+   * Provides a loading indicator for the user.
    *
    * @memberof reloader
    */
   public refetch() {
+    // start LoadingSpinner
     event.emit('showLoading')
+
     this._query.refetch().then((val: any) => {
       this.data = val.data
+
+      // stop LoadingSpinner
       event.emit('hideLoading')
     })
   }