Skip to content

GitLab

Commit f898b708 authored by Adam Procter's avatar Adam Procter
Browse files

Merge branch 'main' into futurenogg

parents 0035a5f9 1fb54fb5
Hide whitespace changes
Inline Side-by-side
package.json
View file @ f898b708
......@@ -8,11 +8,11 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"core-js": "^3.16.1",
"core-js": "^3.16.2",
"freeze-dry": "^0.2.5",
"marked": "^2.1.3",
"marked": "^3.0.0",
"pouchdb": "^7.2.2",
"vue": "^3.2.2",
"vue": "^3.2.4",
"vue-router": "^4.0.0",
"vuex": "^4.0.0"
},
......@@ -22,7 +22,7 @@
"@vue/cli-plugin-router": "^4.5.12",
"@vue/cli-plugin-vuex": "^4.5.12",
"@vue/cli-service": "^4.5.12",
"@vue/compiler-sfc": "^3.2.0",
"@vue/compiler-sfc": "^3.2.4",
"@vue/eslint-config-prettier": "^6.0.0",
"babel-eslint": "^10.1.0",
"eslint": "^7.32.0",
......
src/components/YourNodes.vue → src/components/MyNodes.vue
View file @ f898b708
......@@ -28,7 +28,7 @@ import { mapState } from 'vuex'
// import marked from 'marked'
export default {
name: 'YourNodes',
name: 'MyNodes',
props: {
added: Boolean,
......@@ -42,7 +42,7 @@ export default {
computed: {
...mapState({
myNodes: (state) => state.mynodes,
myNodes: (state) => state.myNodes,
}),
nodesFiltered: function () {
......@@ -70,7 +70,7 @@ export default {
added: {
deep: true,
handler() {
setTimeout(this.loadData, 200)
setTimeout(this.loadData, 500)
},
},
},
......
src/store/modules/mynodes.js
View file @ f898b708
......@@ -43,11 +43,10 @@ export const mutations = {
// this was to set quick focus on new nodes
// i think... need to check old code
state.activeNode = newNode
this.getNodes()
})
})
.catch(function (err) {
console.log(err.status)
console.log(err)
})
})
})
......@@ -89,6 +88,7 @@ export const mutations = {
.catch(function (err) {
console.log(err)
})
// TODO: Get other nodes from all other devices
},
EDIT_NODE(state, e) {
......
src/store/store.js
View file @ f898b708
import { createStore } from 'vuex'
import * as setup from '@/store/modules/setup.js'
import * as mynodes from '@/store/modules/mynodes.js'
import * as myNodes from '@/store/modules/myNodes.js'
export const store = createStore({
//
modules: {
setup,
mynodes,
myNodes,
},
actions: {},
......
src/views/Collect.vue
View file @ f898b708
<template>
<ToolBar @added-node="addedNode" />
<YourNodes :added="added" />
<MyNodes :added="added" />
</template>
<script>
// @ is an alias to /src
import ToolBar from '@/components/ToolBar.vue'
import YourNodes from '@/components/YourNodes.vue'
import MyNodes from '@/components/MyNodes.vue'
export default {
mounted() {
......@@ -16,7 +16,7 @@ export default {
components: {
ToolBar,
YourNodes,
MyNodes,
},
data() {
......
yarn.lock
View file @ f898b708
......@@ -1268,37 +1268,37 @@
semver "^6.1.0"
strip-ansi "^6.0.0"
"@vue/compiler-core@3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.2.tgz#8d3e29f129579ed9b14f48af735fd8d95f248504"
integrity sha512-QhCI0ZU5nAR0LMcLgzW3v75374tIrHGp8XG5CzJS7Nsy+iuignbE4MZ2XJfh5TGIrtpuzfWA4eTIfukZf/cRdg==
"@vue/compiler-core@3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.4.tgz#a98d295771998c1e8dccc4ee3d52feb14b02aea9"
integrity sha512-c8NuQq7mUXXxA4iqD5VUKpyVeklK53+DMbojYMyZ0VPPrb0BUWrZWFiqSDT+MFDv0f6Hv3QuLiHWb1BWMXBbrw==
dependencies:
"@babel/parser" "^7.12.0"
"@babel/types" "^7.12.0"
"@vue/shared" "3.2.2"
"@vue/shared" "3.2.4"
estree-walker "^2.0.1"
source-map "^0.6.1"
"@vue/compiler-dom@3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.2.tgz#26e198498746c53047c3744d26fc95e670692ab7"
integrity sha512-ggcc+NV/ENIE0Uc3TxVE/sKrhYVpLepMAAmEiQ047332mbKOvUkowz4TTFZ+YkgOIuBOPP0XpCxmCMg7p874mA==
"@vue/compiler-dom@3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.4.tgz#3a43de243eba127abbe57e796a0b969d2df78c08"
integrity sha512-uj1nwO4794fw2YsYas5QT+FU/YGrXbS0Qk+1c7Kp1kV7idhZIghWLTjyvYibpGoseFbYLPd+sW2/noJG5H04EQ==
dependencies:
"@vue/compiler-core" "3.2.2"
"@vue/shared" "3.2.2"
"@vue/compiler-core" "3.2.4"
"@vue/shared" "3.2.4"
"@vue/compiler-sfc@^3.2.0":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.2.tgz#5b7b13b07689be8e4880d856f72d1be500785be9"
integrity sha512-hrtqpQ5L6IPn5v7yVRo7uvLcQxv0z1+KBjZBWMBOcrXz4t+PKUxU/SWd6Tl9T8FDmYlunzKUh6lcx+2CLo6f5A==
"@vue/compiler-sfc@^3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.4.tgz#9807868cc950291f163c3930a81bb16e870df097"
integrity sha512-GM+ouDdDzhqgkLmBH4bgq4kiZxJQArSppJiZHWHIx9XRaefHLmc1LBNPmN8ivm4SVfi2i7M2t9k8ZnjsScgzPQ==
dependencies:
"@babel/parser" "^7.13.9"
"@babel/types" "^7.13.0"
"@types/estree" "^0.0.48"
"@vue/compiler-core" "3.2.2"
"@vue/compiler-dom" "3.2.2"
"@vue/compiler-ssr" "3.2.2"
"@vue/shared" "3.2.2"
"@vue/compiler-core" "3.2.4"
"@vue/compiler-dom" "3.2.4"
"@vue/compiler-ssr" "3.2.4"
"@vue/shared" "3.2.4"
consolidate "^0.16.0"
estree-walker "^2.0.1"
hash-sum "^2.0.0"
......@@ -1310,13 +1310,13 @@
postcss-selector-parser "^6.0.4"
source-map "^0.6.1"
"@vue/compiler-ssr@3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.2.tgz#633bb8e01f00a969c35ca12db32be7fe4c7185a9"
integrity sha512-rVl1agMFhdEN3Go0bCriXo+3cysxKIuRP0yh1Wd8ysRrKfAmokyDhUA8PrGSq2Ymj/LdZTh+4OKfj3p2+C+hlA==
"@vue/compiler-ssr@3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.4.tgz#be51f219c2042b3e530373e60bc126ada6bb1cc0"
integrity sha512-bKZuXu9/4XwsFHFWIKQK+5kN7mxIIWmMmT2L4VVek7cvY/vm3p4WTsXYDGZJy0htOTXvM2ifr6sflg012T0hsw==
dependencies:
"@vue/compiler-dom" "3.2.2"
"@vue/shared" "3.2.2"
"@vue/compiler-dom" "3.2.4"
"@vue/shared" "3.2.4"
"@vue/component-compiler-utils@^3.1.0", "@vue/component-compiler-utils@^3.1.2":
version "3.2.0"
......@@ -1347,34 +1347,34 @@
version "1.1.2"
resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab"
"@vue/reactivity@3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.2.tgz#d37011a68395e038a3cf5256af52d48c591b06b6"
integrity sha512-IHjhtmrhK6dzacj/EnLQDWOaA3HuzzVk6w84qgV8EpS4uWGIJXiRalMRg6XvGW2ykJvIl3pLsF0aBFlTMRiLOA==
"@vue/reactivity@3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.4.tgz#a020ad7e50f674219a07764b105b5922e61597ea"
integrity sha512-ljWTR0hr8Tn09hM2tlmWxZzCBPlgGLnq/k8K8X6EcJhtV+C8OzFySnbWqMWataojbrQOocThwsC8awKthSl2uQ==
dependencies:
"@vue/shared" "3.2.2"
"@vue/shared" "3.2.4"
"@vue/runtime-core@3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.2.tgz#b9a7250783de19dd8dd6febf008084b0f9144586"
integrity sha512-/aUk1+GO/VPX0oVxhbzSWE1zrf3/wGCsO1ALNisVokYftKqfqLDjbJHE6mrI2hx3MiuwbHrWjJClkGUVTIOPEQ==
"@vue/runtime-core@3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.4.tgz#da5dde3dc1e48df99dd31ea9a972f5c02acdc3f5"
integrity sha512-W6PtEOs8P8jKYPo3JwaMAozZQivxInUleGfNwI2pK1t8ZLZIxn4kAf7p4VF4jJdQB8SZBzpfWdLUc06j7IOmpQ==
dependencies:
"@vue/reactivity" "3.2.2"
"@vue/shared" "3.2.2"
"@vue/reactivity" "3.2.4"
"@vue/shared" "3.2.4"
"@vue/runtime-dom@3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.2.tgz#6d0da23ed1cfc702477f4b8c5dc4f9335c94e119"
integrity sha512-1Le/NpCfawCOfePfJezvWUF+oCVLU8N+IHN4oFDOxRe6/PgHNJ+yT+YdxFifBfI+TIAoXI/9PsnqzmJZV+xsmw==
"@vue/runtime-dom@3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.4.tgz#1025595f2ae99a12fe0e1e6bce8df6761efec24b"
integrity sha512-HcVtLyn2SGwsf6BFPwkvDPDOhOqkOKcfHDpBp5R1coX+qMsOFrY8lJnGXIY+JnxqFjND00E9+u+lq5cs/W7ooA==
dependencies:
"@vue/runtime-core" "3.2.2"
"@vue/shared" "3.2.2"
"@vue/runtime-core" "3.2.4"
"@vue/shared" "3.2.4"
csstype "^2.6.8"
"@vue/shared@3.2.2":
version "3.2.2"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.2.tgz#6104185ebd57af5a14ac51c1f491b2205fc24054"
integrity sha512-dvYb318tk9uOzHtSaT3WII/HscQSIRzoCZ5GyxEb3JlkEXASpAUAQwKnvSe2CudnF8XHFRTB7VITWSnWNLZUtA==
"@vue/shared@3.2.4":
version "3.2.4"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.4.tgz#ba2a09527afff27b28d08f921b4a597e9504ca7a"
integrity sha512-j2j1MRmjalVKr3YBTxl/BClSIc8UQ8NnPpLYclxerK65JIowI4O7n8O8lElveEtEoHxy1d7BelPUDI0Q4bumqg==
"@vue/web-component-wrapper@^1.2.0":
version "1.3.0"
......@@ -2549,9 +2549,10 @@ core-js-compat@^3.6.5, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
browserslist "^4.16.6"
semver "7.0.0"
core-js@^3.16.1:
version "3.16.1"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249"
core-js@^3.16.2:
version "3.16.2"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.2.tgz#3f485822889c7fc48ef463e35be5cc2a4a01a1f4"
integrity sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==
core-js@^3.6.5:
version "3.12.1"
......@@ -4996,9 +4997,10 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"
marked@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz#bd017cef6431724fd4b27e0657f5ceb14bff3753"
marked@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/marked/-/marked-3.0.0.tgz#ac8369b7ddeef15fbbce870d14f321bdb20ca4e2"
integrity sha512-IF2MYfFafPsLIhzLTu63secRBwOmIY+vwS+ei6qg8F+bTS+MxH6ONYRmuseGdZqF44qvoi3nP/rlpClBdgLbiQ==
md5.js@^1.3.4:
version "1.3.5"
......@@ -7652,14 +7654,14 @@ vue-template-es2015-compiler@^1.9.0:
version "1.9.1"
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
vue@^3.2.2:
version "3.2.2"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.2.tgz#11715cb71a02baefd0f6e6552dc623680eb1bf32"
integrity sha512-D/LuzAV30CgNJYGyNheE/VUs5N4toL2IgmS6c9qeOxvyh0xyn4exyRqizpXIrsvfx34zG9x5gCI2tdRHCGvF9w==
vue@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.4.tgz#d94d88675e41c050d3a722d0848a7063b5e87a60"
integrity sha512-rNCFmoewm8IwmTK0nj3ysKq53iRpNEFKoBJ4inar6tIh7Oj7juubS39RI8UI+VE7x+Cs2z6PBsadtZu7z2qppg==
dependencies:
"@vue/compiler-dom" "3.2.2"
"@vue/runtime-dom" "3.2.2"
"@vue/shared" "3.2.2"
"@vue/compiler-dom" "3.2.4"
"@vue/runtime-dom" "3.2.4"
"@vue/shared" "3.2.4"
vuex@^4.0.0:
version "4.0.2"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment