Merge pull request #93 from ecnordbund/dev

Release 0.2.0
EC-Nordbund · Jul 22, 2018 · e6a5ec3 · e6a5ec3
2 parents 5546179 + 9886623
commit e6a5ec3
Show file tree

Hide file tree

Showing 48 changed files with 2,860 additions and 1,627 deletions.
diff --git a/docs/.vuepress/config.js b/docs/.vuepress/config.js
@@ -2,7 +2,7 @@ module.exports = {
   title: 'EC-Nordbund',
   description: 'Hilfe und Dokumentation',
   themeConfig: {
-    repo: 'ecnordbund/ec-verwaltung',
+    repo: 'ecnordbund/ec-verwaltungs-app',
     docsDir: 'docs',
     locales: {
       '/': {
@@ -30,4 +30,4 @@ module.exports = {
     lineNumbers: true
   },
   port: 8081
-};
+}
diff --git a/electron/package.json b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ec-verwaltungs-app",
-  "version": "0.1.5",
+  "version": "0.2.0",
   "description": "EC-Verwaltungs Application",
   "keywords": [],
   "homepage": "https://ec-nordbund.de",

diff --git a/electron/src/main/main.dev.js b/electron/src/main/main.dev.js
@@ -10,21 +10,15 @@ require('electron').app.once('ready', () => {
     .default(installExtension.VUEJS_DEVTOOLS)
     .then(() => {})
     .catch(err => {
-      console.log(
-        'Unable to install `vue-devtools`: \n',
-        err
-      )
+      throw err
     })
 
   //Install ApolloDevtools
   installExtension
     .default(installExtension.APOLLO_DEVELOPER_TOOLS)
     .then(() => {})
     .catch(err => {
-      console.log(
-        'Unable to install `apollo-devtools`: \n',
-        err
-      )
+      throw err
     })
 })
 

diff --git a/electron/src/main/main.js b/electron/src/main/main.js
@@ -1,15 +1,34 @@
+//@ts-check
+
 // Import Electron
 const { app, BrowserWindow, Tray } = require('electron')
 
+app.setAsDefaultProtocolClient('ec', process.execPath)
+
+function handleProto(args) {
+  if (args.length > 1) {
+    const splitted = args[1].split('ec://')
+    if (splitted.length > 1) {
+      mainWindow.webContents.send(
+        'proto-set-route',
+        splitted[1]
+      )
+    }
+  }
+}
+
 // On Install do Stuff
 if (require('electron-squirrel-startup')) {
   app.quit()
 }
 
 //Single Instance
-const isSecondInstance = app.makeSingleInstance(() => {
-  BrowserWindow.getAllWindows()[0].show()
-})
+const isSecondInstance = app.makeSingleInstance(
+  (args, wd) => {
+    BrowserWindow.getAllWindows()[0].show()
+    handleProto(args)
+  }
+)
 
 if (isSecondInstance) {
   app.quit()
@@ -65,6 +84,7 @@ function createWindow() {
     loadingWindow.setClosable(true)
     loadingWindow.close()
     mainWindow.maximize()
+    handleProto(process.argv)
   })
   mainWindow.on('closed', () => {
     mainWindow = null