From 5fae1f0ac84e54357c0c4ca28a0d4507074f3ce8 Mon Sep 17 00:00:00 2001
From: Adam Procter <adamprocter@researchnot.es>
Date: Thu, 3 Sep 2020 15:52:33 +0100
Subject: [PATCH] fixing up buttons
---
app/package.json | 20 +--
app/src/components/BaseButton.vue | 3 +-
app/src/components/ConnectionsLayer.vue | 34 ++--
app/src/components/NodesLayer.vue | 9 +-
app/src/components/TipsLayer.vue | 49 +++---
app/yarn.lock | 196 ++++++++++++++++--------
6 files changed, 190 insertions(+), 121 deletions(-)
diff --git a/app/package.json b/app/package.json
index 4feb71c..f51f0ad 100644
--- a/app/package.json
+++ b/app/package.json
@@ -10,31 +10,31 @@
},
"dependencies": {
"core-js": "^3.6.5",
- "file-loader": "^6.0.0",
- "ipfs": "^0.49.0",
+ "file-loader": "^6.1.0",
+ "ipfs": "^0.49.1",
"lodash": "^4.17.20",
"marked": "^1.1.1",
"pixi.js": "^5.3.3",
"pouchdb": "^7.2.2",
"vue": "^2.6.12",
- "vue-context": "^5.2.0",
+ "vue-context": "^6.0.0",
"vue-draggable-resizable": "^2.2.0",
"vue-emoji-picker": "^1.0.1",
"vue-router": "^3.4.3",
"vuex": "^3.5.1"
},
"devDependencies": {
- "@vue/cli-plugin-babel": "^4.5.3",
- "@vue/cli-plugin-eslint": "^4.5.3",
- "@vue/cli-plugin-router": "^4.5.3",
- "@vue/cli-plugin-vuex": "^4.5.3",
- "@vue/cli-service": "^4.5.3",
+ "@vue/cli-plugin-babel": "^4.5.4",
+ "@vue/cli-plugin-eslint": "^4.5.4",
+ "@vue/cli-plugin-router": "^4.5.4",
+ "@vue/cli-plugin-vuex": "^4.5.4",
+ "@vue/cli-service": "^4.5.4",
"@vue/eslint-config-prettier": "^6.0.0",
"babel-eslint": "^10.0.3",
- "eslint": "^7.7.0",
+ "eslint": "^7.8.1",
"eslint-plugin-prettier": "^3.1.4",
"eslint-plugin-vue": "^6.2.2",
- "prettier": "^2.0.5",
+ "prettier": "^2.1.1",
"vue-template-compiler": "^2.6.12"
}
}
diff --git a/app/src/components/BaseButton.vue b/app/src/components/BaseButton.vue
index c027a8e..542f513 100644
--- a/app/src/components/BaseButton.vue
+++ b/app/src/components/BaseButton.vue
@@ -71,7 +71,8 @@ button.new-link {
border-radius: 10px;
border: 2px solid rgba(0, 0, 0, 0.1);
z-index: 100;
- background-color: #cab6ff;
+ background-color: Transparent;
+ /* background-color: #cab6ff; */
outline: none;
}
</style>
diff --git a/app/src/components/ConnectionsLayer.vue b/app/src/components/ConnectionsLayer.vue
index feaaa8b..08179a4 100644
--- a/app/src/components/ConnectionsLayer.vue
+++ b/app/src/components/ConnectionsLayer.vue
@@ -8,14 +8,13 @@
import { mapState } from 'vuex'
import * as PIXI from 'pixi.js'
//var initialMoveTo
-let buttons = new PIXI.Graphics()
export default {
name: 'ConnectionsLayer',
data() {
return {
- localtoolstate: this.toolmode,
+ // localtoolstate: this.toolmode,
}
},
computed: mapState({
@@ -35,29 +34,28 @@ export default {
this.connectionsDraw()
},
},
+ toolmode: {
+ handler() {
+ this.toolState()
+ },
+ },
},
methods: {
toolState() {
- //console.log(this.toolmode)
- if (this.localtoolstate == 'connect') {
- console.log('tools')
- //this.buttonsDraw()
+ if (this.toolmode == 'connect') {
+ this.buttonsDraw()
} else {
- // this.clearButtons()
+ this.connectionsDraw()
}
- // <div v-if="toolmode == 'move'">
- },
- clearButtons() {
- const stage = this.PIXIApp.stage
- stage.removeChild(buttons)
},
+
buttonsDraw() {
- // stage.removeChild(buttons)
var i
var j
this.canvas = this.$refs.pixi
const stage = this.PIXIApp.stage
+ let buttons = new PIXI.Graphics()
for (i = 0; i < Object.keys(this.myNodes).length; i++) {
for (j = 0; j < Object.keys(this.configPositions).length; j++) {
@@ -92,11 +90,10 @@ export default {
}
}
let line = new PIXI.Graphics()
- // connection on move
+
var initialMoveTo
// Opt-in to interactivity
buttons.interactive = true
-
// Shows hand cursor
buttons.buttonMode = true
@@ -109,6 +106,7 @@ export default {
let lines = []
function onDragStart(event) {
+ console.log(event)
this.dragging = true
let mouseX = event.data.global.x
@@ -142,6 +140,7 @@ export default {
stage.addChild(buttons)
},
+
connectionsDraw() {
var i
@@ -185,10 +184,7 @@ export default {
view: canvas,
})
this.connectionsDraw()
- this.toolState()
-
- // FIXME: code OLD
- // this.connectingDraw()
+ this.buttonsDraw()
},
}
</script>
diff --git a/app/src/components/NodesLayer.vue b/app/src/components/NodesLayer.vue
index ae4b6f2..99e2e0a 100644
--- a/app/src/components/NodesLayer.vue
+++ b/app/src/components/NodesLayer.vue
@@ -12,7 +12,7 @@
:z="value.z_index"
:draggable="false"
:resizable="false"
- style="background-color: rgb(205, 234, 255);"
+ style="background-color: rgb(205, 234, 255)"
>
<form>
<div v-if="value.read_mode == false">
@@ -84,7 +84,7 @@
:z="value.z_index"
:draggable="false"
:resizable="false"
- style="background-color: rgb(205, 234, 255);"
+ style="background-color: rgb(205, 234, 255)"
>
<form>
<div v-if="value.read_mode == false">
@@ -126,7 +126,8 @@
>
<BaseButton
buttonClass="new-link"
- @click="onClickNewLink(nodeid, value.x_pos, value.y_pos)"
+ @mousedown="onClickNewLink(nodeid, value.x_pos, value.y_pos)"
+ @mouseup="onClickNewLink(nodeid, value.x_pos, value.y_pos)"
></BaseButton>
<div v-if="value.read_mode == true">
@@ -167,7 +168,7 @@
@dragstop="onDragstop"
@resizestop="onResizestop"
:drag-cancel="'.drag-cancel'"
- style="background-color: rgb(205, 234, 255);"
+ style="background-color: rgb(205, 234, 255)"
>
<form>
<div v-if="value.read_mode == false">
diff --git a/app/src/components/TipsLayer.vue b/app/src/components/TipsLayer.vue
index 36832b3..dbc57ba 100644
--- a/app/src/components/TipsLayer.vue
+++ b/app/src/components/TipsLayer.vue
@@ -1,26 +1,30 @@
<template>
<div ref="nodes" class="node">
- <vue-draggable-resizable
- class="innernode"
- :w="250"
- :h="225"
- :x="205"
- :y="15"
- :z="1"
- :draggable="true"
- :resizable="false"
- style="background-color: #6fcf97;"
- >
- <div>
- <p id="nodeid" :inner-html.prop="nodetext | marked"></p>
+ <div v-show="tipsplease">
+ <vue-draggable-resizable
+ class="innernode"
+ :w="250"
+ :h="225"
+ :x="205"
+ :y="15"
+ :z="1"
+ :draggable="true"
+ :resizable="false"
+ style="background-color: #6fcf97"
+ >
+ <div>
+ <p id="nodeid" :inner-html.prop="nodetext | marked"></p>
- <div class="btn-row">
- <BaseButton buttonClass="danger" @click="deleteFlag()"
- >Hide</BaseButton
- >
+ <div class="btn-row">
+ <BaseButton buttonClass="danger" @click="hideTips()"
+ >Hide</BaseButton
+ >
+ </div>
</div>
- </div>
- </vue-draggable-resizable>
+ </vue-draggable-resizable>
+ </div>
+
+ <div v-show="!tipsplease"></div>
</div>
</template>
@@ -32,6 +36,7 @@ export default {
return {
nodetext:
'## Shortcuts 🢠-> 🰠\n **n** to create new nodes. </br> **c** create connections </br> **a** or **s** select mode. </br> **m** move mode',
+ tipsplease: true,
}
},
@@ -40,7 +45,11 @@ export default {
marked: marked,
},
- methods: {},
+ methods: {
+ hideTips() {
+ this.tipsplease = false
+ },
+ },
}
</script>
diff --git a/app/yarn.lock b/app/yarn.lock
index dfd41c3..3997995 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -997,6 +997,21 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"
+"@eslint/eslintrc@^0.1.3":
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085"
+ dependencies:
+ ajv "^6.12.4"
+ debug "^4.1.1"
+ espree "^7.3.0"
+ globals "^12.1.0"
+ ignore "^4.0.6"
+ import-fresh "^3.2.1"
+ js-yaml "^3.13.1"
+ lodash "^4.17.19"
+ minimatch "^3.0.4"
+ strip-json-comments "^3.1.1"
+
"@hapi/accept@^3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-3.2.4.tgz#687510529493fe1d7d47954c31aff360d9364bd1"
@@ -1734,6 +1749,10 @@
version "7.0.4"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"
+"@types/json-schema@^7.0.5":
+ version "7.0.6"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
+
"@types/long@^4.0.0":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
@@ -1849,9 +1868,9 @@
lodash.kebabcase "^4.1.1"
svg-tags "^1.0.0"
-"@vue/babel-preset-app@^4.5.3":
- version "4.5.3"
- resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.5.3.tgz#2d8fdef342621f663311df2db6944b4fb8c1d57a"
+"@vue/babel-preset-app@^4.5.4":
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.5.4.tgz#bb164e8ab55673c561e6e83511631eda19efd7e4"
dependencies:
"@ant-design-vue/babel-plugin-jsx" "^1.0.0-0"
"@babel/core" "^7.11.0"
@@ -1912,46 +1931,46 @@
"@vue/babel-plugin-transform-vue-jsx" "^1.1.2"
camelcase "^5.0.0"
-"@vue/cli-overlay@^4.5.3":
- version "4.5.3"
- resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.5.3.tgz#5937a232c613e5019868ce090b7c3e5d9e5ae473"
+"@vue/cli-overlay@^4.5.4":
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/@vue/cli-overlay/-/cli-overlay-4.5.4.tgz#e07e3ccc2e4d770d4fdbd45cdde777d592822c19"
-"@vue/cli-plugin-babel@^4.5.3":
- version "4.5.3"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.3.tgz#80b2d49b754f57707a25064935cb4efac60fa70c"
+"@vue/cli-plugin-babel@^4.5.4":
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-babel/-/cli-plugin-babel-4.5.4.tgz#a01cdcb3d46064675dd88d61b640adadcc851e2b"
dependencies:
"@babel/core" "^7.11.0"
- "@vue/babel-preset-app" "^4.5.3"
- "@vue/cli-shared-utils" "^4.5.3"
+ "@vue/babel-preset-app" "^4.5.4"
+ "@vue/cli-shared-utils" "^4.5.4"
babel-loader "^8.1.0"
cache-loader "^4.1.0"
thread-loader "^2.1.3"
webpack "^4.0.0"
-"@vue/cli-plugin-eslint@^4.5.3":
- version "4.5.3"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.3.tgz#edac801bf05001e1a7fccd58b20c1a6cfe52701a"
+"@vue/cli-plugin-eslint@^4.5.4":
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-4.5.4.tgz#0f1f307abfe1e4ad67dcb97693640942b15fae76"
dependencies:
- "@vue/cli-shared-utils" "^4.5.3"
+ "@vue/cli-shared-utils" "^4.5.4"
eslint-loader "^2.2.1"
globby "^9.2.0"
inquirer "^7.1.0"
webpack "^4.0.0"
yorkie "^2.0.0"
-"@vue/cli-plugin-router@^4.5.3":
- version "4.5.3"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.5.3.tgz#32c73d6b68b1d2b0d945dcc9be3ceb15e1d7fd52"
+"@vue/cli-plugin-router@^4.5.4":
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-router/-/cli-plugin-router-4.5.4.tgz#06f22408c7ed6aceddbf7302cb47a293b7af4347"
dependencies:
- "@vue/cli-shared-utils" "^4.5.3"
+ "@vue/cli-shared-utils" "^4.5.4"
-"@vue/cli-plugin-vuex@^4.5.3":
- version "4.5.3"
- resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.3.tgz#c0a566b0156e5bbbcc41e8cec195bc683aca7f5c"
+"@vue/cli-plugin-vuex@^4.5.4":
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-4.5.4.tgz#6296e307388f61132117e0ac03188013652b0c55"
-"@vue/cli-service@^4.5.3":
- version "4.5.3"
- resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.5.3.tgz#4cf269a86d3d78c0568ed77908c18e9b970ad2ff"
+"@vue/cli-service@^4.5.4":
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/@vue/cli-service/-/cli-service-4.5.4.tgz#f903edf555d107404624de2fed5996da8cedc524"
dependencies:
"@intervolga/optimize-cssnano-plugin" "^1.0.5"
"@soda/friendly-errors-webpack-plugin" "^1.7.1"
@@ -1959,10 +1978,10 @@
"@types/minimist" "^1.2.0"
"@types/webpack" "^4.0.0"
"@types/webpack-dev-server" "^3.11.0"
- "@vue/cli-overlay" "^4.5.3"
- "@vue/cli-plugin-router" "^4.5.3"
- "@vue/cli-plugin-vuex" "^4.5.3"
- "@vue/cli-shared-utils" "^4.5.3"
+ "@vue/cli-overlay" "^4.5.4"
+ "@vue/cli-plugin-router" "^4.5.4"
+ "@vue/cli-plugin-vuex" "^4.5.4"
+ "@vue/cli-shared-utils" "^4.5.4"
"@vue/component-compiler-utils" "^3.1.2"
"@vue/preload-webpack-plugin" "^1.1.0"
"@vue/web-component-wrapper" "^1.2.0"
@@ -2011,9 +2030,9 @@
optionalDependencies:
vue-loader-v16 "npm:vue-loader@^16.0.0-beta.3"
-"@vue/cli-shared-utils@^4.5.3":
- version "4.5.3"
- resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.5.3.tgz#23bcca7ffc3a09b2c50d8b8d9d031a9ff775b512"
+"@vue/cli-shared-utils@^4.5.4":
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/@vue/cli-shared-utils/-/cli-shared-utils-4.5.4.tgz#ed36b2971dc02653f7f2ad4e66bbe9510e1bd414"
dependencies:
"@hapi/joi" "^15.0.1"
chalk "^2.4.2"
@@ -2287,7 +2306,7 @@ acorn@^7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
-acorn@^7.3.1, acorn@^7.4.0:
+acorn@^7.4.0:
version "7.4.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
@@ -2314,6 +2333,10 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1:
version "3.4.1"
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
+ajv-keywords@^3.5.2:
+ version "3.5.2"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+
ajv@^6.1.0, ajv@^6.10.2, ajv@^6.5.5:
version "6.11.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"
@@ -2341,6 +2364,15 @@ ajv@^6.12.2:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
+ajv@^6.12.4:
+ version "6.12.4"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
+ dependencies:
+ fast-deep-equal "^3.1.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
+
alphanum-sort@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
@@ -4608,11 +4640,12 @@ eslint-visitor-keys@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
-eslint@^7.7.0:
- version "7.7.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.7.0.tgz#18beba51411927c4b64da0a8ceadefe4030d6073"
+eslint@^7.8.1:
+ version "7.8.1"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.8.1.tgz#e59de3573fb6a5be8ff526c791571646d124a8fa"
dependencies:
"@babel/code-frame" "^7.0.0"
+ "@eslint/eslintrc" "^0.1.3"
ajv "^6.10.0"
chalk "^4.0.0"
cross-spawn "^7.0.2"
@@ -4622,7 +4655,7 @@ eslint@^7.7.0:
eslint-scope "^5.1.0"
eslint-utils "^2.1.0"
eslint-visitor-keys "^1.3.0"
- espree "^7.2.0"
+ espree "^7.3.0"
esquery "^1.2.0"
esutils "^2.0.2"
file-entry-cache "^5.0.1"
@@ -4657,11 +4690,11 @@ espree@^6.1.2:
acorn-jsx "^5.2.0"
eslint-visitor-keys "^1.1.0"
-espree@^7.2.0:
- version "7.2.0"
- resolved "https://registry.yarnpkg.com/espree/-/espree-7.2.0.tgz#1c263d5b513dbad0ac30c4991b93ac354e948d69"
+espree@^7.3.0:
+ version "7.3.0"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
dependencies:
- acorn "^7.3.1"
+ acorn "^7.4.0"
acorn-jsx "^5.2.0"
eslint-visitor-keys "^1.3.0"
@@ -5034,12 +5067,12 @@ file-loader@^4.2.0:
loader-utils "^1.2.3"
schema-utils "^2.5.0"
-file-loader@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.0.0.tgz#97bbfaab7a2460c07bcbd72d3a6922407f67649f"
+file-loader@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-6.1.0.tgz#65b9fcfb0ea7f65a234a1f10cdd7f1ab9a33f253"
dependencies:
loader-utils "^2.0.0"
- schema-utils "^2.6.5"
+ schema-utils "^2.7.1"
file-type@^14.1.4:
version "14.3.0"
@@ -5843,7 +5876,7 @@ import-fresh@^2.0.0:
caller-path "^2.0.0"
resolve-from "^3.0.0"
-import-fresh@^3.0.0:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
dependencies:
@@ -6027,23 +6060,23 @@ ipfs-block-service@^0.17.1:
err-code "^2.0.0"
streaming-iterables "^4.1.0"
-ipfs-core-utils@^0.3.1:
- version "0.3.1"
- resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.3.1.tgz#d163c90fdd449a6acec267e1fd6c79c749502fc2"
+ipfs-core-utils@^0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/ipfs-core-utils/-/ipfs-core-utils-0.3.2.tgz#24112ff687f79bd8d536c9b6aff4b7964161b8b9"
dependencies:
blob-to-it "0.0.1"
browser-readablestream-to-it "0.0.1"
buffer "^5.6.0"
cids "^0.8.3"
err-code "^2.0.0"
- ipfs-utils "^2.2.2"
+ ipfs-utils "^3.0.0"
it-all "^1.0.1"
it-map "^1.0.0"
it-peekable "0.0.1"
-ipfs-http-client@^46.0.0:
- version "46.0.0"
- resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-46.0.0.tgz#752346b275e8bc292c451ab8507eb225404b0031"
+ipfs-http-client@^46.0.1:
+ version "46.0.1"
+ resolved "https://registry.yarnpkg.com/ipfs-http-client/-/ipfs-http-client-46.0.1.tgz#72c69fb8ab8f3c312573d15f28b93a130a033618"
dependencies:
abort-controller "^3.0.0"
any-signal "^1.1.0"
@@ -6052,8 +6085,8 @@ ipfs-http-client@^46.0.0:
cids "^0.8.3"
debug "^4.1.0"
form-data "^3.0.0"
- ipfs-core-utils "^0.3.1"
- ipfs-utils "^2.2.2"
+ ipfs-core-utils "^0.3.2"
+ ipfs-utils "^3.0.0"
ipld-block "^0.9.2"
ipld-dag-cbor "^0.16.0"
ipld-dag-pb "^0.19.0"
@@ -6201,9 +6234,26 @@ ipfs-utils@^2.3.0:
node-fetch "^2.6.0"
stream-to-it "^0.2.0"
-ipfs@^0.49.0:
- version "0.49.0"
- resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.49.0.tgz#c7d44315e998a6e33bc68d4dc73db86c9d5b7bfc"
+ipfs-utils@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/ipfs-utils/-/ipfs-utils-3.0.0.tgz#58f8345ff26c4ae6b4a8e3a2366bd25de3e1460e"
+ dependencies:
+ abort-controller "^3.0.0"
+ any-signal "^1.1.0"
+ buffer "^5.6.0"
+ err-code "^2.0.0"
+ fs-extra "^9.0.1"
+ is-electron "^2.2.0"
+ iso-url "^0.4.7"
+ it-glob "0.0.8"
+ merge-options "^2.0.0"
+ nanoid "^3.1.3"
+ node-fetch "^2.6.0"
+ stream-to-it "^0.2.0"
+
+ipfs@^0.49.1:
+ version "0.49.1"
+ resolved "https://registry.yarnpkg.com/ipfs/-/ipfs-0.49.1.tgz#3b26a796726e521d641000023d671cba83813e5a"
dependencies:
"@hapi/ammo" "^3.1.2"
"@hapi/boom" "^7.4.3"
@@ -6237,14 +6287,14 @@ ipfs@^0.49.0:
interface-datastore "^1.0.2"
ipfs-bitswap "^2.0.1"
ipfs-block-service "^0.17.1"
- ipfs-core-utils "^0.3.1"
- ipfs-http-client "^46.0.0"
+ ipfs-core-utils "^0.3.2"
+ ipfs-http-client "^46.0.1"
ipfs-http-response "^0.5.0"
ipfs-repo "^4.0.0"
ipfs-unixfs "^1.0.3"
ipfs-unixfs-exporter "^2.0.2"
ipfs-unixfs-importer "^2.0.2"
- ipfs-utils "^2.2.2"
+ ipfs-utils "^3.0.0"
ipld "^0.26.2"
ipld-bitcoin "^0.3.0"
ipld-block "^0.9.2"
@@ -9948,9 +9998,9 @@ prettier@^1.18.2:
version "1.19.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
-prettier@^2.0.5:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4"
+prettier@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"
pretty-bytes@^5.3.0:
version "5.3.0"
@@ -10640,6 +10690,14 @@ schema-utils@^2.6.6:
ajv "^6.12.2"
ajv-keywords "^3.4.1"
+schema-utils@^2.7.1:
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
+ dependencies:
+ "@types/json-schema" "^7.0.5"
+ ajv "^6.12.4"
+ ajv-keywords "^3.5.2"
+
secp256k1@^3.0.1:
version "3.8.0"
resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.8.0.tgz#28f59f4b01dbee9575f56a47034b7d2e3b3b352d"
@@ -11297,6 +11355,10 @@ strip-json-comments@^3.0.1, strip-json-comments@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180"
+strip-json-comments@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+
strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -11974,9 +12036,9 @@ vue-clickaway@^2.2.2:
dependencies:
loose-envify "^1.2.0"
-vue-context@^5.2.0:
- version "5.2.0"
- resolved "https://registry.yarnpkg.com/vue-context/-/vue-context-5.2.0.tgz#d027f626af50e717c2afd57859dec30a851167de"
+vue-context@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/vue-context/-/vue-context-6.0.0.tgz#97a1a423fc86fb7a54f46d1567670aba281a5970"
dependencies:
vue-clickaway "^2.2.2"
--
GitLab