From efcccfcf7c6bd8095d13c33ef742661fd88adbb7 Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Sat, 20 Jun 2020 12:35:56 +0100
Subject: [PATCH] updated packages etc
---
.DS_Store | Bin 10244 -> 10244 bytes
app/package.json | 1 +
app/src/components/ListLayer.vue | 10 ++---
app/src/experimental/ModeToolbar.vue | 7 ++--
app/src/store/index.js | 2 +
app/yarn.lock | 58 +++++++++++++++++++++++++--
6 files changed, 66 insertions(+), 12 deletions(-)
diff --git a/.DS_Store b/.DS_Store
index fd1a2cf3cdcdac96fd96b4efe3c7b0c9d68769cd..94e91fc9c7816fc97b471daafcb884f5f9e977d1 100644
GIT binary patch
delta 14
VcmZn(XbISGNr2IC^JM`;aR4k?1xo+`
delta 14
VcmZn(XbISGNr2H{^JM`;aR4k+1xf$_
diff --git a/app/package.json b/app/package.json
index 6ab47dc..b5cfab6 100644
--- a/app/package.json
+++ b/app/package.json
@@ -16,6 +16,7 @@
"marked": "^1.1.0",
"pouchdb": "^7.2.1",
"pouchdb-find": "^7.2.1",
+ "pouchdb-replication-stream": "^1.2.9",
"vue": "^2.6.11",
"vue-context": "^5.2.0",
"vue-draggable-resizable": "^2.2.0",
diff --git a/app/src/components/ListLayer.vue b/app/src/components/ListLayer.vue
index 91e4de6..0bead56 100644
--- a/app/src/components/ListLayer.vue
+++ b/app/src/components/ListLayer.vue
@@ -18,17 +18,17 @@ export default {
name: 'ListLayer',
props: {
nodeid: String,
- nodetext: String
+ nodetext: String,
},
computed: mapState({
- myNodes: state => state.myNodes
+ myNodes: (state) => state.myNodes,
}),
filters: {
- // need to write a reverse data filter I suspect here so new data is at the top of list
- marked: marked
- }
+ // reverse was added to the view (List.vue) for reference (didnt need filter)
+ marked: marked,
+ },
}
</script>
diff --git a/app/src/experimental/ModeToolbar.vue b/app/src/experimental/ModeToolbar.vue
index 6b2f4e6..c65051d 100644
--- a/app/src/experimental/ModeToolbar.vue
+++ b/app/src/experimental/ModeToolbar.vue
@@ -62,19 +62,20 @@ export default {
this.isReachable(this.getServerUrl()).then(function (online) {
if (online) {
// handle online status
- // console.log('online')
+ console.log('online')
location.reload()
} else {
- // console.log('no connectivity')
+ console.log('no connectivity')
}
})
} else {
// handle offline status
- // console.log('offline')
+ console.log('offline')
ref.$emit('offlineTriggered')
}
},
isReachable: function (url) {
+ // This should pick up a CORS error but it doesnt seem to //
return fetch(url, { method: 'HEAD', mode: 'no-cors' })
.then(function (resp) {
return resp && (resp.ok || resp.type === 'opaque')
diff --git a/app/src/store/index.js b/app/src/store/index.js
index ebed356..6009a5c 100644
--- a/app/src/store/index.js
+++ b/app/src/store/index.js
@@ -1,6 +1,8 @@
import Vue from 'vue'
import Vuex from 'vuex'
import PouchDB from 'pouchdb'
+//import Stream from 'pouchdb-replication-stream'
+// Not sure find is used this way and I dont think I use it anymore anyway??
PouchDB.plugin(require('pouchdb-find'))
import VueDraggableResizable from 'vue-draggable-resizable'
import 'vue-draggable-resizable/dist/VueDraggableResizable.css'
diff --git a/app/yarn.lock b/app/yarn.lock
index 7eac540..fc00b7a 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -5238,7 +5238,7 @@ ignore@^4.0.3, ignore@^4.0.6:
version "4.0.6"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
-immediate@3.0.6:
+immediate@3.0.6, immediate@~3.0.5:
version "3.0.6"
resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -6499,7 +6499,7 @@ json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-json-stringify-safe@~5.0.1:
+json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -7198,6 +7198,12 @@ libp2p@^0.27.7:
timeout-abort-controller "^1.0.0"
xsalsa20 "^1.0.2"
+lie@3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+ dependencies:
+ immediate "~3.0.5"
+
lines-and-columns@^1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@@ -7302,6 +7308,10 @@ lodash.padstart@4.6.1:
version "4.6.1"
resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"
+lodash.pick@^4.0.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
+
lodash.repeat@4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/lodash.repeat/-/lodash.repeat-4.1.0.tgz#fc7de8131d8c8ac07e4b49f74ffe829d1f2bec44"
@@ -7906,6 +7916,15 @@ natural-compare@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+ndjson@^1.4.3:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/ndjson/-/ndjson-1.5.0.tgz#ae603b36b134bcec347b452422b0bf98d5832ec8"
+ dependencies:
+ json-stringify-safe "^5.0.1"
+ minimist "^1.2.0"
+ split2 "^2.1.0"
+ through2 "^2.0.3"
+
needle@^2.2.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
@@ -9108,6 +9127,13 @@ postcss@^7.0.30:
source-map "^0.6.1"
supports-color "^6.1.0"
+pouch-stream@^0.4.0:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/pouch-stream/-/pouch-stream-0.4.1.tgz#0c6d8475c9307677627991a2f079b301c3b89bdd"
+ dependencies:
+ inherits "^2.0.1"
+ readable-stream "^1.0.27-1"
+
pouchdb-abstract-mapreduce@7.2.1:
version "7.2.1"
resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.2.1.tgz#ad87d89d0e376be8e7740b767365572422d940a8"
@@ -9177,6 +9203,24 @@ pouchdb-md5@7.2.1:
pouchdb-binary-utils "7.2.1"
spark-md5 "3.0.0"
+pouchdb-promise@^6.0.4:
+ version "6.4.3"
+ resolved "https://registry.yarnpkg.com/pouchdb-promise/-/pouchdb-promise-6.4.3.tgz#74516f4acf74957b54debd0fb2c0e5b5a68ca7b3"
+ dependencies:
+ lie "3.1.1"
+
+pouchdb-replication-stream@^1.2.9:
+ version "1.2.9"
+ resolved "https://registry.yarnpkg.com/pouchdb-replication-stream/-/pouchdb-replication-stream-1.2.9.tgz#aa4fa5d8f52df4825392f18e07c7e11acffc650a"
+ dependencies:
+ argsarray "0.0.1"
+ inherits "^2.0.3"
+ lodash.pick "^4.0.0"
+ ndjson "^1.4.3"
+ pouch-stream "^0.4.0"
+ pouchdb-promise "^6.0.4"
+ through2 "^2.0.0"
+
pouchdb-selector-core@7.2.1:
version "7.2.1"
resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.2.1.tgz#0eb190dff1df62d416ba670fdd84565542aa0183"
@@ -9530,7 +9574,7 @@ readable-stream@1.0.33:
string_decoder "^1.1.1"
util-deprecate "^1.0.1"
-readable-stream@^1.0.33:
+readable-stream@^1.0.27-1, readable-stream@^1.0.33:
version "1.1.14"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
dependencies:
@@ -10391,6 +10435,12 @@ split-string@^3.0.1, split-string@^3.0.2:
dependencies:
extend-shallow "^3.0.0"
+split2@^2.1.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+ dependencies:
+ through2 "^2.0.2"
+
split2@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/split2/-/split2-3.1.1.tgz#c51f18f3e06a8c4469aaab487687d8d956160bb6"
@@ -10789,7 +10839,7 @@ through2@3.0.1:
dependencies:
readable-stream "2 || 3"
-through2@^2.0.0:
+through2@^2.0.0, through2@^2.0.2, through2@^2.0.3:
version "2.0.5"
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
dependencies:
--
GitLab