From 23b43b7a3d20cae25b57ff6f1c371cfa786408e3 Mon Sep 17 00:00:00 2001 From: Seth Back Date: Thu, 23 Jan 2020 11:31:38 -0700 Subject: [PATCH 1/6] add require for process for Node 12+ --- src/index.ejs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/index.ejs b/src/index.ejs index e5bf9ae..385f357 100644 --- a/src/index.ejs +++ b/src/index.ejs @@ -16,7 +16,7 @@
- <% if (!process.browser) { %> + <% if (!require('process').browser) { %> @@ -24,4 +24,4 @@ - + \ No newline at end of file From d7a53803646dbc77890b06197b443d53f998db0b Mon Sep 17 00:00:00 2001 From: Adam Burdett Date: Wed, 26 Feb 2020 16:30:40 -0700 Subject: [PATCH 2/6] treat electron-debug as external pkg in webpack Signed-off-by: Adam Burdett --- .electron-vue/webpack.main.config.js | 3 ++- package-lock.json | 33 +++++++++++++++++++++------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/.electron-vue/webpack.main.config.js b/.electron-vue/webpack.main.config.js index cfdbdf2..77a4db8 100644 --- a/.electron-vue/webpack.main.config.js +++ b/.electron-vue/webpack.main.config.js @@ -13,7 +13,8 @@ let mainConfig = { main: path.join(__dirname, '../src/main/index.js') }, externals: [ - ...Object.keys(dependencies || {}) + ...Object.keys(dependencies || {}), + {'electron-debug': 'electron-debug'} ], module: { rules: [ diff --git a/package-lock.json b/package-lock.json index 79d64a1..adf1684 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3982,15 +3982,32 @@ "dev": true }, "electron-localshortcut": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.1.0.tgz", - "integrity": "sha512-MgL/j5jdjW7iA0R6cI7S045B0GlKXWM1FjjujVPjlrmyXRa6yH0bGSaIAfxXAF9tpJm3pLEiQzerYHkRh9JG/A==", + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/electron-localshortcut/-/electron-localshortcut-3.2.1.tgz", + "integrity": "sha512-DWvhKv36GsdXKnaFFhEiK8kZZA+24/yFLgtTwJJHc7AFgDjNRIBJZ/jq62Y/dWv9E4ypYwrVWN2bVrCYw1uv7Q==", "dev": true, "requires": { - "debug": "^2.6.8", + "debug": "^4.0.1", "electron-is-accelerator": "^0.1.0", - "keyboardevent-from-electron-accelerator": "^1.1.0", + "keyboardevent-from-electron-accelerator": "^2.0.0", "keyboardevents-areequal": "^0.2.1" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "electron-notarize": { @@ -6826,9 +6843,9 @@ "dev": true }, "keyboardevent-from-electron-accelerator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-1.1.0.tgz", - "integrity": "sha512-VDC4vKWGrR3VgIKCE4CsXnvObGgP8C2idnTKEMUkuEuvDGE1GEBX9FtNdJzrD00iQlhI3xFxRaeItsUmlERVng==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/keyboardevent-from-electron-accelerator/-/keyboardevent-from-electron-accelerator-2.0.0.tgz", + "integrity": "sha512-iQcmNA0M4ETMNi0kG/q0h/43wZk7rMeKYrXP7sqKIJbHkTU8Koowgzv+ieR/vWJbOwxx5nDC3UnudZ0aLSu4VA==", "dev": true }, "keyboardevents-areequal": { From bb089b3a1311a3d290024a5fd55ffa46f0b45ea2 Mon Sep 17 00:00:00 2001 From: Sam Curren Date: Thu, 27 Feb 2020 11:03:28 -0700 Subject: [PATCH 3/6] RFC 0348 Step 1 Signed-off-by: Sam Curren --- src/renderer/components/AgentBase.vue | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/renderer/components/AgentBase.vue b/src/renderer/components/AgentBase.vue index 89ceb83..d33da16 100644 --- a/src/renderer/components/AgentBase.vue +++ b/src/renderer/components/AgentBase.vue @@ -201,6 +201,13 @@ export default { this.connection.send_message(msg); }, async processInbound(msg){ + // RFC 0348 Step 1: modify prefix (if present) to old standard + let OLD = "did:sov:BzCbsNYhMrjHiqZDTUASHg;spec/"; + let NEW = "https://didcomm.org/"; + if(msg['@type'].startsWith(NEW)){ + msg['@type'] = msg['@type'].replace(NEW, OLD); + } + // END RFC 0348 Step 1 this.$message_bus.$emit('message-received', msg); this.$message_bus.$emit(msg['@type'], msg); }, From a9c809e67052db870ee6a1616c9a58c32f447174 Mon Sep 17 00:00:00 2001 From: Daniel Bluhm Date: Fri, 28 Feb 2020 11:34:18 -0500 Subject: [PATCH 4/6] Cleanup of agent list Signed-off-by: Daniel Bluhm --- src/main/index.js | 4 +- src/renderer/components/AgentList.vue | 74 +++++++++++++-------------- 2 files changed, 37 insertions(+), 41 deletions(-) diff --git a/src/main/index.js b/src/main/index.js index f4c496a..c0694d0 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -18,9 +18,9 @@ function createWindow () { * Initial window options */ mainWindow = new BrowserWindow({ - height: 563, + height: 600, useContentSize: true, - width: 300//900 + width: 350//900 }); mainWindow.loadURL(winURL); diff --git a/src/renderer/components/AgentList.vue b/src/renderer/components/AgentList.vue index 02ced7f..0523b3c 100644 --- a/src/renderer/components/AgentList.vue +++ b/src/renderer/components/AgentList.vue @@ -1,42 +1,47 @@ + - - From 69cf47d9bbda59407824dd67d697053007ed63dc Mon Sep 17 00:00:00 2001 From: Daniel Bluhm Date: Fri, 28 Feb 2020 16:55:22 -0500 Subject: [PATCH 5/6] Verification fixes Signed-off-by: Daniel Bluhm --- .../components/Verifications/Verification.vue | 25 +++++++++++-------- .../components/Verifications/index.vue | 6 +++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/renderer/components/Verifications/Verification.vue b/src/renderer/components/Verifications/Verification.vue index 2551be0..6fdea25 100644 --- a/src/renderer/components/Verifications/Verification.vue +++ b/src/renderer/components/Verifications/Verification.vue @@ -17,7 +17,7 @@ @@ -208,6 +208,7 @@